diff options
Diffstat (limited to 'pkgs/development')
4726 files changed, 68252 insertions, 56558 deletions
diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index c8896c14c32f9..0b7efb60deb9b 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -9,7 +9,6 @@ , gmp , libiconv , xz -, gcc-unwrapped , readline , zlib , python3 diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix index 7fdd4e99d550b..0180558e1b967 100644 --- a/pkgs/development/ada-modules/gnatcoll/core.nix +++ b/pkgs/development/ada-modules/gnatcoll/core.nix @@ -3,7 +3,6 @@ , gnat , gprbuild , fetchFromGitHub -, xmlada , which }: diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 6eacff1ddb82f..017a51e2fb750 100644 --- a/pkgs/development/ada-modules/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix @@ -5,7 +5,6 @@ , gprbuild , which , gnatcoll-core -, xmlada , component # components built by this derivation other components depend on , gnatcoll-sql diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index 319b295d58fdc..d50baba1391fb 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -11,25 +11,25 @@ let gnat_version = lib.versions.major gnat.version; - fetchSpark2014 = { rev, sha256 } : fetchFromGitHub { + fetchSpark2014 = { rev, hash } : fetchFromGitHub { owner = "AdaCore"; repo = "spark2014"; fetchSubmodules = true; - inherit rev sha256; + inherit rev hash; }; spark2014 = { "12" = { src = fetchSpark2014 { rev = "ab34e07080a769b63beacc141707b5885c49d375"; # branch fsf-12 - sha256 = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; + hash = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; }; commit_date = "2022-05-25"; }; "13" = { src = fetchSpark2014 { rev = "12db22e854defa9d1c993ef904af1e72330a68ca"; # branch fsf-13 - sha256 = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; + hash = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; }; commit_date = "2023-01-05"; }; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index a8b172f4eb5d2..ccf8b4591d388 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -1,6 +1,6 @@ { lib, stdenv, makeWrapper , runCommand, wrapBintoolsWith, wrapCCWith, autoPatchelfHook -, buildAndroidndk, androidndk, targetAndroidndkPkgs +, llvmPackages, buildAndroidndk, androidndk, targetAndroidndkPkgs }: let @@ -63,6 +63,7 @@ rec { passthru = { inherit targetPrefix; isClang = true; # clang based cc, but bintools ld + inherit (llvmPackages.clang.cc) hardeningUnsupportedFlagsByTargetPlatform; }; dontUnpack = true; dontBuild = true; diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index b11776acebf59..93af59a859330 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,8 +1,8 @@ -{ lib, androidenv, buildPackages, pkgs, targetPackages +{ lib, androidenv, buildPackages, pkgs, targetPackages, androidndkPkgs_23, config }: let - makeNdkPkgs = ndkVersion: + makeNdkPkgs = ndkVersion: llvmPackages: let buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { includeNDK = true; @@ -22,6 +22,10 @@ let inherit (pkgs) stdenv runCommand wrapBintoolsWith wrapCCWith; + + # For hardeningUnsupportedFlagsByTargetPlatform + inherit llvmPackages; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, # but for splicing messing up on infinite recursion for the variants we # *dont't* use. Using this workaround, but also making a test to ensure @@ -33,9 +37,10 @@ let in { - "21" = makeNdkPkgs "21.0.6113669"; - "23b" = makeNdkPkgs "23.1.7779620"; - "24" = makeNdkPkgs "24.0.8215888"; - "25" = makeNdkPkgs "25.2.9519653"; - "26" = makeNdkPkgs "26.3.11579264"; + "21" = makeNdkPkgs "21.0.6113669" pkgs.llvmPackages_14; # "9" + "23" = makeNdkPkgs "23.1.7779620" pkgs.llvmPackages_14; # "12" + # Versions below 24 use a version not available in nixpkgs/old version which could be removed in the near future so use 14 for them as this is only used to get the hardening flags. + "24" = makeNdkPkgs "24.0.8215888" pkgs.llvmPackages_14; + "25" = makeNdkPkgs "25.2.9519653" pkgs.llvmPackages_14; + "26" = makeNdkPkgs "26.3.11579264" pkgs.llvmPackages_17; } diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 144ffb55e95ea..98ffe5e6af60b 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.21.3"; + version = "0.23.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-IzHvJQ7UdGXFeSyNYKeHlDuY/o1y/E4fM+lG3t9J2HM="; + hash = "sha256-X5BJuqr3TVwpv731ym+Ac3+goA0LH9f3H5wWFwQsAB8="; }; in mixRelease { @@ -20,7 +20,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-3PVMembw3CpYUQ/ynoPKmu0N5iZwoFu9uNjRS+kS4BY="; + hash = "sha256-2b5XJnS4ipSjppUniXr1ep8Ymv3yd6COYM/W1QNM/zc="; }; # elixir-ls is an umbrella app diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index 4dff6a21ed84c..2a6322cec899c 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchgit, fetchHex, rebar3WithPlugins, rebar3-nix, rebar3Relx +{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx , buildRebar3, writeScript, lib }: let diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 95b991cc7d822..a2ea7c8bd449e 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper -, stdenv, writeScript, lib, erlang }: +, stdenv, writeScript, lib }: let version = "0.52.0"; owner = "erlang-ls"; diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index a762b8e0bc2e8..5c5f833119aa9 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,56 +1,61 @@ -{ stdenv -, lib -, elixir -, erlang -, hex -, git -, rebar -, rebar3 -, fetchMixDeps -, findutils -, ripgrep -, bbe -, makeWrapper -, coreutils -, gnused -, gnugrep -, gawk +{ + stdenv, + lib, + elixir, + erlang, + hex, + git, + rebar, + rebar3, + fetchMixDeps, + findutils, + ripgrep, + bbe, + makeWrapper, + coreutils, + gnused, + gnugrep, + gawk, }@inputs: -{ pname -, version -, src -, nativeBuildInputs ? [ ] -, buildInputs ? [ ] -, meta ? { } -, enableDebugInfo ? false -, mixEnv ? "prod" -, compileFlags ? [ ] +{ + pname, + version, + src, + nativeBuildInputs ? [ ], + buildInputs ? [ ], + meta ? { }, + enableDebugInfo ? false, + mixEnv ? "prod", + compileFlags ? [ ], + # Build a particular named release. + # see https://hexdocs.pm/mix/1.12/Mix.Tasks.Release.html#content + mixReleaseName ? "", # Options to be passed to the Erlang compiler. As documented in the reference # manual, these must be valid Erlang terms. They will be turned into an # erlang list and set as the ERL_COMPILER_OPTIONS environment variable. # See https://www.erlang.org/doc/man/compile -, erlangCompilerOptions ? [ ] + erlangCompilerOptions ? [ ], # Deterministic Erlang builds remove full system paths from debug information # among other things to keep builds more reproducible. See their docs for more: # https://www.erlang.org/doc/man/compile -, erlangDeterministicBuilds ? true + erlangDeterministicBuilds ? true, # Mix dependencies provided as a fixed output derivation -, mixFodDeps ? null + mixFodDeps ? null, # Mix dependencies generated by mix2nix # # This assumes each dependency is built by buildMix or buildRebar3. Each # dependency needs to have a setup hook to add the lib path to $ERL_LIBS. # This is how Mix finds dependencies. -, mixNixDeps ? { } + mixNixDeps ? { }, -, elixir ? inputs.elixir -, erlang ? inputs.erlang -, hex ? inputs.hex.override { inherit elixir; } + elixir ? inputs.elixir, + erlang ? inputs.erlang, + hex ? inputs.hex.override { inherit elixir; }, # Remove releases/COOKIE # @@ -65,172 +70,204 @@ # # You can always specify a custom cookie by using RELEASE_COOKIE environment # variable, regardless of the value of this attr. -, removeCookie ? true + removeCookie ? true, # This reduces closure size, but can lead to some hard to understand runtime # errors, so use with caution. See e.g. # https://github.com/whitfin/cachex/issues/205 # https://framagit.org/framasoft/mobilizon/-/issues/1169 -, stripDebug ? false + stripDebug ? false, -, ... + ... }@attrs: let # Remove non standard attributes that cannot be coerced to strings - overridable = builtins.removeAttrs attrs [ "compileFlags" "erlangCompilerOptions" "mixNixDeps" ]; + overridable = builtins.removeAttrs attrs [ + "compileFlags" + "erlangCompilerOptions" + "mixNixDeps" + ]; in assert mixNixDeps != { } -> mixFodDeps == null; assert stripDebug -> !enableDebugInfo; -stdenv.mkDerivation (overridable // { - nativeBuildInputs = nativeBuildInputs ++ - # Erlang/Elixir deps - [ erlang elixir hex git ] ++ - # Mix deps - (builtins.attrValues mixNixDeps) ++ - # other compile-time deps - [ findutils ripgrep bbe makeWrapper ]; - - buildInputs = buildInputs; - - MIX_ENV = mixEnv; - MIX_DEBUG = if enableDebugInfo then 1 else 0; - HEX_OFFLINE = 1; - - DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation - # The API with `mix local.rebar rebar path` makes a copy of the binary - # some older dependencies still use rebar. - MIX_REBAR = "${rebar}/bin/rebar"; - MIX_REBAR3 = "${rebar3}/bin/rebar3"; - - ERL_COMPILER_OPTIONS = - let - options = erlangCompilerOptions ++ lib.optionals erlangDeterministicBuilds [ "deterministic" ]; - in - "[${lib.concatStringsSep "," options}]"; - - LC_ALL = "C.UTF-8"; - - postUnpack = '' - # Mix and Hex - export MIX_HOME="$TEMPDIR/mix" - export HEX_HOME="$TEMPDIR/hex" - - # Rebar - export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" - export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" - - ${lib.optionalString (mixFodDeps != null) '' - # Compilation of the dependencies will require that the dependency path is - # writable, thus a copy to the $TEMPDIR is inevitable here. - export MIX_DEPS_PATH="$TEMPDIR/deps" - cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" - ''} - '' + (attrs.postUnpack or ""); - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - ${./mix-configure-hook.sh} - - # This is needed for projects that have a specific compile step - # the dependency needs to be compiled in order for the task - # to be available. - # - # Phoenix projects for example will need compile.phoenix. - mix deps.compile --no-deps-check --skip-umbrella-children - - # Symlink dependency sources. This is needed for projects that require - # access to the source of their dependencies. For example, Phoenix - # projects need javascript assets to build asset bundles. - ${lib.optionalString (mixNixDeps != { }) '' - mkdir -p deps - - ${lib.concatMapStringsSep "\n" (dep: '' - dep_name=$(basename ${dep} | cut -d '-' -f2) - dep_path="deps/$dep_name" - if [ -d "${dep}/src" ]; then - ln -s ${dep}/src $dep_path +stdenv.mkDerivation ( + overridable + // { + nativeBuildInputs = + nativeBuildInputs + ++ + # Erlang/Elixir deps + [ + erlang + elixir + hex + git + ] + ++ + # Mix deps + (builtins.attrValues mixNixDeps) + ++ + # other compile-time deps + [ + findutils + ripgrep + bbe + makeWrapper + ]; + + buildInputs = buildInputs; + + MIX_ENV = mixEnv; + MIX_DEBUG = if enableDebugInfo then 1 else 0; + HEX_OFFLINE = 1; + + DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation + # The API with `mix local.rebar rebar path` makes a copy of the binary + # some older dependencies still use rebar. + MIX_REBAR = "${rebar}/bin/rebar"; + MIX_REBAR3 = "${rebar3}/bin/rebar3"; + + ERL_COMPILER_OPTIONS = + let + options = erlangCompilerOptions ++ lib.optionals erlangDeterministicBuilds [ "deterministic" ]; + in + "[${lib.concatStringsSep "," options}]"; + + LC_ALL = "C.UTF-8"; + + postUnpack = + '' + # Mix and Hex + export MIX_HOME="$TEMPDIR/mix" + export HEX_HOME="$TEMPDIR/hex" + + # Rebar + export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" + export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" + + ${lib.optionalString (mixFodDeps != null) '' + # Compilation of the dependencies will require that the dependency path is + # writable, thus a copy to the $TEMPDIR is inevitable here. + export MIX_DEPS_PATH="$TEMPDIR/deps" + cp --no-preserve=mode -R "${mixFodDeps}" "$MIX_DEPS_PATH" + ''} + '' + + (attrs.postUnpack or ""); + + configurePhase = + attrs.configurePhase or '' + runHook preConfigure + + ${./mix-configure-hook.sh} + + # This is needed for projects that have a specific compile step + # the dependency needs to be compiled in order for the task + # to be available. + # + # Phoenix projects for example will need compile.phoenix. + mix deps.compile --no-deps-check --skip-umbrella-children + + # Symlink dependency sources. This is needed for projects that require + # access to the source of their dependencies. For example, Phoenix + # projects need javascript assets to build asset bundles. + ${lib.optionalString (mixNixDeps != { }) '' + mkdir -p deps + + ${lib.concatMapStringsSep "\n" (dep: '' + dep_name=$(basename ${dep} | cut -d '-' -f2) + dep_path="deps/$dep_name" + if [ -d "${dep}/src" ]; then + ln -s ${dep}/src $dep_path + fi + '') (builtins.attrValues mixNixDeps)} + ''} + + # Symlink deps to build root. Similar to above, but allows for mixFodDeps + # Phoenix projects to find javascript assets. + ${lib.optionalString (mixFodDeps != null) '' + ln -s ../deps ./ + ''} + + runHook postConfigure + ''; + + buildPhase = + attrs.buildPhase or '' + runHook preBuild + + mix compile --no-deps-check ${lib.concatStringsSep " " compileFlags} + + runHook postBuild + ''; + + installPhase = + attrs.installPhase or '' + runHook preInstall + + mix release ${mixReleaseName} --no-deps-check --path "$out" + + runHook postInstall + ''; + + postFixup = + '' + echo "removing files for Microsoft Windows" + rm -f "$out"/bin/*.bat + + echo "wrapping programs in $out/bin with their runtime deps" + for f in $(find $out/bin/ -type f -executable); do + wrapProgram "$f" \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + gnugrep + gawk + ] + } + done + '' + + lib.optionalString removeCookie '' + if [ -e $out/releases/COOKIE ]; then + echo "removing $out/releases/COOKIE" + rm $out/releases/COOKIE fi - '') (builtins.attrValues mixNixDeps)} - ''} - - # Symlink deps to build root. Similar to above, but allows for mixFodDeps - # Phoenix projects to find javascript assets. - ${lib.optionalString (mixFodDeps != null) '' - ln -s ../deps ./ - ''} - - runHook postConfigure - ''; - - buildPhase = attrs.buildPhase or '' - runHook preBuild - - mix compile --no-deps-check ${lib.concatStringsSep " " compileFlags} - - runHook postBuild - ''; - - installPhase = attrs.installPhase or '' - runHook preInstall - - mix release --no-deps-check --path "$out" - - runHook postInstall - ''; - - postFixup = '' - echo "removing files for Microsoft Windows" - rm -f "$out"/bin/*.bat - - echo "wrapping programs in $out/bin with their runtime deps" - for f in $(find $out/bin/ -type f -executable); do - wrapProgram "$f" \ - --prefix PATH : ${lib.makeBinPath [ - coreutils - gnused - gnugrep - gawk - ]} - done - '' + lib.optionalString removeCookie '' - if [ -e $out/releases/COOKIE ]; then - echo "removing $out/releases/COOKIE" - rm $out/releases/COOKIE - fi - '' + '' - if [ -e $out/erts-* ]; then - # ERTS is included in the release, then erlang is not required as a runtime dependency. - # But, erlang is still referenced in some places. To removed references to erlang, - # following steps are required. - - # 1. remove references to erlang from plain text files - for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do - echo "removing references to erlang in $file" - substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" - done - - # 2. remove references to erlang from .beam files - # - # No need to do anything, because it has been handled by "deterministic" option specified - # by ERL_COMPILER_OPTIONS. - - # 3. remove references to erlang from normal binary files - for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do - echo "removing references to erlang in $file" - # use bbe to substitute strings in binary files, because using substituteInPlace - # on binaries will raise errors - bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file" - rm -f "$file" - mv "$file".tmp "$file" - done - - # References to erlang should be removed from output after above processing. - fi - '' + lib.optionalString stripDebug '' - # Strip debug symbols to avoid hardreferences to "foreign" closures actually - # not needed at runtime, while at the same time reduce size of BEAM files. - erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop - ''; -}) + '' + + '' + if [ -e $out/erts-* ]; then + # ERTS is included in the release, then erlang is not required as a runtime dependency. + # But, erlang is still referenced in some places. To removed references to erlang, + # following steps are required. + + # 1. remove references to erlang from plain text files + for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do + echo "removing references to erlang in $file" + substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" + done + + # 2. remove references to erlang from .beam files + # + # No need to do anything, because it has been handled by "deterministic" option specified + # by ERL_COMPILER_OPTIONS. + + # 3. remove references to erlang from normal binary files + for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do + echo "removing references to erlang in $file" + # use bbe to substitute strings in binary files, because using substituteInPlace + # on binaries will raise errors + bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file" + rm -f "$file" + mv "$file".tmp "$file" + done + + # References to erlang should be removed from output after above processing. + fi + '' + + lib.optionalString stripDebug '' + # Strip debug symbols to avoid hardreferences to "foreign" closures actually + # not needed at runtime, while at the same time reduce size of BEAM files. + erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop + ''; + } +) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py deleted file mode 100755 index 5ff56b2bd2998..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" - -import json -import re -import requests -import sys - -# openjdk15 is only for bootstrapping openjdk -releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") -oses = ("mac", "linux", "alpine_linux") -types = ("jre", "jdk") -impls = ("hotspot", "openj9") - -arch_to_nixos = { - "x64": ("x86_64",), - "aarch64": ("aarch64",), - "arm": ("armv6l", "armv7l"), - "ppc64le": ("powerpc64le",), -} - -def get_sha256(url): - resp = requests.get(url) - if resp.status_code != 200: - print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr) - sys.exit(1) - return resp.text.strip().split(" ")[0] - -def generate_sources(release, assets): - out = {} - for asset in assets: - if asset["os"] not in oses: continue - if asset["binary_type"] not in types: continue - if asset["openjdk_impl"] not in impls: continue - if asset["heap_size"] != "normal": continue - if asset["architecture"] not in arch_to_nixos: continue - - # examples: 11.0.1+13, 8.0.222+10 - version, build = asset["version_data"]["semver"].split("+") - - type_map = out.setdefault(asset["os"], {}) - impl_map = type_map.setdefault(asset["binary_type"], {}) - arch_map = impl_map.setdefault(asset["openjdk_impl"], { - "packageType": asset["binary_type"], - "vmType": asset["openjdk_impl"], - }) - - for nixos_arch in arch_to_nixos[asset["architecture"]]: - arch_map[nixos_arch] = { - "url": asset["binary_link"], - "sha256": get_sha256(asset["checksum_link"]), - "version": version, - "build": build, - } - - return out - -out = {} -for release in releases: - resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release) - if resp.status_code != 200: - print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr) - sys.exit(1) - out[release] = generate_sources(release, resp.json()) - -with open("sources.json", "w") as f: - json.dump(out, f, indent=2, sort_keys=True) - f.write('\n') diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix deleted file mode 100644 index 68d33b657c687..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ sourcePerArch, knownVulnerabilities ? [] }: - -{ swingSupport ? true # not used for now -, lib, stdenv -, fetchurl -, setJavaClassPath -}: - -assert (stdenv.isDarwin && stdenv.isx86_64); - -let cpuName = stdenv.hostPlatform.parsed.cpu.name; - result = stdenv.mkDerivation { - pname = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin"; - version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); - - src = fetchurl { - inherit (sourcePerArch.${cpuName}) url sha256; - }; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - mv $sourceRoot $out - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/ - - rm -rf $out/Home/demo - - # Remove some broken manpages. - rm -rf $out/Home/man/ja* - - ln -s $out/Contents/Home/* $out/ - - # Propagate the setJavaClassPath setup hook from the JDK so that - # any package that depends on the JDK has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <<EOF >> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - # FIXME: use multiple outputs or return actual JRE package - passthru.jre = result; - - passthru.home = result; - - meta = with lib; { - license = licenses.gpl2Classpath; - description = "AdoptOpenJDK, prebuilt OpenJDK binary"; - platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms - maintainers = with lib.maintainers; [ taku0 ]; - inherit knownVulnerabilities; - mainProgram = "java"; - }; - -}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix deleted file mode 100644 index 712efc2f6e4b9..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ sourcePerArch, knownVulnerabilities ? [] }: - -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, makeWrapper -, setJavaClassPath -# minimum dependencies -, alsa-lib -, fontconfig -, freetype -, libffi -, xorg -, zlib -# runtime dependencies -, cups -# runtime dependencies for GTK+ Look and Feel -, gtkSupport ? true -, cairo -, glib -, gtk3 -}: - -let - cpuName = stdenv.hostPlatform.parsed.cpu.name; - runtimeDependencies = [ - cups - ] ++ lib.optionals gtkSupport [ - cairo glib gtk3 - ]; - runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; -in - -let result = stdenv.mkDerivation rec { - pname = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin"; - - version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); - - src = fetchurl { - inherit (sourcePerArch.${cpuName}) url sha256; - }; - - buildInputs = [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - freetype - stdenv.cc.cc.lib # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - zlib - ] ++ lib.optional stdenv.isAarch32 libffi; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - mv $sourceRoot $out - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - rm -rf $out/demo - - # Remove some broken manpages. - rm -rf $out/man/ja* - - # Remove embedded freetype to avoid problems like - # https://github.com/NixOS/nixpkgs/issues/57733 - find "$out" -name 'libfreetype.so*' -delete - - # Propagate the setJavaClassPath setup hook from the JDK so that - # any package that depends on the JDK has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <<EOF >> "$out/nix-support/setup-hook" - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - - # We cannot use -exec since wrapProgram is a function but not a command. - # - # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it - # breaks building OpenJDK (#114495). - for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do - if patchelf --print-interpreter "$bin" &> /dev/null; then - wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" - fi - done - ''; - - preFixup = '' - find "$out" -name libfontmanager.so -exec \ - patchelf --add-needed libfontconfig.so {} \; - ''; - - # FIXME: use multiple outputs or return actual JRE package - passthru.jre = result; - - passthru.home = result; - - meta = with lib; { - license = licenses.gpl2Classpath; - sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; - description = "AdoptOpenJDK, prebuilt OpenJDK binary"; - platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms - maintainers = with lib.maintainers; [ taku0 ]; - inherit knownVulnerabilities; - mainProgram = "java"; - }; - -}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix deleted file mode 100644 index f4f5108df4372..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; }; - jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; }; - jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix deleted file mode 100644 index 6d5b1b036e5b3..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.hotspot; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.openj9; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.openj9; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix deleted file mode 100644 index 87beaf8ddaf86..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; - jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; - jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix deleted file mode 100644 index e6c0002014158..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix deleted file mode 100644 index a4d5b1fc432ee..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; - jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; - jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix deleted file mode 100644 index 4d357969f0aed..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix deleted file mode 100644 index 422e5f21e96cf..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; }; - jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix deleted file mode 100644 index 47bd2a5c9f9fd..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix deleted file mode 100644 index 4eef76cb63129..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; }; - jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix deleted file mode 100644 index 873e0ce3549de..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix deleted file mode 100644 index b79b39902226b..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.hotspot; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix deleted file mode 100644 index b8bb1cbf2bab7..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jre.hotspot; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix deleted file mode 100644 index 56028d7f25e42..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib }: - -let - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; }; - jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; }; - jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; }; - jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix deleted file mode 100644 index ee8226f6903db..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, lib }: - -let - variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux"; - sources = import ./sources.nix; -in -{ - jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; }; - jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.hotspot; }; - jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.openj9; }; - jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.openj9; }; -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json deleted file mode 100644 index 18b8e683bc946..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ /dev/null @@ -1,1192 +0,0 @@ -{ - "openjdk11": { - "alpine_linux": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - } - } - } - }, - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "armv6l": { - "build": "7", - "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "armv7l": { - "build": "7", - "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - } - }, - "openj9": { - "aarch64": { - "build": "9", - "sha256": "31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11-ea" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11" - }, - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "armv6l": { - "build": "7", - "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "armv7l": { - "build": "7", - "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - } - }, - "openj9": { - "aarch64": { - "build": "9", - "sha256": "434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11-ea" - }, - "packageType": "jre", - "powerpc64le": { - "build": "9", - "sha256": "f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11" - }, - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - } - }, - "openj9": { - "packageType": "jdk", - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "797cee6b9f6e18bcc026ee9dcebbce81d62ca897038402d247630b25d41efe15", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" - } - }, - "openj9": { - "packageType": "jre", - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "80a0c03f0b603d6008e29c651f884878743fcaa90fc05aef15f3411749da94e7", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz", - "version": "11.0.11" - } - } - } - } - }, - "openjdk13": { - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "8.1", - "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - }, - "armv6l": { - "build": "8.1", - "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - }, - "armv7l": { - "build": "8.1", - "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "8.1", - "sha256": "fb3362e34aac091a4682394d20dcdc3daea51995d369d62c28424573e0fc04aa", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "8.1", - "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - } - }, - "openj9": { - "packageType": "jdk", - "powerpc64le": { - "build": "8.1", - "sha256": "f71513e525172dfef695b7c27b25e151f232e05b2281648c2b794650c4970832", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", - "version": "13.0.2" - }, - "vmType": "openj9", - "x86_64": { - "build": "8.1", - "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", - "version": "13.0.2" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "8.1", - "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "8.1", - "sha256": "43d6fb71bdf7b6ad9295087c46dfc9b00bf26db1b5cdcff0c418cbe43b49904a", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_ppc64le_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "8.1", - "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - } - }, - "openj9": { - "packageType": "jre", - "powerpc64le": { - "build": "8.1", - "sha256": "7bf8dc4c3b95e87b154f7bc2f9388a6539413fe76d49b362bba878217ccb7ed7", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", - "version": "13.0.2" - }, - "vmType": "openj9", - "x86_64": { - "build": "8.1", - "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz", - "version": "13.0.2" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "8.1", - "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - } - }, - "openj9": { - "packageType": "jdk", - "vmType": "openj9", - "x86_64": { - "build": "8.1", - "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", - "version": "13.0.2" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "8.1", - "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz", - "version": "13.0.2" - } - }, - "openj9": { - "packageType": "jre", - "vmType": "openj9", - "x86_64": { - "build": "8.1", - "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2", - "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz", - "version": "13.0.2" - } - } - } - } - }, - "openjdk14": { - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "12", - "sha256": "ee87e9f03b1fbe6f328429b78fe1a9f44900026d220c90dfd747fe0bcd62d904", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "armv6l": { - "build": "12", - "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "armv7l": { - "build": "12", - "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "12", - "sha256": "465a3b8e931896b8d95e452d479615c4bf543535c05b6ea246323ae114e67d7d", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - } - }, - "openj9": { - "packageType": "jdk", - "powerpc64le": { - "build": "12", - "sha256": "177fd161ae14df92203d70cd618559daf889ec0c172d6ee615859352f68a2371", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", - "version": "14.0.2" - }, - "vmType": "openj9", - "x86_64": { - "build": "12", - "sha256": "306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", - "version": "14.0.2" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "12", - "sha256": "2b749ceead19d68dd7e3c28b143dc4f94bb0916378a98b7346e851318ea4da84", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_aarch64_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "armv6l": { - "build": "12", - "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "armv7l": { - "build": "12", - "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "12", - "sha256": "0f96998be562cfbe8a4114581349dbd2609d0a23091e538fe142dcd9c83e70cf", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_ppc64le_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "1107845947da56e6bdad0da0b79210a079a74ec5c806f815ec5db9d09e1a9236", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_linux_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - } - }, - "openj9": { - "packageType": "jre", - "powerpc64le": { - "build": "12", - "sha256": "ad7a55a3669878c0c7d7c66faafe7c626d4341374719b6fdd81d2986c6e80945", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", - "version": "14.0.2" - }, - "vmType": "openj9", - "x86_64": { - "build": "12", - "sha256": "3a137146a7b0bd8b029e72beb37c5fbb09dcfb9e33a10125076fff1555227cfd", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", - "version": "14.0.2" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "09b7e6ab5d5eb4b73813f4caa793a0b616d33794a17988fa6a6b7c972e8f3dd3", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - } - }, - "openj9": { - "packageType": "jdk", - "vmType": "openj9", - "x86_64": { - "build": "12", - "sha256": "95e6abcc12dde676ccd5ba65ab86f06ddaa22749dde00e31f4c6d3ea95277359", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz", - "version": "14.0.2" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "12", - "sha256": "e8b5196de8ecb2b136a28494c2888784b9d9e22e29d2c38528892fb7d0c95260", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_mac_hotspot_14.0.2_12.tar.gz", - "version": "14.0.2" - } - }, - "openj9": { - "packageType": "jre", - "vmType": "openj9", - "x86_64": { - "build": "12", - "sha256": "2562a442d7278409358f474071db34df4ba9c555925f28d0270139f97133c8d5", - "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz", - "version": "14.0.2" - } - } - } - } - }, - "openjdk15": { - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - } - }, - "openj9": { - "aarch64": { - "build": "7", - "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2-ea" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2" - }, - "vmType": "openj9", - "x86_64": { - "build": "7", - "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - } - }, - "openj9": { - "aarch64": { - "build": "7", - "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2-ea" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "79f657141f1cd0e4a70d041b9215b8b00140d479ce73ed71bc4f3dd015157958", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2" - }, - "vmType": "openj9", - "x86_64": { - "build": "7", - "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - } - }, - "openj9": { - "packageType": "jdk", - "vmType": "openj9", - "x86_64": { - "build": "7", - "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz", - "version": "15.0.2" - } - }, - "openj9": { - "packageType": "jre", - "vmType": "openj9", - "x86_64": { - "build": "7", - "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0", - "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz", - "version": "15.0.2" - } - } - } - } - }, - "openjdk16": { - "alpine_linux": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "5f10ffc12056b735f5fe505ec6c481fff94de27e80c1d77ea9f9e2830669cc1d", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_alpine-linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - } - } - } - }, - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - }, - "armv6l": { - "build": "7", - "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - }, - "armv7l": { - "build": "7", - "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - } - }, - "openj9": { - "aarch64": { - "build": "9", - "sha256": "abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1-ea" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "9", - "sha256": "9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1" - }, - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "9", - "sha256": "4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - }, - "armv6l": { - "build": "9", - "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - }, - "armv7l": { - "build": "9", - "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - }, - "packageType": "jre", - "powerpc64le": { - "build": "9", - "sha256": "495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - }, - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - } - }, - "openj9": { - "aarch64": { - "build": "9", - "sha256": "01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1-ea" - }, - "packageType": "jre", - "powerpc64le": { - "build": "9", - "sha256": "f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1" - }, - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95", - "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz", - "version": "16.0.2" - } - }, - "openj9": { - "packageType": "jdk", - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "6d4241c6ede2167fb71bd57f7a770a74564ee007c06bcae98e1abc3c1de4756f", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "9", - "sha256": "33eeccbeea75e70b09610ba12e9591386a0e42248525b8358c9ae683bce82779", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_mac_hotspot_16.0.1_9.tar.gz", - "version": "16.0.1" - } - }, - "openj9": { - "packageType": "jre", - "vmType": "openj9", - "x86_64": { - "build": "9", - "sha256": "f57a6f04cf21a8470bb6f9488c57031d89db73c8b24997d74812855372f4e6b8", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz", - "version": "16.0.1" - } - } - } - } - }, - "openjdk17": { - "alpine_linux": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - } - } - } - }, - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "armv6l": { - "build": "7", - "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "armv7l": { - "build": "7", - "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "armv6l": { - "build": "7", - "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "armv7l": { - "build": "7", - "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" - } - } - } - } - }, - "openjdk8": { - "alpine_linux": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - } - } - } - }, - "linux": { - "jdk": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "armv6l": { - "build": "7", - "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "armv7l": { - "build": "7", - "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - } - }, - "openj9": { - "aarch64": { - "build": "10", - "sha256": "b168245ddc18b85135c15ed6baea5cbcc06192b49af04dcfa698458373efc061", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292-ea" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "10", - "sha256": "bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292" - }, - "vmType": "openj9", - "x86_64": { - "build": "10", - "sha256": "06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292" - } - } - }, - "jre": { - "hotspot": { - "aarch64": { - "build": "7", - "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "armv6l": { - "build": "7", - "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "armv7l": { - "build": "7", - "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - } - }, - "openj9": { - "aarch64": { - "build": "10", - "sha256": "f87f90673e25c3ce9e868e96a6059b22665f12d05e389813f75dfbc95d970393", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292-ea" - }, - "packageType": "jre", - "powerpc64le": { - "build": "10", - "sha256": "b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292" - }, - "vmType": "openj9", - "x86_64": { - "build": "10", - "sha256": "6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292" - } - } - } - }, - "mac": { - "jdk": { - "hotspot": { - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - } - }, - "openj9": { - "packageType": "jdk", - "vmType": "openj9", - "x86_64": { - "build": "10", - "sha256": "d262bc226895e80b7e80d61905e65fe043ca0a3e3b930f7b88ddfacb8835e939", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292" - } - } - }, - "jre": { - "hotspot": { - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz", - "version": "8.0.372" - } - }, - "openj9": { - "packageType": "jre", - "vmType": "openj9", - "x86_64": { - "build": "10", - "sha256": "50cbc5ef48d0167d649d3ba2c2b8d71553541bffb98914418f4a26e0c5f69aca", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz", - "version": "8.0.292" - } - } - } - } - } -} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.nix b/pkgs/development/compilers/adoptopenjdk-bin/sources.nix deleted file mode 100644 index 0d5dd3c6cd480..0000000000000 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.nix +++ /dev/null @@ -1 +0,0 @@ -builtins.fromJSON (builtins.readFile ./sources.json) diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index f32cc203b67d4..6dd49281bb81f 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.9.1"; + version = "2201.9.2"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-5ATrR2TZHu4xr+XuGaiSZpIKTDQt6MTxg2DdU1qVjMI="; + hash = "sha256-J73fai5mPPNHk/wux4nhX3KsalxWER8nMqWovWgm6WA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 8542fd52d04f6..d6c1442a8b8b5 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "117"; + version = "118"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-QYJkrvwcUWbFV5oQdP11JuVmfOTYaFWGQGksboQ1d58="; + hash = "sha256-akMW3S2/qUyLK8F77EtnaXPDXvIMpkGfNB2jOD6hQho="; }; nativeBuildInputs = [ cmake python3 ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; platforms = platforms.all; - maintainers = with maintainers; [ asppsa ]; + maintainers = with maintainers; [ asppsa willcohen ]; license = licenses.asl20; }; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index edf0f03659b22..e761c8609e8bf 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -17,7 +17,7 @@ , zlib , ghc , gmp-static -, verilog +, iverilog , asciidoctor , texliveFull , which @@ -108,7 +108,7 @@ in stdenv.mkDerivation rec { nativeCheckInputs = [ gmp-static - verilog + iverilog ]; checkTarget = "check-smoke"; # this is the shortest check but "check-suite" tests much more diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix deleted file mode 100644 index 1097e7d3f81fb..0000000000000 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file is based on https://github.com/turboMaCk/bs-platform.nix/blob/master/build-bs-platform.nix -# to make potential future updates simpler - -{ lib, stdenv, ninja, runCommand, nodejs, python3, - ocaml-version, version, src, - patches ? [], - ocaml ? (import ./ocaml.nix { - version = ocaml-version; - inherit lib stdenv; - src = "${src}/ocaml"; - }), - custom-ninja ? (ninja.overrideAttrs (attrs: { - src = runCommand "ninja-patched-source" {} '' - mkdir -p $out - tar zxvf ${src}/vendor/ninja.tar.gz -C $out - ''; - patches = []; - })), - ... -}: - -let - bin_folder = if stdenv.isDarwin then "darwin" else "linux"; -in - -stdenv.mkDerivation rec { - inherit src version patches; - pname = "bs-platform"; - - BS_RELEASE_BUILD = "true"; - - # BuckleScript's idiosyncratic build process only builds artifacts required - # for editor-tooling to work when this environment variable is set: - # https://github.com/BuckleScript/bucklescript/blob/7.2.0/scripts/install.js#L225-L227 - BS_TRAVIS_CI = "1"; - - buildInputs = [ nodejs python3 custom-ninja ]; - - prePatch = '' - sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js - mkdir -p ./native/${ocaml-version}/bin - ln -sf ${ocaml}/bin/* ./native/${ocaml-version}/bin - ''; - - # avoid building the development version, will break aarch64 build - dontConfigure = true; - - buildPhase = '' - # This is an unfortunate name, but it's actually how to build a release - # binary for BuckleScript - npm run postinstall - ''; - - installPhase = '' - mkdir -p $out/bin - cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out - mkdir -p $out/lib/ocaml - cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml - cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml - cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml - cp bsconfig.json package.json $out - ln -s $out/bsb $out/bin/bsb - ln -s $out/bsc $out/bin/bsc - ln -s $out/bsrefmt $out/bin/bsrefmt - ''; -} diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix deleted file mode 100644 index a1b8ad550ac36..0000000000000 --- a/pkgs/development/compilers/bs-platform/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, ninja, nodejs, python3, ... }: -let - build-bs-platform = import ./build-bs-platform.nix; -in -(build-bs-platform rec { - inherit lib stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "8.2.0"; - ocaml-version = "4.06.1"; - - patches = [ ./jscomp-release-ninja.patch ]; - - src = fetchFromGitHub { - owner = "BuckleScript"; - repo = "bucklescript"; - rev = version; - sha256 = "1hql7sxps1k17zmwyha6idq6nw20abpq770l55ry722birclmsmf"; - fetchSubmodules = true; - }; -}).overrideAttrs (attrs: { - meta = with lib; { - description = "JavaScript backend for OCaml focused on smooth integration and clean generated code"; - homepage = "https://bucklescript.github.io"; - license = licenses.lgpl3; - maintainers = with maintainers; [ turbomack gamb ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch b/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch deleted file mode 100644 index 96235f921317d..0000000000000 --- a/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch +++ /dev/null @@ -1,16 +0,0 @@ - jscomp/others/release.ninja | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja -index 9ea6d11c5..a91ed9c80 100644 ---- a/jscomp/others/release.ninja -+++ b/jscomp/others/release.ninja -@@ -30,7 +30,7 @@ build others/js_json.cmj : cc_cmi others/js_json.ml | others/js_array2.cmj other - build others/js_json.cmi : cc others/js_json.mli | others/js_dict.cmi others/js_null.cmi others/js_string.cmj others/js_types.cmi runtime - build others/js_list.cmj : cc_cmi others/js_list.ml | others/js_array2.cmj others/js_list.cmi others/js_vector.cmj runtime - build others/js_list.cmi : cc others/js_list.mli | others/js_vector.cmi runtime --build others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.ml | others/js_mapperRt.cmi runtime -+build others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.ml | others/js_array2.cmj others/js_mapperRt.cmi runtime - build others/js_mapperRt.cmi : cc others/js_mapperRt.mli | runtime - build others/js_math.cmi others/js_math.cmj : cc others/js_math.ml | others/js_int.cmj runtime - build others/js_null.cmj : cc_cmi others/js_null.ml | others/js_exn.cmj others/js_null.cmi runtime \ No newline at end of file diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix deleted file mode 100644 index 206a3aff61cbf..0000000000000 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, src, version }: -stdenv.mkDerivation rec { - inherit src version; - pname = "ocaml-bs"; - configurePhase = '' - ./configure -prefix $out - ''; - - # Workaround ocaml-4.06 limitation of duplicate definitions. - # ld: libcamlrun.a(minor_gc.o):/build/ocaml/byterun/caml/major_gc.h:67: multiple definition of - # `caml_major_ring'; libcamlrun.a(stacks.o):/build/ocaml/byterun/caml/major_gc.h:67: first defined here - # Match -fcommon workaround in ocaml-4.06 itself. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = '' - make -j9 world.opt - ''; - - meta = with lib; { - branch = "4.06"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix deleted file mode 100644 index ddec40e49cb9c..0000000000000 --- a/pkgs/development/compilers/bupc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchurl, perl, coreutils }: - -stdenv.mkDerivation rec { - pname = "berkeley_upc"; - version = "2020.12.0"; - - src = fetchurl { - url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz"; - sha256 = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; - }; - - postPatch = '' - patchShebangs . - ''; - - # Used during the configure phase - ENVCMD = "${coreutils}/bin/env"; - - buildInputs = [ perl ]; - - meta = with lib; { - description = "Compiler for the Berkely Unified Parallel C language"; - longDescription = '' - Unified Parallel C (UPC) is an extension of the C programming language - designed for high performance computing on large-scale parallel - machines.The language provides a uniform programming model for both - shared and distributed memory hardware. The programmer is presented with - a single shared, partitioned address space, where variables may be - directly read and written by any processor, but each variable is - physically associated with a single processor. UPC uses a Single Program - Multiple Data (SPMD) model of computation in which the amount of - parallelism is fixed at program startup time, typically with a single - thread of execution per processor. - ''; - homepage = "https://upc.lbl.gov/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 2577f1321d749..cbaac08ba6c89 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -1,23 +1,24 @@ -{ llvmPackages -, lib -, fetchFromGitHub -, cmake -, python3 -, curl -, libxml2 -, libffi -, xar -, testers +{ + llvmPackages, + lib, + fetchFromGitHub, + cmake, + python3, + curl, + libxml2, + libffi, + xar, + testers, }: llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c"; - version = "0.5.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; - rev = "refs/tags/${finalAttrs.version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk="; }; @@ -26,9 +27,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib" ''; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ llvmPackages.llvm @@ -36,9 +35,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { curl libxml2 libffi - ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ - xar - ]; + ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ xar ]; nativeCheckInputs = [ python3 ]; @@ -52,16 +49,17 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { ''; passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; + version = testers.testVersion { package = finalAttrs.finalPackage; }; }; meta = with lib; { description = "Compiler for the C3 language"; homepage = "https://github.com/c3lang/c3c"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ luc65r ]; + maintainers = with maintainers; [ + luc65r + anas + ]; platforms = platforms.all; mainProgram = "c3c"; }; diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/development/compilers/chez-racket/shared.nix index 46f53204309b2..b9368dd4ebea5 100644 --- a/pkgs/development/compilers/chez-racket/shared.nix +++ b/pkgs/development/compilers/chez-racket/shared.nix @@ -1,5 +1,5 @@ args: -{ stdenv, lib, fetchFromGitHub, coreutils, darwin +{ stdenv, lib, fetchFromGitHub, coreutils, cctools, darwin , ncurses, libiconv, libX11, zlib, lz4 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (args // { export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)" ''; - nativeBuildInputs = lib.optionals stdenv.isDarwin (with darwin; [ cctools autoSignDarwinBinariesHook ]); + nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]); buildInputs = [ libiconv libX11 lz4 ncurses zlib ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index dd15b5394bc9c..2f0b8316ae8b2 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "chicken"; - version = "5.3.0"; + version = "5.4.0"; binaryVersion = 11; src = fetchurl { url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY="; + sha256 = "sha256-PF1KphwRZ79tm/nq+JHadjC6n188Fb8JUVpwOb/N7F8="; }; # Disable two broken tests: "static link" and "linking tests" diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index bbc256db52dd3..dc162bbe13c4e 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -2,9 +2,9 @@ [7off] dependencies = ["anaphora", "define-options", "lowdown", "matchable", "srfi-1", "sxml-transforms", "sxpath", "utf8", "srfi-42", "srfi-69", "strse", "uri-common"] license = "agpl" -sha256 = "06nzh23bpf9f011wr5sxqnq4nb1b7af6148qz52ri9hbb8r2mi4i" +sha256 = "1z35j4py67c3x2f87mzvczpbbcskd80d5m7a7080gfxzrmwrn2c9" synopsis = "Markdown to Gemini text" -version = "1.32" +version = "1.33" [F-operator] dependencies = ["miscmacros", "datatype", "box"] @@ -70,11 +70,11 @@ synopsis = "SRFI-69-like library for alists" version = "0.3.0" [allegro] -dependencies = ["foreigners"] +dependencies = ["foreigners", "chicken"] license = "bsd" -sha256 = "14w7q0iwskrqbqfjspf5wxnxb8wn56q9xbpc0vz518azm9ndf63p" +sha256 = "1c83294hv7czfx45yczchvgnd3k72d26ya5mhf365zmrkbzqylfz" synopsis = "Allegro" -version = "3.0.0" +version = "4.0.0" [amb] dependencies = ["srfi-1"] @@ -107,9 +107,9 @@ version = "0.6" [apropos] dependencies = ["utf8", "srfi-1", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "01h8fpz32bc3c9ldyamawvj7jf2b4b10zz08a22i90ww5lyvn90s" +sha256 = "1w0kyycm8j30fd7iv9zs852rx5jpsmv2xs0lplpcjhmv2a3dlmv1" synopsis = "CHICKEN apropos" -version = "3.10.2" +version = "3.11.1" [arcadedb] dependencies = ["medea"] @@ -226,9 +226,9 @@ version = "1.0" [beaker] dependencies = ["begin-syntax", "debugger-protocol", "schematic", "srfi-1", "srfi-13", "srfi-14", "srfi-69", "vector-lib", "with-current-directory", "module-declarations"] license = "bsd" -sha256 = "1nxzqjwh3bi2zyifdpn0wb86352rizjpfl3lfi34f3g6m95avmmg" +sha256 = "1ilsr7gl8dr8wv5n0v9kgpmy6a7j6v581ykl2bb6fbnnssfq655z" synopsis = "Lab supplies for CHICKEN development" -version = "0.0.22" +version = "0.0.23" [begin-syntax] dependencies = ["matchable", "module-declarations"] @@ -345,9 +345,9 @@ version = "1.2" [breadline] dependencies = ["apropos", "srfi-18"] license = "gpl-3" -sha256 = "1rvppf2aci4dxn6a74nzzj1iw7is65ad38fbvrr9harazfx6j4jy" +sha256 = "1kkga2n6vw2hxg9sd20f6swnj6hikddyiamsdbqp5m72nlxkq72c" synopsis = "Bindings to readline" -version = "0.11" +version = "0.12" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] @@ -597,9 +597,9 @@ version = "1.0" [condition-utils] dependencies = ["srfi-1", "srfi-69", "check-errors"] license = "bsd" -sha256 = "11mkmbyciyrqyakp1gyfvmbfayglhzx2x6j6zyp9kj31vhi2y4hd" +sha256 = "1g3vi4pn3z66qldbw4h5731xvi2hd37l887czzbj2a2pbwv4rfp3" synopsis = "SRFI 12 Condition Utilities" -version = "2.2.3" +version = "2.3.1" [continuations] dependencies = [] @@ -735,11 +735,11 @@ synopsis = "Directed graph in adjacency list format." version = "2.0" [directory-utils] -dependencies = ["srfi-1", "utf8", "miscmacros", "moremacros", "stack", "list-utils", "check-errors"] +dependencies = ["srfi-1", "utf8", "miscmacros", "stack", "check-errors"] license = "bsd" -sha256 = "0xiga98dddi5vg5h1m2vws5prk4ri96rx6l359lji62aq51h526i" +sha256 = "17306fd9brbifvc3ahzfwcam9px2fs1674m8wzbyr6hzh9bhw62z" synopsis = "directory-utils" -version = "2.3.0" +version = "2.4.1" [disjoint-set] dependencies = [] @@ -1078,11 +1078,11 @@ synopsis = "Chicken bindings to genann - a simple neural network library in ANSI version = "0.2.2" [generalized-arrays] -dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-160", "check-errors", "transducers"] +dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-143", "srfi-160", "check-errors", "transducers"] license = "bsd-3" -sha256 = "1ypga6lanhqsm8lpgk6s1nj4q024xb9kl9ar58cwj53h1irn7942" +sha256 = "0zimlx33nn4val556sbwzgcsrpavz02dmk78hbv2xrjasraq36zn" synopsis = "Provides generalized arrays, intervals, and storage classes for CHICKEN Scheme." -version = "2.0.0" +version = "2.0.2" [generics] dependencies = ["simple-cells"] @@ -1290,9 +1290,9 @@ version = "0.3" [http-client] dependencies = ["intarweb", "uri-common", "simple-md5", "sendfile", "srfi-1", "srfi-13", "srfi-18", "srfi-69"] license = "bsd" -sha256 = "0d24dpi8c45rvwfm31hd033rpyghx9xps1qdki8czcl6500bcy7y" +sha256 = "16f1ch4sdb1lfwfq5fa142sjzgvd2l4c6b5q750cfkfz8p6zi1vw" synopsis = "High-level HTTP client library" -version = "1.2.1" +version = "1.2.2" [http-session] dependencies = ["intarweb", "simple-sha1", "spiffy", "srfi-1", "srfi-18", "srfi-69", "uri-common"] @@ -1511,6 +1511,13 @@ sha256 = "0sl8i18g03cl8qpaqbrfkcx7xd28jyxcb183873s9yq7max4zryr" synopsis = "Evaluate expressions once" version = "0.3" +[lay] +dependencies = [] +license = "bsd" +sha256 = "1z7n51p6yzn9bd4l7jxh3mrq45a6h8mi95s2v2d9xgn3m0dmbhqi" +synopsis = "Lay eggs efficiently" +version = "0.2.2" + [lazy-ffi] dependencies = ["bind", "srfi-1", "srfi-69"] license = "bsd" @@ -1651,6 +1658,13 @@ sha256 = "1zc9prn3n4rac6ibgbfg0fcdl0czf31qhx8v2276m49i7hizvan4" synopsis = "Efficient color types and math" version = "0.1.1" +[magic-pipes] +dependencies = ["srfi-38", "typed-records", "args", "alist-lib", "sql-de-lite", "medea", "ssql", "ssax", "sxml-serializer"] +license = "bsd" +sha256 = "1rxsy3mdagw713d6qhgyrq73gvgrvr4w1vgbs41zkkv1ck3ggqys" +synopsis = "Unix shell pipeline tools for working with s-expressions" +version = "1.3" + [magic] dependencies = [] license = "bsd" @@ -1710,9 +1724,9 @@ version = "1.2" [math-utils] dependencies = [] license = "public-domain" -sha256 = "1jcr67q4pq7i34lkhbqml18rkv6w61wsqclp9k1xgvg6p2b0aaxj" +sha256 = "1vc8xrah2yngfbwvah1948h156dp1lw75nrapjcmvybc2315fn93" synopsis = "Miscellaneous math utilities" -version = "1.0.6" +version = "1.1.0" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1794,9 +1808,9 @@ version = "4.3.6" [message-digest-utils] dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors"] license = "bsd" -sha256 = "004da7czv5mqxz8cif2nc0shx1xxj266alqm2370h13wbdl369c3" +sha256 = "04pxzqnirv04hcjik1v2mz59vvfgxfanfsgwy6q0ai17as2kaajr" synopsis = "Message Digest Support" -version = "4.3.5" +version = "4.3.7" [message-digest] dependencies = ["message-digest-primitive", "message-digest-type", "message-digest-utils"] @@ -1892,9 +1906,9 @@ version = "2.5.3" [mosquitto] dependencies = ["srfi-1"] license = "mit" -sha256 = "1pdhks3wii43l5wbmqich93zk6vy0b62h8qhv1k2wd8llv33gx6r" +sha256 = "1kc5kh9lp17lpx48br8mb2wg78li7g4kq606dq86v02kwj1b4xh1" synopsis = "Bindings to mosquitto MQTT client library" -version = "0.1.4" +version = "0.1.5" [mpd-client] dependencies = ["regex", "srfi-1"] @@ -2011,9 +2025,9 @@ version = "1.21" [openssl] dependencies = ["srfi-1", "srfi-13", "srfi-18", "address-info"] license = "bsd" -sha256 = "018x80cxs7glvqn7nhjcfbvw36bn3pf4y24a6cn7mz25z6597vg0" +sha256 = "1x6y0i9mgfxiays044babfkz7jy2635gy9c27fab5knvhhdqz6lg" synopsis = "Bindings to the OpenSSL SSL/TLS library" -version = "2.2.5" +version = "2.2.6" [operations] dependencies = ["srfi-1"] @@ -2155,6 +2169,13 @@ sha256 = "06sqn5gz5n2zfdk5z2c20mz4r6w9mslxvlanvmq1wdzr5qnvkh9s" synopsis = "Bindings for PostgreSQL's C-api" version = "4.1.4" +[poule] +dependencies = ["datatype", "mailbox", "matchable", "srfi-1", "srfi-18", "typed-records"] +license = "bsd" +sha256 = "0ldh8jzqcrscgkr16s8hqjmqqxligb37xffk8s8kqa2y9sbk9d96" +synopsis = "Manage pools of worker processes" +version = "0.1.1" + [prefixes] dependencies = ["tree-walkers"] license = "bsd" @@ -2183,6 +2204,13 @@ sha256 = "0770cpzd75jky6pjn57z9f8gg7jiy5a4lng798ndcqhzfqvmbfdi" synopsis = "procedural-macros made easy" version = "3.0.1" +[procedure-decoration] +dependencies = ["check-errors"] +license = "bsd" +sha256 = "0sid5fcw9pvf8n1zq5i757pzdr4hgx5w55qgrabsxpq5pgxj6gbs" +synopsis = "Procedure Decoration API" +version = "3.0.0" + [protobj] dependencies = [] license = "lgpl-2.1" @@ -2284,9 +2312,9 @@ version = "0.1.1" [r7rs] dependencies = ["matchable", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "1rwx52mjsylvbkmpg0z7jbawaf87dsxdgwgq8z5nh8k5nb03b6v5" +sha256 = "1mipp3qafsfk4fsldi9qvggzlkby7a7glydhjjf5ifb8w6f4kx8f" synopsis = "R7RS compatibility" -version = "1.0.9" +version = "1.0.10" [rabbit] dependencies = ["srfi-1"] @@ -2414,6 +2442,13 @@ sha256 = "1vngrvh2b7rv5n5zvksfg27zikpc7d8xb8n1kd0pyfr7hna00wf9" synopsis = "Serialization of arbitrary data." version = "0.9.12" +[s48-modules] +dependencies = ["srfi-1"] +license = "bsd" +sha256 = "1pn8igkydivysrlgc1l0c2j1cn3yvsb7ggbpfbrpdkwxb9wm810b" +synopsis = "basic Scheme48 module syntax" +version = "0.7" + [s9fes-char-graphics] dependencies = ["srfi-1", "utf8", "format"] license = "public-domain" @@ -2480,9 +2515,9 @@ version = "0.3.2" [scheme-indent] dependencies = ["srfi-1"] license = "bsd" -sha256 = "1jjgi0wwfk3bx8ayc09y09pxg9awdx5hm397gqhg6gvjbn3sm3in" +sha256 = "0czcmlcapq33f4g19x11q2nd3yrnf2mvb8hm2lcc2an6fp2gg4hc" synopsis = "A Scheme code indenter" -version = "0.6" +version = "0.7" [scheme2c-compatibility] dependencies = ["srfi-1", "srfi-13", "srfi-14", "traversal", "foreigners", "xlib"] @@ -2550,9 +2585,9 @@ version = "0.4.1" [semantic-version] dependencies = ["utf8", "srfi-1", "vector-lib", "srfi-69", "srfi-128", "record-variants"] license = "bsd" -sha256 = "10wczj83664q09zxgcnf1zr96xds6dmfvn0gvw8cq4i269ppcv0j" +sha256 = "0aig2n1q08rqbvwl74ly4x05gzy7hc47n5dqgbn4zjg5539d77qd" synopsis = "Semantic Version Utilities" -version = "0.0.16" +version = "0.0.17" [sendfile] dependencies = ["memory-mapped-files"] @@ -3031,11 +3066,11 @@ synopsis = "SRFI 141: Integer division" version = "1.0.0" [srfi-143] -dependencies = [] +dependencies = ["r7rs"] license = "mit" -sha256 = "0a30ysddklf2mndh5chhkdx5zqlkgyxggwxypgn7znmny23zlrja" +sha256 = "1zfl2mv6ma97yf6p1ql5a3v50brk5b0h61p2dzyz2n2qi81mrfgm" synopsis = "SRFI 143: Fixnums" -version = "0.4.1" +version = "1.0.0" [srfi-144] dependencies = ["r7rs"] @@ -3145,9 +3180,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "0vqwg2sknm7fm677npbjdvhcfa2s6l41sgvhkk11m10b8jgnr1b3" +sha256 = "06lr89dgaslq218434al3nd18zdnp6rm4c6gr96pcglhjarcyv1n" synopsis = "Time Data Types and Procedures" -version = "4.9.6" +version = "4.9.8" [srfi-193] dependencies = [] @@ -3425,9 +3460,9 @@ version = "0.3" [stack] dependencies = ["record-variants", "check-errors"] license = "bsd" -sha256 = "0fcpsh9rgibkz807jwr062bcjzz7x93pv5x9xniycpjp6i3s5r2x" +sha256 = "00hh6kagnj7xsrg8i4wig1jp8y5v5g2887zgnfvqd5ibxr232g54" synopsis = "Provides LIFO queue (stack) operations" -version = "3.1.0" +version = "3.2.0" [stalin] dependencies = [] @@ -3579,9 +3614,9 @@ version = "2.6.0" [synch] dependencies = ["srfi-18", "check-errors"] license = "bsd" -sha256 = "0hqwk1xfrslcyigjj9z28lki8xdb1x1ccvss225mnmahpdn42pp8" +sha256 = "09vf7ljkpiiaib8wslpjnabhqw70l6z5aqkp3nx223nqh4qgr8mb" synopsis = "Synchronization Forms" -version = "3.3.8" +version = "3.3.9" [sysexits] dependencies = [] @@ -3731,11 +3766,11 @@ synopsis = "tracing and breakpoints" version = "2.0" [transducers] -dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-146", "srfi-160", "check-errors"] +dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors"] license = "mit" -sha256 = "1bz05dy7kjypk85yck3a8h6iji6kkmnb48kpqdqvj9nm0kvg2nwd" +sha256 = "194clggnwmv7g0v4y5q8brr4aac3rs4ddzigxbls0pmdr925chlb" synopsis = "Transducers for working with foldable data types." -version = "0.5.4" +version = "0.5.5" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 3e2cc49a26697..dfef7c6cd236a 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -16,7 +16,8 @@ eggDerivation { name = "egg2nix-${version}"; buildInputs = with chickenEggs; [ - args matchable + args + matchable ]; meta = { diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 2d2462355928e..05a51f7bf91ac 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -1,18 +1,21 @@ { callPackage, lib, stdenv, chicken, makeWrapper }: -{ name, src -, buildInputs ? [] -, chickenInstallFlags ? [] -, cscOptions ? [] -, ...} @ args: +{ name +, src +, buildInputs ? [ ] +, chickenInstallFlags ? [ ] +, cscOptions ? [ ] +, ... +} @ args: let overrides = callPackage ./overrides.nix { }; baseName = lib.getName name; - override = if builtins.hasAttr baseName overrides - then - builtins.getAttr baseName overrides - else - lib.id; + override = + if builtins.hasAttr baseName overrides + then + builtins.getAttr baseName overrides + else + lib.id; in (stdenv.mkDerivation ({ name = "chicken-${name}"; @@ -52,5 +55,5 @@ in meta = { inherit (chicken.meta) platforms; - } // args.meta or {}; -} // builtins.removeAttrs args ["name" "buildInputs" "meta"]) ).overrideAttrs override + } // args.meta or { }; +} // builtins.removeAttrs args [ "name" "buildInputs" "meta" ])).overrideAttrs override diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index d29f52661bb7b..5748897e0c74a 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -25,8 +25,16 @@ let }; in { - allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]); + allegro = old: + ((addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd pkgs.libGLU ] + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.isLinux [ pkgs.xorg.libX11 ])) old) // { + # depends on 'chicken' egg, which doesn't exist, + # so we specify all the deps here + propagatedBuildInputs = [ + chickenEggs.foreigners + ]; + }; breadline = addToBuildInputs pkgs.readline; blas = addToBuildInputsWithPkgConfig pkgs.blas; blosc = addToBuildInputs pkgs.c-blosc; @@ -35,7 +43,6 @@ in (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; - dbus = addToBuildInputsWithPkgConfig pkgs.dbus; epoxy = old: (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old) // lib.optionalAttrs stdenv.cc.isClang { @@ -122,7 +129,8 @@ in taglib = old: (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) // ( # needed for tablib-config to be in PATH - addToNativeBuildInputs pkgs.taglib old); + addToNativeBuildInputs pkgs.taglib old + ); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; @@ -166,6 +174,34 @@ in pledge = addMetaAttrs { platforms = lib.platforms.openbsd; }; unveil = addMetaAttrs { platforms = lib.platforms.openbsd; }; + # overrides for chicken 5.4 + dbus = old: + (addToBuildInputsWithPkgConfig [ pkgs.dbus ] old) // { + # backticks in compiler options + # aren't supported anymore as of chicken 5.4, it seems. + preBuild = '' + substituteInPlace \ + dbus.egg dbus.setup \ + --replace '`pkg-config --cflags dbus-1`' "$(pkg-config --cflags dbus-1)" \ + --replace '`pkg-config --libs dbus-1`' "$(pkg-config --libs dbus-1)" + ''; + }; + math = old: { + # define-values is used but not imported + # some breaking change happened now it needs to be done + # explicitly? + preBuild = '' + substituteInPlace *.scm **/*.scm \ + --replace-quiet 'only chicken.base' 'only chicken.base define-values' + ''; + }; + socket = old: { + # chicken-do checks for changes to a file that doesn't exist + preBuild = '' + touch socket-config + ''; + }; + # mark broken "ephem-v1.1" = broken; F-operator = broken; diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index a893166082d5f..2cf630ceae19a 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.76.0"; + version = "1.80.1"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-L8ELchwUzweS1gzZ8EfnddZu5xMJIVURViwwtPpxylo="; + hash = "sha256-Vqucix0hil9isi4/+DLC4tq8XLVeiFUEMBeJfkZMEpI="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 0d27b9f62c8ae..d5d56546b576c 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -9,7 +9,6 @@ , boost , libunwind , ninja -, cacert }: let diff --git a/pkgs/development/compilers/corretto/19.nix b/pkgs/development/compilers/corretto/19.nix deleted file mode 100644 index 0674b63f21dfa..0000000000000 --- a/pkgs/development/compilers/corretto/19.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchFromGitHub -, gradle_7 -, jdk19 -, lib -, stdenv -, rsync -, runCommand -, testers -}: - -let - corretto = import ./mk-corretto.nix rec { - inherit lib stdenv rsync runCommand testers; - jdk = jdk19; - gradle = gradle_7; - version = "19.0.2.7.1"; - src = fetchFromGitHub { - owner = "corretto"; - repo = "corretto-19"; - rev = version; - sha256 = "sha256-mEj/MIbdXU0+fF5RhqjPuSeyclstesGaXB0e48YlKuw="; - }; - }; -in -corretto diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index c26614e47641a..1059935ce20f9 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -31,7 +31,9 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { dontConfigure = true; - postPatch = '' + postPatch = let + extra_config = builtins.concatStringsSep " " extraConfig; + in '' # The rpm/deb task definitions require a Gradle plugin which we don't # have and so the build fails. We'll simply remove them here because # they are not needed anyways. @@ -41,35 +43,29 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { for file in $(find installers -name "build.gradle"); do substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" done - ''; - - buildPhase = - let - # The Linux installer is placed at linux/universal/tar whereas the MacOS - # one is at mac/tar. - task = - if stdenv.isDarwin then - ":installers:mac:tar:packageBuildResults" - else ":installers:linux:universal:tar:packageBuildResults"; - extra_config = builtins.concatStringsSep " " extraConfig; - in - '' - runHook preBuild + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") + ''; - # Corretto's actual built is triggered via `gradle`. - gradle -Pcorretto.extra_config="${extra_config}" --console=plain --no-daemon ${task} + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - # Prepare for the installPhase so that it looks like if a normal - # OpenJDK had been built. - dir=build/jdkImageName/images - mkdir -p $dir - file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') - tar -xzf $file -C $dir - mv $dir/amazon-corretto-* $dir/jdk + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.isDarwin then + ":installers:mac:tar:build" + else ":installers:linux:universal:tar:packageBuildResults"; - runHook postBuild - ''; + postBuild = '' + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + '' + oldAttrs.postBuild or ""; installPhase = oldAttrs.installPhase + '' # The installPhase will place everything in $out/lib/openjdk and diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index ee10acbdeb7c9..0b21122b035e3 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -3,6 +3,7 @@ , fetchurl , unzip , runCommand +, cctools , darwin , sources ? import ./sources.nix {inherit fetchurl;} , version ? sources.versionUsed @@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { testCompile = runCommand "dart-test-compile" { nativeBuildInputs = [ finalAttrs.finalPackage ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.sigtool ]; + ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ]; } '' HELLO_MESSAGE="Hello, world!" echo "void main() => print('$HELLO_MESSAGE');" > hello.dart diff --git a/pkgs/development/compilers/dotnet/8/deps.nix b/pkgs/development/compilers/dotnet/8/deps.nix index 11e45f1d79c39..4d36de2bc87b3 100644 --- a/pkgs/development/compilers/dotnet/8/deps.nix +++ b/pkgs/development/compilers/dotnet/8/deps.nix @@ -1,10 +1,11 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "4ceb7c65d355ac08753d7e255ded7261c9e3d6a3692c4641eda432d84cc5c2ef"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.4-servicing.24169.9/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "467caa1c74ac499a0359b813a54fcf07f664f543e2b495f33213fe5500355494"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.4-servicing.24169.9/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "0q669pidvv27vll5xpap08c2askmaqggsky00ia1d00f3bnnfxbr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.4-servicing.24169.9/runtime.linux-x64.microsoft.netcore.ilasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "03q3c45cn8vy3qb9q1b8m965j5z9cg9x9ja0l6271lkr4fq72qp4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.4-servicing.24169.9/runtime.linux-x64.microsoft.netcore.ildasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5f84f02ef53e9e05fafddf0ef2a249d5a7990c458c90f42b365cd8b9397b2e8e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.4-servicing.24169.9/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "171f006df766e439a3080496dd6e4899649e52085ca6afdb375caa57d04eb998"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.4-servicing.24169.9/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "5e1652bd1d0194300849ffaf1ef3371795f8d63889e685c2ef74434c33608f1e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.4-servicing.24169.9/runtime.osx-x64.microsoft.netcore.ilasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "e3b4ef11f3f8f625730fad3f59aa84a82c63f1921eb4145109723cd9f458e20b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.4-servicing.24169.9/runtime.osx-x64.microsoft.netcore.ildasm.8.0.4-servicing.24169.9.nupkg"; version = "8.0.4-servicing.24169.9"; }) + (fetchNuGet { hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; pname = "Newtonsoft.Json"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg"; version = "13.0.1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "71596da0817e53bf1b7bc26ff70e5cf7dc875a11a2fc9eb71475346322d4ab49"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.6-servicing.24267.15/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "bf727a8e7e39fe8cac684b4a52bfcd7e903c5f10545d4ce551e99206c2ebe77e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.6-servicing.24267.15/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { hash = "sha256-/9D6lYqCnRpbPCyiQjsTM2xldFppLv1kPuDVmqxFlL0="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.6-servicing.24267.15/runtime.linux-x64.microsoft.netcore.ilasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { hash = "sha256-WcucJmF9psRFLG3H7tRy41rJ+VGMwEvY15fN+tMJXjQ="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.6-servicing.24267.15/runtime.linux-x64.microsoft.netcore.ildasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "f0696cf30ae877c83829827cc687b9f8b45dfe7351c6604a2141d366b9b87454"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.6-servicing.24267.15/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "187b36d4aa226f0d0aad75293ccf03979d7b862f6036df549070089ecc5a9045"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.6-servicing.24267.15/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "5c4ab3d6b7593949b677b43dd3385f60776815dbacf5319975591280a494b705"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.6-servicing.24267.15/runtime.osx-x64.microsoft.netcore.ilasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "46b5d82cb1ab6c585593ef6b0a1fbbcd76e058ecd526cc6ab337cf0f53c322d0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.6-servicing.24267.15/runtime.osx-x64.microsoft.netcore.ildasm.8.0.6-servicing.24267.15.nupkg"; version = "8.0.6-servicing.24267.15"; }) ] diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json index cc1ea74ed3549..4ab3373b910ce 100644 --- a/pkgs/development/compilers/dotnet/8/release-info.json +++ b/pkgs/development/compilers/dotnet/8/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-BC1K5hjTdhdEYGkC32gXDfdR6A3WVBVvTKqbslE40fc=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.104-servicing.24171.1.centos.8-x64.tar.gz", - "artifactsHash": "sha256-+ft4PIFOwfv5Z8VqW6bt71LP/HuvTWRTDYnB71Ti0O8=" + "tarballHash": "sha256-wZC9fua07CZoHOTTYRjy509sroJWYEu7byS21Co99Xw=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.106-servicing.24278.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-PL7Kk9M3VI36KeAT+lSBW+kSHSBJd4rfC5fEpCVFR0w=" } diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json index 9aa1bd7305be7..72a9adce899b1 100644 --- a/pkgs/development/compilers/dotnet/8/release.json +++ b/pkgs/development/compilers/dotnet/8/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.6", + "release": "8.0.7", "channel": "8.0", - "tag": "v8.0.6", - "sdkVersion": "8.0.106", - "runtimeVersion": "8.0.6", - "aspNetCoreVersion": "8.0.6", + "tag": "v8.0.7", + "sdkVersion": "8.0.107", + "runtimeVersion": "8.0.7", + "aspNetCoreVersion": "8.0.7", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "64c5c1aee8dc1faa16021350fcdd0bba15004160" + "sourceVersion": "8be139ddde52d33e24c7d82f813248ff9fc54b97" } diff --git a/pkgs/development/compilers/dotnet/9/deps.nix b/pkgs/development/compilers/dotnet/9/deps.nix index 969b92810ebf2..a29430b20db43 100644 --- a/pkgs/development/compilers/dotnet/9/deps.nix +++ b/pkgs/development/compilers/dotnet/9/deps.nix @@ -1,10 +1,10 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5f3c7c39b0cc257afdf7a72e4ce8def0467bb7a857cb255dda34adc58c3b76e8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "0ab21ff07d4321d9c4d0de0371d85265adbd8854d3d467ab8be92baf48be295a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "1f65al2nk2qzip1k8hjx6i9ls4sbx86qv0pbvaswambxqd4rc7dj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "1dlhchclghq19ryb0sz6md77y1hbkhd9p1wig8fg57im04w62s1n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "83af33efeb28280b2af68fea1dd84c087095420a2c21a1f439bc0cdeef9b8c47"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "b77560cd71f013fe211aaf1f3c300a53a123b1e1d852059675b5aa5d7e20ac94"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "0f85a64c48baa58f6ef66bffba85689c5c698d390092ab5d0a71ce02d65a37be"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "077f88a286227e1bef45ccb166fe3ffcb7bbcb8dc8d56956e0ffe775e45f49ad"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "7fe7cfd2467f526c895b03e2857f7248d403c36eec650a2e9736feeef9e53d1d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.6.24307.2/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "c9f9bf62deee5c257332e2b845fe31ddd12aa7b4a7eeb8e86f293c9b22fb7a29"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.6.24307.2/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { hash = "sha256-lSOD/QJU9ojpmja7r7UZ5fHvWrcj9RzbcsLZNlps0Ns="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.6.24307.2/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { hash = "sha256-wUcbB23KRQNPE/z3uvULgdbVhFcCUk7VG2E1b1UQwug="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.6.24307.2/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "062f36ebb2b77ceb04766ab5e4e7aa798365f44ead0c490ea16289de74200766"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.6.24307.2/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "d482e7b5e3fa39d1776dacf9949f88f6bb9d3e0ed5aaf2e96388078cfd205176"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.6.24307.2/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "c4eff5c233b01747d8760db587345badeb629dff0a7fce5db75e6ffaf32cd8e4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.6.24307.2/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "64282f15bdd10029cda678878717086dd59d833bddb97f6ad778397dc8d1dbc4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.6.24307.2/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.6.24307.2.nupkg"; version = "9.0.0-preview.6.24307.2"; }) ] diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index 2722b9bc079d8..ed42c7cd42ad4 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-RD63MT28wOY+EjN8mlGrhKenAdvoSnzHYqzqyvWmZSI=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.5.24257.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-SHhAFlSlRRoUIR/qCox71t5d1PaqSPcfiCSvRiSpDMw=" + "tarballHash": "sha256-9MfRifCL91p9TWgIL5qlKxcn2Hgq4gY7cleQyRvx+Vw=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.6.24312.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-I0vw3uDV7xze3p/JutImAvoHw3pH74p+xahCdnEWTWM=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 8777362f335c1..ad20bdb00fc59 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0-preview.5", + "release": "9.0.0-preview.6", "channel": "9.0", - "tag": "v9.0.0-preview.5.24306.7", - "sdkVersion": "9.0.100-preview.5.24307.1", - "runtimeVersion": "9.0.0-preview.5.24306.7", - "aspNetCoreVersion": "9.0.0-preview.5.24306.11", + "tag": "v9.0.0-preview.6.24327.7", + "sdkVersion": "9.0.100-preview.6.24328.1", + "runtimeVersion": "9.0.0-preview.6.24327.7", + "aspNetCoreVersion": "9.0.0-preview.6.24328.4", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "78f4e02d8b749da1168368a232b858448545928f" + "sourceVersion": "df2bf85c5dd6f3b834db7ee91d53c5d0b9469ca6" } diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 11ece53971662..246cc9ade7172 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -18,6 +18,7 @@ assert if type == "sdk" then packages != null else true; , libuuid , zlib , libkrb5 +, openssl , curl , lttng-ust_2_12 , testers @@ -51,6 +52,21 @@ let sigtool = callPackage ./sigtool.nix {}; signAppHost = callPackage ./sign-apphost.nix {}; + hasILCompiler = + lib.versionAtLeast version (if targetRid == "osx-arm64" then "8" else "7"); + + extraTargets = writeText "extra.targets" ('' + <Project> + '' + lib.optionalString hasILCompiler '' + <ItemGroup> + <CustomLinkerArg Include="-Wl,-rpath,'${lib.makeLibraryPath [ icu zlib openssl ]}'" /> + </ItemGroup> + '' + lib.optionalString stdenv.isDarwin '' + <Import Project="${signAppHost}" /> + '' + '' + </Project> + ''); + in mkCommon type rec { inherit pname version; @@ -70,6 +86,7 @@ mkCommon type rec { icu libkrb5 curl + xmlstarlet ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; src = fetchurl ( @@ -79,15 +96,15 @@ mkCommon type rec { sourceRoot = "."; - postPatch = if type == "sdk" && stdenv.isDarwin then '' + postPatch = if type == "sdk" then ('' xmlstarlet ed \ --inplace \ -s //_:Project -t elem -n Import \ - -i \$prev -t attr -n Project -v "${signAppHost}" \ + -i \$prev -t attr -n Project -v "${extraTargets}" \ sdk/*/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.targets - + '' + lib.optionalString stdenv.isDarwin '' codesign --remove-signature packs/Microsoft.NETCore.App.Host.osx-*/*/runtimes/osx-*/native/{apphost,singlefilehost} - '' else null; + '') else null; dontPatchELF = true; noDumpEnvVars = true; @@ -135,7 +152,7 @@ mkCommon type rec { ''; passthru = { - inherit icu; + inherit icu hasILCompiler; } // lib.optionalAttrs (type == "sdk") { packages = mkNugetDeps { name = "${pname}-${version}-deps"; diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index eaae0db2fc027..303e5eaba847b 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -1,5 +1,5 @@ dotnetPackages: -{ buildEnv, makeWrapper, lib }: +{ buildEnv, makeWrapper, lib, symlinkJoin }: # TODO: Rethink how we determine and/or get the CLI. # Possible options raised in #187118: # 1. A separate argument for the CLI (as suggested by IvarWithoutBones @@ -27,7 +27,10 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) inherit (cli) icu; versions = lib.catAttrs "version" dotnetPackages; - packages = lib.remove null (lib.catAttrs "packages" dotnetPackages); + packages = symlinkJoin { + name = "combined-packages"; + paths = lib.remove null (lib.catAttrs "packages" dotnetPackages); + }; }; inherit (cli) meta; diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index e26fd0e337708..8ed6de7e37366 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -1,12 +1,22 @@ # TODO: switch to stdenvNoCC { stdenv +, stdenvNoCC , lib , writeText , testers , runCommand +, runCommandWith , expect , curl , installShellFiles +, callPackage +, zlib +, swiftPackages +, darwin +, icu +, lndir +, substituteAll +, nugetPackageHook }: type: args: stdenv.mkDerivation (finalAttrs: args // { doInstallCheck = true; @@ -16,17 +26,16 @@ $out/bin/dotnet --info ''; - # TODO: move this to sdk section? - setupHook = writeText "dotnet-setup-hook" ('' - if [ ! -w "$HOME" ]; then - export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files - fi + setupHooks = args.setupHooks or [] ++ [ + ./dotnet-setup-hook.sh + ] ++ lib.optional (type == "sdk") (substituteAll { + src = ./dotnet-sdk-setup-hook.sh; + inherit lndir; + }); - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk - export DOTNET_NOLOGO=1 # Disables the welcome message - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1 # Skip integrity check on first run, which fails due to read-only directory - '' + args.setupHook or ""); + propagatedBuildInputs = + (args.propagatedBuildInputs or []) + ++ [ nugetPackageHook ]; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; @@ -43,9 +52,11 @@ mkDotnetTest = { name, + stdenv ? stdenvNoCC, template, usePackageSource ? false, build, + buildInputs ? [], # TODO: use correct runtimes instead of sdk runtime ? finalAttrs.finalPackage, runInputs ? [], @@ -54,22 +65,22 @@ }: let sdk = finalAttrs.finalPackage; - built = runCommand "dotnet-test-${name}" { - buildInputs = [ sdk ]; + built = stdenv.mkDerivation { + name = "dotnet-test-${name}"; + buildInputs = + [ sdk ] + ++ buildInputs + ++ lib.optional (usePackageSource) sdk.packages; # make sure ICU works in a sandbox - propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile + '' - (allow network-inbound (local ip)) - (allow mach-lookup (global-name "com.apple.FSEvents")) + propagatedSandboxProfile = toString sdk.__propagatedSandboxProfile; + unpackPhase = '' + mkdir test + cd test + dotnet new ${template} -o . ''; - } ('' - HOME=$PWD/.home - dotnet new nugetconfig - dotnet nuget disable source nuget - '' + lib.optionalString usePackageSource '' - dotnet nuget add source ${finalAttrs.finalPackage.packages} - '' + '' - dotnet new ${template} -n test -o . - '' + build); + buildPhase = build; + dontPatchELF = true; + }; in if run == null then built @@ -77,6 +88,7 @@ runCommand "${built.name}-run" ({ src = built; nativeBuildInputs = [ built ] ++ runInputs; + passthru = { inherit built; }; } // lib.optionalAttrs (stdenv.isDarwin && runAllowNetworking) { sandboxProfile = '' (allow network-inbound (local ip)) @@ -95,7 +107,6 @@ # yes, older SDKs omit the comma [[ "$output" =~ Hello,?\ World! ]] && touch "$out" ''; - in { version = testers.testVersion ({ package = finalAttrs.finalPackage; @@ -103,7 +114,7 @@ command = "dotnet --info"; }); } - // lib.optionalAttrs (type == "sdk") { + // lib.optionalAttrs (type == "sdk") ({ console = mkDotnetTest { name = "console"; template = "console"; @@ -113,8 +124,8 @@ publish = mkDotnetTest { name = "publish"; template = "console"; - build = "dotnet publish -o $out"; - run = checkConsoleOutput "$src/test"; + build = "dotnet publish -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; }; self-contained = mkDotnetTest { @@ -130,20 +141,20 @@ name = "single-file"; template = "console"; usePackageSource = true; - build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out"; + build = "dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out/bin"; runtime = null; - run = checkConsoleOutput "$src/test"; + run = checkConsoleOutput "$src/bin/test"; }; web = mkDotnetTest { name = "web"; template = "web"; - build = "dotnet publish -o $out"; + build = "dotnet publish -o $out/bin"; runInputs = [ expect curl ]; run = '' expect <<"EOF" set status 1 - spawn $env(src)/test + spawn $env(src)/bin/test proc abort { } { exit 2 } expect_before default abort expect -re {Now listening on: ([^\r]+)\r} { @@ -165,6 +176,28 @@ ''; runAllowNetworking = true; }; - } // args.passthru.tests or {}; + } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { + aot = mkDotnetTest { + name = "aot"; + stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv; + template = "console"; + usePackageSource = true; + buildInputs = + [ zlib + ] ++ lib.optional stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ + swiftPackages.swift + Foundation + CryptoKit + GSS + ICU + ]); + build = '' + dotnet restore -p:PublishAot=true + dotnet publish -p:PublishAot=true -o $out/bin + ''; + runtime = null; + run = checkConsoleOutput "$src/bin/test"; + }; + }) // args.passthru.tests or {}; } // args.passthru or {}; }) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 2bbd36f57ea84..9a1acf4ad70d5 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -5,45 +5,60 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7 Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet */ -{ lib, config, callPackage, recurseIntoAttrs }: -let - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; - buildAttrs = { - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); - }; - - ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = import ./versions/6.0.nix buildAttrs; - dotnet_7_0 = import ./versions/7.0.nix buildAttrs; - dotnet_8_0 = import ./versions/8.0.nix buildAttrs; - dotnet_9_0 = import ./versions/9.0.nix buildAttrs; - - runtimeIdentifierMap = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - "x86_64-windows" = "win-x64"; - "i686-windows" = "win-x86"; - }; - - # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); -in -{ - inherit systemToDotnetRid; - - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; - - dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); -} // lib.optionalAttrs config.allowAliases { - # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; - sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; -} // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 // dotnet_9_0 +{ lib +, config +, recurseIntoAttrs +, generateSplicesForMkScope +, makeScopeWithSplicing' +}: + +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "dotnetCorePackages"; + f = (self: + let + callPackage = self.callPackage; + + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; + buildAttrs = { + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; + + ## Files in versions/ are generated automatically by update.sh ## + dotnet_6_0 = import ./versions/6.0.nix buildAttrs; + dotnet_7_0 = import ./versions/7.0.nix buildAttrs; + dotnet_8_0 = import ./versions/8.0.nix buildAttrs; + dotnet_9_0 = import ./versions/9.0.nix buildAttrs; + + runtimeIdentifierMap = { + "x86_64-linux" = "linux-x64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; + "x86_64-windows" = "win-x64"; + "i686-windows" = "win-x86"; + }; + + in { + inherit callPackage; + + # Convert a "stdenv.hostPlatform.system" to a dotnet RID + systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; + + patchNupkgs = callPackage ./patch-nupkgs.nix {}; + nugetPackageHook = callPackage ./nuget-package-hook.nix {}; + + dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0.sdk_8_0_1xx; }); + dotnet_9 = recurseIntoAttrs (callPackage ./9 {}); + } // lib.optionalAttrs config.allowAliases { + # EOL + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + } // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 // dotnet_9_0); +} diff --git a/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh new file mode 100644 index 0000000000000..33a6089663a95 --- /dev/null +++ b/pkgs/development/compilers/dotnet/dotnet-sdk-setup-hook.sh @@ -0,0 +1,77 @@ +# shellcheck shell=bash disable=SC2154 +export MSBUILDALWAYSOVERWRITEREADONLYFILES=1 + +declare -Ag _nugetInputs + +addNugetInputs() { + if [[ -d "$1/share/nuget" ]]; then + _nugetInputs[$1]=1 + fi +} + +addEnvHooks "$targetOffset" addNugetInputs + +_linkPackages() { + local -r src="$1" + local -r dest="$2" + local dir + + for x in "$src"/*/*; do + dir=$dest/$(basename "$(dirname "$x")") + mkdir -p "$dir" + ln -s "$x" "$dir"/ + done +} + +createNugetDirs() { + nugetTemp=$PWD/.nuget-temp + export NUGET_PACKAGES=$nugetTemp/packages + nugetSource=$nugetTemp/source + mkdir -p "$NUGET_PACKAGES" "$nugetSource" + + dotnet new nugetconfig + if [[ -z ${keepNugetConfig-} ]]; then + dotnet nuget disable source nuget + fi + + dotnet nuget add source "$nugetSource" -n _nix +} + +configureNuget() { + for x in "${!_nugetInputs[@]}"; do + if [[ -d $x/share/nuget/packages ]]; then + addToSearchPathWithCustomDelimiter ";" NUGET_FALLBACK_PACKAGES "$x/share/nuget/packages" + fi + + if [[ -d $x/share/nuget/source ]]; then + _linkPackages "$x/share/nuget/source" "$nugetSource" + fi + done + + if [[ -n "${linkNugetPackages-}" + || -f .config/dotnet-tools.json + || -f dotnet-tools.json + || -f paket.dependencies ]]; then + for x in "${!_nugetInputs[@]}"; do + if [[ -d $x/share/nuget/packages ]]; then + @lndir@/bin/lndir -silent "$x/share/nuget/packages" "$NUGET_PACKAGES" + fi + done + fi + + if [[ -f paket.dependencies ]]; then + sed -i "s:source .*:source $nugetSource:" paket.dependencies + sed -i "s:remote\:.*:remote\: $nugetSource:" paket.lock + + for x in "${!_nugetInputs[@]}"; do + if [[ -d $x/share/nuget/source ]]; then + @lndir@/bin/lndir -silent "$x/share/nuget/source" "$NUGET_PACKAGES" + fi + done + fi +} + +if [[ -z ${dontConfigureNuget-} ]]; then + prePhases+=(createNugetDirs) + preConfigurePhases+=(configureNuget) +fi diff --git a/pkgs/development/compilers/dotnet/dotnet-setup-hook.sh b/pkgs/development/compilers/dotnet/dotnet-setup-hook.sh new file mode 100644 index 0000000000000..0b393cbb4d78b --- /dev/null +++ b/pkgs/development/compilers/dotnet/dotnet-setup-hook.sh @@ -0,0 +1,8 @@ +if [ ! -w "$HOME" ]; then + export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files +fi + +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk +export DOTNET_NOLOGO=1 # Disables the welcome message +export DOTNET_CLI_TELEMETRY_OPTOUT=1 +export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1 # Skip integrity check on first run, which fails due to read-only directory diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index 90541215f9493..7e629383ab372 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -32,7 +32,6 @@ let installPhase = '' mkdir -p $out cp -r * $out/ - ln -fs ${old.passthru.packages}/* $out/ ''; }; }; diff --git a/pkgs/development/compilers/dotnet/nuget-package-hook.nix b/pkgs/development/compilers/dotnet/nuget-package-hook.nix new file mode 100644 index 0000000000000..4fe926b4684e7 --- /dev/null +++ b/pkgs/development/compilers/dotnet/nuget-package-hook.nix @@ -0,0 +1,12 @@ +{ + makeSetupHook, + zip, + strip-nondeterminism, +}: +makeSetupHook { + name = "nuget-package-hook"; + substitutions = { + inherit zip; + stripNondeterminism = strip-nondeterminism; + }; +} ./nuget-package-hook.sh diff --git a/pkgs/development/compilers/dotnet/nuget-package-hook.sh b/pkgs/development/compilers/dotnet/nuget-package-hook.sh new file mode 100644 index 0000000000000..2bb79a0150cb7 --- /dev/null +++ b/pkgs/development/compilers/dotnet/nuget-package-hook.sh @@ -0,0 +1,38 @@ +# shellcheck shell=bash disable=SC2154 + +_createNugetSourceInOutput() { + local package version id dir nupkg content + local -a nuspec + shopt -s nullglob + + for package in "$prefix"/share/nuget/packages/*/*; do + version=$(basename "$package") + id=$(basename "$(dirname "$package")") + dir="$prefix/share/nuget/source/$id/$version" + nupkg=$dir/$id.$version.nupkg + nuspec=("$package"/*.nuspec) + + if [[ -n ${createInstallableNugetSource-} ]]; then + content=. + else + content=$(basename "${nuspec[0]}") + fi + + mkdir -p "$dir" + cp "${nuspec[0]}" "$dir/$id.nuspec" + (cd "$package" && @zip@/bin/zip -rq0 "$nupkg" "$content") + @stripNondeterminism@/bin/strip-nondeterminism --type zip "$nupkg" + touch "$nupkg".sha512 + done +} + +createNugetSource() { + local output + for output in $(getAllOutputNames); do + prefix="${!output}" _createNugetSourceInOutput + done +} + +if [[ -z ${dontCreateNugetSource-} ]]; then + postFixupHooks+=(createNugetSource) +fi diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 4ce789e00b912..db9b5e68bdbf2 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -1,6 +1,9 @@ { stdenv , callPackage , vmr +, xmlstarlet +, strip-nondeterminism +, zip }: let @@ -16,6 +19,12 @@ in { src = vmr; dontUnpack = true; + nativeBuildInputs = [ + xmlstarlet + strip-nondeterminism + zip + ]; + outputs = [ "out" "packages" "artifacts" ]; installPhase = '' @@ -26,17 +35,55 @@ in { mkdir "$out"/bin ln -s "$out"/dotnet "$out"/bin/dotnet - mkdir "$packages" - # this roughly corresponds to the {sdk,aspnetcore}_packages in ../update.sh - cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/*Microsoft.{NET.ILLink.Tasks,NETCore,DotNet,AspNetCore}.*.nupkg "$packages" - - cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid} "$artifacts" + mkdir -p "$packages" "$artifacts" + cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/* "$artifacts"/ + chmod +w -R "$artifacts" + + local package + + for package in "$artifacts"/*.nupkg; do + local copy + case "$(basename "$package")" in + *Microsoft.NET.* | \ + *Microsoft.ILLink.* | \ + *Microsoft.Tasks.* | \ + *Microsoft.NETCore.* | \ + *Microsoft.DotNet.* | \ + *Microsoft.AspNetCore.*) copy=1 ;; + *) copy= ;; + esac + if [[ -n $copy ]]; then + echo copying "$package" to packages + xmlstarlet \ + sel -t \ + -m /_:package/_:metadata \ + -v _:id -nl \ + -v _:version -nl \ + "$package"/*.nuspec \ + | tr A-Z a-z | ( + read id + read version + mkdir -p "$packages"/share/nuget/packages/"$id" + cp -r "$package" "$packages"/share/nuget/packages/"$id"/"$version" + ) + fi + done + + for package in "$artifacts"/{,SourceBuildReferencePackages/}*.nupkg; do + echo packing "$package" to artifacts + (cd "$package" && zip -rq0 "$package.tmp" .) + strip-nondeterminism --type zip "$package.tmp" + rm -r "$package" + mv "$package.tmp" "$package" + done runHook postInstall ''; passthru = { inherit (vmr) icu targetRid; + # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215 + hasILCompiler = false; }; meta = vmr.meta // { diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix index 572211b1b378f..23789b124411b 100644 --- a/pkgs/development/compilers/dotnet/patch-nupkgs.nix +++ b/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -1,6 +1,5 @@ { stdenv , lib -, dotnetCorePackages , zlib , curl , icu @@ -12,8 +11,6 @@ }: let - buildRid = dotnetCorePackages.systemToDotnetRid stdenv.buildPlatform.system; - binaryRPath = lib.makeLibraryPath ([ stdenv.cc.cc zlib @@ -24,7 +21,7 @@ let openssl ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); -in writeShellScriptBin "patch-nupkgs" '' +in writeShellScriptBin "patch-nupkgs" ('' set -euo pipefail shopt -s nullglob isELF() { @@ -37,13 +34,12 @@ in writeShellScriptBin "patch-nupkgs" '' if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } cd "$1" - for x in *.${buildRid}/* *.${buildRid}.*/*; do + for x in */* */*; do # .nupkg.metadata is written last, so we know the packages is complete [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ && [[ ! -f "$x"/.nix-patched ]] || continue echo "Patching package $x" - pushd "$x" - for p in $(find -type f); do + find "$x" -type f -print0 | while IFS= read -rd "" p; do if [[ "$p" != *.nix-patched ]] \ && isELF "$p" \ && patchelf --print-interpreter "$p" &>/dev/null; then @@ -68,7 +64,18 @@ in writeShellScriptBin "patch-nupkgs" '' mv "$tmp" "$p" fi done - touch .nix-patched + touch "$x"/.nix-patched + done +'' + lib.optionalString stdenv.isDarwin '' + for x in microsoft.dotnet.ilcompiler/*; do + # .nupkg.metadata is written last, so we know the packages is complete + [[ -d "$x" ]] && [[ -f "$x"/.nupkg.metadata ]] \ + && [[ ! -f "$x"/.nix-patched-ilcompiler ]] || continue + echo "Patching package $x" + pushd "$x" + sed -i 's: -no_code_signature_warning::g' build/Microsoft.NETCore.Native.targets + sed -i 's:Include="-ld_classic"::g' build/Microsoft.NETCore.Native.Unix.targets + touch .nix-patched-ilcompiler popd done -'' +'') diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix index 658ee578ae983..fe5d1ebc6879c 100644 --- a/pkgs/development/compilers/dotnet/sigtool.nix +++ b/pkgs/development/compilers/dotnet/sigtool.nix @@ -1,11 +1,10 @@ -{ darwin +{ cctools +, darwin , fetchFromGitHub , makeWrapper }: -let - cctools = darwin.cctools; -in darwin.sigtool.overrideAttrs (old: { +darwin.sigtool.overrideAttrs (old: { # this is a fork of sigtool that supports -v and --remove-signature, which are # used by the dotnet sdk src = fetchFromGitHub { diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 5806a5ee6de82..a78f5a9c5c8d9 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -1,15 +1,14 @@ { stdenv -, stdenvNoCC , callPackage , lib , writeShellScript -, pkgsBuildHost , mkNugetDeps , nix , cacert , nuget-to-nix , dotnetCorePackages , xmlstarlet +, patchNupkgs , releaseManifestFile , tarballHash @@ -21,21 +20,24 @@ let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - dotnetSdk = pkgsBuildHost.callPackage bootstrapSdk {}; - - patchNupkgs = pkgsBuildHost.callPackage ./patch-nupkgs.nix {}; + dotnetSdk = callPackage bootstrapSdk {}; deps = mkNugetDeps { name = "dotnet-vmr-deps"; sourceFile = depsFile; }; + sdkPackages = dotnetSdk.packages.override { + installable = true; + }; + vmr = (mkVMR { inherit releaseManifestFile tarballHash dotnetSdk; }).overrideAttrs (old: rec { prebuiltPackages = mkNugetDeps { name = "dotnet-vmr-deps"; sourceFile = depsFile; + installable = true; }; nativeBuildInputs = @@ -52,7 +54,9 @@ let ''; postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || ln -sf "$prebuiltPackages"/* prereqs/packages/prebuilt/ + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ ''; buildFlags = diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix index 4212aaaab0249..d6849c98e17d9 100644 --- a/pkgs/development/compilers/dotnet/stage1.nix +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -1,7 +1,6 @@ { stdenv , lib , callPackage -, pkgsBuildHost , releaseManifestFile , tarballHash @@ -13,7 +12,7 @@ let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - stage0 = pkgsBuildHost.callPackage ./stage0.nix args; + stage0 = callPackage ./stage0.nix args; vmr = (mkVMR { inherit releaseManifestFile tarballHash; diff --git a/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch b/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch deleted file mode 100644 index ac840ee273dbb..0000000000000 --- a/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 85a940f3f039704da73ee177c1848cd4b6ed029f Mon Sep 17 00:00:00 2001 -From: David McFarland <corngood@gmail.com> -Date: Tue, 9 Jan 2024 15:10:00 -0400 -Subject: [PATCH] stop passing bare sdk arg to swiftc - ---- - .../CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt b/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt -index b847f5c3cd..cf8344ead0 100644 ---- a/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt -+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt -@@ -49,9 +49,13 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_OSX) - set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") - endif() - -+if (CMAKE_OSX_SYSROOT) -+ set(SWIFT_ARGS -sdk ${CMAKE_OSX_SYSROOT}) -+endif() -+ - add_custom_command( - OUTPUT pal_swiftbindings.o -- COMMAND xcrun swiftc -emit-object -static -parse-as-library -runtime-compatibility-version none -sdk ${CMAKE_OSX_SYSROOT} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o -+ COMMAND swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache" -emit-object -static -parse-as-library -runtime-compatibility-version none ${SWIFT_ARGS} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o - MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift - COMMENT "Compiling Swift file pal_swiftbindings.swift" - ) --- -2.42.0 - diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index fbcbd84bf9f6c..486ad2636a0e0 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -7,46 +7,48 @@ set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" release () { - local content="$1" - local version="$2" + local content="$1" + local version="$2" - jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" } release_files () { - local release="$1" - local expr="$2" + local release="$1" + local expr="$2" - jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } release_platform_attr () { - local release_files="$1" - local platform="$2" - local attr="$3" + local release_files="$1" + local platform="$2" + local attr="$3" - jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" + jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { - local release_files="$1" - local platforms=( - "x86_64-linux linux-x64" - "aarch64-linux linux-arm64" - "x86_64-darwin osx-x64" - "aarch64-darwin osx-arm64" - ) - - echo "srcs = {" - for kv in "${platforms[@]}"; do - local nix_platform=${kv%% *} - local ms_platform=${kv##* } - - local url=$(release_platform_attr "$release_files" "$ms_platform" url) - local hash=$(release_platform_attr "$release_files" "$ms_platform" hash) - - [[ -z "$url" || -z "$hash" ]] && continue - echo " $nix_platform = { + local release_files="$1" + local platforms=( + "x86_64-linux linux-x64" + "aarch64-linux linux-arm64" + "x86_64-darwin osx-x64" + "aarch64-darwin osx-arm64" + ) + + echo "srcs = {" + local kv + for kv in "${platforms[@]}"; do + local nix_platform=${kv%% *} + local ms_platform=${kv##* } + local url hash + + url=$(release_platform_attr "$release_files" "$ms_platform" url) + hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + + [[ -z "$url" || -z "$hash" ]] && continue + echo " $nix_platform = { url = \"$url\"; sha512 = \"$hash\"; };" @@ -55,15 +57,13 @@ platform_sources () { } generate_package_list() { - local version pkgs nuget_url - version="$1" + local version="$1" shift - pkgs=( "$@" ) + local pkgs=( "$@" ) nuget_url pkg url hash nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" for pkg in "${pkgs[@]}"; do - local url hash url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" hash="$(nix-prefetch-url "$url")" if [[ -z "$hash" ]]; then @@ -76,8 +76,10 @@ generate_package_list() { } version_older () { - cur_version=$1 - max_version=$2 + local cur_version=$1 + local max_version=$2 + local result + result=$(nix-instantiate -I ../../../../. \ --eval -E "(import ../../../../. {}).lib.versionOlder \"$cur_version\" \"$max_version\"") if [[ "$result" == "true" ]]; then @@ -112,15 +114,15 @@ aspnetcore_packages () { # This should not happend in minor or bugfix updates, but probably happens # with every new major .NET release. local pkgs=( - "Microsoft.AspNetCore.App.Runtime.linux-arm" - "Microsoft.AspNetCore.App.Runtime.linux-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" - "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" - "Microsoft.AspNetCore.App.Runtime.linux-x64" - "Microsoft.AspNetCore.App.Runtime.osx-x64" - "Microsoft.AspNetCore.App.Runtime.win-arm64" - "Microsoft.AspNetCore.App.Runtime.win-x64" - "Microsoft.AspNetCore.App.Runtime.win-x86" + "Microsoft.AspNetCore.App.Runtime.linux-arm" + "Microsoft.AspNetCore.App.Runtime.linux-arm64" + "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" + "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" + "Microsoft.AspNetCore.App.Runtime.linux-x64" + "Microsoft.AspNetCore.App.Runtime.osx-x64" + "Microsoft.AspNetCore.App.Runtime.win-arm64" + "Microsoft.AspNetCore.App.Runtime.win-x64" + "Microsoft.AspNetCore.App.Runtime.win-x86" ) # These packages are currently broken on .NET 8 @@ -133,9 +135,9 @@ aspnetcore_packages () { # Packages that only apply to .NET 6 and up if ! version_older "$version" "6"; then pkgs+=( - "Microsoft.AspNetCore.App.Ref" - "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" - "Microsoft.AspNetCore.App.Runtime.osx-arm64" + "Microsoft.AspNetCore.App.Ref" + "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" + "Microsoft.AspNetCore.App.Runtime.osx-arm64" ) fi @@ -168,102 +170,103 @@ sdk_packages () { # This should not happend in minor or bugfix updates, but probably happens # with every new major .NET release. local pkgs=( - "Microsoft.NETCore.App.Host.linux-arm" - "Microsoft.NETCore.App.Host.linux-arm64" - "Microsoft.NETCore.App.Host.linux-musl-arm64" - "Microsoft.NETCore.App.Host.linux-musl-x64" - "Microsoft.NETCore.App.Host.linux-x64" - "Microsoft.NETCore.App.Host.osx-x64" - "Microsoft.NETCore.App.Host.win-arm64" - "Microsoft.NETCore.App.Host.win-x64" - "Microsoft.NETCore.App.Host.win-x86" - "Microsoft.NETCore.App.Runtime.linux-arm" - "Microsoft.NETCore.App.Runtime.linux-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.linux-x64" - "Microsoft.NETCore.App.Runtime.osx-x64" - "Microsoft.NETCore.App.Runtime.win-arm64" - "Microsoft.NETCore.App.Runtime.win-x64" - "Microsoft.NETCore.App.Runtime.win-x86" - "Microsoft.NETCore.DotNetAppHost" - "Microsoft.NETCore.DotNetHost" - "Microsoft.NETCore.DotNetHostPolicy" - "Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHost" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHost" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHost" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHost" - "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" - "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHost" - "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" - "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Host.linux-musl-arm" - "Microsoft.NETCore.App.Host.osx-arm64" - "Microsoft.NETCore.App.Runtime.linux-musl-arm" - "Microsoft.NETCore.App.Runtime.osx-arm64" - "Microsoft.NETCore.App.Ref" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm" - "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" - "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" - "Microsoft.NETCore.App.Runtime.Mono.linux-x64" - "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" - "Microsoft.NETCore.App.Runtime.Mono.osx-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x64" - "Microsoft.NETCore.App.Runtime.Mono.win-x86" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" - "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" - "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" - "Microsoft.NETCore.App.Crossgen2.linux-arm" - "Microsoft.NETCore.App.Crossgen2.linux-arm64" - "Microsoft.NETCore.App.Crossgen2.linux-x64" - "Microsoft.NETCore.App.Crossgen2.osx-x64" - "Microsoft.NETCore.App.Crossgen2.osx-arm64" + "Microsoft.NETCore.App.Host.linux-arm" + "Microsoft.NETCore.App.Host.linux-arm64" + "Microsoft.NETCore.App.Host.linux-musl-arm64" + "Microsoft.NETCore.App.Host.linux-musl-x64" + "Microsoft.NETCore.App.Host.linux-x64" + "Microsoft.NETCore.App.Host.osx-x64" + "Microsoft.NETCore.App.Host.win-arm64" + "Microsoft.NETCore.App.Host.win-x64" + "Microsoft.NETCore.App.Host.win-x86" + "Microsoft.NETCore.App.Runtime.linux-arm" + "Microsoft.NETCore.App.Runtime.linux-arm64" + "Microsoft.NETCore.App.Runtime.linux-musl-arm64" + "Microsoft.NETCore.App.Runtime.linux-musl-x64" + "Microsoft.NETCore.App.Runtime.linux-x64" + "Microsoft.NETCore.App.Runtime.osx-x64" + "Microsoft.NETCore.App.Runtime.win-arm64" + "Microsoft.NETCore.App.Runtime.win-x64" + "Microsoft.NETCore.App.Runtime.win-x86" + "Microsoft.NETCore.DotNetAppHost" + "Microsoft.NETCore.DotNetHost" + "Microsoft.NETCore.DotNetHostPolicy" + "Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" + "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-arm.Microsoft.NETCore.DotNetHost" + "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-x64.Microsoft.NETCore.DotNetHost" + "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.osx-x64.Microsoft.NETCore.DotNetHost" + "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.win-arm64.Microsoft.NETCore.DotNetHost" + "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" + "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" + "runtime.win-x64.Microsoft.NETCore.DotNetHost" + "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" + "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" + "runtime.win-x86.Microsoft.NETCore.DotNetHost" + "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" + "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" + "Microsoft.NETCore.App.Host.linux-musl-arm" + "Microsoft.NETCore.App.Host.osx-arm64" + "Microsoft.NETCore.App.Runtime.linux-musl-arm" + "Microsoft.NETCore.App.Runtime.osx-arm64" + "Microsoft.NETCore.App.Ref" + "Microsoft.NETCore.App.Runtime.Mono.linux-arm" + "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" + "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" + "Microsoft.NETCore.App.Runtime.Mono.linux-x64" + "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" + "Microsoft.NETCore.App.Runtime.Mono.osx-x64" + "Microsoft.NETCore.App.Runtime.Mono.win-x64" + "Microsoft.NETCore.App.Runtime.Mono.win-x86" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" + "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" + "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" + "Microsoft.NETCore.App.Crossgen2.linux-musl-arm" + "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64" + "Microsoft.NETCore.App.Crossgen2.linux-musl-x64" + "Microsoft.NETCore.App.Crossgen2.linux-arm" + "Microsoft.NETCore.App.Crossgen2.linux-arm64" + "Microsoft.NETCore.App.Crossgen2.linux-x64" + "Microsoft.NETCore.App.Crossgen2.osx-x64" + "Microsoft.NETCore.App.Crossgen2.osx-arm64" ) # These packages were removed on .NET 9 if ! version_older "$version" "9"; then - local newpkgs=() - for pkg in "${pkgs[@]}"; do - [[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg") - done - pkgs=("${newpkgs[@]}") + local newpkgs=() + local pkg + for pkg in "${pkgs[@]}"; do + [[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg") + done + pkgs=("${newpkgs[@]}") fi # These packages were removed on .NET 8 @@ -282,13 +285,14 @@ sdk_packages () { # Packages that only apply to .NET 7 and up if ! version_older "$version" "7"; then pkgs+=( - "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" - "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" - "runtime.linux-x64.Microsoft.DotNet.ILCompiler" - "runtime.osx-x64.Microsoft.DotNet.ILCompiler" - "runtime.win-arm64.Microsoft.DotNet.ILCompiler" - "runtime.win-x64.Microsoft.DotNet.ILCompiler" + "Microsoft.DotNet.ILCompiler" + "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" + "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler" + "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler" + "runtime.linux-x64.Microsoft.DotNet.ILCompiler" + "runtime.osx-x64.Microsoft.DotNet.ILCompiler" + "runtime.win-arm64.Microsoft.DotNet.ILCompiler" + "runtime.win-x64.Microsoft.DotNet.ILCompiler" ) fi @@ -296,6 +300,7 @@ sdk_packages () { if ! version_older "$version" "8"; then pkgs+=( "Microsoft.NET.ILLink.Tasks" + "runtime.osx-arm64.Microsoft.DotNet.ILCompiler" ) fi @@ -303,74 +308,83 @@ sdk_packages () { } main () { - pname=$(basename "$0") - if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then - echo "Usage: $pname [sem-versions] + local pname + pname=$(basename "$0") + if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then + echo "Usage: $pname [sem-versions] Get updated dotnet src (platform - url & sha512) expressions for specified versions Examples: $pname 6.0.14 7.0.201 - specific x.y.z versions $pname 6.0 7.0 - latest x.y versions " >&2 - exit 1 - fi - - for sem_version in "$@"; do - echo "Generating ./versions/${sem_version}.nix" - patch_specified=false - # Check if a patch was specified as an argument. - # If so, generate file for the specific version. - # If only x.y version was provided, get the latest patch - # version of the given x.y version. - if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then - patch_specified=true - elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then - continue + exit 1 fi - # Make sure the x.y version is properly passed to .NET release metadata url. - # Then get the json file and parse it to find the latest patch release. - major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") - content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") - major_minor_underscore=${major_minor/./_} - - release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -r '.runtime.version' <<< "$release_content") - mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) - - # If patch was not specified, check if the package is already the latest version - # If it is, exit early - if [ "$patch_specified" == false ] && [ -f "./versions/${sem_version}.nix" ]; then - current_version=$(nix-instantiate --eval -E "(import ./versions/${sem_version}.nix { \ + for sem_version in "$@"; do + echo "Generating ./versions/${sem_version}.nix" + local patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + continue + fi + + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. + local major_minor content major_minor_patch + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") + local major_minor_underscore=${major_minor/./_} + + local release_content aspnetcore_version runtime_version + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + local -a sdk_versions + mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "./versions/${sem_version}.nix" ]; then + local current_version + current_version=$(nix-instantiate --eval -E "(import ./versions/${sem_version}.nix { \ buildAspNetCore = { ... }: {}; \ buildNetSdk = { ... }: {}; \ buildNetRuntime = { ... }: {}; \ }).release_${major_minor_underscore}" | jq -r) - if [[ "$current_version" == "$major_minor_patch" ]]; then - echo "Nothing to update." - continue + if [[ "$current_version" == "$major_minor_patch" ]]; then + echo "Nothing to update." + continue + fi fi - fi - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + local channel_version support_phase + channel_version=$(jq -r '."channel-version"' <<< "$content") + support_phase=$(jq -r '."support-phase"' <<< "$content") - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - sdk_packages="$(sdk_packages "${runtime_version}")" - aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" + local sdk_packages aspnetcore_packages + sdk_packages="$(sdk_packages "${runtime_version}")" + aspnetcore_packages="$(aspnetcore_packages "${aspnetcore_version}")" - result=$(mktemp) - trap "rm -f $result" TERM INT EXIT + result=$(mktemp) + trap "rm -f $result" TERM INT EXIT - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v$channel_version ($support_phase) @@ -392,35 +406,36 @@ in rec { $runtime_sources };" > "${result}" - declare -A feature_bands - unset latest_sdk - - for sdk_version in "${sdk_versions[@]}"; do - sdk_base_version=${sdk_version%-*} - feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || latest_sdk=$sdk_attrname - - echo " + local -A feature_bands + unset latest_sdk + + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname + + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources inherit packages; };" >> "${result}" - done + done - echo " + echo " sdk_$major_minor_underscore = $latest_sdk; }" >> "${result}" - cp "${result}" "./versions/${sem_version}.nix" - echo "Generated ./versions/${sem_version}.nix" - done + cp "${result}" "./versions/${sem_version}.nix" + echo "Generated ./versions/${sem_version}.nix" + done } main "$@" diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 56320767e7c74..24a2c1a24df76 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -4,202 +4,202 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.31"; sha256 = "16xd2i3rzvvkdqswmr4i132s7a71m0i2iml8zbxb81vj0qj99nmi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "0blf8hl2irl9r9x6f7cih87ps21rcs3b8r09z5wp7jcb5j1cv8fg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.31"; sha256 = "13765sv4fi9sr0cq4d1lif461xmaxdm4rlnk9gg01g1wgfjaci9v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.31"; sha256 = "1nyk0bggmwggw06dm5py4qz2f8b4mzc1c0zvqb3zigsrn37mp44s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "13kww7x35926wik32z8cnvzhpqp3dwhazkzb569v87x8yww56n3k"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.31"; sha256 = "07hjgb341356qz440i7agz0zmy0267s1ab09n26nmmclmwi33b6c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.31"; sha256 = "15zi7yfc862ckv67w69linqnnckb57v2c8xfkd8sc583b55wj65c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.31"; sha256 = "0b7k2rhhffg36bsqwdbz4sqfn5frahclfhl4g67f8kdz3xjqnv6s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.31"; sha256 = "1wablrn1g5z4b995zan397iayxilriapcycmd7fd2rlqamay639p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.31"; sha256 = "1yf6wkmf0dvifphgai72ik09mxvzqdmwg9bgw76d7lwrjq1i0ij8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "0w4sab66rjjyar9z139ls6rx29gvgj3rp3cbrsc8z00y9mw2sl22"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.31"; sha256 = "0g76dzpmpffgv2a10znz0fcqkbms2l3br49f45fa72l6ap4dsm0i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.31"; sha256 = "05s1c6bd4592xhy0y3w0cjckg11hb4pci729v59k3i3hl0hbad4s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.31"; sha256 = "10cjff8ddjykawlacjv5zqgdax8vc6g8kdqz9xyk557xi1p1bai9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.31"; sha256 = "1cqkvmasyh53nlj9vciyfpvv2mhv9jnvnfh5w5sm98cqc49dkmkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.31"; sha256 = "0k16h1fwnvhw1gcx8ib01bidhrls5m56fiy6wldk3ajgs5dif8i6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.31"; sha256 = "1rrgp98ssg6xvq4m12hk4wzdrcrc9ks1pbjdvacv7a68zhq9c2ds"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.31"; sha256 = "0d9lbwlq4xf31lfrkmyv4wsdz39fhha8ink02hkah2yawr4pfbza"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.31"; sha256 = "127jg9md1xriaj00bh0vqx426y0kiq5l2r9vkd78cihzyfv0asd2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.31"; sha256 = "0p9z0mx8fmj908nn4ckj78phdwjlwlkd3fy8g04nsgds54wzznnm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "1wmlwzy9bc1fs38r0vpn3ragp8pkimcq6sicj978yhk7brn52z1p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.31"; sha256 = "0jr9llhmdjzv4z813m8g1carsj7fqbsjc2r2315qkicvisjf82yg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.31"; sha256 = "13wfhnjqvk6h9d6s8jvm81fscsc6am3vixpqags8fc38449852v7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "1cl561dgdk4mj48zw5xwg7a0cafkx8j2wjd4nlv0x3di300k75k5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.31"; sha256 = "14pbbp2mmnrx42a3zzwavbfshpp4hp04lmpayw3d2fm9nbrzjzlf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.31"; sha256 = "105f5iq1r1j7fb1nkvls7hdm864pk7l04w0drqj1msml7ja4fdw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.31"; sha256 = "0ln0hj3xgr4xlghfna43rr68gclhp6dnqnhn4sfwh82z9i2593nr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0cwzp2ym7d6kyp3sf21v7ixfdjcprpw27qv6x1j7h7bp9jfk8cj2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "1dcj6cclv3j3xmhhvk46kak1afp04mamli0j0n9c4pf3ri4p02h0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "1ld8jxpiapa3zmvikd0r200nx1cwlmm50rl4dyxm3m1xn6hvxkaa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0mr4x1x42srl363f7v5zdn1l973rfw247vf20i5wrv5hv0qci2pa"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0i2q45z8qkp0pz44rcsljzxrk25xq62z7i4rnq16mcpiq4ycacd8"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "16z8z85bn2zd5r4jjbz5f1sjadj8s3fv3l42xfqka9wj3362rrsr"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0svd4zv4ah95n5cw7z2p8ndfvvvk29qyyd1cpw2qkkghj21lqzk5"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0sr995kaxlnzzgdlgdfnw0zf6qi06f54xga6a80sr69qxacg1n7f"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0ds6i8lcswa8fgbljs1hx3fq0x1h8h9ahb190y751kx53gda4q7j"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0v3wc81wlsp97a0ab3kqbf2la8j5d66sdzhjs5fagcmlzhgjybvb"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "06a8zdvyr004lhs0pdsin3v8ylmlyqapa5wvyh7q0l4ds9f13h9l"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0k1zsaaj5r91n9iqfdwww0s3kq5ak254brfyhq018jzfgsmwsv1r"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1smij7fblrcbdn6960snvb5yz0ylk31ixha26bx4pw1qzdq25dda"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "17fb7lnzcna3vjmkkf64l6x67vsc9lkk318bydn0rd8xmsvcarlh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0z94wlfc7y356m6xbh4yn4f7349dxv3340mmiz3k9m39mcibvh5c"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0d7fpy0ycqigdr79p4ii8hd2d0pgc70rmn67h6y3hvcqxn4569x8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0vx2caca3rs34hhbci4m8sdrapbph1ry6mj5mjymzqgdvl21zgxl"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0hhflm634mqdr3q9qjc701yjfammc10hch334zs42758nzbpi4f7"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0l5861rmfqqsqr53d2jnal7nggc6mlvy7hj9ln4b5nbk8w2qmsfs"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "12dj9crj57k905q2i0r6ragmf6n85q4p1ayf00vfjr5wqylfmm18"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0aslfapafa9mp3k09yjy6ay4lclb5kmkiic660xqjqw0gk851skb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "12w425dbggb34knqxqfqrp6hzyi2d427anmrjqmipsi8hnivnrpd"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0zqfg5g06aqyypk0ka21jzsrb1v38yrgqcsll3ps7xsjd3swx8pp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "07wpsqknjimf0k9gxz49n69jhybj6h1yap4lsyhaclw4nxmhi2vc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0akikavmdma4p2fh96i91xfxk8a3dmcm6j0pc0az321fi22g9k1m"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "11knfd86jpmpnhn2vkqn0rkl7yg8ndfva07j90lm27zznz0fzhbd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0qg7qi7x98szsi1n0gmjv5nplpnkwhli3jrf64wc9jpf3mv2wd6n"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0rv4fwgqr26s1n1qqkzsp1ghn5m5zimllfh5ydn2rd4z9gvg0ivy"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1w71y8yffaljg96sy7lqfjpxk0mxbh5k1m9mik2nps1cs4f71l5g"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "19xb50y6jcn9yj1yblyd5c7gdcj09xvz0lna329a3gm55144pfgq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "1qgfxnvlhbr1y9r89srljdmgnyvjqh8knyhcgpakh3g4bi6j61s3"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "1141m8s0q7d73hicr9fgrgc4623rvz6a8mcf70zdq5hrf718nim5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1691jld833fyjyy3ahw4hq6k7rlwx6nzz74qf97s5nadbzdqa6b7"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0b1i3mgnnp3h13p94n14xfvz28lsqmadqiyc5ib44yb28w72zwrm"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0clgs6fs1gz2rld92hcmf4dksw62xb948l1a8zrsdyir40j0l33s"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "1p0cnnvb9i9x2yivvzj3lawy2fdrx2lw934q309anipfsxdzgx13"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1qy3bgvr9bqi35ncq6f11ihdrbv63vzhs72pl1s56f7wsqx7wpba"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "06bjzlw0gskrgzrp344nq5qz95rkmqf56zcj1dip1107pzhiz4x7"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0d6cdb1nsiqidwy5sgwq5iznb75cqkjffvyqlw9r7i9knj24yp30"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0srvnrvgn48jjwmxrsqqafz9xvvgc3vc24yfibjcj0aa20mr0zjp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.31"; sha256 = "1dmadshsp686r44sm1l72jkjlym0hbvpycv1vvaivrgrkjsy22yv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.31"; sha256 = "0sah1gf2lccc93n3lmkgiahlz4jwr02cw20bvcwqyikpldy2awds"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.31"; sha256 = "1rinf7daaphinmjfcp1v28gm88wcpjvi59a3an76vvjjgpwcms23"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "115c220p0mbk30biaw0sfqprnaghks7lcvvz6n5rsg0kn4fvy7qs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.31"; sha256 = "1y1sdabrcxswlwwlh5a493chxfsfpxrhvs2bkhqpw6bm712df6y4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.31"; sha256 = "06hcajknx5f3q4hl4950p3wpqylwkrbkady2qyrjil9d9i2nh7dr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.31"; sha256 = "1ybchvd2n4n57sn0ycd4rw5fhlhyc9w66anffdzmzxk0m2nj1ll4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.31"; sha256 = "1glgiqxkppk99h5q7hii1d0zx160qxmmna3qjfvk0yp62cx51nam"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.31"; sha256 = "07wdnlh41x3mblxi8wr5f6n0p9m7j76a6zda5snq25lfsvv75qr7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.31"; sha256 = "1q56hjpxpda23qn678cm11s0klf7259wbiw4js0yrjhzv0bwy2gf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.31"; sha256 = "17yzgzbadg8cxrfp9y9lil346jj6lk1ba96pmwcglprmqlf2747s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.31"; sha256 = "0j2bachvygz0cnyx1gdj64czsbxypzqhfm3x302jq1lq5mc7g94h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0ypldja725nxa9h3ddn352lm2c6f07vs1485mqgh10ymnv6a4m65"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0my18xrinvnb66vm3ni1l6d18l381fd8rpxbjwmcsdznv8p8brg7"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "1i2dyhifzawlsyygykl1rw9y0ybkn8jagklvnvk94mswh55df8k9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0lr7qhhgdn20xap6jrsqm444vycmhyjway0g417wk2bp9v22wgf4"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0gscb2py8shgnsqk4rm1wr29b0g9bk2sxfwlva2vy82i3msx9zcm"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0rwg0dbd9bfyhs5n2bwr6pz1ygklhgsx1kfjinyl6prgpz8sghgb"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0wwkhq5lahhxz24ihh16ybzkajgzbncfl8mykndphlgq2y0qznay"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "1hdz6j2i206gshm01zrijsgflgab937h8b5idxamdk4rnq9jzhg2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.31"; sha256 = "03q5qamv7yw6gc975i8fccms5d9wlq8zn7kzaimnzykh470adnz7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.31"; sha256 = "0zp62hsaf6nfg28wc6inraqwihbbcd2mcjjkl5g8dfhfd62wqryq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.31"; sha256 = "08dydwm0sq3hr6bak3p11c9i66jg1prcb75nvdrrx01jsv9gcmab"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.31"; sha256 = "16xjxz2y3s6lagfmyhzqwwddbs678nfrwz6ja56sxjkwicisq5qm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.31"; sha256 = "1kqqij06k5mcjphcnwikyjs02b2z0fdccsmbfa7diw5wmci4hr9n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.31"; sha256 = "0n7cddp4pq5dr7b38mar64cnb3apf6ib9p9wi506shisy8xh7fni"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.31"; sha256 = "02x1i47syzjm6j7wi1ldzgh4gpz866qcygr4z0b16qsl36qvzb55"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.31"; sha256 = "1xab7dmxks7kqqnraivgwg4qyvcp11zz7vj1qbryxj6qv7wkv0bg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.31"; sha256 = "0z0isj1zsknp81wdf09qf1f1p1vk3v92f9jbkzx9pnqvfdk3s4wb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.31"; sha256 = "02bi7qlc5d9iz82ld6z6ycczlj3s6c2fy7zi9f917z7v6b278n76"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1s889d0rri4xjjk1w47f04jnn1awyxgwa9j01dn0n98qhhl8h8jm"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0c9rx3g3j7jrcbly8482xvjhyf16vns95zs466yj17jm9wnq0gcb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0szi3vbsj7gnbf3nq5q0xbf5p4581bglcz3mclwi8z0x2d607c23"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "07nxbwjjdzxviyrr4f13bfrbs33kz3bf53lk470r5jchi7msv8l2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.31"; sha256 = "17zn4r2nqkqb4cl0mn1mkd0v11j1j4gwxzcas38ss0snidqddkqj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.32"; sha256 = "16dk5xnrqp04a359m8zhqvxd44ywkc4gg0cd6dmi85qxwfdq06cs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.32"; sha256 = "0s4k7wmz11rx1257v1mr8n43shmij1dvh58xk890d0zbxqbv91vh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.32"; sha256 = "00q75d3swd9lq5kqq61vrbhvlax2vicxn84sm0gsyli7092c6nn6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.32"; sha256 = "09pfzr90cf29jdw5l9wzicmbbfjx37h78qv002q408n09d6wbmv0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.32"; sha256 = "07rb8djc0pkynfhibn8kv0kb1ip0ski5s6jjz34bs1jd3zp2yijf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.32"; sha256 = "0paraxqg5dn4l3b0w1pn4g08fc7wz7iybjqvdkhpdz2cmkixw7xy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.32"; sha256 = "0zznf4bsqc6gwh1s7vxs0wmspwb957jrksn4d113f8rvsklhy0il"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.32"; sha256 = "0qbgwdc3lqkiwqmn141pk08z8dnzfazpamqvcdjb2zq58kmqq9aa"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.32"; sha256 = "1mkaw0zpvam58pfb0zslygkrg5h3vcaxav35pcrssyjvmxr507l8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.32"; sha256 = "0vcz9c4ffj39a3infwypqxn88mwagifzw2yxwzs2sm2zy8rakc19"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.32"; sha256 = "0mzcwms2nd2sw53vmmvcn33bpv32xgknarc7s6v1kkpf1b3i6r6n"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.32"; sha256 = "19inclzxlyjp3vaxs3ssgcrzld6j35isin8s41ysrnfplvyc1wgx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.32"; sha256 = "1qmvx3iahrfckp526ix5qqcp863gw9gbasvjj7r7w9hwjknvg825"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.32"; sha256 = "0jv2w71brxynkxjr7076gdvp7jzfpfl1xlb2j2baqy98n9br659i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.32"; sha256 = "0zljqrg741v8mbfvig9hskddqyhbi3pydhgapfx63f06f54a8cy8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.32"; sha256 = "1y3a2s7mciz4hzv1ifmmlhjzl24hrndqncsnm6f33jzaxwwqgk5p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.32"; sha256 = "1as3xy9kyjfas3ahf6gpr5z3pfffgvan5xl0i9ryfzfvqfkaiswb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.32"; sha256 = "1kl8rvwsh8ppb08gglcjivjaackf23ac5024a73pba8hgn9cd86r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.32"; sha256 = "0bv9s4n9iagdd43p6qdahqawjnsci7g6rzz9c20jk0h02vhnl44w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.32"; sha256 = "1v1g6crlpqh18slqxvayay5y8rha46vq11n1yksqlr99vaa3c9ag"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.32"; sha256 = "0w8vcppl28fjc40wpr9lbv30ymj86ndm0jfbza531h3nnrk3ipmd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.32"; sha256 = "1bxqwj57z51hwaiv0xs243fkc6kz46yl1x0zrakmrbhazfa74ns9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.32"; sha256 = "1g88yykizsk3rqvqzgf3wix4wszbm8135mg1594rj78y5vipyy3q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.32"; sha256 = "0pyrjzwcjhkmi07dahz07njssz6r9sbk0f3852lfsxpnmy4zrn4i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.32"; sha256 = "0rfm7qiigb0lf8nkc98qbc703gnahzdcpv9gx24dz7nfcf6svfm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.32"; sha256 = "03dxavb0rlds4b5dp2mw768a2b06cgilx1zqfgnjg677m30gwiwz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.32"; sha256 = "04c3wp868i0vhmzidby881al9943af8z41h74m1n7mss83gn4yzw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.32"; sha256 = "0hyd2yq5zb3i3dcnzxa335anxj93d5rzlzxls6sv4cm5cpmh35nb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.32"; sha256 = "1v0lwvz9x30n8ynw4h6ywmgb3hf1j9d5c7g7ygr6g5mqpxxmpx9w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.32"; sha256 = "00sb4zf8zdjyrpjv372bq287197k6nm73sa7s4l4hxx9dbnp79yn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.32"; sha256 = "1g5zijlx1wqnga99bqb1jf7fahf2b05m2cpvz6bbfi5viad59g2q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "00fdzf0k0a4z7jdhyl7fskb5z3808cpncgkhqlfckicvd493369r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "03qc1avm835qbccda9gg2m4sdjnl2g69riba62s79ljhq8jfzwj6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "0a6lvdhyx57k7s5aqiffpg4pvbyc1y4alb269z5chs48d3vrd9y1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "015xski1vvhrlhhhd1p4pdc901q7nncylax6lqh4hi8fp4q4bix2"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "0dh68sbhfi7cnx1p0i4aa35h1jc8ya6dgr1v73s9qg1ii6jzd4mj"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "1q44yridrcnv9dvcwszgbvpp7hmcvij2y8b3mk75s94ylvmc14rl"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "1qrvlmjvgqlfpa8cwk6sbkpd44fzh2ixlsxms3nhkd61967azrfp"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "1hk98yqmlqh73qrcw1wa9kanh2srawlrxcwgfxb80f15g77vixj4"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "0g683f7g8mx9id79y11mm9vi477h6x2ybaqz7yzk9q2lx2apsmyx"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "1znjli22nizx2rcyp1wjgv5sdm381079hdb764gvbwn8b5l89k02"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "057r7w6dxjybgdq6r8606rxmmh83qrfyfc2y4fi3a0n2nzf2kkqz"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0pbhnsyq2rw8l41x500h3q2awrj0rlcr96xkjqvb9nclrnbfdyx6"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "1yvgrsrl86j0f5ndwrg8c1zjkirbny0rfsqnln563rvpi3hd285g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "0kw8gmrhi59rfg9386ik264yqv2vmwnh9gn9bxd5c78zsjc4lri5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "0p85xq3l8wk9rid0a0n0viz0fj52cf2822kbym931qgacbw2cgpb"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0g8xxwfg2nfqqhssqhf2x7364zvigngy4ncrgm9x5mv82f6y2l4b"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "0pdln2pwm171b9qhmagi4pp7b44xzsdsx48bb8mnzkbb9j7l557k"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "13sl3g6dmibadr2znns68cg3n4gwhsqnl9fklch094pwzk36hd66"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "1y0kk6lcx6z44r6483akg3bj98hnaqh869gwcqqv0kf9nj3lbvgw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0b4fqvdh04yl1942aq1s4kq7m38hsvpg7kim83xkn17scwzdwjwy"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "05r7rznkpfd7qgd0carb965q8hmnv5i9hs83fa9pmkgmzmykwjn1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "0ilzphin2fdiaszb09skw9a9nzqkpb2dmphrcqz8jayc7d1lyg6y"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "0z6k4zci6aafrpjv0kk96civz2ymxgxghh2v42idpbksaa5fgh1x"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0z435p6ym9is98vw00n3x919nb4ssp8h8kvx56phrwb34xp624d0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "16zq5xhhapbazkgpjsd6fhd2jj0b839ljgcinrj902a6r3qfmsf3"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "0g9dfgw8cdx0kal15i5znfqj0d8h60xczk7isjxs643msair0xj0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "0b8lfp8kvnfmb673ba77kgrj8sxcycy46308fjhgrjlhp3fhydvs"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "16anbmqrbm5xgdxw1rs090kicjf1d8a6lvd03ygl2kchqs9mabf8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "09q15492pgylpmzkw1cr2dbf5f3l9ak9a384m0pkidcv25hirm04"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "0swj701rik80sgldqlzirzkx0r53zwnp9lqhqgb68d2sm07y1d7v"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "18akyc7h2jzn2dr1rr5n0a3j6d6bs777rs9zl5awa0igxx6x9azl"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0mcb19n1gp8zx7wlkg6pmf3dxbd999vjxx5kan933320d5kwx298"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "11l3ass11qjq97xvydmsm2s4ycfbapccmzzi32ai7cywikswgqjj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "06rc3xx1ka3p73iw41zgp6c2sb0k7rhgj6znklk5cghkmf45z6dp"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "0sfd54gi4fxzlxnigmsvl33s1z8ba2y6gv2daag6q8x2rwkgvvhj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0kxy4yslrslg0qql9c00lqwf8rv383yc01v10mmi0sp3rva3sd74"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "00jj4dah0578162y4n6vcjbp9k9cknckkk2kgvd0g9xnnyby57yq"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "0my97vzpc3n2sfgksq97lj8jz40hx91sf2mawjmy3kac3zm0d33k"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "1gm1ccl56dvllpjqklnfs4g283knfw5521db37rg3ihj5c8pfqd7"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "1g0g4dhypkmns4i6a6n615gaq3203szl1gcbhlay25ghr5x3vb8p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.32"; sha256 = "0mn1qvf7ah4acdzq09b0r7hdi3lvdqdvdkb7yk4d8igc8ad33v72"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.32"; sha256 = "1cl915vac9vcbib916qj3adlczjhkqhfjkmdjrg39wgwi2rn9a4z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.32"; sha256 = "0r3qyf5hmzp0srq64ggcy0asb14v1abr68rgraml2mfsl5yf491h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.32"; sha256 = "1da9kpqjvlny88189j03r49gk5mbffy17501sn3i658pwcc0bhq3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.32"; sha256 = "0s1kmdlxmsv9fkv7i3c1w4cy4swwxv7dsbmjw8vqxbjwjd8x2v8n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.32"; sha256 = "12hllbgiha7pksiif73anhfxsq4zi6qm9dwprs6pgw6ifb52fk6d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.32"; sha256 = "1kpy06afqhjhn1zjm48sdlhdwzv8dddiwy6x7i0l9c1zinpz8fx1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.32"; sha256 = "0z4rsxczlh8vn9qr7n3cqkr2nmcxpx2d1x7xbz4mymqwa658azcz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.32"; sha256 = "0a2a848jpnzmcr8l3118a910l2d5bivf9v7cpwqp4d6fpdph5p8f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.32"; sha256 = "1i2x31nbc080inwl8ydd1jf5p9ixdkcz1dz6bgxy0jrfhw10xr03"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.32"; sha256 = "0kk14f26gx90fyacanbjhiv2d28gxap0dbps0zalga07zkaj53qy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.32"; sha256 = "0c81xrn5qzqw4wfi0vrqmj61mzcqiv0qvh51gk858v81j7ixn59y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.32"; sha256 = "0m91kwrqx8j9n442g31ixwww160wxwmd5mbkp6lcpw8p4d7dwjlc"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "1c5yd6waaxhj4klrc095ssj2cf948q1va6nj0jg2vkm38kjlayhm"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "1r3hqswn5nc0l91lwhvjcnqrsr0yjnnlz35s5bpymh4hxd4cvg2w"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "09smvx968m420hrm6hlwaaq13b19xf2pwaghvq8mripxpvzbhrwk"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "07pgqfw4jjq0yjvx7r6k3cny1bdp8kqrs07p81s10q6kxrbdj7j1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "1hgs8s3dam1hgmxavga3j01556qi3iyww8p4s24fwnmgbp5iqv2f"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "1ydply51jqklzimdfarkbs1xp4nhxn08zxqq2v966cqsms0b6l6j"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "1gfi2rj4fcjcszpl1xhn3h7dy3w99qmpkrlzfrq110ld1fv6kj50"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "0l5zkwwjf05zn16zfh3mai524lb4n42v7v0jd0aphzzy5q90wkzd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.32"; sha256 = "113sr1iwwf3z88sd4s2qp3n3p33xsjp0cyv45czffqbn081a4s8f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.32"; sha256 = "1a6ma8q2ckph0azqbv3kbyvnp5zhmkz1ckqc6fwqdmlhb7dmmrhq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.32"; sha256 = "04yh4fqmpmhcrk0p3rbdj7ywkxxl7l959zw8bcy36dqjixpmjasr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.32"; sha256 = "15qsjizbjilz6mpxxqcvn8nzlxwviv6ipyzmidd34ssjlzdagglz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.32"; sha256 = "06ip5fjhwvajz2sq7hgw9d4000mk5nnm6ad4fpn9r56r58phaqf9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.32"; sha256 = "1d4bnh0bjy1m024ncwvjj8964ia5rv0hi1nwnmr0zvxzd9a4l2cz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.32"; sha256 = "056b94p57r0y51fbgisryawn43b14p3zj19qs1h3cmm9rksmlf3v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.32"; sha256 = "1kf2madx3ygg0cczxf0hxxch0qyyr7lp75n6x646bvi28znlk4kc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.32"; sha256 = "1i2qb8kjmpp7ngabg1rf9w2n6n4gkdydb1zmn8d30wvbak698dwb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.32"; sha256 = "1s10rpx8d79r88lwl4vykba9gfba3c3nbxc28ilb0p64scl47ba0"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.32"; sha256 = "01s5d3wi5zcgkp5dk0qvjqp8hm0x4r4min5nr0hb20b05ix4fjy7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.32"; sha256 = "0svywpr1j98igpg3fqmba485q0kn1jyh508yi5q8n6n8ccajl8rk"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.32"; sha256 = "1cpsp0npaz25dh46jdrv5dm2mf73dsp2ancg8v13f0rsxncg2ylb"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.32"; sha256 = "139rkh5fxjnharwp12irl227cydg0c7sv30anv59mni1r1np5gkq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.32"; sha256 = "0zkklh4awc5p2g39mk06sd71xjvjfr8c3qcgwiwfw1yka8hrnka9"; }) ]; in rec { - release_6_0 = "6.0.31"; + release_6_0 = "6.0.32"; aspnetcore_6_0 = buildAspNetCore { - version = "6.0.31"; + version = "6.0.32"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8c7ccb6-b0f8-4448-a542-ed153838cac3/f104b5cc6c11109c0b48e2bb8f5b6cef/aspnetcore-runtime-6.0.31-linux-x64.tar.gz"; - sha512 = "ebb20a3461bf9d1e3a5c91761452f5ef2e60873826ad3158493768a18d207319bccc40d6c1a64fd61dd8c22bad51c26689394b0e6a40c4bfe4cca00ce4c00db1"; + url = "https://download.visualstudio.microsoft.com/download/pr/99f90118-96b4-4d06-97ad-d779715319f6/aecf393f9b9d362b66b93a47d90cfa8d/aspnetcore-runtime-6.0.32-linux-x64.tar.gz"; + sha512 = "1849c0073f12477b94357a1afb1cbd4ad67764263528b66037c19d554df41e681e4b41c0804b106319fe661d0bc3bae9e29e4913c0d0df33861cf6f32ebaac96"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/088b0ba5-2eaa-4815-a5c2-3517b99d059c/f6d18014064903be5fa2f654f51f5ce0/aspnetcore-runtime-6.0.31-linux-arm64.tar.gz"; - sha512 = "5d395554520a62c81e01f045245749d771d728a353631879462ac499e78658377e475bca756668eeafdd65ac55ad55f244f778809c127a553c5c330b76ef9dd8"; + url = "https://download.visualstudio.microsoft.com/download/pr/7b3ead1a-441d-42b9-ac91-1253ed8aee48/044d517eaff9f65e18e3e27f4d825d34/aspnetcore-runtime-6.0.32-linux-arm64.tar.gz"; + sha512 = "7b420354821f30809a6e8278f6e9c0654599d3e3b578b777da0f8e387612c20f28ddc49d5baac09627857297648a53ca847bc1237bc30275db5b661253f67523"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9b9addf2-5f49-4d1d-8272-bc348c9d93e4/a4dc2cdc0dcf8215a1c7e436a4c854cc/aspnetcore-runtime-6.0.31-osx-x64.tar.gz"; - sha512 = "79ced204af5aff757fc7680298121269bdc770b62411750f913d3129dad79c8b2eabd54b2986073c219b3aaa4b49f7188ab7694b99361fb725bff8e32db07dc3"; + url = "https://download.visualstudio.microsoft.com/download/pr/ff01df65-0536-46ad-bd67-95b72251e2cc/a9efc5c00994076c2635d70cac4f94bc/aspnetcore-runtime-6.0.32-osx-x64.tar.gz"; + sha512 = "7a91b051b6a48fff6838dc7565ccab11bb16ed0cddb1ce8bdb870d7b1a8978e544047541c2ff3b5b08272768e4dc8edd193cfb2acbd3a6e8cfd5b441dee24b47"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/299cb3a7-badd-474f-9906-33d744bd77e7/cfb103fc34184ce82a012c5a1046292a/aspnetcore-runtime-6.0.31-osx-arm64.tar.gz"; - sha512 = "f19e54b4a4e42db7aae880b86a6dde57dc988aebf852008b70ae56f89ad130e0aba73903357f4e97ead10d013ae3fa7fd28d197ef88f0742391f601ff136951b"; + url = "https://download.visualstudio.microsoft.com/download/pr/747ff7b4-44cb-4f11-a052-00484643c9ca/60175b793e5b9b472fb53960ee3aabe3/aspnetcore-runtime-6.0.32-osx-arm64.tar.gz"; + sha512 = "63de1906b3217c8e42dc6da3c5d1dd0f02ec7c8c1f988e2b5df1ca4e2e9220d6ff306e5a1d8f2af1bbc7eecd00790799bf847097e9054f96cd460cb22d3e5ce0"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.31"; + version = "6.0.32"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d67d6174-70c0-4256-b4f3-1f06cb5e8499/4bb51048eee17bda6b0ab7887c227206/dotnet-runtime-6.0.31-linux-x64.tar.gz"; - sha512 = "8df8d8bfe24104f41cc9715bb04fdc1811426c4d16f29336607c68a30d245fb8f36577d639e7da4865204fa85280fb5cdcf47e93183afe6b9e946e0c53df32c8"; + url = "https://download.visualstudio.microsoft.com/download/pr/37d9269f-d651-4248-beae-ccfbf4dc34fc/17809ba306015df6406cf4338b5cc576/dotnet-runtime-6.0.32-linux-x64.tar.gz"; + sha512 = "9babfe66f4a4261dd454f3220899af0a19532ab93575b581cec838f1c5f130d98b6fb1aaae5ee8e5b2e70deb55b619a0d55347f014ace72cb84b78d61faf0a59"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/34215580-c4c9-49ee-a9a1-e9cb1a25646b/9ac060d3bd7eaf550d11acd60bd2841a/dotnet-runtime-6.0.31-linux-arm64.tar.gz"; - sha512 = "022c7fc8878544f8abde8cf13ef661327238381c8f4731b4975be294616fda00a4b093036a896baef99eb58b881890d3fa951cc51b0212e766a8a7ce95d2c440"; + url = "https://download.visualstudio.microsoft.com/download/pr/ae57a4e9-a6d3-4532-9061-72cfcbb90e70/89016f6466f00a8e707cd2f12fafe9e4/dotnet-runtime-6.0.32-linux-arm64.tar.gz"; + sha512 = "dd9807d0e8872956602241bdc06e33cc6d7cb5519bf7d7864e1671c8608adab28b539ab910778a5f2543e8cd06c9db64f8def044180f29167ac82bc36ee258e5"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e06ea94c-e84e-48c3-9bcb-5fc65db7701b/22612902257c79e6483990c0d9bf02b5/dotnet-runtime-6.0.31-osx-x64.tar.gz"; - sha512 = "fb6ae3a5f5f31078cbc98d06101ed53b6a23e9a5582c3d660850e7315fe21d776ad2c3ec716ce27cc0ac87c37d99c6dd9bc864d9410917aa4c73cd885010980a"; + url = "https://download.visualstudio.microsoft.com/download/pr/7ff71c2f-9fc9-402a-b88b-e85510530744/4fe521036c2d271ed8247fd5b761af1d/dotnet-runtime-6.0.32-osx-x64.tar.gz"; + sha512 = "d9e29d9b5fefd1b431135c6cf504dc16400920eaa1d7b67ec5b24d1ab672a9d573a6c55750abb116facd2b228ed07a73951b7feee1982d5b24ba3cd025b4e6d5"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d82928b9-3ce6-4060-bdd5-159afb165b37/002421f6104e66b92b7abb31abe7ffed/dotnet-runtime-6.0.31-osx-arm64.tar.gz"; - sha512 = "57d89d189fd7c33ae9627a06dd543d4783c1e04376173e4a2868a342ca864323e41d5a4050dd82fbd9d7947ca1ea12185e80294c70857b97e3d32eace15940cc"; + url = "https://download.visualstudio.microsoft.com/download/pr/aea2980c-1104-4e20-b608-ff52a1295165/19c1f907bab296a31a1c084776bad885/dotnet-runtime-6.0.32-osx-arm64.tar.gz"; + sha512 = "cf9ec72bfb89124d12a359725689b5d4539ff6a8235fafada93d71b7e1c9d836592e6edecb2e1242a23298b0489050068322d2b9356b5d2e59f7dc519f2c5cfe"; }; }; }; sdk_6_0_4xx = buildNetSdk { - version = "6.0.423"; + version = "6.0.424"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/111a63f5-e1d4-4d07-b8b2-98642b5fcc59/389661b982fa5b83b09a1f50b9da247a/dotnet-sdk-6.0.423-linux-x64.tar.gz"; - sha512 = "4b4a0e66634211ae04fa030e18ae9e22640f5828307ba85c4bae596ab2d31260519197828dae3b2ec73d6772635e0b375536ea6591b03c67c2b7a5566f016952"; + url = "https://download.visualstudio.microsoft.com/download/pr/e94bb674-1fb1-4966-b2f0-bc9055ea33fc/428b37dee8ffb641fd1e45b401b2994c/dotnet-sdk-6.0.424-linux-x64.tar.gz"; + sha512 = "e9823aa2ad261199f8289fde8721931c1e4d47357b4973b8c7d34c12abd440bb932064ac151b0e0d7b3d5b72a5dfe3f20d5dafa19e6f56f1a61ad54b7de5e584"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f60a9d6c-1df8-4b84-af48-1961ed476a38/32f60a0f291dce64fb33a502e69e78bf/dotnet-sdk-6.0.423-linux-arm64.tar.gz"; - sha512 = "42f5e89d6d9a9923bbc20398a6272290b5f693cc767aa540233630f849779daa8cc7d8ac87655f6b2c8e0250bf5be986a8e8ae502b6f33c0b3e474d041b77625"; + url = "https://download.visualstudio.microsoft.com/download/pr/5f4b8e71-b03a-45cb-9a81-3cfcb51ef346/eb9509f0a061be1106689c1fbf5d5169/dotnet-sdk-6.0.424-linux-arm64.tar.gz"; + sha512 = "6a24dcad251016aa82ea11d3c665b250d5f86e7f8a82a6ec0f01d250e9cd671fd0746812757c023f28d4929248d326b2a5dc13ede8d5b5486671ea1452954aed"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8e5dec4f-d683-4ffa-9704-f4af023d5383/483bb54f830379d5eedd21c47ccaf47b/dotnet-sdk-6.0.423-osx-x64.tar.gz"; - sha512 = "31d8f5aa5b0fc5de1c6f809920cc8ffa0415059daa12ed21888795e600b528376d7b14da5b946ae5493af7214543e6494d9afc8ca017d05ee56dbfd10e2fade0"; + url = "https://download.visualstudio.microsoft.com/download/pr/28142fce-3788-45fb-a84a-1b00493f02b2/bc8df50296819166baa09ad3d372dca2/dotnet-sdk-6.0.424-osx-x64.tar.gz"; + sha512 = "611a226f16d2dc6c5cfdac1911f116d159d65e1e0d4189afd8db8d88faecd92e32244e96c8d3cfa7d094a6d8ba086323b8d1d038bc0efffcd14795d197cf91a1"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c53f9a57-8f7c-4d78-a2a5-32ddcf142cbb/312e8c418f6dd2372dd0e9174b10e6dc/dotnet-sdk-6.0.423-osx-arm64.tar.gz"; - sha512 = "fb31894ae43764c518d7909859a2b598134bc03bbb7996ad0badc1088cfcf4d666f25746f77cfef1aa042c2f9fdb348e6975e1c4a98ff93c1b206a4a0429f995"; + url = "https://download.visualstudio.microsoft.com/download/pr/9692d45e-74d3-49a6-b076-7f1248e92c92/62628ca1d882a0266afb8413a7fbf3ca/dotnet-sdk-6.0.424-osx-arm64.tar.gz"; + sha512 = "8de0b5aa92445a366807e3ba87d7b9de3b7dc035d96f7070f03197a6e6b78881d1dc279a619914140cd9025aa9084b35526d6db2c2db396cc07ebc398cbc6e71"; }; }; inherit packages; }; sdk_6_0_1xx = buildNetSdk { - version = "6.0.131"; + version = "6.0.132"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/439c6d52-892d-4aa6-a6c8-e2f9bcda7121/1fab8b4544b64a5c74fd0277d9115292/dotnet-sdk-6.0.131-linux-x64.tar.gz"; - sha512 = "3df39fbce2d549a258163588a7205bed73dd39a69c6ba7fee785bd8a663e679a4194cb7e20a2e0c289539e1e412ab3a7ac019cd92cac13d219dfb50cd25740a4"; + url = "https://download.visualstudio.microsoft.com/download/pr/9f73ff6b-6d2a-4089-bd97-ffac5a817931/2991e59497eb076bed968bb53fc7aa84/dotnet-sdk-6.0.132-linux-x64.tar.gz"; + sha512 = "71e23cb50ee342d23797f0b9d8ad524b42b3be664b20730da7ebb7cb85c0ec5c69efefa3a68907190328a693f6e21bddd7b9e7ca3da2f48434be1a736b3f7ccb"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9402bde0-16de-4696-973f-2a9667ce34a9/81b5e2ffa23e29e10a473cdff7dc7c7e/dotnet-sdk-6.0.131-linux-arm64.tar.gz"; - sha512 = "5815bc11dbab9c8be4c9b0d20903d3b6df2e825bbb2789f2d90d1b7d7fc3f4de28a450f5906d82675e8f67d34da8b28526bfbd5dfefa109bd895d2ac03f08cd3"; + url = "https://download.visualstudio.microsoft.com/download/pr/ab80d02c-8522-44b3-a6d1-7a4717305656/8ca7718b9d10dd08aad2ccb91d885074/dotnet-sdk-6.0.132-linux-arm64.tar.gz"; + sha512 = "574e63f1de4620f7f62421acf6c0f1971089b10b08e81125582d81fb23c0fca5c7703b79c0d7627ab743ed8ceb5d2948fdb606a9e8c6cf7628fa27d510d4719d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6667b054-8dd2-42bd-b769-521b5e3c95b7/f8a8a2c8c5f57f81e2b3b1581faaf84d/dotnet-sdk-6.0.131-osx-x64.tar.gz"; - sha512 = "eaf8323e2ebadbeb30bf610700b46814bb42efe17cbf7d0ee7322e7cf089a41cbf87e184226536ac580dd60f04009e3dda5878427df788727d065ae3e9f908ff"; + url = "https://download.visualstudio.microsoft.com/download/pr/45415455-e8cf-42a7-a827-96d189fbc330/36452e5dceca0b0bba3b70a024ee9c15/dotnet-sdk-6.0.132-osx-x64.tar.gz"; + sha512 = "479a45792663144f386ac9ce7f387e2c6d04024dd85de07a83956b4aeff7e91e062937e6e5c341fbc447566284145a491a2faaf6af929cf1940c09ef4966f7bf"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/512b8abb-992c-4af5-b308-9733d072c2d1/ce40f01dea24d4fd4849bb952c9fdb32/dotnet-sdk-6.0.131-osx-arm64.tar.gz"; - sha512 = "ad4563ada153b3d9f11bec8514f97999b31772089150856e46278638caebcf84b51f1413e49cce2c1e4aff266b91a72c1685b6df6546b9a8a2a415e78046587c"; + url = "https://download.visualstudio.microsoft.com/download/pr/6fc7e679-93e6-451d-ad5c-0ff6ebdc92a7/55df25bc67b5032a83256b1d6a276730/dotnet-sdk-6.0.132-osx-arm64.tar.gz"; + sha512 = "076f890802a0446b43a6aecad0efad939f100e70ed7b5f4ceeab87b0781598b23d647bd77773ce8d895a1573fe68e05cffbcc0d5368cdf954b0471abcdd2780e"; }; }; inherit packages; diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index fac65c6b2dd05..159d9cc239853 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -111,6 +111,7 @@ let (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18sarln3kbkqc1ab9jnadcqqxs8iicf7jqldxzbjzhdpmf96vwna"; }) (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1vh3ymhv33qysc4vj4gb3g1rgajy4jr4kxfjcsq2myn96aan84i1"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.20"; sha256 = "12w9hlq70ynkrgqbr555lnqmbf67iz3kaci2vi07zsn3mmak3z6j"; }) + (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0c966243j6m22hy3n922rl64vi6y1l7ljn69bwydm5clyh7zvn0a"; }) (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "11c31fzq4qfxcsz3p6vzdfnaqs29saf1dnmzq7l90p6ylwsblc7f"; }) (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "087q3p57snmvvzzqpxp3vwvi2q21kzlk8qh1w6axrcjdci31xmji"; }) (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1nc8m38jsqai934nn26f6dkl3c0r4sabssjiizcixdyypzlv3hcf"; }) diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index e88c122e3a8dd..9e09e7d6e82c7 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -4,225 +4,204 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.6"; sha256 = "1wgxqrnwhxrss67qm72zwgvf0wzskfpq6jmsj7qrl5z035v6wqsk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.6"; sha256 = "16m3qvial8wm0p56wf1135fl1v71fv4lmxqgfp79nrs0p5hrvyy2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.6"; sha256 = "0qaq8wv1xhr3wm03qiagwyrks18xg81m23q3fw2i1wq61pb3r7b5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.6"; sha256 = "1834b3cxmjpxw9q9b6i7a3rkjy1rmcxv3kvnwzbyszn9k41bfcd0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.6"; sha256 = "1cx96knhh3nkjd0qasw8z89c9f9y7agazdf8ba61r8ir3k9nmh9q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.6"; sha256 = "1a7l158y6g2dmrviiisf8qzmnmv5zn5r2cdmrdfwmcsqg9n3dcxx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.6"; sha256 = "1m71clfwd7gcgpqblp2q8f4m3a72a90jfv6iif7j3v2wjhmg6ckc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.6"; sha256 = "16ln87byqnf7bd8jp5p8lr9blzcwpnrxgsznpv3j4kf7a48q3cip"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.6"; sha256 = "10dk5lwimgbj436asx89wnghlr2x0lm09yc9c642f6dy58g2fgyl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.6"; sha256 = "18y39dkflh9xyga94nhm1xvz9jpz06nd1189k92mp410zv940561"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.6"; sha256 = "10h4v3a847h0chxs6q88133x8kbx3g74s8zvb5p0p0akkmljyx69"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.6"; sha256 = "11d6by5vd18vri4cfwfx1yv62dh8bh5q8s63ngrmx84f7vdis30n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.6"; sha256 = "07ghgyk9j3bhjw5ik8dv57r4yvri3652yzshvbvh6rh6l0b10ylv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.6"; sha256 = "0i13a09hrglpfzh130q7cdys49s27k1kafhqkd7d524irnid6hpf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.6"; sha256 = "1p3h4mhcx1f6m667771blxm13dprrxq3kgpwmxpmiv2qkgqgy63g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.6"; sha256 = "0asaa081vq2m7zcawld8r2zhf1i1ch4sj0qj5c4w2d2wynrc3yl8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.6"; sha256 = "1npwnm05kz368fyx2fli6k74zxlmbkmnpzs0bavcjdqw91m72rn6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.6"; sha256 = "1qhn6d2nax5pak9nw0ly09lkjgx26ir06a9kbqsrd5al2if7vxmm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.6"; sha256 = "1102pac84v6740nwnh7w40lkdjq1qq0v1f1d93zbml52w1k31hcf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.6"; sha256 = "098x9l0adam6nfqjs8lisdjv3zlmic9jvf0qf7b7j0cazpsck437"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.6"; sha256 = "169drx723b5hgy4jav2pj25hfxjj3vzs0aj86ck7wwiwkzjnn714"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.6"; sha256 = "1slpg1gjhmwr1a2yvbxn1qqjpsrzww6552fbqq6gvghdkbjfis0l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.6"; sha256 = "06d6jn7fn61iynhqbykdpy37mdi0l46cidlz2s2gn6vlwpz0h150"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.6"; sha256 = "14zjhrb208zxa0xc2k9lm7s9507rvap9fhwsdrdkf6nd3gvdfmyz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.6"; sha256 = "1dh3nynradl8gnilx02zv4qgqjq81cmszrqx3kamki05dbga4v6q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.6"; sha256 = "0ngsjx4pxwig87y9n9z538y9kh5kwkff3x7f2kkmi5h19kwdkwk8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.6"; sha256 = "0qgcmxhyhbxyrs74l7700psxpfyj17q4mbsrvd7112h8yyvxvspn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.6"; sha256 = "0q3nyjdh4n5kgsxqkq6sj5kngra40lhq4ms3p097m0aj2225zvfh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.6"; sha256 = "10ihdkap0l8dvixp9qwc54n9397smfnivqhcv56vgzva1ys4fp4z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.6"; sha256 = "01r85dmhca8k8791l0p8frw94bnaxm5x3imcmpb9nyflw5cqvalc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0izgwc1qv5dfimxnl7aq13qbviyf462cw7igbgzzn1jqrc8j77fx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1dv5xf8bmh4q14s8vnjpz8xvv76f1hxpl2w485v37a6znd7jcbjn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0isvgn41x6x9wdnf8phn84b3w5ir9r6drpawrrbbx099gwzzay4a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "18gi6vrqamlcv6js0bggjj0gf7q9qzj9hfgps480b5qj7a4lsw6z"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "16swhnl9zyf0bijhwy6gixp4brf7nc0avlhh0rh3q3zknfa32mls"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "07p4s12pkyb7w60g2h18155lida80xwycbyp2c98ak8zrk58j9hi"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "09yz8isiaka54h5pgp7d2llzl11262xwmv02q20bla1rmax8d0qj"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "17q5gzg4r9ljflahnp8rip66bm34sbj33hm0a32m3hlkpjjs302h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1kynfwp6aqxiazqy970r8dbpwdl88s1acfwinj8wq6dj125brhyc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1xhi7nakjskr3cnsdg5cx0b6ijmmzj4kaawcqwbph06gfbf9s07m"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "1sfn8mrfy5w6piirgqrla99v70g6csxc7sibj52r9iyw9x1hwm1z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "122h4b1ndpphcap2xigv4l28a4wyhpv4kj9q4zjsliz4dc6bfmnx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1825wj7ijw7r9552lq1wppcaqhp1ncigaw8wn1yg82invmshflf8"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1gc39h7lna08dgrp1gxrzh6m4wqlyp12vbsyh7mzlpbiqdi9bbvp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "02gc74yx87riml3aadsm9yv7y6ylamicc0mpd5wg91b9vzsj236j"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0vgh3fpgagkbv0ff6r4fczhg2lq44zshf6sja96ja8wafsjby17s"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "012fl9873nb71v2fgfzg7d35zac7hn13qfqm7201sl0fqs42iyn9"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0ajr9bwa9jlcf2rwpd7h06q457jhfm01hlzsp6yz3ix8ilbghlv5"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "19zqzlq1fbri10xis3q8h2l8fcjmgllsxyp84yz93kwxh82yakl1"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "1yg9zrji6dqhi9nv89bznbqm7rr167axx5s1rnc1p6g8snpy67yz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0hn0kyry6hhrilj957qaa7nxb34ix3hsj8293vlnqrsdfcn3r3v2"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0jlpz6xpidhj42rnirl5mn8agxxy6nlym0a79nqblznc6nfsk3mp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "1z6n3gfmmpb291r4ns84lz9l7gcjyfbbqwidc7cfidlf0g87j6kn"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "1s4wpsywinfp59nbpc66l8h4f6r3w2abjdfz0pbw4inqqxdf16qr"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1vd3la5sl9az2kh5g3i4f3sh6gjwqnq9lijj9d2rzq6wlbg0ygi8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0hrwgjz94swf1zdsplbdddzj5afnchzsrd8wf5h25x6blq0sk8hj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "1yh21ypyzjlzz1r9b1f987pqnhsy1hlb1zw1v4q4zf52v7ja03kn"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0k2g7vi1d2d4wddyccxhzbj1zrj50819227lggmd8hmfz50qdm4h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1yk87srq1i7n7wihzadsb6yqgi74aybk4n0n8vbgqfgfk19aipif"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1j5b7kb0lj0nqp632plpv4hz9blfwvslx82l4nk58lfk9n37dlsk"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0qlk7cdkplc30isb4ljk26x7pnbiad6lfnjj4h4m9l5lz1pfl1fs"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "072bm84fw6q8q1a2dvwn6m176l4vj8kjkzwjgd78ihg34gdiz125"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "131gcwp0nisfil3cf9is09cc9dbrv6kisk2llzfyq7m1wcy3ixqz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0vwfl048xgv2fwhym10b2hg8lmviamaxs7qkf96pn8s67b2h39ks"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0flfn8zkq1ds72wf66f0sqahm6ab4ajc28dcanrpadyc1vxyqm34"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "02xsrxwag62fnmg490l920c6nnyjvxxashjikf58ysfmvlsxvpbw"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0mvgb6fjia8ajds872g5ycwb8885d0fhgx9wjp3r9rcxb1cgkl44"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1mwiis128nmljsim4phf1ms9r9ww9wg950fr3k0y89j9abdfbdmd"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0kmvd79gf3gax266f8gh41px181anh6mpdj6ys2634f55syfyvb4"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0gg64xa48wg9vz4r896grd0xqdv4l8kcqlv0pccfaslmlja6f9dc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.6"; sha256 = "009ych2a5swg9cbbzhyy23rjisa5hcm683hwd4f9sjg9j6yxdyzw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.6"; sha256 = "1gnky9ippjpdbrksbvff13xyjxyzw8k2bapqiw3mnivy4a4h4zcf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.6"; sha256 = "0miwpwm3y97jz7345c6fknhgrwr8gacrgs5bbb638vfp6vw2jb7h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.6"; sha256 = "1j9hfqiz5gqsz91q5snywzrql6bvxczj9yk4jmnp47kp9n9fwi2m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.6"; sha256 = "11lg910fgdnh79lmpc0v501a3ykvk99c015w3nsf87pb2hsfgmi8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.6"; sha256 = "0w885xnxlyvrlyvddvlzry3jscy16dg6mxk585fzw046yww60318"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.6"; sha256 = "0sz8pl62mfjr65jca4j15277a48ly943l0agwpg87l61pybxlqny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.6"; sha256 = "0mi44y7nz4n3h70v6v0x4ldfg3ma9wp7yys6l5rm551dbsmfrpbz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.6"; sha256 = "14hhibn8swy9d0n1jz7sbdc8z0qahn40m10ras18yl2cy717bdvw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.6"; sha256 = "1gapc36yd1a9q12av0hz9jqjlilmqp07zbwpzjdh7pvsp5vygf0x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.6"; sha256 = "0vbhpg42sgjppqskz065z5h6bz4rn5xizffg7znw95vbxwclqmn1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.6"; sha256 = "14h3qfwp27zzi6l1rh98z47yja5l7aa8pvc0cx6fcvqrlrpz5c5g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.6"; sha256 = "01ss9lni310cjb5d8ifrq5arq83mhvxa6dnisk7rgh0y3qc635nl"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0rcvc38vmr58mwyc0fqbdlgh3iaq41y9djlswniplc4m3m0llq4v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1lmngy0101diwbb84f80q71qg10whm38mqfaa8n63qa42q7niski"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0s2ihbzjvq53npkjp40mzknm1q6s5bv4wpznqa8y2s29f1am8p8s"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0l7ysphsimif6l19z1awvqmpkm6a16d4ymxn08qhqf9yl8ywr341"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1qir2zm02wf133ak5pw8fs7gzmixz1hh867zczclf6l2swnxhb6q"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1gci3c46m16yf045w4vsgi8fjvsmqblzkjj2fd4d03h789spqyf6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0kjqc9x3vna55prp0gc29ndzysdrvzm8lq7fk907xhs1655xly0d"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0gqbcgakcimdmdhyif036r00wk1mfbqir5k513nzv4vi2gbxiypj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.6"; sha256 = "1b5155pcj5j3y7irdjn8ba7rhcfm9vd8cwmybdn470r89frq7qf4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.6"; sha256 = "1hwrgwil7na9my78wgphx9hjd4qjj5ayr1hx73bglf058mi9kgsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.6"; sha256 = "0f9z837gbyi4179xgrrfmvhach8iq4inknihfwpvrz5jlmg48f3k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.6"; sha256 = "1jzr4zj9wa68rn8zcb6wk4sy8fiih8sibsdvy89029x9f3qgchjr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.6"; sha256 = "0aigvzg1ppjpr4mgg56hmkfrqg89zn3vyrpwz8cfysjbqz356xx9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.6"; sha256 = "1628i25saxmny4k8zzhh6nkz0njlvmi05f1m2sx976flqd3kxr78"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.6"; sha256 = "0fz0a4hm8lf56r5hff4vcz6pfmwfqygddm6cyxj04x63wqd16sl8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.6"; sha256 = "1bg9d8fcwr7808vbakkgrzry4wf0l7r28xn9hsnh14awsqprngid"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0l3pibk6q4hhinf2ki42vcc6kvvi5x4icm8bpcnm9iss6kafchry"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "19wwim19f1aqscvya85chbycj30ns5cxr2ga5jfrkxbyni9q557m"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "1bggciasdgh7yr9vjkfq8fjxzg8lbcj4cd16slcr8kkpqy1lj79s"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "1zz8d3dq0n58qnxb4y1njbgls5nfaaqibgxq4k3s5wnclxp8fmys"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0l6rsnf39m6fp4p8bs0rl98k36bj4yg2q49hgg89yf7q3r5xka91"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0cqm5183as2m3nsl9as00qm9928bani6gflndg0fv73r799k5raz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0yjji845ngsaqxyg2cmngj3vba8v4wyriv0qz4hgn1wbrramml6b"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.6"; sha256 = "0slfrm65izibsxg505vr8m4k6n2a2kl4iqyyr9xkgr8541g7rrs5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.7"; sha256 = "1wp5yrhqm1aqyl0z7xgg19m7yp99m6fc4jc1xm3yr693a954g1zp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.7"; sha256 = "07vb5aljh5xzrzdxwnrxx09bzxrd3acvqj3zzynaknn2fdrlf832"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.7"; sha256 = "0rhzr1ni73g1gabcxiab29y28jl2r3a17a0z8g0nldwpd8xa2g4j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.7"; sha256 = "1nhijfs6l9fhq8zakfz06ifd2bnr5975i3zpalgd7qkkyhjjmbcn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.7"; sha256 = "0llrps0ikh8z9nkpn1sgx3xad7x0akn439gd0k6b84v3n3gmpamk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.7"; sha256 = "09l49k05zy2km18a4zh2y6yxc5hjamm7s0daw6k3g4ampj4f2rad"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.7"; sha256 = "1fhqm4xl51mk2ig0rxwl7rxv56dqrs0xlz5q444m5ifin3j68240"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.7"; sha256 = "00b2d5l1s52prmdf4hfxms39qcyz1jg65fgxrhmbvzb1z5zvl321"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.7"; sha256 = "0wjqwp2ybxqfgz7wni6v31kgv3ann4il1cqmq01sfwfmw5xxvpvg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.7"; sha256 = "1aws0azwwicdal4mdnnl0bs68dnfycqhz32j5fsnz2niz4m1nfg2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.7"; sha256 = "16gky3jmq218v5mnhdyr0ncc0assy48vhqsh7q30n4ii0c4dn07l"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.7"; sha256 = "158csq8wz40b23pcihj2acfc02d9g2yg8hbnzy452xkwfm4nkh6c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.7"; sha256 = "12ym5pykygfmw7nzfa4gm4f7xm3mdp63f914zms0zk6gg7y7jkfm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.7"; sha256 = "1vwy9mcfpvzy4l4fw2i57mn9fqqdnrqcgvcypwxrkr4kdzcg1x3x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.7"; sha256 = "0lk77qzgvchdcbqipldqpyba0rzwcc4qyknxn5vkiyia39aikl1k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.7"; sha256 = "1klvxxpdajnb7x7w9yjiwc6x1s9shkb2acwggs8z276q73hhq0v6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.7"; sha256 = "0vc5mr9jmbdpg2hkjfb3mzwmfh7pn8lin3mp53j7w3nq3s2wybqy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.7"; sha256 = "0cimx6xdv31pp0l2gklh2cwvb2ki5rp6l0pc8smg04xfsm14hllf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.7"; sha256 = "1f1ajjrdznd8m2im9dw816p7yyz8qmkag4bf09g5bjywp6116xl7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.7"; sha256 = "02jgc289as6d2dc8y8jz6zl2vxjn9w8w9s9rg4kxd72yxryvq0s2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.7"; sha256 = "1ng78mgh95kjksg65kwgg6ga3346vc3dw6yv3gb5icvq4h058n26"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.7"; sha256 = "1wpi3hhca8rilgcvwk05hb81mcs0fmrbzimv9wj42km178gwdf6p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.7"; sha256 = "1hv7gkgr1r1vb1qqm85160rvq73pn5jpbfg1pf0pnzhr58cw21vi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.7"; sha256 = "01af32zccgiim7dhsg3r7zagn0d5vmr0fxa6i35ir1l9h7hvxmyq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.7"; sha256 = "1qbd34x0j8h5qp51nq8i3lbxdxang6yv983n7cijhpk50g5qdk9a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.7"; sha256 = "06lvfia3jlafkglnq9jkzjq5w5a1am5r4jiy4kv2yfarj83a8xvk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.7"; sha256 = "11j7hppcjf5lvrs25pgn2xvl4gjxaig0gx073np6vpjfdx6izpj8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.7"; sha256 = "1vcbjk0xvxkcvlqv1d8njr4h3m9vvxz697skxsg4r01gwz0v5jsz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.7"; sha256 = "0mskkrv05ajzpkkn1qj1378flzp8lvqyvh80hipks2j55pa1jrsg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.7"; sha256 = "0z32qaz485l2ksxnqxl7jrqlqhrbwz1kfp3f4qzhhfcav68ylkcz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "05ykcrf3y2hh7vykjwk1yrdarzzff8hgg6swa8hja67yzf3sj17s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "167a5rmxgpqfzvgn8sfsxlyinnrcgjln2hcnq3q77vv2l1zrq6v6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0m95s6gz51pnf159a1i8arxlkdpaqdcbvj86m7m7340lny0vza38"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "05ypj80bfrq9i6l2y9nkqqrgvs26z9jg7h2lc3gaf7cb02vacv4q"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "18i0sb869apkjlvdk8xd7y0j203rr60wfm8n7y9ifaqj5y4m74qk"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "1zys8l52j0kqgplpya9a630hnp9290pcwgg5ld41dhl2bziyg4z6"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "07vgsv93n420h4c27bqss979vh6pg11cpcsz9lf7z6qnh56r29r5"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "07zwcakh3flhyqfk1akl9qv0h3lsw2nmr1c1vlc025cc7yaa54sq"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "0adjssv5g7lk7i1cf46ma1wk22b3nk20i8aim93i9k0rn6mv21a8"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "0xc6ghfjfgxdnmg94j89rqfnwahnq1vdq835wn7pkss2ifbf1vkr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0qmzqxs0ishi7byqdz96mbcprad6ghk4z72vp0sk2z5wpkiykyq0"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "0k1xb2a6f2nhds3fravnkh7kwyqrlgrip68bsh5ziy7c6975nbam"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "09zbg9yfg1pad3cz78sca2n29qdzdfjd7q5mhplcyipcmg43sinv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "152j6zxz19m0dc09rf4p61aiipdihzwpm66s5fzgjf2a4xzjq6gy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0rif771aj7j4mfsgs7h846znzaw9b3gyzxym8d6jnak431cv1hwy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "09692akh798nrcp9lw8k0i7xmlnbjbwx4p5wmjd8kkhm2wax4k2c"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "14chclwxhvam94211aa3pnpay5sfmddjxnaiqgjcqnmwfgkgm148"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "1wrdx8jigx6jkwgr63v2bwym5pf3lbr108xvsbdqq2fwszdd5f8w"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "14n7xqn9pi96v6p7n8yg1dddhanhzfm8b1n9wmmrmxmxi3s8m202"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "1lxfxi8bjvw5pd8j4xy7g79kv41hbylnj3x8a2kf4zsqsdis0hzx"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "0623bvv10splx5v0jn1i23w6ciyrs2ldp6k2rbsvzgxyyy4skflb"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "1dqrjxz1zwfvczxjqzpgbcsiw9s17d4fhkki7yyw9q9q4g8nkcsy"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0ryk72g8bym8pcf8w0zcpwckgr1qr0civxbhr0ggvg5b3mkpm339"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "1n1fc515kdlj5ahkl9n32dynjcabz726rbvpjyxaaq7l7yfhvmiw"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "0n0gzha5padp2276sqwy7xm1an46qz1spvs5rss3fs5z1mxmahmh"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "0f43qv3ixmndgwhhinz45hhy7wjbqwwraivxs6xwimf0qdnis755"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0wqhzd5v3lr6mdqmpf9bv51xi3i7zpdr2c867rlx1v3xnc3kpqrw"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "062nv47s556qlh9q66qaad4azxns9xr0dk38p32w7p2n3529yqij"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "19mj7cp4gfi5dz2hb0jj7hv7csvq2jscvp729b0pfa8gm0pinyf6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "0i09jm8lwh2ljdb4qvklr7641i4s73fsybff38qiydbjn9gs9fpi"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0rf93y39mv3b9qjic435llyn7ag8ng0r6cw4j3i6ncj579l3yjh9"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "05njr3l3k8p9ydy16wnhvayp425llbfijm8zjny7irzcmyfh7x91"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "0xcrprczk5ajkm1mhgf0nl5v8hihl34dp8qbfg9bd0mnhqk2cdxl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "0q41f0zjldfpl7mq5q2wd4bks4k8k2xc5c6rbmfcw3xcr38zqvlc"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0x90yf8v4qf558ynjxpvz0nf5n37k68nli35r3xxxgf8dc6c5xgj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "0rfrykqig7h4ihhrdm9qjwz41b26cid6zl1vy920p4as6hd8l0l3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "0ajf267742id2fxqjnzvb95l745g4q0x1l3cxqrxw35lr0l0hg4m"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "0m2n1jhg6zf25hwfx55ifw7fm2sp7v253hbqw9pw5q282pqz5r82"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "0chpzvr9ccngnjj7m6iq5w9zza7vl01pm6xs7n6kg8vs7h8pjsfl"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "0ibdwfyz58523823kiwijw6zq0f9nf4jvxjz6i6h33p07yxkdvwz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.7"; sha256 = "14xzxclfm8qn82fp15kpzbccfjq815n4mm4268jq0p2m7r4x8cs7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.7"; sha256 = "1fwxwyjn3w45dnc2swlvqqrkiq7alxpqgd3vldx00fk5phdhgm3h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.7"; sha256 = "0pycd82v8kpbi9dbcc3p358m27xzpf97pkl3mpax8napksciwbqx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.7"; sha256 = "13s8rvbccnrpxv9il5bxymkm0drca4y9n2hvf4l5p3zrj6wx3p24"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.7"; sha256 = "166gh8afm3c15gs5nhnrggi1xdx72zh5v34kv3ssaqir9ixmhzmb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.7"; sha256 = "1x0zfr8hs7m9wxcmyzha9r78zk22adcc3ihklzyidddg0aja74d8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.7"; sha256 = "0krpmp2c6mnvd54668pm19zsa7rnx8qlwaxpc61h2zrij0ha51pw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.7"; sha256 = "0jy9k0zwp9pkc416fwrpvhn7v0ykg1fi19y227wjj9spyp4rh2kj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.7"; sha256 = "0yzjzhavq5nvm2wcnkdlh95bnqd3nx88hl77s4lk34ib76bnsx9w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.7"; sha256 = "12wn4rpr8mmck1g8dmg2b3jiz7girry7n79syn08s624kz3a3vvr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.7"; sha256 = "0z3kgbj1v6b972l3i9pgw3xh61nrh7k7lfxhh0hq19f6wk28lpir"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.7"; sha256 = "1fywnc00hp0lzggwkvqq9y4j5lzc0zskbavnmly6vsa3ygkapsh8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.7"; sha256 = "15ry3z0x4qcfq6zxm8yg3vpaq21xgmvy4dn7n0d1ljrha5q4zj2q"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "0bqlgkvy3p3rn1qj7wzzc37jfrwgp3vl52dm1rzalid66b67xj0q"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "0573srfwydvnfswvdn0q8ccbz9ibkvdv21hg7r48v06j5020gfpr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "16s22ngjq338c132yhndldjwqik51y52fafw9zzcd65qcp11s6kv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "11n9fygm2hwznrimgw96lw43sp16w3qh2hq58sywdprinbii7gfa"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.7"; sha256 = "18h5a00mlpfgbhgjnknhkyxy0pp4q836p7zal5m29h33q5gsi4hn"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.7"; sha256 = "1jzr1zdch2ddkskg1rnmfcqcajqrd41zjs08mp5x3ivmskr2xxwp"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.7"; sha256 = "1azzc725wpw118fxl7k4q8090miaib3y1y1lcs3zsmw36vhdll6h"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.7"; sha256 = "00ppkc0949lq39dhrq24gz4m7imi96f8py59saisqd54rr1cgk3q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.7"; sha256 = "10r0bvni4jh5a3wwxad5znqvqn2s4b11l8lydf3kqhg1r21s5fp7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.7"; sha256 = "04qj62yiz5maqq8r0w6nd02vp6a2s9zn9wd5ii964l4gh1gpzvfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.7"; sha256 = "0pf0ap28ar30fj3bfznnmsbjfcb27l1jgzsizb3wbwq59gffkpvw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.7"; sha256 = "1rhs1klbpyzg4pdfgnj4jiqm8979d3qmpcj2gvflziz2va465wli"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.7"; sha256 = "13kndc5a7zcfsdl8x3mk3fmarrn1rvgzpp1j97y218j6nnrjlgm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.7"; sha256 = "1q5v404fjs0zm3r2c6sk0523irl2zkpn4h19jc7b2bn44qfvfqq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.7"; sha256 = "12dgkaxcsk7xihgc3jqpa9xaymnsnhbq31gv73apm80x268q4rn6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.7"; sha256 = "0y06yfr15sir7lra8igmhkdax76sy0hpr56dlg6yas74p0pnz6q2"; }) + (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "14zkh7hgl0idpvfkl916hypspwsjp3gphjzdi38i8cpd83wwbarm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "1g7j5xx972716122msm0kj466pl3kzfq3h5gij5p4sm9llbijb2b"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "02laryf8xrjklw0lg29bwhyky7q72wlx13ccvmsc93a0l939wvy6"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "1myy71l948wzsiz3w7pfiycvx73y1vh0k48620xfpnrzb8lmfn17"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "00wvs1nkmfk16cm3cam4hx5n8yryb8qm58b4cslg09jq8ikdyw0l"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "08p0zbzxvfijbsv8zd7r44wdpnbh87rs4pk439gxkqlvm2y8y8px"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "1q1cb66j5qh0dgmbx6rfi9prygr86dfms96r7jxipl5cfp0v3mrx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "1sqm3v60y96sg27gxvj9ihadwxlb4s397cm8a0wif7g6g5c0nacb"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.7"; sha256 = "1f6v9r0xf6aa690wy2ch2h6l5sl9vlcvbi1jkgz863l72kb5b6bz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.7"; sha256 = "13y90l6kpc4a3x844iivsnprcabxk5adpvpsrrcgxm8kxcq3rwsd"; }) ]; in rec { - release_8_0 = "8.0.6"; + release_8_0 = "8.0.7"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.6"; + version = "8.0.7"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ce31d92b-b514-4f9c-843b-29c466871369/b332eba5641cbc6eed1e3a98480972d2/aspnetcore-runtime-8.0.6-linux-x64.tar.gz"; - sha512 = "16cd54c431d80710a06037f8ea593e04764a80cbaad75e1db4225fbe3e7fce4c4d279f40757b9811e1c092436d2a1ca3be64c74cb190ebf78418a9865992ad12"; + url = "https://download.visualstudio.microsoft.com/download/pr/06cbb934-ef54-4627-8848-a24a879f2130/52d4247944cee754ec8f4fd617d502a6/aspnetcore-runtime-8.0.7-linux-x64.tar.gz"; + sha512 = "c7479dc008fce77c2bfcaa1ac1c9fe6f64ef7e59609fff6707da14975aade73e3cb22b97f2b3922a2642fa8d843a3caf714ab3a2b357abeda486b9d0f8bebb18"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ccdcbb70-a5e9-4753-b6e3-4461ce56a69d/240803fc1ffba38ab3603778c03e9b87/aspnetcore-runtime-8.0.6-linux-arm64.tar.gz"; - sha512 = "9ed12847e404a0a4fdd8fca33a9a787c5ac2e6745d23821c7890f731f2f8f5682e7f9166b2764b13b612b08e091c71e13359b68acc11bcf990afdef1d42f6473"; + url = "https://download.visualstudio.microsoft.com/download/pr/421d499f-85cb-43dd-97b2-8ebfd06dda8a/61b03be4662125e4af044c7881e66f0e/aspnetcore-runtime-8.0.7-linux-arm64.tar.gz"; + sha512 = "5f1d31b0efc793655abf4289f8f1c7e8cd1ffabfd65b385b49e3f5232277c62ccfbbdad2a51731a8a88594a06c2c9774e38865cb3f7e19c9925a12b25b40b485"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ccd03400-c514-4956-9e9d-ad1bd67d1338/436b9590788dd3df98e73d4c5379c711/aspnetcore-runtime-8.0.6-osx-x64.tar.gz"; - sha512 = "61786ecd784b83eacfe4dd901bdd55474e52d9da85806b3d52184e8e35a3065b476e574c939f3af491a925bf7f04fdf376c53a25c103a187a7939f4736158297"; + url = "https://download.visualstudio.microsoft.com/download/pr/e2410d8b-380c-400f-ae85-c0451afc35e1/cf601795432ee94bf55f03f8fef08e6d/aspnetcore-runtime-8.0.7-osx-x64.tar.gz"; + sha512 = "867765250c5ab0431023d59b9fd04ac0ac868797e2ea1b4257e44d93033d653e48d8776bb7e7cbbdec094a5a60002d2833c5a58094fe54c2b6402b1ce2882c49"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b90758d2-834d-4fe7-b97f-e8294b68d07c/71d63df9474999f831811dd6989d9ba7/aspnetcore-runtime-8.0.6-osx-arm64.tar.gz"; - sha512 = "85d82e90182375ca21326e3d57be0dc5a39d7e64f1a4005950fe21c720f1d1e1615f64030c950fa7a49f6a104f029b9845648cebeb98d48d892aad3309c583c8"; + url = "https://download.visualstudio.microsoft.com/download/pr/f8909467-b187-4651-86ab-6edbbc21f6e8/f07e4a0141b3907f83079c0dd44188ca/aspnetcore-runtime-8.0.7-osx-arm64.tar.gz"; + sha512 = "f02e3b3a4ec366a2be7ef596f728914fb7c3810ed507ebcade27b09ff62e7cb84cd4b24c8438cada72b99e60fc7477d868a6cb57083a39387f7900874faa35f7"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.6"; + version = "8.0.7"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/021c3de8-14d5-493f-92dc-2c8f8be76961/6ee3407acebf74631bfc01f14301afa6/dotnet-runtime-8.0.6-linux-x64.tar.gz"; - sha512 = "c0c5e93d4e68e2075c4c63336dc74246efb704ac9663411351efdefc4cc7da5a7750f44b8a23aebe959bb4308575bead443a41b2524ae03b29ac41929d27e0e0"; + url = "https://download.visualstudio.microsoft.com/download/pr/cf3418ca-0e14-4b76-b615-ac2f2497f8ec/2583028ea52460cb1534d929dc7970fe/dotnet-runtime-8.0.7-linux-x64.tar.gz"; + sha512 = "88e9ac34ad5ac76eec5499f2eb8d1aa35076518c842854ec1053953d34969c7bf1c5b2dbce245dbace3a18c3b8a4c79d2ef2d2ff105ce9d17cbbdbe813d8b16f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0039e2c5-d78d-45fb-94c0-e258ff0335fe/c3bff45767f679bbab149398e9ee2c6b/dotnet-runtime-8.0.6-linux-arm64.tar.gz"; - sha512 = "428c5a81938273c5e63b04858dbf2f4e82c9bcfa3bd33f954081238be2fb52aadce99296698eabac72e4be55c61e6c1ff06d2d8d1fd5d6a2d0c7a2917cd50739"; + url = "https://download.visualstudio.microsoft.com/download/pr/710337b9-9cb6-4bc8-8d13-daeab2578a08/b3ec8c17f85e340820a0ab36a3870168/dotnet-runtime-8.0.7-linux-arm64.tar.gz"; + sha512 = "99e6959a1156d5abc8f0c73b3d493fc1e10a42d48a573226ebcfbdf96bb6fb1c8701db5b3582a4303ce26a4f784e74eb402cb6e5e4bcdbb5dfab8fea221cfe02"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/20271d05-67e0-4356-87a9-0ce5102b5007/b7c91c6470e1c2ffbb493a35dd6883c0/dotnet-runtime-8.0.6-osx-x64.tar.gz"; - sha512 = "44c0ad9fc613975fa0c12b12b91ff8cd8ba0be5e8ed59510e7a5ab22e55267a468b321ce34515daf070ffc8d557c09d7ea3ed3c3407887f706553b5d378e3232"; + url = "https://download.visualstudio.microsoft.com/download/pr/c0e3a3f4-d235-4531-a1f2-1ff969cac1ab/837430d708532d74b7296108a681b9bb/dotnet-runtime-8.0.7-osx-x64.tar.gz"; + sha512 = "09107de04c6748fb3d98d72296e3470a6d3551a66bfcc310d2be0f678dd1cb8cb13a886b1b7e1e3856e12c0766cd5007f9922625653a6e284f5ab8fc80ee04ad"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f090da0-5f55-44f1-ac17-9bd001b33d66/eae314b23ab350b375e794e136a2ca9e/dotnet-runtime-8.0.6-osx-arm64.tar.gz"; - sha512 = "21ae6420914e45be9fe17bfb0c89948eead27756dedb13fc2c6b9b08d78aee80daa2b8cda358268c819f00ba7ca33ed75e21bed387045b3a62160fea159eaa3c"; + url = "https://download.visualstudio.microsoft.com/download/pr/ccacebeb-3dda-4887-9a98-e2dc9a9d9dc2/0ecac27f49c0111f4877cac54ff873a0/dotnet-runtime-8.0.7-osx-arm64.tar.gz"; + sha512 = "8af655573350f6be0b47223ae7272ca8d49fb3c74f6fc167e7249267c1616842eea09709205a07acd3b86a5ac862026ed1269ece5e681c3fd50ada8351c5dfdc"; }; }; }; sdk_8_0_3xx = buildNetSdk { - version = "8.0.301"; + version = "8.0.303"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/86497c4f-3dc8-4ee7-9f6a-9e0464059427/293d074c28bbfd9410f4db8e021fa290/dotnet-sdk-8.0.301-linux-x64.tar.gz"; - sha512 = "6e2e1ad5fe3f00e6974ad3eac9c5b74cd09521f19e06eb9aff45a44d6c55e4a2c1cd489364735215d2ea53cec2a7d45892a5ede344a8421be9ad15872c3496a2"; + url = "https://download.visualstudio.microsoft.com/download/pr/60218cc4-13eb-41d5-aa0b-5fd5a3fb03b8/6c42bee7c3651b1317b709a27a741362/dotnet-sdk-8.0.303-linux-x64.tar.gz"; + sha512 = "814ff07ccdfc8160c4a24adfda6c815e7feace88c59722f827a5a27041719067538754911fc15cb46978e16566fe0938695891723d182055190e876131faedda"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/cd9decc0-f3ef-46d6-b7d1-348b757781ad/9ad92a8f4b805feb3d017731e78eca15/dotnet-sdk-8.0.301-linux-arm64.tar.gz"; - sha512 = "cb904a625d5e4ef4db995225d6705b84201dc7d7d09a0b1669baccc86e05419472719025036dd78983b21850f7663d159ae41926364d1d3ca0eab62862f75d29"; + url = "https://download.visualstudio.microsoft.com/download/pr/4bfdbe1a-e1f9-4535-8da6-6e1e7ea0994c/b110641d008b36dded561ff2bdb0f793/dotnet-sdk-8.0.303-linux-arm64.tar.gz"; + sha512 = "09cb6b12770febe186e36971afdbcea6e8bf5fb34b7701cd8c416f597d3b7e930d05e51ccef1985e5598291540ef2d721187904587469300bb39772317e2be5c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6ef47a54-b1c6-4000-8df4-486f64464c2b/ae87b597b19312fa9f73b9f2f8c687bd/dotnet-sdk-8.0.301-osx-x64.tar.gz"; - sha512 = "5d91fbc584f32f4d48dee303c7eb16b38b2e2fab9549bd54293bac28508a6d53f93782ff102266010f8cd8c15c6436a807a7e6efede2e1051fe206957ba73071"; + url = "https://download.visualstudio.microsoft.com/download/pr/295f5e51-4d26-4706-90c1-25b745cd2abf/ef976bfc166782e519036ee7670eac36/dotnet-sdk-8.0.303-osx-x64.tar.gz"; + sha512 = "5676b8c0497adcc9543b5f4dd57c54451ea66e79ce6f656647bff54619785a05f5c52cb22483bf14b1f3eb85cd3fb19c2ce4352e7b8482fbc1998a1e7043c377"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c503e53c-0567-4604-b7a8-1d6e7a1357f5/53e78f56b01147a092c0cc273b443550/dotnet-sdk-8.0.301-osx-arm64.tar.gz"; - sha512 = "8d56980b6a6ffd78618a6e9833126d7e67052ca6041bd5f167a32e277aac7094a5cd37b9e7e145d5c9b74da95561535189a077d074ddb0fe710a76c2a2c9b1eb"; - }; - }; - inherit packages; - }; - - sdk_8_0_2xx = buildNetSdk { - version = "8.0.206"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5fd599e9-4bf8-4603-8a14-87777293837d/1d5f0729055901dce471570bb82a441f/dotnet-sdk-8.0.206-linux-x64.tar.gz"; - sha512 = "d03cbb5ea44a6f4957d7c1fa0f7c19e3df2efcbf569b071082e37ac86776af0729540c3bbddc44668ae2eedcfcb4b098883bb560d26418f1583a558d60c99ef5"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f25f9e53-deba-4c1c-b9d2-5e026e5a4d92/c291c78eb71c30b1c66745dec87936ce/dotnet-sdk-8.0.206-linux-arm64.tar.gz"; - sha512 = "eb0489785dc5bf824bc3fc1014815ebd371fbc73eb02b63e5a1650bcadb158cab7e909904889f6e198a180a1742976351208a57796ef38a4205c52fb945b7d09"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ea0371ce-1119-416c-bab1-578cb8c1fa77/71cb9d66778c8e2a65ca40d8456300ef/dotnet-sdk-8.0.206-osx-x64.tar.gz"; - sha512 = "d7742a0b00c4df835639eeb18f2ae4888ac33d7d7c25d097a8868c5172c878d7df8c5bbd54de9b34f877f07a2dc6c748ea510f783e1842058e8cfd0ad2cda83f"; - }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/bca24333-c463-4f90-8085-f856962fac39/ef02fb556ff3d92938a2c11e408c7d71/dotnet-sdk-8.0.206-osx-arm64.tar.gz"; - sha512 = "c4a17c17b02d9559e0029328179d22617321e439e9360175f25385d60789f91582a4024ce41690439d85852e4c85f0d0ae20fe818c0f4acf0d7d48ffac2d2b5c"; + url = "https://download.visualstudio.microsoft.com/download/pr/d81d84cf-4bb8-4371-a4d2-88699a38a83b/9bddfe1952bedc37e4130ff12abc698d/dotnet-sdk-8.0.303-osx-arm64.tar.gz"; + sha512 = "c1c2935ac0b6654805e8112ff88d31ca9aae7f345218c9a9d9e512c98d73e2bccdfdb006537832e4f20fd3a9ce4defaad537e5cb98deb538e95b54a2c76a9110"; }; }; inherit packages; }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.106"; + version = "8.0.107"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0fe59d31-bc28-4f57-8d1a-285f47b5a0ec/e4c5def191daf9f999efc5812b085924/dotnet-sdk-8.0.106-linux-x64.tar.gz"; - sha512 = "06eecc146b16eef0654fb4fd17faec06c6dc1b7236acc7e4a33e4b13cbea1d725faeb9eda41a0c12e65ec4c89d6624971429ca223638387c66f1d3e4dcd1407b"; + url = "https://download.visualstudio.microsoft.com/download/pr/7280c125-4555-41e5-8060-cd69e4e325a4/34e25b09d2c92b71215f8974a4eeded3/dotnet-sdk-8.0.107-linux-x64.tar.gz"; + sha512 = "10e0fbdc589e5e0de4fb0fe0e9c839bb2257c51948037a224d4358b8328b6791014ab4cb164beb617c83531a6ed774acb37b08e4a1b53f165e3eb853fd41a959"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/34676827-2699-4f0d-81e3-347939a91b7e/6f2f3851e005f57f8b6c132ead1952e5/dotnet-sdk-8.0.106-linux-arm64.tar.gz"; - sha512 = "e8f735d20d79b20d24ce5b2f7c25c60604cb6b694b6572488c654cbf14a4d99c269f64f4ca23ab78aefaedf14f35a0ae1f33adf6afac5556e2ebd22ec73e04eb"; + url = "https://download.visualstudio.microsoft.com/download/pr/8d60cad9-ce0f-43de-8dd3-fa3fd39fae11/ce3bd2ec1177f519b45fe30c6e9bb74a/dotnet-sdk-8.0.107-linux-arm64.tar.gz"; + sha512 = "ab487873827677f44efe4372e0c325a48f339008d00307876e1e56795bc006be1770e8b1f9581c7197ea1bf857eae525aca18934591f603363f8fe9e021e7b2a"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8380cce5-930a-43ff-8a27-981e175d9881/4ddeae425c3c344f4afd8adddb03af5b/dotnet-sdk-8.0.106-osx-x64.tar.gz"; - sha512 = "4e6d45b7b1618bdb528a865d1c89e7ec7750f8a73ae7e805675dd9d7d3974f0b19785e743298f0c468144cd7fe9e20e521f65e9fc081b89d8bd9e187b5783c2c"; + url = "https://download.visualstudio.microsoft.com/download/pr/c26fc34d-c784-4c4a-a2b1-43bf3599d4e6/c3ebead0223edb028c7e53eecf37048e/dotnet-sdk-8.0.107-osx-x64.tar.gz"; + sha512 = "9bc62515220f924cadf02e5be880fa813b6d0b0cf8c2199a7e930e25e81576ff3e88894e5a0b691d8b0a1e32fe1ab4499ff47d80cd004f07af61d6d362efb654"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d595db17-776d-4b09-aefe-44777823a4de/55867e85ac1b03cd5609a936055c8ee1/dotnet-sdk-8.0.106-osx-arm64.tar.gz"; - sha512 = "490c20abc3cf52f76fecf422a6fcc66c98b7500a56986f84e617860a2758f43ddc4b235647837fae69e4c46a9d1ab9177d4bbfe134258797599b69178f6b91f8"; + url = "https://download.visualstudio.microsoft.com/download/pr/2bb0f88b-19ab-48f3-b0ff-146629c3ead8/8e59918475c54fe4d881ce8f5bbde2bc/dotnet-sdk-8.0.107-osx-arm64.tar.gz"; + sha512 = "b293f8e3cad20278ee85e30b4b1baa615c30b0e7aba557b1d0248d9e5c4557e323b726afdde0386c0227d6cbc6f95c8ef5493e209cb5a42b64e8c7f6e495224e"; }; }; inherit packages; diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index 2cf73e2a4a7a1..300304720c017 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -4,143 +4,145 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.5.24306.11"; sha256 = "12mq2k54nijycjmgb9c299bcad7iwgc5prff3cv4ilc8zf0db058"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0z0nby81zf1gzvwkm9hk6xxhbxgjxbcqbfw1k6f6dkhq4r52b19m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0aa2i7kdq2czz8j4r3qf3qkq7kzi07ga19bm5kj35das4v66srn4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "1inc6v7kk43yy68gwa0vg04j9jr71rbzdpi486xvv4zf29d3nnyc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0a4bmfdl3paqb8sh3w5pbahsfifdvdx48m52vsi4qjpbaz37jqqm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0man1h54lwqid1rpaxr7v811alm1cn6hdyamw5h9sy5k43d6q4jc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "1kn4ghd0rcik6zncqj7a8yx4hldc8ms5dz40zcyz8zpnjr0jalgy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "1vvm6fjnb4b07a6s78qrpc0h2xgzkc5n7xd0n8pl8vf221i36cjz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.5.24306.11"; sha256 = "1ixzkjrrp63dzgx4bpdphcxmwb4bkvpghn2xblsq55lnqgsqrk1c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.5.24306.11"; sha256 = "12ly0aq7w3ysaz1lgafsj8b3xz60h1sx80112h016cm9x8qaj60s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.5.24306.11"; sha256 = "1jar76bi0apskqva4xvb21mpkm2spar8zg6dijsb1sfckhvprwg5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "16igqkvzbmiz18y2pxbxjdbn55505i38ci4dlxk2gc90q9ly9hmp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "0yjhaflyvwla7bfc5r0f241lpdgs8f07idgw17c27py3jak4z7nc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0xqpixi7klisihnnx0nxadxskryh1fk7p998sib3yvp9r02jnqvn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0wjdwmqkphrz421mvqmv30nkpji6zkyv53n0n58s7cg1xhrysgn5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "17xmgdysdsf9x1b5bbyk92fb0m49q2qxqsabdn0dj7apbnappflv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "05l7iccmn56hfjfdzw6g2xyhwqn86pmfi0bhxs8zkvfmcxff01km"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0f8ifac136v8lrqg6p49c6v1fbzs7066d2x1gf70wxr5572s53zz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1i02qz80mk278wyj19m6s05xzzyz11q2yrbanark541b5nvp7f74"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "02bk2wwlm262v6mz3k2dx1pj02sdmdmmic79bbkjksfpw1pbg4rm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.5.24306.7"; sha256 = "03f18kc1kdm6aglcwc60757prmcb8csw5gvl594kgpgmsh819vdf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "04yw10x9lkma4jkhaylwi8scxpifvhyq47mv316m49fas2r7xl96"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "01jwa6idxn9jv5vp7am34gzf984jvd72cyns1w367p0v3c6yragl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "19bgk42zkrb6q0nss1c4fxs5ii7pwjb85zrzsscgsvy3hjqqwzrk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "10xdihmr8nd1jyqwrfsrym8285ngg5z2apbawy92s14bwjy51cj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "10bxll4zphrd2bvyp38z55rcl1fbdd64s53bv7hsjkcfsv26c4wc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0a530mpk29cl8iz1k6rwhgrspa5ssjkqnky5ivbx5hz9iq541bq4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1l2ak1kiq2515x16wdijk2rrjrzxc9jkbwd0ip7j3fqkm0wj62b2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "065lhbwjmzf8gcqll5f2lbvgkiiqfjliypvgi4sab0r0m3gjchdb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.5.24306.7"; sha256 = "02yli22m04wyr418na5mjs2ln6zawva8i8ixcij5bynqdfw2rakv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1ix5nw7z8ymnxk1vj101namd4r18bqx6dkzv0zrqj4dx2zpadhd4"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1janx1brnv64cfjvjmdk4zinqbkmmx525l04fmy7pi6c3hq93fr5"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1m8cml0zk772i5a5yy909sb5089h7afphmcn95hm03i6f52kmmf3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0n04zf1xhdqm0nia3ja3kjz0aq2kasghqw6gamfpd68ln9yimi9q"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0h29s18r4n09l8f2znpd2s9p12f8s2winnqqgn80nynsja5zb34q"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "05cf012c37q9vlq7fd2n76gps9dg20lk88dama26jlbpczj7gv81"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0lgfnh0w31afi7ijsbjc305yxp7klxhz61pxcf27pxh7y9vcrvnn"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1h12scdq455rb1ffy339a1fmjkgpp7hp4bjhr2fb7lp8kmsppwxl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1z1csk8z1yh4w697ghzk73vm4ry2a0d2sy4b5sk34r0bpxw5lbhh"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "13p6vi44agpzjq0qghjc4xydy1xy2985v4b0dl5v9j3pgrd1s8qk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "0dakyl9dl1609jpwc5h6rkbl5s1s2fcfn3isf69z8m5n36vlz2xl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0nc6xh9xcqg64xf14f95mwxqki4ing5hpwwyd30d1j0ndbdf4xyc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "1rjqx0mdf4jd5g613mxmjzjjyzl7gj6wnixhz8x6k21fwmsrn496"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "059s063nfxn98cgym7zfn18icd2f7bky1n1b3pbz2d8bc2y6b6qd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.5.24306.7"; sha256 = "1584xdik4q3bdgsnshmwxsy7sx9zjh112m1nvrc8sjm3vy4hpl5c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "0l5n8k8zzw3wjgp0mf85jv470cmvp5cs4m7azf4x2x8p4q5j3pzf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0mryfw8svnmzxnvwkd2vs9f1mxdyami5dlcnibvjgylj0ggi8l53"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "04zy5396cm98h5gf9rdar7mx6c96fx3lh3k6vm86bcs6y4pvmib8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "00np825qdxnqq6vwazs66afdyvz668lyhsyl1hsflwg312h26kfx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1b8m4r2xzlsrja4w12np2wi71bwh38crvjy80md1gc5g67qkh0nc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1j5qpqy7fsg7m637i5p0mfaar6jrfcnwl8kz4virby6an3kgn2fs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1n9m33v04hbbvg7cac5s31sc6733amsafg8kv39b1v5bmfid6m7w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.5.24306.7"; sha256 = "0lz2z4gx54zy8sffwbys1ls1qh03xjgzxzkmsngjdhpzbipyslng"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0faq6h29s4l9lgjkhp82wygxjhjmqpigpc2rzhkw519vkc9a38jp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "19al895aca67a681zm4ppznpdrf4mcs3qqkpwngmcv13jx9mydzf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "1ds8w00nxq9i06xklh9klv47q79c0b9blzafkvbay9gclxib310k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "19xabxhnb22g6pj8c7bx2zv9ys6qca561fmxq2ac8jl8bdwjzw20"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0g57liiiavqg3s1j4ra0ppd21ldfwihahqd69mai5h37yr7wggn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "15vv4bhdvki49y4zhqpvz1vr8d1iznrbbxk5hypq13k6aypsb3nr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0q5ircv3lrcrjdvkv50gknaix55l9z24rr8x8cb54zcq3fjfn2li"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0hxf3xk6yn8n04fwj9j7c6a70y9apf31aafn2nhd3yykvvf7618d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1pw27c0czrrgp0vqnlcz6zhyrhbjbqh14wbcknrcn1smlm6fl77x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "14k0sd0b6rpngw8s1gz833kq89qghnhszgvk9v2rabncb1qlhanv"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "0c2spsh6m236cmpf6c2hafcrr4w2ks433g024cmpa93a3s6dfvcp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "0wla1jr95b7hm6wa2yx080wgy8iaqr7r3q83jp3qdnp3k2y0rgpk"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "00mkrwlx48dis7fg73gxj1c99zs1na4k6y11q1908a674hni8qlx"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "02aqy5fjy8r8n1acvmixmlwif5jg6fhaygnk5ishlmw18yvhzp7m"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1qbjvdmlg3hj1p9v8nzgcpp5cr7nakn14nksighqc8ck4nf9i68g"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1s8m140xbwc2pmyhrrmgfd4r2lppld26m6x3k1kz9gfn7kk4ayjx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1f9hn43fs25fbzzhrawfjgz56mknsnmhmdgf1f1pqlpfzwb2bvvn"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.5.24306.7"; sha256 = "0ck2agia8lmhvwvzh73yh2ydkqfz4g21404cv4qxjj28l618cjl5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.6.24328.4"; sha256 = "1f48vfy1r5c40swlf44ippd2zhpy7mgpk08yisvn62yslf9wqqin"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.6.24328.4"; sha256 = "1ay99zj073hj5wcy7igzmr6mi106rscqhbqp3d9agx61j899ysnd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.6.24328.4"; sha256 = "04pmm083fnq3yzxr5fm9ygfvfvqvvhdlr00rcgmd73223bs4xr8d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.6.24328.4"; sha256 = "023m314504r08b0bqc7amzksmh0abk42mwvlzaxfv3qk85zs7cw6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.6.24328.4"; sha256 = "0caqwqr8drbpvmmkgb6k57qgh9wyn38nxdqz8a0skcgahy6pq9m2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.6.24328.4"; sha256 = "1v556hjhar64vz133q2lqw62b1jdn9iiicdqsvgqk0r5jqm8jdr4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.6.24328.4"; sha256 = "10hdf27nchw6hard88wxq4hngnix4iwqnxi38lpiykgh0vlh49nh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.6.24328.4"; sha256 = "0phwx3chh6sikq1sms9dwrf256g8n635cjvizp7q2xw7l6b0p340"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.6.24328.4"; sha256 = "069n01fvpq82hyfz9wrr5cv0l35ngs1dayh25nzq5irk8qhjiqjc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.6.24328.4"; sha256 = "00k2kdk94x36lwhi2i3pvxzg5ry6xi3z5b3bs49b79hfj1vggf9g"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.6.24328.4"; sha256 = "1nzcjv16pilfvplcqyxnr42vmq70kzaih2756gjkqph6yivqcday"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.6.24328.4"; sha256 = "0jhh0bxrh05102c638vpsjn0fm4hjnkkb2l7j7q5f30gim94w6bm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "0571v4nn1fxx9mvp0qx8h80qblk6v37y4pr17k18kkcn3jvadig7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0i1az3knmh7cn1cz56s0ggplfmaga6a5fki2p1hxalxc6by1f819"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "07jc58k33wfq9999f0m64k6hccjnri27zpzpwyjdkrwgxxc9rdfg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1jgml4ixy6qkjlc4rk5dncjxfranxr0xv8qikwdplllksarn2bvi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0mxjv98kxjamrl8y8hl9adskczhwk33l8k36v1lfn4w9lfqxrjmf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0kvprnbrymkyp4yg8vrrsackys7fc56ngqbf112mvwi56gacc2cy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1jbc2zxgasdk9vbjh8bb8s4i5kqbgpfklijcqy8ig3af01k8pw67"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1clzwsm180ki0cr5wp1i958phdarnv69zdqxp1bn2wqgd77rkrw6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.6.24327.7"; sha256 = "0dx35jbbdkdbd0377ldgcncwix6857x1kqmn930sj2597z292m0v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "1wm6vc3k4jkq1vxxvw3wq9k1b84azq8v2zazscpc44vksiisdxc0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "18zkm3mqr7464h0qmn5ighjf2gpfrpyg85cmrdr9jqknz1qd08qx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "034ncg45k07v7qfkbw6y8y3n9wzgkhy6gq000if2v71j45kdsa6c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "07c1wnbki98sl472z32zhgkhdfzvf1qhhhmdfsfk41qxa6yz56xp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0pn4nx36w1prkg1kjjlhsx3iyqd19n4wiqzd8ck2k92z3l5397d7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0v0sg0sdkjisg7j540bs48ylyaw0yypmnijv4qp4h42hsdgk213w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "02hwd80ikxbwikadmiwrybdv5ybp64sbbwkn4kfn7nqvw3q70yh0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1j0v5p9w7d9h1cl43ys29qh601zqw4nh5z827xyi0mqn69dz086s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.6.24327.7"; sha256 = "1v2xidnjq70ivprdqf365kjdi1wm27dh7jgmlmjwrj65zbkkrp8n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "016snk92jhgdixmv1nms2qqlx5myr1cj8qmxcm8851scv1k1hl7g"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "0m4jc8v22byj1r2fn9mh7sv5hn1ygrw8njazfffqcn90pv0gs5xf"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "1cp05rqz5bgw0h7vxf1gzwpmjbglrmwx8q9crn8mykvq0lmgwqim"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "1wld5vlag0rhi82f2h6hkkx4w5m5wpc5zpn70zyd0k17kg79iaqj"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "0n45l47iy12d49igzangz2ljbij52frvsxfniji5lzx40d97jkji"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "17g6qsaiazn001y5qhngmii0mfjlh2wj372g8682alxblgbb5zcm"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "1pmzakkq1ckhfsqb1a1s10gfj75nfkii2axwhb0rkyh1gm99iib2"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "1in2g348vacz1n59h2ivi9b4kh8fqlrbplg4hpajamz9az16dxlp"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "0n8w7lq4xd7vj9rvd4nb7c7vzjmzsl6rcad3gmqzrlkf7chp80s8"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "0ryyx1g8rb1fr3j3vxwww3fbfi4dpilddaq8nssa7pzcxbd7fwj7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "1hw84f1n8imsy7xijmblwxpmzig11aphqn74dn7cjggdc6rhbjcw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0ypfvrl9dgsxkk36aixzk8n0kbwa766pihly46aq21rz2dwcnskw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "19i9rih610mynm7d5b1kx6vdyynmx3853sz7ky69yg2ppyin4xy5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0gfqkjvalws82474wqd672xxpf0lhwq18vdxjpxm50fj1nl8sa35"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.6.24327.7"; sha256 = "08w7j5qs6nh7aa2nfslkmj4avbl4aqwh0z0r4qs309rlpa5q4i7l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "0c1g6sb50gg69fs8jhclal3izkf9xrzhi4bhi0l6w3df1nx0m6mv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1crp6qd0la8qmk1iks3s9n2mhml4474w4pr26ahmpp50j0dxv8cx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0cd3838jm19q6izzp7vzi10hjsjsn31l579zz49hnnlpqxssnkd1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1xgivx8s3z03mqh6bwi8aapshzf9h7n5108k1adiff4xsvqbz7q7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0fnyk76w1fwwz9iscwqjxigpyslibm56fbxlbffpwmdaibhwrpx3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "08899x6by57wdgzbxs9sgajvn0cqjs2hqn70y3yisykgf3pis67c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "01aml04jlslzxfmh8zhv1agapwm6cy57mb5v1iaqivrczny0c9kf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.6.24327.7"; sha256 = "1j2m1hhimd85mm1nxz2qd4vswlxpx37a1kw2haa5w9dmn6wkahr3"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "033cjqzpph7rfhf4pv04xla5xbdz84416rdbra9na520apz2lsfx"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.6.24327.7"; sha256 = "1h5cv3vi9mzm41dmncdn9v78n3ihiyyvgsrw974xqspw9j6pmcwh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "0x7rady0vb8lazb0kxn2yyp5f4kylg76xb1ha8pmgd0wkc6k00s0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1apmjwkvdvpfq56wmlm7140ffqjykfwr0vz5c3ji6ps19gw7flp6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0anp07fypi7ah4g15p73bw3fmgpnq2cczws9r2s9hshx51kdn5ld"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.6.24327.7"; sha256 = "1qggl537v0kfd1nv14jbiqks2l7khzm937gc72a1vpcjlvv217xj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "06wibvavjggqldaifz26ykj6rk3wigxcm4gc8j75kxh5nd20ymra"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "0p3aff8018arm0rrkhbdqwbcz6mc70zvld068alr8r3rpaj2xrqk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1gyr83lwzb0s327jjk26whcys45gkk7cgk2gc0p1rpaahxpb9ryc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.6.24327.7"; sha256 = "1zwg4q8crmk1ldrdf3n2r3z0jrdgcyfcm9l1wl5x9nkn2f65r334"; }) + (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "0jq5k1gn9ni5sxcnr3xsr7ns9pyicc529v60nwdfsv4343majshb"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "1zcapqvghq17zb2z1f38p7lblkf34m3nl5jqza0rjppvkqg0wcrr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "1fwr4lk7a6pwpa6qhy1lnbkn3r81x9rishp43hpdzhra6ks6fma8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "0rlcmp2h9dxh76a59aq91cxlrz558c04l5xf4yfgg2c5hihqpgbq"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "1rxlkz33095yk593r8mr4cx9883q9pfwj4w36lgim9kkqnv6cmb1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "0gvcfa2w7zdd35fnkjch9mn0zysz6jjnmmv2ibwng84xjma5104v"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "18k4frx0vwsnm6wypcdiijvaa45gav3cjq8drirb01m5kaghn7ks"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "0s6pq4zbgmzp30zw6ria5zflcz58ix6amm9bhxz73m85hwaiq5nj"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.6.24327.7"; sha256 = "0dqslmn9nfrpi821y28cli3n4j2rvn4m9kp78qwpa8a9k3f1x8cb"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.6.24327.7"; sha256 = "0gwidi14v21fvr15pgjhfy4x5611q32r52cyz1y18wff84vn6888"; }) ]; in rec { - release_9_0 = "9.0.0-preview.5"; + release_9_0 = "9.0.0-preview.6"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-preview.5.24306.11"; + version = "9.0.0-preview.6.24328.4"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f43de71b-3bf6-49ae-99ec-66499bfa6990/438e1533bbb47d3d7e1f58983677a4f6/aspnetcore-runtime-9.0.0-preview.5.24306.11-linux-x64.tar.gz"; - sha512 = "b4358041bfc42bf614644e7f3c38a4fb73185a8d3541065bfd6758622860b0d0addff6a7ab6e7439d029b0b54238864279d19f1b5096b5d7c0fd10c0435e652e"; + url = "https://download.visualstudio.microsoft.com/download/pr/2ca1c5cb-12bd-49f5-8924-b1ca8031a856/ed898523c59ab06231f833b15b46006d/aspnetcore-runtime-9.0.0-preview.6.24328.4-linux-x64.tar.gz"; + sha512 = "4e178bbd26c70a3f1690c2b84b01c5a43cbf546adc878617fdf4c39d10e8063684420126261aacabcaa7f72c697290c1c06d3e93d9f3babe57c72d5fe98346fb"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e8849fb4-309b-4008-b697-4b5af127cc8e/285762b4db9cfb18abad4e005b37f2cb/aspnetcore-runtime-9.0.0-preview.5.24306.11-linux-arm64.tar.gz"; - sha512 = "6e6198d26b16ebae7bf7f7a428b0026d3c7edb20fa0acf844670a98cdb78a8b0d37cad5df22f35dc3379de8069fdc95318f5eeebcd5b03ad99cf595699116abb"; + url = "https://download.visualstudio.microsoft.com/download/pr/9c7b5592-95fd-4d00-8515-3d6a5c24264f/59f528496c3ab6576bac71982f2dcd98/aspnetcore-runtime-9.0.0-preview.6.24328.4-linux-arm64.tar.gz"; + sha512 = "55e5ea839ddf9cb40d538af961e26959a2dbeaa2dac5de3c85ea50b15927fd5f132ce614e2e4abeb2c8f46f13902cc5f04591f4d12196ae0f8761822e107972e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f07ad200-6654-4341-a594-9a1eb1ca66f9/929c2533f6fe9c402fcb5fee99ee1103/aspnetcore-runtime-9.0.0-preview.5.24306.11-osx-x64.tar.gz"; - sha512 = "104b0b8f216bd36710ee912c92c89c4a5be97774eb21cf090c5c12acbe3ff8a8ec22a2b2bca56feda8aa21690c734d5a4b8293569cbf45172ead6b587d3858fd"; + url = "https://download.visualstudio.microsoft.com/download/pr/b37e6088-911d-48ae-9bb1-920c5c784e44/eec60edf24e317a9df244a48a73f6ba3/aspnetcore-runtime-9.0.0-preview.6.24328.4-osx-x64.tar.gz"; + sha512 = "b80a2ab4ed45878a7817fb0a60da2e1a0f1a4f4477e8e15a6245e5b94fd4cf4fb57dc57a6daa9c8256648e42f1d33a7680a4b8b8eeb41a0d4fcd020b0e216e06"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b4c5eec1-4026-4e58-adfd-64dbf4426b1e/1f05059da0484ade0ba1ce6a3e8f6bd5/aspnetcore-runtime-9.0.0-preview.5.24306.11-osx-arm64.tar.gz"; - sha512 = "f6ed6cc22e20e986cf54ddd0c8868b524efcf84ccbcd5335bdb4ac44fbb08641850448aed5d85bcfd2d403b3a89a73cb932d73db1b590cfc704a58aa8ec79d5f"; + url = "https://download.visualstudio.microsoft.com/download/pr/62ec355f-dbe5-4674-a3c8-a745079e11cc/f50999d4b748511662feb80dc3950f3e/aspnetcore-runtime-9.0.0-preview.6.24328.4-osx-arm64.tar.gz"; + sha512 = "181c501df6e92ecf85d4c81df755eb06b1734d1814653818164175977a40ac94044341d97c8d40b185dd70685eb55212e9fbb93c4538dbc48529433a336d6af2"; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-preview.5.24306.7"; + version = "9.0.0-preview.6.24327.7"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/acc83ac1-a75a-453d-beb1-ab0eef7544b6/fc1c9260c812441c5c51370aa57ea1f9/dotnet-runtime-9.0.0-preview.5.24306.7-linux-x64.tar.gz"; - sha512 = "6d5a313eb3213bca2ac209021218d978a7d8291041f4572780dfb48b5ccb7efe9ace509c75dad1db8e6a427c0bd5e4b2596c3e9f66eec5df4e717a66f8c3d7fa"; + url = "https://download.visualstudio.microsoft.com/download/pr/484c439d-3a87-4eb9-9a08-683a1c2bb334/0edb0aa500ff6bfa446940e1773ff203/dotnet-runtime-9.0.0-preview.6.24327.7-linux-x64.tar.gz"; + sha512 = "09aa8c4e6ae3ada1a265a5cd2b46779a763163e4dd9a1892b44606b89cf147339e10b7c584dbcaf5404af0553f0ef6c5801436c217f4fe1a5d3bdb6d74aef1d1"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7ac3c308-bdeb-4fff-98b8-b22ff6c479aa/31e3d32e7732b17506d41cb6cd7a51b2/dotnet-runtime-9.0.0-preview.5.24306.7-linux-arm64.tar.gz"; - sha512 = "8e49eb2e279684c665031e04c915d63c19e617bf44194655374c957bb13d7f22c8c0e233196711c029653958f98788732e1bbf200d22fad27f76523d7506a91e"; + url = "https://download.visualstudio.microsoft.com/download/pr/c19fa925-faec-409e-8a8d-2c106581014a/ad8f61c688682647a6a2daa4fac8fdd3/dotnet-runtime-9.0.0-preview.6.24327.7-linux-arm64.tar.gz"; + sha512 = "755961903291c262a1f5f7b70543016c8f85f6993e861a6f83f8509fd2a828f4a34f4161a3b9f15114663e8073b37937748befeef9ea9818d513aea1b27f944c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4a7db5f1-a6b4-4232-ba81-f848a8f6dde7/20b9502eb9b73e2f7ae047ae53cd1f21/dotnet-runtime-9.0.0-preview.5.24306.7-osx-x64.tar.gz"; - sha512 = "617847ec35016e4c51359fb8585563a432b8a9ff2c6656d6c10f2e3db70c20dada36509a73b31622c91ccfd5246f51c1c0df79852035f65521ac3f78943f37ca"; + url = "https://download.visualstudio.microsoft.com/download/pr/0bee7cca-fd9f-4769-8409-30bfea40aa07/e6e565aa83cbf8fc8a27cb054e83d45d/dotnet-runtime-9.0.0-preview.6.24327.7-osx-x64.tar.gz"; + sha512 = "53d7fd172cc4bfd0a380847b7d38cfdab03f469579458e3c7ab26dbad82b54a663261b60ebc35009f232509e486657ebc4b8516866016510f66e9a3fbec53eb2"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/42df8bc2-3414-4253-99f0-50d52d4b0c36/a9b0b1664e2dcba0622b9dc6c6a8a8e8/dotnet-runtime-9.0.0-preview.5.24306.7-osx-arm64.tar.gz"; - sha512 = "7c61293b719016dc8212e5564a80a3686a6947d220e2243438616559995c2d415629bf583148513d0691325ebdac91b6a13cbf4d37d7328426b73989edd8ef7c"; + url = "https://download.visualstudio.microsoft.com/download/pr/866edb84-2362-4941-b63c-8480b2133c5f/2750c6b8cdf26e9214f040c86b040d33/dotnet-runtime-9.0.0-preview.6.24327.7-osx-arm64.tar.gz"; + sha512 = "9f038f1ddf51a6fdb96081932c889d63d9ee818de8b5e71af905ede052c17bb22293599baaf9295f42e560d8073d41785507f752fbba316b446664fb762a60f7"; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-preview.5.24307.3"; + version = "9.0.100-preview.6.24328.19"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/96e19e8f-579e-4a1d-a18e-6773a44d7cd1/092cfc588686cc698c449998b7d5ae35/dotnet-sdk-9.0.100-preview.5.24307.3-linux-x64.tar.gz"; - sha512 = "13b9934b3e7b736ab802a8c580aad95ed4dff6b8f31047c71ce9ffcf4d07e55105d4b0170d309551707b9d232d297cb305c67ed5b5f7026f47ec072ee1bbc121"; + url = "https://download.visualstudio.microsoft.com/download/pr/a01db0ce-d997-41c7-83de-08ddbb1bad67/49da8a4fae2e0e803854738e5098d89e/dotnet-sdk-9.0.100-preview.6.24328.19-linux-x64.tar.gz"; + sha512 = "ff040c456b096aeac707053517d5f9f5f0df92b6754a4af6b6fe635fd8f4a569589b8241cbad0c5db998dc5bc54682b2f1e4dc4f3d88024a3ef56c1ecc9f4c97"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/25f41d0d-d27c-4dc5-8884-6c49897d89d1/c51387b8bde1d278a0982b03c3e8c1b1/dotnet-sdk-9.0.100-preview.5.24307.3-linux-arm64.tar.gz"; - sha512 = "3c6f7e6f2f56e86bc8a9633f50129cfa992c52c287dc89551b23cd62fa471199e90392eba7414659c8ff8eecf1dad04016615a98cf85f6c2045d61f6f14c9e73"; + url = "https://download.visualstudio.microsoft.com/download/pr/4129d95b-c724-43cc-b1f5-f394c6fddf5d/24f44d474f12d33f4f74f6913d9b233e/dotnet-sdk-9.0.100-preview.6.24328.19-linux-arm64.tar.gz"; + sha512 = "f4822637ed89f856736bb947cfc1fd4f1c81452016884cdf10ca9ac97c36d5bf810316d534263b3219843096fd5ffc15972714041f85caab243efb5fb910d7fe"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/a6731f1c-ffd0-4cca-a309-89576e55552c/3000f43ca4b3b51bb034bd7daa514841/dotnet-sdk-9.0.100-preview.5.24307.3-osx-x64.tar.gz"; - sha512 = "ebb84f920a7bb663238a10007d784a7c90f66d073089371fc2c9d5556cba945918fd8b193e02eb3d889676952b79616398aa2555d7d46d080088f01f67ede43e"; + url = "https://download.visualstudio.microsoft.com/download/pr/a856c115-c1e0-4050-bcc2-5a2e8840a60d/dd16b2fd886ab6e66ce56f6e7c08beb3/dotnet-sdk-9.0.100-preview.6.24328.19-osx-x64.tar.gz"; + sha512 = "db4e9122cb0ba6d4560a6396cef194735ad41c22ee8cebbfedd41c7b8eca049209e9eedb5013927d6a1f76fea134b78e637c0b3d02523fa7f7a7d4311a059c18"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/090175ff-fe42-4064-98fe-b6d90e08162d/bc72a57ada79f0ee7b71d74f5deb66a0/dotnet-sdk-9.0.100-preview.5.24307.3-osx-arm64.tar.gz"; - sha512 = "8c1a13d14f2502d3897871f82abd2c2df8cb41ff9d754e79693b99d0780deb910dad7486e05ec065c4a38490de00d251c64b0b2a734863e0a452f0ed23b1e1a0"; + url = "https://download.visualstudio.microsoft.com/download/pr/4dec7038-6ff5-4490-a383-4e98596b3265/671e5c37c62486c331a3c2cea7c8572a/dotnet-sdk-9.0.100-preview.6.24328.19-osx-arm64.tar.gz"; + sha512 = "0aee16fc9a8e9729a5016d12e656ea2f8f0703116a778d3e33cc05c7f2d9870239fb3a0f4e5d7152cd7d6942c41853855fced70f777cbb7d40b5a3e03da2b4c8"; }; }; inherit packages; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 32e10419d0b8b..8fd7cce1aa945 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,5 +1,4 @@ { clangStdenv -, stdenvNoCC , lib , fetchurl , dotnetCorePackages @@ -20,11 +19,12 @@ , swiftPackages , openssl , getconf -, makeWrapper , python3 , xmlstarlet , nodejs , callPackage +, unzip +, yq , dotnetSdk , releaseManifestFile @@ -41,7 +41,6 @@ let isDarwin buildPlatform targetPlatform; - inherit (darwin) cctools; inherit (swiftPackages) apple_sdk swift; releaseManifest = lib.importJSON releaseManifestFile; @@ -53,16 +52,6 @@ let sigtool = callPackage ./sigtool.nix {}; - # we need dwarfdump from cctools, but can't have e.g. 'ar' overriding stdenv - dwarfdump = stdenvNoCC.mkDerivation { - name = "dwarfdump-wrapper"; - dontUnpack = true; - installPhase = '' - mkdir -p "$out/bin" - ln -s "${cctools}/bin/dwarfdump" "$out/bin" - ''; - }; - _icu = if isDarwin then darwin.ICU else icu; in stdenv.mkDerivation rec { @@ -89,6 +78,8 @@ in stdenv.mkDerivation rec { pkg-config python3 xmlstarlet + unzip + yq ] ++ lib.optionals (lib.versionAtLeast version "9") [ nodejs @@ -118,7 +109,6 @@ in stdenv.mkDerivation rec { buildInputs = old.buildInputs ++ old.propagatedBuildInputs; propagatedBuildInputs = []; })) - dwarfdump sigtool Foundation CoreFoundation @@ -144,14 +134,6 @@ in stdenv.mkDerivation rec { patches = lib.optionals (lib.versionOlder version "9") [ ./fix-aspnetcore-portable-build.patch - ] - ++ lib.optionals isDarwin [ - # stop passing -sdk without a path - # stop using xcrun - # add -module-cache-path to fix swift errors, see sandboxProfile - # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' - # <unknown>:0: error: could not build Objective-C module 'SwiftShims' - ./stop-passing-bare-sdk-arg-to-swiftc.patch ]; postPatch = '' @@ -306,6 +288,16 @@ in stdenv.mkDerivation rec { -s //Project -t elem -n PropertyGroup \ -s \$prev -t elem -n SkipInstallerBuild -v true \ src/runtime/Directory.Build.props + + # stop passing -sdk without a path + # stop using xcrun + # add -module-cache-path to fix swift errors, see sandboxProfile + # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' + # <unknown>:0: error: could not build Objective-C module 'SwiftShims' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ + --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ + --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' '' + lib.optionalString (lib.versionAtLeast version "9") '' # fix: strip: error: unknown argument '-n' @@ -363,6 +355,7 @@ in stdenv.mkDerivation rec { typeset -f isScript patchShebangs > src/aspnetcore/patch-shebangs.sh ''; + dontConfigureNuget = true; # NUGET_PACKAGES breaks the build dontUseCmakeConfigure = true; # https://github.com/NixOS/nixpkgs/issues/38991 @@ -420,6 +413,16 @@ in stdenv.mkDerivation rec { done popd + local -r unpacked="$PWD/.unpacked" + for nupkg in $out/Private.SourceBuilt.Artifacts.*.${targetRid}/{,SourceBuildReferencePackages/}*.nupkg; do + rm -rf "$unpacked" + unzip -qd "$unpacked" "$nupkg" + chmod -R +rw "$unpacked" + rm "$nupkg" + mv "$unpacked" "$nupkg" + # TODO: should we fix executable flags here? see dotnetInstallHook + done + runHook postInstall ''; @@ -428,7 +431,12 @@ in stdenv.mkDerivation rec { stripDebugList = [ "." ]; # stripping dlls results in: # Failed to load System.Private.CoreLib.dll (error code 0x8007000B) - stripExclude = [ "*.dll" ]; + # stripped crossgen2 results in: + # Failure processing application bundle; possible file corruption. + # this needs to be a bash array + preFixup = '' + stripExclude=(\*.dll crossgen2) + ''; passthru = { inherit releaseManifest buildRid targetRid; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix deleted file mode 100644 index cd15f29e370c9..0000000000000 --- a/pkgs/development/compilers/edk2/default.nix +++ /dev/null @@ -1,153 +0,0 @@ -{ stdenv -, clangStdenv -, fetchFromGitHub -, fetchpatch -, runCommand -, libuuid -, python3 -, bc -, lib -, buildPackages -}: - -let - pythonEnv = buildPackages.python3.withPackages (ps: [ps.tkinter]); - -targetArch = if stdenv.isi686 then - "IA32" -else if stdenv.isx86_64 then - "X64" -else if stdenv.isAarch32 then - "ARM" -else if stdenv.isAarch64 then - "AARCH64" -else if stdenv.hostPlatform.isRiscV64 then - "RISCV64" -else - throw "Unsupported architecture"; - -buildType = if stdenv.isDarwin then - "CLANGPDB" - else - "GCC5"; - -edk2 = stdenv.mkDerivation rec { - pname = "edk2"; - version = "202402"; - - patches = [ - # pass targetPrefix as an env var - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; - hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; - }) - # https://github.com/tianocore/edk2/pull/5658 - (fetchpatch { - url = "https://github.com/tianocore/edk2/commit/a34ff4a8f69a7b8a52b9b299153a8fac702c7df1.patch"; - hash = "sha256-u+niqwjuLV5tNPykW4xhb7PW2XvUmXhx5uvftG1UIbU="; - }) - ]; - - srcWithVendoring = fetchFromGitHub { - owner = "tianocore"; - repo = "edk2"; - rev = "edk2-stable${edk2.version}"; - fetchSubmodules = true; - hash = "sha256-Nurm6QNKCyV6wvbj0ELdYAL7mbZ0yg/tTwnEJ+N18ng="; - }; - - # We don't want EDK2 to keep track of OpenSSL, - # they're frankly bad at it. - src = runCommand "edk2-unvendored-src" { } '' - cp --no-preserve=mode -r ${srcWithVendoring} $out - rm -rf $out/CryptoPkg/Library/OpensslLib/openssl - mkdir -p $out/CryptoPkg/Library/OpensslLib/openssl - tar --strip-components=1 -xf ${buildPackages.openssl.src} -C $out/CryptoPkg/Library/OpensslLib/openssl - chmod -R +w $out/ - - # Fix missing INT64_MAX include that edk2 explicitly does not provide - # via it's own <stdint.h>. Let's pull in openssl's definition instead: - sed -i $out/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c \ - -e '1i #include "internal/numbers.h"' - ''; - - nativeBuildInputs = [ pythonEnv ]; - depsBuildBuild = [ buildPackages.stdenv.cc buildPackages.bash ]; - depsHostHost = [ libuuid ]; - strictDeps = true; - - # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 - ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; - - makeFlags = [ "-C BaseTools" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-return-type" - + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.isDarwin) " -Wno-error=macro-redefined"; - - hardeningDisable = [ "format" "fortify" ]; - - installPhase = '' - mkdir -vp $out - mv -v BaseTools $out - mv -v edksetup.sh $out - # patchShebangs fails to see these when cross compiling - for i in $out/BaseTools/BinWrappers/PosixLike/*; do - chmod +x "$i" - patchShebangs --build "$i" - done - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Intel EFI development kit"; - homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; - license = licenses.bsd2; - platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64; - }; - - passthru = { - mkDerivation = projectDscPath: attrsOrFun: stdenv.mkDerivation (finalAttrs: - let - attrs = lib.toFunction attrsOrFun finalAttrs; - in - { - inherit (edk2) src; - - depsBuildBuild = [ buildPackages.stdenv.cc ] ++ attrs.depsBuildBuild or []; - nativeBuildInputs = [ bc pythonEnv ] ++ attrs.nativeBuildInputs or []; - strictDeps = true; - - ${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix; - - prePatch = '' - rm -rf BaseTools - ln -sv ${buildPackages.edk2}/BaseTools BaseTools - ''; - - configurePhase = '' - runHook preConfigure - export WORKSPACE="$PWD" - . ${buildPackages.edk2}/edksetup.sh BaseTools - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - build -a ${targetArch} -b ${attrs.buildConfig or "RELEASE"} -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mv -v Build/*/* $out - runHook postInstall - ''; - } // removeAttrs attrs [ "nativeBuildInputs" "depsBuildBuild" ]); - }; -}; - -in - -edk2 diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index 16cd7f972ce45..efb3fbfcc5cd5 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; + cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; # Tests perform networking and therefore can't work in sandbox doCheck = false; diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix index 1f86de75e3578..1580d1f43fddc 100644 --- a/pkgs/development/compilers/elm/packages/node/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ../../../../node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 2919a305e428b..2d94880976d79 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.55"; + version = "3.1.64"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-7tZEZ7NN1jJBHa9G5sRz/ZpWJvgnTJj4i5EvQMsGQH4="; + npmDepsHash = "sha256-2dsIuB6P+Z3wflIsn6QaZvjHeHHGzsFAI3GcP3SfiP4="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-3SqbkXI8xn4Zj3bDLCegxslYH5m/PkF6n/pPfm5z5VA="; + hash = "sha256-AbO1b4pxZ7I6n1dRzxhLC7DnXIUnaCK9SbLy96Qxqr0="; rev = version; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./0001-emulate-clang-sysroot-include-logic.patch; - resourceDir = "${llvmEnv}/lib/clang/18/"; + resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/"; }) ]; @@ -51,9 +51,6 @@ stdenv.mkDerivation rec { patchShebangs . - # emscripten 3.1.55 requires LLVM tip-of-tree instead of LLVM 18 - sed -i -e "s/EXPECTED_LLVM_VERSION = 19/EXPECTED_LLVM_VERSION = 18/g" tools/shared.py - # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index f7ac2a009658f..cf2e1b32e4595 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.39"; + version = "0.6.41"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-eVf1pQJ0mIZURRDK2k6boZUs+m6hu6lbWqKYWSNC5ng="; + hash = "sha256-CXaHiyPZy454HJfmXnNsUNo30v4PdhupgGz0a8y/q0Y="; }; - cargoHash = "sha256-H7JorE6Psg/rndYpNMiyxOfsifBEi4l4bk4CvhDRFjE="; + cargoHash = "sha256-D3RixepsH6WR7W1REbFLuIzn1eoAacqw0Ripp9lgnpE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix index 168cf3ea34993..a020d6a2ce31e 100644 --- a/pkgs/development/compilers/factor-lang/factor99.nix +++ b/pkgs/development/compilers/factor-lang/factor99.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation { under a BSD license. ''; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra spacefrogg ]; + maintainers = with maintainers; [ spacefrogg ]; platforms = lib.intersectLists platforms.x86_64 platforms.linux; mainProgram = "factor"; }; diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix index 54138a6d3de8e..3f005243d6074 100644 --- a/pkgs/development/compilers/firrtl/default.nix +++ b/pkgs/development/compilers/firrtl/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.chisel-lang.org/firrtl/"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 753938e95aa30..708640c8719c4 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,7 +1,7 @@ # This derivation is a reduced-functionality variant of Gambit stable, # used to compile the full version of Gambit stable *and* unstable. -{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +{ gccStdenv, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: # As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better gccStdenv.mkDerivation { diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 60b9fb792d2f4..05d92d434faf4 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,6 +1,5 @@ { gccStdenv, lib, pkgs, - git, openssl, autoconf, gcc, coreutils, gnused, gnugrep, - makeStaticLibraries, + git, openssl, autoconf, coreutils, src, version, git-version, stampYmd ? 0, stampHms ? 0, gambit-support, diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 25c5646338653..9a254ef59c023 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -7,6 +7,14 @@ let forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; }; + + # todo(@reckenrode) Remove in staging. This is ugly, but it avoid unwanted rebuilds on Darwin and Linux. + enableDarwinFixesForStagingNext = + version: + stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + && lib.versionAtLeast version "6" + && lib.versionOlder version "10"; in originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { @@ -20,9 +28,20 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" - else - EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" - fi + ${ + if enableDarwinFixesForStagingNext finalAttrs.version then + '' + elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + else + EXTRA_LDFLAGS="" + '' + else + '' + else + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + '' + }fi # GCC interprets empty paths as ".", which we don't want. if test -z "''${CPATH-}"; then unset CPATH; fi @@ -56,9 +75,24 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { extraLDFlags=("-L/usr/lib64" "-L/usr/lib") libc_libdir="/usr/lib" fi - extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" - "''${extraLDFlags[@]}") - for i in "''${extraLDFlags[@]}"; do + ${ + if enableDarwinFixesForStagingNext finalAttrs.version then + '' + extraLDFlags=("-L$libc_libdir") + nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post} + if test "''${!nixDontSetRpathVar-}" != "1"; then + extraLDFlags+=("-rpath" "$libc_libdir") + fi + extraLDFlags+=("''${extraLDFlags[@]}") + '' + else + '' + extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" + "''${extraLDFlags[@]}") + '' +# The strange indentation with the next line is to ensure the string renders the same when the condition is false, +# which is necessary to prevent unwanted rebuilds in staging-next. +} for i in "''${extraLDFlags[@]}"; do declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i" done done diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index b8dccf9fcc575..f8e2ef6508b0d 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -24,6 +24,7 @@ , langObjC , langObjCpp , langJit +, langRust ? false , disableBootstrap ? stdenv.targetPlatform != stdenv.hostPlatform }: @@ -171,6 +172,7 @@ let ++ lib.optional langObjCpp "obj-c++" ++ lib.optionals crossDarwin [ "objc" "obj-c++" ] ++ lib.optional langJit "jit" + ++ lib.optional langRust "rust" ) }" ] diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index fd9036c23ac6c..d81a732b4189f 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -31,6 +31,8 @@ , javaAwtGtk ? false , langAda ? false , langGo ? false +, langRust ? false +, cargo , withoutTargetLibc ? null , threadsCross ? null }: @@ -53,6 +55,7 @@ in ++ optionals javaAwtGtk [ pkg-config ] ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ] ++ optionals langAda [ gnat-bootstrap ] + ++ optionals langRust [ cargo ] # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ optionals buildPlatform.isDarwin [ gnused ] diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 5eb92fd701da9..959b570f470c5 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -8,6 +8,8 @@ , reproducibleBuild ? true , profiledCompiler ? false , langJit ? false +, langRust ? false +, cargo , staticCompiler ? false , enableShared ? stdenv.targetPlatform.hasSharedLibraries , enableLTO ? stdenv.hostPlatform.hasSharedLibraries @@ -33,6 +35,7 @@ , nukeReferences , callPackage , majorMinorVersion +, cctools , darwin # only for gcc<=6.x @@ -127,6 +130,7 @@ let inherit binutils buildPackages + cargo cloog withoutTargetLibc darwin @@ -152,6 +156,7 @@ let langJit langObjC langObjCpp + langRust lib libcCross libmpc @@ -449,15 +454,15 @@ pipe ((callFile ./common/builder.nix {}) ({ badPlatforms = # avr-gcc8 is maintained for the `qmk` package if (is8 && targetPlatform.isAvr) then [] - else if !(is48 || is49) then [ "aarch64-darwin" ] + else if !(is48 || is49 || is6) then [ "aarch64-darwin" ] else platforms.darwin; - } // optionalAttrs is11 { + } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; } // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) { # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools. preBuild = '' - makeFlagsArray+=('STRIP=${getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip') + makeFlagsArray+=('STRIP=${getBin cctools}/bin/${stdenv.cc.targetPrefix}strip') ''; } // optionalAttrs (!atLeast8) { doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv diff --git a/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 0000000000000..a29bb5eba98cd --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 662dc97762c..5140a04f9dd 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3053,6 +3053,43 @@ static const char* apzDarwin_Stdint_7Patch[] = { + #endif", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -9855,9 +9892,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 277 ++#define REGEX_COUNT 278 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 241 ++#define FIX_COUNT 242 + + /* + * Enumerate the fixes +@@ -9933,6 +9970,7 @@ typedef enum { + DARWIN_STDINT_5_FIXIDX, + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -10457,6 +10495,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 98fb5b61649..8aad418dff8 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1591,6 +1591,20 @@ fix = { + "#define UINTMAX_C(v) (v ## ULL)"; + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix <c_asm.h> on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 0000000000000..a8a995d030dfe --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index d12ba7c3e88..9f31b29c509 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3468,6 +3468,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = { + #endif\n", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -10347,9 +10384,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 291 ++#define REGEX_COUNT 292 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 253 ++#define FIX_COUNT 254 + + /* + * Enumerate the fixes +@@ -10435,6 +10472,7 @@ typedef enum { + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, + DARWIN_UCRED__ATOMIC_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -11011,6 +11049,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 179e2f3c98a..70b681f35c8 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1793,6 +1793,20 @@ fix = { + test_text = ""; /* Don't provide this for wrap fixes. */ + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix <c_asm.h> on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 0000000000000..0a4f46bce066b --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 9578c99ab7b..e0ae73496c6 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3428,6 +3428,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = { + #endif\n", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -10356,9 +10393,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 294 ++#define REGEX_COUNT 295 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 255 ++#define FIX_COUNT 256 + + /* + * Enumerate the fixes +@@ -10445,6 +10482,7 @@ typedef enum { + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, + DARWIN_UCRED__ATOMIC_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -11027,6 +11065,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 948ea1d9183..5eb403ac841 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1697,6 +1697,20 @@ fix = { + test_text = ""; /* Don't provide this for wrap fixes. */ + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix <c_asm.h> on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 0000000000000..8575f71912a1c --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 47a3578f017..6cf22d19b2a 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3480,6 +3480,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = { + #endif\n", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -10445,9 +10482,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 296 ++#define REGEX_COUNT 297 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 257 ++#define FIX_COUNT 258 + + /* + * Enumerate the fixes +@@ -10535,6 +10572,7 @@ typedef enum { + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, + DARWIN_UCRED__ATOMIC_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -11123,6 +11161,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index bf136fdaa20..89bceb46c26 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1727,6 +1727,20 @@ fix = { + test_text = ""; /* Don't provide this for wrap fixes. */ + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix <c_asm.h> on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index b7da7eb925eef..7e16ac0003eaa 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -156,8 +156,8 @@ in }) ]; "12" = [ (fetchurl { name = "gcc-12-darwin-aarch64-support.patch"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/f1188b90d610e2ed170b22512ff7435ba5c891e2/gcc/gcc-12.3.0.diff"; - sha256 = "sha256-naL5ZNiurqfDBiPSU8PTbTmLqj25B+vjjiqc4fAFgYs="; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/1ed9eaea059f1677d27382c62f21462b476b37fe/gcc/gcc-12.4.0.diff"; + sha256 = "sha256-wOjpT79lps4TKG5/E761odhLGCphBIkCbOPiQg/D1Fw="; }) ]; "11" = [ (fetchpatch { # There are no upstream release tags in https://github.com/iains/gcc-11-branch. @@ -165,6 +165,20 @@ in url = "https://github.com/iains/gcc-11-branch/compare/ff4bf326d03e750a8d4905ea49425fe7d15a04b8..gcc-11.4-darwin-r0.diff"; hash = "sha256-6prPgR2eGVJs7vKd6iM1eZsEPCD1ShzLns2Z+29vlt4="; }) ]; + "10" = [ (fetchpatch { + # There are no upstream release tags in https://github.com/iains/gcc-10-branch. + # d04fe55 is the commit from https://github.com/gcc-mirror/gcc/releases/tag/releases%2Fgcc-10.5.0 + url = "https://github.com/iains/gcc-10-branch/compare/d04fe5541c53cb16d1ca5c80da044b4c7633dbc6...gcc-10-5Dr0-pre-0.diff"; + hash = "sha256-kVUHZKtYqkWIcqxHG7yAOR2B60w4KWLoxzaiFD/FWYk="; + }) ]; +}.${majorVersion} or []) + +# Work around newer AvailabilityInternal.h when building older versions of GCC. +++ optionals (stdenv.isDarwin) ({ + "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; + "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; + "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; + "6" = [ ../patches/6/AvailabilityInternal.h-fixincludes.patch ]; }.${majorVersion} or []) @@ -273,9 +287,9 @@ in ./6/gnat-glibc234.patch ] -# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input. +# The clang-based assembler used in darwin.binutils (LLVM >11) does not support piping input. # Fortunately, it does not exhibit the problem GCC has with the cctools assembler. -# This patch can be dropped should darwin.cctools-llvm ever implement support. +# This patch can be dropped should darwin.binutils ever implement support. ++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch # Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index af983be968b0f..c71ea137eadca 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ pkgs, gccStdenv, lib, coreutils, +{ gccStdenv, lib, coreutils, openssl, zlib, sqlite, version, git-version, src, gambit-support, diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 148bf7451675c..ff35cee6c9933 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { version = "0.18.1"; diff --git a/pkgs/development/compilers/gerbil/gerbil-leveldb.nix b/pkgs/development/compilers/gerbil/gerbil-leveldb.nix index 811e677e9218e..2938469d62b74 100644 --- a/pkgs/development/compilers/gerbil/gerbil-leveldb.nix +++ b/pkgs/development/compilers/gerbil/gerbil-leveldb.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, leveldb, ... }: +{ pkgs, lib, fetchFromGitHub, leveldb, ... }: { pname = "gerbil-leveldb"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libxml.nix b/pkgs/development/compilers/gerbil/gerbil-libxml.nix index bbd33752670e3..bee0d0f16f59a 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libxml.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libxml.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, libxml2, ... }: +{ pkgs, lib, fetchFromGitHub, libxml2, ... }: { pname = "gerbil-libxml"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libyaml.nix b/pkgs/development/compilers/gerbil/gerbil-libyaml.nix index 0a69537b365de..b88beb9f6986b 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libyaml.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libyaml.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, libyaml, ... }: +{ pkgs, lib, fetchFromGitHub, libyaml, ... }: { pname = "gerbil-libyaml"; diff --git a/pkgs/development/compilers/gerbil/gerbil-lmdb.nix b/pkgs/development/compilers/gerbil/gerbil-lmdb.nix index f86912aeaaa8d..1a3355c149086 100644 --- a/pkgs/development/compilers/gerbil/gerbil-lmdb.nix +++ b/pkgs/development/compilers/gerbil/gerbil-lmdb.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, lmdb, ... }: +{ pkgs, lib, fetchFromGitHub, lmdb, ... }: { pname = "gerbil-lmdb"; diff --git a/pkgs/development/compilers/gerbil/gerbil-mysql.nix b/pkgs/development/compilers/gerbil/gerbil-mysql.nix index ca1960e0ed39a..a8cf710ec6548 100644 --- a/pkgs/development/compilers/gerbil/gerbil-mysql.nix +++ b/pkgs/development/compilers/gerbil/gerbil-mysql.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, mariadb-connector-c, ... }: +{ pkgs, lib, fetchFromGitHub, mariadb-connector-c, ... }: { pname = "gerbil-mysql"; diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 4b0d3289c1078..0dd078556efba 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { version = "unstable-2023-12-06"; diff --git a/pkgs/development/compilers/ghc/8.10.7-binary.nix b/pkgs/development/compilers/ghc/8.10.7-binary.nix index c29b3c89f4b87..a4602c9a645cb 100644 --- a/pkgs/development/compilers/ghc/8.10.7-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.7-binary.nix @@ -4,6 +4,7 @@ , ncurses6, gmp, libiconv, numactl , llvmPackages , coreutils +, rcodesign , targetPackages # minimal = true; will remove files that aren't strictly necessary for @@ -190,7 +191,15 @@ stdenv.mkDerivation rec { # https://gitlab.haskell.org/ghc/ghc/-/issues/20059 # and update this comment accordingly. - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + # Upstream binaries may not be linker-signed, which invalidates their signatures + # because `install_name_tool` will only replace a signature if it is both + # an ad hoc signature and the signature is flagged as linker-signed. + # + # rcodesign is used to replace the signature instead of sigtool because it + # supports setting the linker-signed flag, which will ensure future processing + # of the binaries does not invalidate their signatures. + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ rcodesign ]; # Set LD_LIBRARY_PATH or equivalent so that the programs running as part # of the bindist installer can find the libraries they expect. @@ -236,15 +245,20 @@ stdenv.mkDerivation rec { ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin ('' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do isScript $exe && continue ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe + '' + lib.optionalString stdenv.isAarch64 '' + # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file. + # Object files don’t have signatures, so ignoring the failures is harmless. + rcodesign sign --code-signature-flags linker-signed $exe || true + '' + '' done - '' + + '') + # Some scripts used during the build need to have their shebangs patched '' diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index c8669a2761f82..a6694e2e99c9c 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -9,7 +9,11 @@ , libiconv ? null, ncurses , # GHC can be built with system libffi or a bundled one. + # we explicitly use libffi-3.3 here because 3.4 removes a flag that causes + # problems for ghc-8.10.7's RTS. See #324384. + # Save for aarch_darwin since libffi-3.3 is broken there but the issue isn't present anyway libffi ? null +, libffi_3_3 ? null , useLLVM ? !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower @@ -56,7 +60,7 @@ , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: +}@args: assert !enableIntegerSimple -> gmp != null; @@ -65,6 +69,7 @@ assert !enableIntegerSimple -> gmp != null; assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; let + libffi_name = if stdenv.isDarwin && stdenv.isAarch64 then "libffi" else "libffi_3_3"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; inherit (bootPkgs) ghc; @@ -119,7 +124,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] + ++ [args.${libffi_name}] ++ lib.optional (!enableIntegerSimple) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -152,18 +157,16 @@ let otool = cc.bintools.bintools; - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. We decide based on target platform to have consistent tools - # across all GHC stages. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then cc.bintools - else cc.bintools.bintools; - # Same goes for strip. + # GHC needs install_name_tool on all darwin platforms. The same one can + # be used on both platforms. It is safe to use with linker-generated + # signatures because it will update the signatures automatically after + # modifying the target binary. + install_name_tool = cc.bintools.bintools; + + # strip on darwin is wrapped to enable deterministic mode. strip = # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; }.${name}; @@ -334,10 +337,10 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ + ] ++ lib.optionals (args.${libffi_name} != null) [ "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + "--with-ffi-includes=${targetPackages.${libffi_name}.dev}/include" + "--with-ffi-libraries=${targetPackages.${libffi_name}.out}/lib" ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix index 65ed655e57974..d67e9f47ac48f 100644 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.3-binary.nix @@ -282,6 +282,12 @@ stdenv.mkDerivation rec { isScript "$i" || continue sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" done + '' + lib.optionalString stdenv.targetPlatform.isDarwin '' + # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it + # detects `llvm-ar` even though the resulting archives are not supported by ld64. + # https://gitlab.haskell.org/ghc/ghc/-/issues/23188 + # https://github.com/haskell/cabal/issues/8882 + sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings" ''; # Apparently necessary for the ghc Alpine (musl) bindist: @@ -403,8 +409,5 @@ stdenv.mkDerivation rec { # `pkgsMusl`. platforms = builtins.attrNames ghcBinDists.${distSetName}; maintainers = lib.teams.haskell.members; - # packages involving hsc2hs (clock) produce libraries our - # ld can't link against - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/compilers/ghc/9.6.6.nix b/pkgs/development/compilers/ghc/9.6.6.nix new file mode 100644 index 0000000000000..60854685f1e13 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.6.6.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix { + version = "9.6.6"; + sha256 = "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad"; +} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index b5fef30332f7f..b6d4d7236fe6b 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -171,7 +171,7 @@ then ./docs-sphinx-7-ghc98.patch else ./docs-sphinx-7.patch ) ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [ (fetchpatch { name = "fix-fully_static.patch"; url = "https://gitlab.haskell.org/ghc/ghc/-/commit/1bb24432ff77e11a0340a7d8586e151e15bba2a1.diff"; @@ -288,18 +288,16 @@ let otool = cc.bintools.bintools; - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. We decide based on target platform to have consistent tools - # across all GHC stages. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then cc.bintools - else cc.bintools.bintools; - # Same goes for strip. + # GHC needs install_name_tool on all darwin platforms. The same one can + # be used on both platforms. It is safe to use with linker-generated + # signatures because it will update the signatures automatically after + # modifying the target binary. + install_name_tool = cc.bintools.bintools; + + # strip on darwin is wrapped to enable deterministic mode. strip = # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; }.${name}; diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 79fced444f562..2b23cd75a0ed7 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -157,18 +157,16 @@ let otool = cc.bintools.bintools; - # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is - # part of the bintools wrapper (due to codesigning requirements), but not on - # x86_64-darwin. We decide based on target platform to have consistent tools - # across all GHC stages. - install_name_tool = - if stdenv.targetPlatform.isAarch64 - then cc.bintools - else cc.bintools.bintools; - # Same goes for strip. + # GHC needs install_name_tool on all darwin platforms. The same one can + # be used on both platforms. It is safe to use with linker-generated + # signatures because it will update the signatures automatically after + # modifying the target binary. + install_name_tool = cc.bintools.bintools; + + # strip on darwin is wrapped to enable deterministic mode. strip = # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" - if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + if stdenv.targetPlatform.isDarwin then cc.bintools else cc.bintools.bintools; }.${name}; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 4363dc32c21e1..9a648f8384060 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -17,7 +17,6 @@ , gcc , lib , ghcjsDepOverrides ? (_:_:{}) -, haskell , linkFarm , buildPackages }: diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix deleted file mode 100644 index 3a28aa03c1108..0000000000000 --- a/pkgs/development/compilers/ghdl/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv -, fetchFromGitHub -, callPackage -, gnat -, zlib -, llvm -, lib -, backend ? "mcode" -}: - -assert backend == "mcode" || backend == "llvm"; - -stdenv.mkDerivation (finalAttrs: { - pname = "ghdl-${backend}"; - version = "4.1.0"; - - src = fetchFromGitHub { - owner = "ghdl"; - repo = "ghdl"; - rev = "v${finalAttrs.version}"; - hash = "sha256-tPSHer3qdtEZoPh9BsEyuTOrXgyENFUyJqnUS3UYAvM="; - }; - - LIBRARY_PATH = "${stdenv.cc.libc}/lib"; - - nativeBuildInputs = [ - gnat - ]; - buildInputs = [ - zlib - ] ++ lib.optionals (backend == "llvm") [ - llvm - ]; - propagatedBuildInputs = [ - ] ++ lib.optionals (backend == "llvm") [ - zlib - ]; - - preConfigure = '' - # If llvm 7.0 works, 7.x releases should work too. - sed -i 's/check_version 7.0/check_version 7/g' configure - ''; - - configureFlags = [ - # See https://github.com/ghdl/ghdl/pull/2058 - "--disable-werror" - "--enable-synth" - ] ++ lib.optionals (backend == "llvm") [ - "--with-llvm-config=${llvm.dev}/bin/llvm-config" - ]; - - enableParallelBuilding = true; - - passthru = { - # run with either of - # nix-build -A ghdl-mcode.passthru.tests - # nix-build -A ghdl-llvm.passthru.tests - tests = { - simple = callPackage ./test-simple.nix { inherit backend; }; - }; - }; - - meta = { - homepage = "https://github.com/ghdl/ghdl"; - description = "VHDL 2008/93/87 simulator"; - license = lib.licenses.gpl2Plus; - mainProgram = "ghdl"; - maintainers = with lib.maintainers; [ lucus16 thoughtpolice ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/development/compilers/ghdl/expected-output.txt b/pkgs/development/compilers/ghdl/expected-output.txt deleted file mode 100644 index 0396b0c2787b6..0000000000000 --- a/pkgs/development/compilers/ghdl/expected-output.txt +++ /dev/null @@ -1,8 +0,0 @@ -simple-tb.vhd:71:5:@700ms:(report note): 32 -simple-tb.vhd:71:5:@900ms:(report note): 78 -simple-tb.vhd:71:5:@1100ms:(report note): 105 -simple-tb.vhd:71:5:@1300ms:(report note): 120 -simple-tb.vhd:71:5:@1500ms:(report note): 79 -simple-tb.vhd:71:5:@1700ms:(report note): 83 -simple-tb.vhd:71:5:@1900ms:(report note): 32 -simple-tb.vhd:75:1:@2100ms:(report note): All tests passed. diff --git a/pkgs/development/compilers/ghdl/simple-tb.vhd b/pkgs/development/compilers/ghdl/simple-tb.vhd deleted file mode 100644 index 65e4d0967c52f..0000000000000 --- a/pkgs/development/compilers/ghdl/simple-tb.vhd +++ /dev/null @@ -1,78 +0,0 @@ -library ieee; -use IEEE.STD_LOGIC_1164.all; -use ieee.numeric_std.all; - -library STD; -use STD.textio.all; - -entity tb is -end tb; - -architecture beh of tb is - -component simple -port ( - CLK, RESET : in std_ulogic; - DATA_OUT : out std_ulogic_vector(7 downto 0); - DONE_OUT : out std_ulogic -); -end component; - -signal data : std_ulogic_vector(7 downto 0) := "00100000"; -signal clk : std_ulogic; -signal RESET : std_ulogic := '0'; -signal done : std_ulogic := '0'; -signal cyclecount : integer := 0; - -constant cycle_time_c : time := 200 ms; -constant maxcycles : integer := 100; - -begin - -simple1 : simple -port map ( - CLK => clk, - RESET => RESET, - DATA_OUT => data, - DONE_OUT => done -); - -clk_process : process -begin - clk <= '0'; - wait for cycle_time_c/2; - clk <= '1'; - wait for cycle_time_c/2; -end process; - -count_process : process(CLK) -begin - if (CLK'event and CLK ='1') then - if (RESET = '1') then - cyclecount <= 0; - else - cyclecount <= cyclecount + 1; - end if; - end if; -end process; - -test : process - -begin - -RESET <= '1'; -wait until (clk'event and clk='1'); -wait until (clk'event and clk='1'); -RESET <= '0'; -wait until (clk'event and clk='1'); -for cyclecnt in 1 to maxcycles loop - exit when done = '1'; - wait until (clk'event and clk='1'); - report integer'image(to_integer(unsigned(data))); -end loop; -wait until (clk'event and clk='1'); - -report "All tests passed." severity NOTE; -wait; -end process; -end beh; diff --git a/pkgs/development/compilers/ghdl/simple.vhd b/pkgs/development/compilers/ghdl/simple.vhd deleted file mode 100644 index f10cf73d067c8..0000000000000 --- a/pkgs/development/compilers/ghdl/simple.vhd +++ /dev/null @@ -1,45 +0,0 @@ -library IEEE; -use IEEE.STD_LOGIC_1164.all; -use IEEE.NUMERIC_STD.ALL; -use IEEE.STD_LOGIC_MISC.or_reduce; - -entity simple is - -port ( - CLK, RESET : in std_ulogic; - DATA_OUT : out std_ulogic_vector(7 downto 0); - DONE_OUT : out std_ulogic -); -end simple; - -architecture beh of simple is - -signal data : std_ulogic_vector(7 downto 0); -signal done: std_ulogic; - -begin - -proc_ctr : process(CLK) -begin -if (CLK = '1' and CLK'event) then - if (RESET = '1') then - data <= "01011111"; - done <= '0'; - else - case data is - when "00100000" => data <= "01001110"; - when "01001110" => data <= "01101001"; - when "01101001" => data <= "01111000"; - when "01111000" => data <= "01001111"; - when "01001111" => data <= "01010011"; - when others => data <= "00100000"; - end case; - done <= not or_reduce(data xor "01010011"); - end if; -end if; -end process; - -DATA_OUT <= data; -DONE_OUT <= done; - -end beh; diff --git a/pkgs/development/compilers/ghdl/test-simple.nix b/pkgs/development/compilers/ghdl/test-simple.nix deleted file mode 100644 index 8d3c3d3095f2d..0000000000000 --- a/pkgs/development/compilers/ghdl/test-simple.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, ghdl-llvm, ghdl-mcode, backend }: - -let - ghdl = if backend == "llvm" then ghdl-llvm else ghdl-mcode; -in -stdenv.mkDerivation { - name = "ghdl-test-simple"; - meta.timeout = 300; - nativeBuildInputs = [ ghdl ]; - buildCommand = '' - cp ${./simple.vhd} simple.vhd - cp ${./simple-tb.vhd} simple-tb.vhd - mkdir -p ghdlwork - ghdl -a --workdir=ghdlwork --ieee=synopsys simple.vhd simple-tb.vhd - ghdl -e --workdir=ghdlwork --ieee=synopsys -o sim-simple tb - '' + (if backend == "llvm" then '' - ./sim-simple --assert-level=warning > output.txt - '' else '' - ghdl -r --workdir=ghdlwork --ieee=synopsys tb > output.txt - '') + '' - diff output.txt ${./expected-output.txt} && touch $out - ''; -} diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 4e2111814deb1..538711b2bd68e 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.2.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-J3FqaKEeK+Xy8Ri5j7+K+4wpvNeMUHSfj2O68XBPlYs="; + hash = "sha256-z9xDMQXzVUeHne7KG4QsutQAiU01mgnV7ccdkjl+EkU="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-l0LFgmsk87mCVu1UiaFtP3mO01CDV3xTz4Kv+l6AAWw="; + cargoHash = "sha256-XKHcA4DSVsWZfUHT6BkRjK0Mzz90E+ohYrtwZKPMtTY="; passthru.updateScript = nix-update-script { }; @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec { description = "Statically typed language for the Erlang VM"; mainProgram = "gleam"; homepage = "https://gleam.run/"; + changelog = "https://github.com/gleam-lang/gleam/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.beam.members ++ [ lib.maintainers.philtaken ]; }; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 91dfb296318cc..5fe11e35a434d 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "14.2.0"; + version = "14.3.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc="; + hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix index 144131887fbac..ec39f8744f583 100644 --- a/pkgs/development/compilers/gmqcc/default.nix +++ b/pkgs/development/compilers/gmqcc/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchFromGitHub }: diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index 5b01856786fed..83f24fff864eb 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -4,6 +4,7 @@ , autoconf269 , automake , libtool +, pkg-config # libs , cjson , db @@ -15,19 +16,19 @@ , texinfo , texliveBasic # test -, writeText }: stdenv.mkDerivation rec { pname = "gnu-cobol"; - version = "3.1.2"; + version = "3.2"; src = fetchurl { url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz"; - sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"; + hash = "sha256-O7SK9GztR3n6z0H9wu5g5My4bqqZ0BCzZoUxXfOcLuI="; }; nativeBuildInputs = [ + pkg-config autoconf269 automake libtool @@ -51,14 +52,27 @@ stdenv.mkDerivation rec { # Skips a broken test postPatch = '' sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at + # upstream reports the following tests as known failures + # test 843: + sed -i '14180i\AT_SKIP_IF([true])' tests/testsuite.src/run_misc.at + # test 875: + sed -i '2894s/^/AT_SKIP_IF([true])/' tests/testsuite.src/run_file.at ''; preConfigure = '' autoconf aclocal automake + '' + lib.optionalString stdenv.isDarwin '' + # when building with nix on darwin, configure will use GNU strip, + # which fails due to using --strip-unneeded, which is not supported + substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip' ''; + # error: call to undeclared function 'xmlCleanupParser' + # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + env.CFLAGS = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + enableParallelBuilding = true; installFlags = [ "install-pdf" "install-html" "localedir=$out/share/locale" ]; @@ -71,7 +85,7 @@ stdenv.mkDerivation rec { runHook preInstallCheck # Run tests - make -j$NIX_BUILD_CORES check + TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make check # Sanity check message="Hello, COBOL!" @@ -96,7 +110,7 @@ stdenv.mkDerivation rec { description = "Open-source COBOL compiler"; homepage = "https://sourceforge.net/projects/gnucobol/"; license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ ericsagnes lovesegfault ]; + maintainers = with maintainers; [ ericsagnes lovesegfault techknowlogick ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 68fe8a015c87f..7c8f1fbd9cde8 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -17,8 +17,7 @@ }: let - useGccGoBootstrap = stdenv.buildPlatform.isMusl; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; @@ -47,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.12"; + version = "1.21.13"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-MOaK8nvB8d8jHjq3Tz0X07jVKgicebyqtXO08bgH7U8="; + hash = "sha256-cfsxYGod5I0SnVkehxemPgxVZf+6CaJOqfiZoTIUw00="; }; strictDeps = true; @@ -115,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild @@ -184,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.darwin ++ platforms.linux ++ platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index dc027c785e566..447b9815fbe09 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -17,8 +17,7 @@ }: let - useGccGoBootstrap = stdenv.buildPlatform.isMusl; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo122Module; }; @@ -117,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { # Wasi does not support CGO CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; - GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild @@ -186,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 5660710f049fa..63df35a72dc17 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -17,8 +17,7 @@ }: let - useGccGoBootstrap = stdenv.buildPlatform.isMusl; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + goBootstrap = buildPackages.callPackage ./bootstrap121.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo123Module; }; @@ -48,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23rc1"; + version = "1.23rc2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-bpxHZYcoCGY8zwuTflY3x99nFGlD+m6JCagaDRKcgEU="; + hash = "sha256-9pnOJWD8Iq2CwGseBLYxi4Xn9obLy0/OFWWCEyxX2Ps="; }; strictDeps = true; @@ -117,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { # Wasi does not support CGO CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; - GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild @@ -184,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index 3b4e8010d27ec..777c82a597752 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, version, hashes, autoPatchelfHook }: +{ stdenv, fetchurl, version, hashes }: let toGoKernel = platform: if platform.isDarwin then "darwin" @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}"); }; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - # We must preserve the signature on Darwin dontStrip = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/compilers/go/bootstrap121.nix b/pkgs/development/compilers/go/bootstrap121.nix index f243ca30abf35..d9b4fa9a14f81 100644 --- a/pkgs/development/compilers/go/bootstrap121.nix +++ b/pkgs/development/compilers/go/bootstrap121.nix @@ -5,6 +5,11 @@ callPackage ./binary.nix { # Use `print-hashes.sh ${version}` to generate the list below darwin-amd64 = "b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70"; darwin-arm64 = "3aca44de55c5e098de2f406e98aba328898b05d509a2e2a356416faacf2c4566"; + freebsd-386 = "312a0065714a50862af714e7a5b3fbbd70fe68f905ffb9bcc56d42eadf6bffab"; + freebsd-amd64 = "b8eaa36654625df799654f77f4af0ea7bd9e5e760ebe86e68fe7c484748ae995"; + freebsd-arm64 = "bca5be1a9934fc522cb1a2e4849bb9f12ee6b480b48949e36a4dfb8e755a4b25"; + freebsd-armv6l = "f4c9c91fa9c37d6d6b7644f3f6b67167b2a44bd48c0cba1d2a5ff5fd50ceb364"; + freebsd-riscv64 = "45b99a9884dcd0dd4c8e4c0f99a4dc2901b8e9628dd8091ae5c0620afd536f0a"; linux-386 = "0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba"; linux-amd64 = "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742"; linux-arm64 = "f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3"; diff --git a/pkgs/development/compilers/go/print-hashes.sh b/pkgs/development/compilers/go/print-hashes.sh index ed3e62b941b8c..bd35b0b69f66e 100755 --- a/pkgs/development/compilers/go/print-hashes.sh +++ b/pkgs/development/compilers/go/print-hashes.sh @@ -13,4 +13,4 @@ fi curl -s "${BASEURL}?mode=json&include=all" | jq '.[] | select(.version == "go'"${VERSION}"'")' | - jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin" or .os == "freebsd")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 34ed06e1de123..83d60202a4fca 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -171,15 +171,11 @@ let $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' - ${# --static is only available in Linux + ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux lib.optionalString (stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' - - echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image $extraNativeImageArgs -march=compatibility --static HelloWorld - ./helloworld | fgrep 'Hello World' ''} ${# --static is only available in Linux diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix index 0a7f04052bb60..ec662e156721c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix @@ -7,7 +7,7 @@ graalvmCEPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; - product = "js-installable-svm"; + product = "graaljs"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix index 268a9743a0254..50fd673624126 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "24.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "09q88nsbz0lrl866x3hqxm3hb5wpn4x5rp6pk69x1v6xzl58wzq2"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "11mz4qrp96iiblc25yssmczjwc44qf5z6q3c40dvmqyzz7rb7dm7"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0zlk0gpxwjkh4wxsc310kl80ipgk5si1lmyx0q2hqsw9lm98n41g"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "0ljmgaw5l617k1z26jlfj7pk87jkrgmai999vjbcvj1z7l26am2g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1y5mc92yync85ywcahvq8x9jlla0rzjd4g7cm6q7p21wvfwp4d5q"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "1h629gzdaay2rr5vgxir4kybarl19rcmvbsgrfri007rkchyxr5g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0ph3c6jgbvm3cliyqlccd2l292a7p0051l3sv7yf3318r6zrrk7m"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "11sjplallyhf0vp6b53rhj5cv0zb6haii4aaan5xahplw9gavv8g"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix index fb6d1595bbf37..d98f4b0e380f4 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix @@ -7,7 +7,7 @@ graalvmCEPackages.buildGraalvmProduct { src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; version = (import ./hashes.nix).version; - product = "nodejs-installable-svm"; + product = "graalnodejs"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix index 3546a11c2fc83..bd17b11ea612d 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "24.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "056x616pp0b25wsryzrfrfnjaxr3444fc3hmv8jspl4pjxjrais2"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "01hldmg7wfxkw0sdcnx4hg8aww8f73cdnkallx2ljm53h77n4hcb"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "1si2ifwihszv06sqd25mswibiqbxhxgj6yw829f8zrdhs0sra2nz"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "0x2a9d4kp4s0sm0cj3al8xkixcicagsknfpclfj07vb46p4h09j5"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1ffkdavrs92h3f5yil15v3i7r9aggkpfqd13gl5ipqlrk6pykhr7"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "1k5hpkvhx8wkjps2qlxicif81m2dp75w4yflarppfcvaz4qx5y45"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "1g6pql0pdxhxwpjqyfkaq07dar8sx2wipsyrjc7hmz3z7pjxcf5i"; - url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "1npzqmwhjjq1kazd52a2vi7pdwmr22acg8qf6b8r0z3y7psax1s0"; + url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 1ce3b864a6bfa..2c7e931a8a7b5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "22.0.0"; + "version" = "22.0.2"; "hashes" = { "aarch64-linux" = { - sha256 = "01097qag9kjjwh3q11j76bn79x80dm8h5rdd6gzwrsqhn48hx6ns"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-aarch64_bin.tar.gz"; + sha256 = "1n8ln1xk60hjvr191pj1mpg793zmq531mkwx3la8d2x6by0lrji8"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "0mq6vdsfgas8lhz1vdiz8qya37fy7qn0078q30zpa09ila3b9vp5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz"; + sha256 = "0krnfhcnvhm809prdbhalj86652zh5cgl14qvp8vq3sydbcivb7b"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1l8h9ai7s4km8wx1x43s3barnbq7b6hzfr1mbbmiksng1d2p26v9"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-x64_bin.tar.gz"; + sha256 = "1r0j7n4k5ganyrxs9pxjwdbm8k9a20g6giixdhm9nmpan6hxs4h5"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "11ncf4wd5asr3jz21fs0j5w49zxrsdw3j42mpcczjy2z1j813cc7"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_macos-aarch64_bin.tar.gz"; + sha256 = "07qhym71n4v2744j9h6qx72v79mgkk266isn4kc9rgrb7x8gsgc8"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index f7a05f8d1455c..78e5770cc68ed 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,44 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, pcre2, neko, mbedtls_2, Security }: - +{ + lib, + stdenv, + fetchFromGitHub, + coreutils, + ocaml-ng, + zlib, + pcre, + pcre2, + neko, + mbedtls_2, + Security, +}: let - ocamlDependencies = version: - if lib.versionAtLeast version "4.3" - then with ocaml-ng.ocamlPackages_4_14; [ - ocaml - findlib - sedlex - xml-light - ptmap - camlp5 - sha - dune_3 - luv - extlib - ] else with ocaml-ng.ocamlPackages_4_10; [ - ocaml - findlib - sedlex - xml-light - ptmap - camlp5 - sha - dune_3 - luv - extlib-1-7-7 - ]; + ocamlDependencies = + version: + if lib.versionAtLeast version "4.3" then + with ocaml-ng.ocamlPackages_4_14; + [ + ocaml + findlib + sedlex + xml-light + ptmap + camlp5 + sha + dune_3 + luv + extlib + ] + else + with ocaml-ng.ocamlPackages_4_10; + [ + ocaml + findlib + sedlex + xml-light + ptmap + camlp5 + sha + dune_3 + luv + extlib-1-7-7 + ]; defaultPatch = '' substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \ --replace '"neko"' '"${neko}/bin/neko"' ''; - generic = { sha256, version, prePatch ? defaultPatch }: + generic = + { + hash, + version, + prePatch ? defaultPatch, + }: stdenv.mkDerivation { pname = "haxe"; inherit version; - buildInputs = [ zlib neko ] - ++ (if lib.versionAtLeast version "4.3" then [pcre2] else [pcre]) + buildInputs = + [ + zlib + neko + ] + ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security ++ ocamlDependencies version; @@ -48,12 +73,15 @@ let repo = "haxe"; rev = version; fetchSubmodules = true; - inherit sha256; + inherit hash; }; inherit prePatch; - buildFlags = [ "all" "tools" ]; + buildFlags = [ + "all" + "tools" + ]; installPhase = '' install -vd "$out/bin" "$out/lib/haxe/std" @@ -111,22 +139,31 @@ let meta = with lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = "https://haxe.org"; - license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file - maintainers = [ maintainers.marcweber maintainers.locallycompact maintainers.logo ]; + license = with licenses; [ + gpl2Plus + mit + ]; # based on upstream opam file + maintainers = [ + maintainers.marcweber + maintainers.locallycompact + maintainers.logo + maintainers.bwkam + ]; platforms = platforms.linux ++ platforms.darwin; }; }; -in { +in +{ haxe_4_0 = generic { version = "4.0.5"; - sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa"; + hash = "sha256-Ck/py+tZS7dBu/uikhSLKBRNljpg2h5PARX0Btklozg="; }; haxe_4_1 = generic { version = "4.1.5"; - sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; + hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY="; }; haxe_4_3 = generic { - version = "4.3.4"; - sha256 = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; + version = "4.3.6"; + hash = "sha256-m/A0xxB3fw+syPmH1GPKKCcj0a2G/HMRKOu+FKrO5jQ="; }; } diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix index e717d9af7ae8a..1b95978b0f52d 100644 --- a/pkgs/development/compilers/inform6/default.nix +++ b/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.42-r2"; + version = "6.42-r4"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-zNm7z2nJlxaHRcZ7Ad8t1jZW999o9WFHrEnqlOJLdk0="; + sha256 = "sha256-R/GzexNpHCmAmiXzCZwEv117Ka4p2R+P7eQPW9C1NXU="; }; buildInputs = [ perl ]; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 02bc670f26cd6..27cd6acc3f171 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -31,13 +31,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.16695.4"; + version = "1.0.17193.4"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-XgQ2Gk3HDKBpsfomlpRUt8WybEIoHfKlyuWJCwCnmDA="; + hash = "sha256-OOKj3kfl+0/dgeICFtbiOVE0nsYYvI4v97BLjcExAmc="; }; nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 3e5ff09a70900..26b4309eb919b 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.4"; + version = "2024.07.0"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-b1lrVbXJQeg+7tI7JcR9JTuiel/b/mctU1caT/y/4SA="; + hash = "sha256-jE1LSL/fW7RKE5GeVzYtw4aFxtzTiz7IasD5YwDm4HE="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mpfr ppl ] ++ (with ocamlPackages; [ + angstrom apron yojson ]); diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 0ed9c159b128e..537133524a2cf 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -6,7 +6,6 @@ , python3 , jdk , git -, libcef , rsync , lib , ant diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index 3c4c5d71c0ce3..2031c006de6f9 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "jrsonnet"; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash zsh fish; do installShellCompletion --cmd jrsonnet \ --$shell <($out/bin/jrsonnet --generate $shell /dev/null) diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index 209e97edcce70..e3360137ca741 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -14,6 +14,7 @@ , gnum4 , openssl , libxml2 +, zlib }: stdenv.mkDerivation rec { @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 + zlib ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/development/compilers/juniper/default.nix index edf3e4b6374c4..09a7f9b286b25 100644 --- a/pkgs/development/compilers/juniper/default.nix +++ b/pkgs/development/compilers/juniper/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.juniper-lang.org/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index c280d2fb7e701..029bd88dfb0f1 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -2,7 +2,6 @@ , pkgsHostTarget , cmake , makeWrapper -, fetchpatch , mkDerivation , fetchFromGitHub , alex @@ -20,7 +19,7 @@ , FloatingHex , isocline , lens -, lsp +, lsp_2_4_0_0 , mtl , network , network-simple @@ -37,7 +36,7 @@ let owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI="; + hash = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { @@ -78,7 +77,7 @@ mkDerivation rec { FloatingHex isocline lens - lsp + lsp_2_4_0_0 mtl network network-simple diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/development/compilers/lesscpy/default.nix index 52372bb1edce7..493fdc08f812c 100644 --- a/pkgs/development/compilers/lesscpy/default.nix +++ b/pkgs/development/compilers/lesscpy/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; + hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; }; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index eb3fe8004aa6d..74819dd9446fa 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -24,6 +24,8 @@ ocamlPackages.buildDunePackage rec { fetchSubmodules = true; }; + patches = [ ./make-compatible-with-linol-0_6.patch ]; + # The build picks this up for ligo --version LIGO_VERSION = version; diff --git a/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch b/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch new file mode 100644 index 0000000000000..659ca3faaf738 --- /dev/null +++ b/pkgs/development/compilers/ligo/make-compatible-with-linol-0_6.patch @@ -0,0 +1,13 @@ +diff --git a/src/bin/cli.ml b/src/bin/cli.ml +index 36ee98cbec..960bfc85a0 100644 +--- a/src/bin/cli.ml ++++ b/src/bin/cli.ml +@@ -3537,7 +3537,7 @@ module Lsp_server = struct + ~session_id + ~skip_analytics + in +- let server = Linol_lwt.Jsonrpc2.create_stdio (s :> Linol_lwt.Jsonrpc2.server) in ++ let server = Linol_lwt.Jsonrpc2.create_stdio ~env:() (s :> Linol_lwt.Jsonrpc2.server) in + let shutdown () = Poly.(s#get_status = `ReceivedExit) in + let task = Linol_lwt.Jsonrpc2.run ~shutdown server in + let analytics_job = diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix index fccfa1eb691b9..f989a5e9d6be1 100644 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, fetchzip, jdk17_headless }: +{ lib, stdenv, fetchzip, jdk17_headless }: stdenv.mkDerivation rec { pname = "lfc"; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 43f940a846616..4e2754def4ded 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -2,6 +2,7 @@ , preLibcCrossHeaders , substitute, substituteAll, fetchFromGitHub, fetchpatch, fetchurl , overrideCC, wrapCCWith, wrapBintoolsWith +, libxcrypt , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm @@ -49,6 +50,10 @@ let ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + mkExtraBuildCommandsBasicRt = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share" + ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" @@ -245,34 +250,50 @@ let '' + mkExtraBuildCommands cc; }; - clangNoLibcxx = wrapCCWith rec { + clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt-no-libc + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommandsBasicRt cc; + }; + + clangWithLibcAndBasicRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.compiler-rt + targetLlvmLibraries.compiler-rt-no-libc ]; extraBuildCommands = '' echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; + '' + mkExtraBuildCommandsBasicRt cc; }; - clangNoLibc = wrapCCWith rec { + clangNoLibcWithBasicRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintoolsNoLibc'; extraPackages = [ - targetLlvmLibraries.compiler-rt + targetLlvmLibraries.compiler-rt-no-libc ]; extraBuildCommands = '' echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; + echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommandsBasicRt cc; }; - clangNoCompilerRt = wrapCCWith rec { + clangNoLibcNoRt = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintoolsNoLibc'; @@ -282,6 +303,8 @@ let '' + mkExtraBuildCommands0 cc; }; + # This is an "oddly ordered" bootstrap just for Darwin. Probably + # don't want it otherwise. clangNoCompilerRtWithLibc = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = null; @@ -290,13 +313,23 @@ let extraBuildCommands = mkExtraBuildCommands0 cc; }; + # Aliases + clangNoCompilerRt = tools.clangNoLibcNoRt; + clangNoLibc = tools.clangNoLibcWithBasicRt; + clangNoLibcxx = tools.clangWithLibcAndBasicRt; }); libraries = lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { - compiler-rt-libc = callPackage ../common/compiler-rt { + compiler-rt-libc = callPackage ../common/compiler-rt (let + stdenv = + if args.stdenv.hostPlatform.useLLVM or false then + overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx + else + args.stdenv; + in { src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"; patches = [ ../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory @@ -312,10 +345,12 @@ let ../common/compiler-rt/armv6-sync-ops-no-thumb.patch ../common/compiler-rt/armv6-no-ldrexd-strexd.patch ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; + inherit stdenv; + } // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ "--disable-symvers" ]; + }); + }); compiler-rt-no-libc = callPackage ../common/compiler-rt { src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"; @@ -333,15 +368,22 @@ let ../common/compiler-rt/armv6-sync-ops-no-thumb.patch ../common/compiler-rt/armv6-no-ldrexd-strexd.patch ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; + stdenv = + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then + stdenv + else + # TODO: make this branch unconditional next rebuild + overrideCC stdenv buildLlvmTools.clangNoLibcNoRt; }; - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; + compiler-rt = + # Building the with-libc compiler-rt and WASM doesn't yet work, + # because wasilibc doesn't provide some expected things. See + # compiler-rt's file for further details. + if stdenv.hostPlatform.libc == null || stdenv.hostPlatform.isWasm then + libraries.compiler-rt-no-libc + else + libraries.compiler-rt-libc; stdenv = overrideCC stdenv buildLlvmTools.clang; @@ -376,7 +418,7 @@ let ]; }) ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; }; libunwind = callPackage ../common/libunwind { @@ -384,7 +426,7 @@ let patches = [ ./libunwind/gnu-install-dirs.patch ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; }; openmp = callPackage ../common/openmp { diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix deleted file mode 100644 index 9e3a32b298081..0000000000000 --- a/pkgs/development/compilers/llvm/13/default.nix +++ /dev/null @@ -1,433 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "13.0.1"; sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - src = monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata - # Previously monorepoSrc was erroneously not being passed through. - // { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../common/llvm/llvm-config-link-static.patch - - ./llvm/gnu-install-dirs.patch - - # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; - sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; - stripLen = 1; - }) - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - - # Backport gcc-13 fixes with missing includes. - (fetchpatch { - name = "signals-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; - hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; - stripLen = 1; - }) - (fetchpatch { - name = "base64-gcc-13.patch"; - url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; - hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; - stripLen = 1; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - # Revert of https://reviews.llvm.org/D100879 - # The malloc alignment assumption is incorrect for jemalloc and causes - # mis-compilation in firefox. - # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 - ./clang/revert-malloc-alignment-assumption.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - lldb = callPackage ../common/lldb.nix { - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ./lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' - echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' - echo "-lunwind" >> $out/nix-support/cc-ldflags - '' + lib.optionalString stdenv.targetPlatform.isWasm '' - echo "-fno-exceptions" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - echo "-nostdlib++" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = '' - echo "-nostartfiles" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands0 cc; - }; - - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata - # Previously monorepoSrc was erroneously not being passed through. - // { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ../common/libcxx { - patches = [ - (substitute { - src = ../common/libcxxabi/wasm.patch; - substitutions = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - substitutions = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - # TODO: remove this, causes LLVM 13 packages rebuild. - inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor. - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - # Fix cross. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; - hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; - }) - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix deleted file mode 100644 index de68e3628bb86..0000000000000 --- a/pkgs/development/compilers/llvm/14/default.nix +++ /dev/null @@ -1,401 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "14.0.6"; sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; - relative = "llvm"; - hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ./lld/fix-root-src-dir.patch - ]; - }; - - lldb = callPackage ../common/lldb.nix { - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; - }; - - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./compiler-rt/armv7l.patch - # Fix build on armv6l - ../common/compiler-rt/armv6-mcr-dmb.patch - ../common/compiler-rt/armv6-sync-ops-no-thumb.patch - ../common/compiler-rt/armv6-no-ldrexd-strexd.patch - ../common/compiler-rt/armv6-scudo-no-yield.patch - ../common/compiler-rt/armv6-scudo-libatomic.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ../common/libcxx { - patches = [ - (substitute { - src = ../common/libcxxabi/wasm.patch; - substitutions = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - substitutions = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix deleted file mode 100644 index aaa6d0acdf3c9..0000000000000 --- a/pkgs/development/compilers/llvm/15/default.nix +++ /dev/null @@ -1,455 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "15.0.7"; sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - lldbPlugins = lib.makeExtensible (lldbPlugins: let - callPackage = newScope (lldbPlugins // { inherit stdenv; inherit (tools) lldb; }); - in { - llef = callPackage ../common/lldb-plugins/llef.nix {}; - }); - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-11-15-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - lldb = callPackage ../common/lldb.nix { - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - ./lldb/procfs.patch - resourceDirPatch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = [ - # See: - # - https://reviews.llvm.org/D133566 - # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 - # !!! Drop in LLVM 16+ - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; - hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY="; - }) - (substitute { - src = ../common/libcxxabi/wasm.patch; - substitutions = [ - "--replace-fail" "/cmake/" "/llvm/cmake/" - ]; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - (substitute { - src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - substitutions = [ - "--replace-fail" "/include/" "/libcxx/include/" - ]; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries lldbPlugins; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix deleted file mode 100644 index 1f386437878c5..0000000000000 --- a/pkgs/development/compilers/llvm/16/default.nix +++ /dev/null @@ -1,437 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "16.0.6"; sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - lldbPlugins = lib.makeExtensible (lldbPlugins: let - callPackage = newScope (lldbPlugins // { inherit stdenv; inherit (tools) lldb; }); - in { - llef = callPackage ../common/lldb-plugins/llef.nix {}; - }); - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ./lld/add-table-base.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in - [ - # FIXME: do we need this? ./procfs.patch - resourceDirPatch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - patches = [ - ./libunwind/gnu-install-dirs.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries lldbPlugins; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix deleted file mode 100644 index a7b5ac3461b31..0000000000000 --- a/pkgs/development/compilers/llvm/17/default.nix +++ /dev/null @@ -1,434 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "17.0.6"; sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - - # resolves https://github.com/llvm/llvm-project/issues/75168 - (fetchpatch { - name = "fix-fzero-call-used-regs.patch"; - url = "https://github.com/llvm/llvm-project/commit/f800c1f3b207e7bcdc8b4c7192928d9a078242a0.patch"; - stripLen = 1; - hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8="; - }) - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ./lld/add-table-base.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - [ - # FIXME: do we need this? ./procfs.patch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./compiler-rt/gnu-install-dirs.patch - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # Prevent a compilation error on darwin - ./compiler-rt/darwin-targetconditionals.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - # https://github.com/llvm/llvm-project/issues/64226 - (fetchpatch { - name = "0042-mbstate_t-not-defined.patch"; - url = "https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch"; - hash = "sha256-jo+DYA6zuSv9OH3A0bYwY5TlkWprup4OKQ7rfK1WHBI="; - }) - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/gnu-install-dirs.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix deleted file mode 100644 index 9d0dff4e52f31..0000000000000 --- a/pkgs/development/compilers/llvm/18/default.nix +++ /dev/null @@ -1,422 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? { version = "18.1.8"; sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; } - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - (fetchpatch { - name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch"; - url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch"; - # TreeTransform.h is not affected in LLVM 18. - excludes = ["docs/ReleaseNotes.rst" "lib/Sema/TreeTransform.h"]; - stripLen = 1; - hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E="; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - [ - # FIXME: do we need this? ./procfs.patch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - # https://github.com/llvm/llvm-project/issues/64226 - ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000000..b8c1c110cf22d --- /dev/null +++ b/pkgs/development/compilers/llvm/19/clang/gnu-install-dirs.patch @@ -0,0 +1,71 @@ +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 75b0080f6..c895b884c 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index e6ae4e19e..5ef01aea2 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files + + include(GetClangResourceDir) + get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) + set(out_files) + set(generated_files) + +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index b5b6d2807..6b592d255 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt +index 3aca22c0b..3115353e3 100644 +--- a/tools/scan-build-py/CMakeLists.txt ++++ b/tools/scan-build-py/CMakeLists.txt +@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) + install(FILES lib/libscanbuild/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" + COMPONENT scan-build-py) + endforeach() + +@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) + install(FILES lib/libscanbuild/resources/${resource} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" + COMPONENT scan-build-py) + endforeach() + +@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) + install(FILES lib/libear/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" + COMPONENT scan-build-py) + endforeach() + diff --git a/pkgs/development/compilers/llvm/19/clang/purity.patch b/pkgs/development/compilers/llvm/19/clang/purity.patch new file mode 100644 index 0000000000000..5ce14a3479a08 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/clang/purity.patch @@ -0,0 +1,25 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -446,9 +446,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + ToolChain.isPIEDefault(Args)); + if (IsPIE) + CmdArgs.push_back("-pie"); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); + } + } + +-- +2.11.0 diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch new file mode 100644 index 0000000000000..07013e5a68259 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -348,4 +348,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -723,6 +723,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 0000000000000..425dc2af01e7c --- /dev/null +++ b/pkgs/development/compilers/llvm/19/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch new file mode 100644 index 0000000000000..2b25fd4a07449 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 4c85551d7766..297d7a47c54b 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -328,8 +328,9 @@ macro(load_llvm_config) + endif() + endif() + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + + set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") + message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch new file mode 100644 index 0000000000000..29942f8ed03d6 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/libcxx/0001-darwin-10.12-mbstate_t-fix.patch @@ -0,0 +1,31 @@ +From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Fri, 23 Feb 2024 22:58:58 +0000 +Subject: [PATCH] darwin 10.12 mbstate_t fix + +https://github.com/llvm/llvm-project/issues/64226 + +removes space from +https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch +so it applies cleanly +--- + libcxx/include/__mbstate_t.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h +index bfa6d61..5f51112 100644 +--- a/libcxx/include/__mbstate_t.h ++++ b/libcxx/include/__mbstate_t.h +@@ -42,6 +42,9 @@ + #elif __has_include(<bits/types/mbstate_t.h>) + # include <bits/types/mbstate_t.h> // works on most Unixes + #elif __has_include(<sys/_types/_mbstate_t.h>) ++# if __has_include(<machine/_types.h>) ++# include <machine/_types.h> ++# endif + # include <sys/_types/_mbstate_t.h> // works on Darwin + #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>) + # include_next <wchar.h> // fall back to the C standard provider of mbstate_t +-- +2.43.0 + diff --git a/pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000000..6c73a240ab6d2 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/lld/gnu-install-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index d3924f7243d4..42a7cd62281c 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch new file mode 100644 index 0000000000000..20d35c9f3ea91 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/lldb/cpu_subtype_arm64e_replacement.patch @@ -0,0 +1,12 @@ +diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm ++++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, + len = sizeof(is_64_bit_capable); + ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); + +- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { ++ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers + // The arm64e architecture is a preview. Pretend the host architecture + // is arm64. + cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/19/lldb/procfs.patch b/pkgs/development/compilers/llvm/19/lldb/procfs.patch new file mode 100644 index 0000000000000..7b200e86505ca --- /dev/null +++ b/pkgs/development/compilers/llvm/19/lldb/procfs.patch @@ -0,0 +1,46 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -10,6 +10,13 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include <sys/ptrace.h> ++#include <asm/ptrace.h> ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS + + #include "lldb/lldb-types.h" + +@@ -17,23 +24,13 @@ + + #include <vector> + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#endif // __ANDROID__ ++#endif + + namespace lldb_private { + namespace process_linux { diff --git a/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000000..6a359bdbefde5 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,13 @@ +--- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 ++++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 +@@ -45,8 +45,8 @@ + install(TARGETS ${name} + COMPONENT ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + add_llvm_install_targets(install-${name} + COMPONENT ${name}) + endif() diff --git a/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000000..8b89839490ba5 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/llvm/gnu-install-dirs.patch @@ -0,0 +1,137 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471817d68286..c51463304159 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) + install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 230620c37027..dd16cab1835e 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -876,8 +876,8 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type) + set(LLVM_LINK_OR_COPY copy) + endif() + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir "${CMAKE_INSTALL_BINDIR}") + endif() +@@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) + # $ORIGIN is not interpreted at link time by aix ld. + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") ++ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back ++ # to `_install_rpath` here. ++ # ++ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. ++ # clang); instead LLVM is its own package and thus lands at its own nix ++ # store path. This makes it so that the default relative rpath (`../lib/`) ++ # does not point at the LLVM shared objects. ++ # ++ # More discussion here: ++ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 ++ # - https://reviews.llvm.org/D146918 (16.0.5+) ++ # ++ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is ++ # no potential that this will result in us pulling in the "wrong" LLVM. ++ # Adding this to the build rpath means we aren't forced to use ++ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build ++ # dir, pre-install, will have the right rpath for LLVM). ++ # ++ # As noted in the differential above, an alternative solution is to have ++ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set ++ # `CMAKE_INSTALL_RPATH`. ++ set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index d99af79aa38e..21e794224b99 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 370005cd8d7d..7e790bc52111 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,7 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index e86eb2b44b10..f63e207e792e 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -366,7 +366,11 @@ int main(int argc, char **argv) { + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } + { + SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); + sys::fs::make_absolute(ActivePrefix, Path); diff --git a/pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 0000000000000..e4f049f4b1777 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,12 @@ +--- a/utils/lit/lit/TestRunner.py 2024-03-15 17:27:53.170780798 -0700 ++++ b/utils/lit/lit/TestRunner.py 2024-03-15 17:28:43.277447791 -0700 +@@ -1183,6 +1183,9 @@ + f.write("@echo on\n") + f.write("\n@if %ERRORLEVEL% NEQ 0 EXIT\n".join(commands)) + else: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.fullmatch(kPdbgRegex, ln) + if match: diff --git a/pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000000..d4ccb2ae98227 --- /dev/null +++ b/pkgs/development/compilers/llvm/19/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,80 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: + config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE ++ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment + ) + except OSError: + print("could not exec llvm-readobj") + diff --git a/pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000000..1354ad267314a --- /dev/null +++ b/pkgs/development/compilers/llvm/19/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + diff --git a/pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch new file mode 100644 index 0000000000000..b7f51196f7bab --- /dev/null +++ b/pkgs/development/compilers/llvm/19/openmp/fix-find-tool.patch @@ -0,0 +1,17 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 630947abec7e..9f032dc7bd3f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -27,10 +27,10 @@ endif() + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. + # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) + find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") + return() diff --git a/pkgs/development/compilers/llvm/19/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/19/openmp/run-lit-directly.patch new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/development/compilers/llvm/19/openmp/run-lit-directly.patch diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix new file mode 100644 index 0000000000000..ee89de4ac751d --- /dev/null +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenv, + llvm_meta, + monorepoSrc, + runCommand, + cmake, + libxml2, + libllvm, + libclang, + version, + python3, + buildLlvmTools, + patches ? [ ], +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bolt"; + inherit version patches; + + # Blank llvm dir just so relative path works + src = runCommand "bolt-src-${finalAttrs.version}" { } '' + mkdir $out + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + + # tablegen stuff, probably not the best way but it works... + cp -r ${monorepoSrc}/llvm/ "$out" + chmod -R +w $out/llvm + ''; + + sourceRoot = "${finalAttrs.src.name}/bolt"; + + nativeBuildInputs = [ + cmake + python3 + ]; + + buildInputs = [ + libllvm + libclang + libxml2 + ]; + + cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen") + ]; + + postUnpack = '' + chmod -R u+w -- $sourceRoot/.. + ''; + + prePatch = '' + cd .. + ''; + + postPatch = '' + cd bolt + ''; + + postInstall = '' + mkdir -p $dev/lib + mv $out/lib/libLLVMBOLT*.a $dev/lib + ''; + + outputs = [ + "out" + "dev" + ]; + + meta = llvm_meta // { + homepage = "https://github.com/llvm/llvm-project/tree/main/bolt"; + description = "LLVM post-link optimizer."; + }; +}) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 922eb8657cee5..dde531adf44e0 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -69,7 +69,7 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]); + ]) ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "-DCLANG_DEFAULT_CXX_STDLIB=ON"; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 diff --git a/pkgs/development/compilers/llvm/common/common-let.nix b/pkgs/development/compilers/llvm/common/common-let.nix index 31360f5b98b94..6ee05b80c4465 100644 --- a/pkgs/development/compilers/llvm/common/common-let.nix +++ b/pkgs/development/compilers/llvm/common/common-let.nix @@ -4,7 +4,8 @@ , gitRelease ? null , officialRelease ? null , monorepoSrc' ? null -}: +, version ? null, +}@args: rec { llvm_meta = { @@ -27,11 +28,11 @@ rec { releaseInfo = if gitRelease != null then rec { original = gitRelease; - release_version = original.version; + release_version = args.version or original.version; version = gitRelease.rev-version; } else rec { original = officialRelease; - release_version = original.version; + release_version = args.version or original.version; version = if original ? candidate then "${release_version}-${original.candidate}" diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 67f9661cf7438..8417563cc95fe 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -12,6 +12,7 @@ , python3 , xcbuild , libllvm +, libcxx , linuxHeaders , libxcrypt @@ -33,6 +34,9 @@ let useLLVM = stdenv.hostPlatform.useLLVM or false; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; haveLibc = stdenv.cc.libc != null; + # TODO: Make this account for GCC having libstdcxx, which will help + # use clean up the `cmakeFlags` rats nest below. + haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; inherit (stdenv.hostPlatform) isMusl isAarch64; @@ -46,7 +50,7 @@ let cp -r ${monorepoSrc}/${baseName} "$out" '' else src; - preConfigure = lib.optionalString (useLLVM && !haveLibc) '' + preConfigure = lib.optionalString (!haveLibc) '' cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") ''; in @@ -82,23 +86,32 @@ stdenv.mkDerivation ({ "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [ "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" - ] ++ lib.optionals ((useLLVM || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13")) [ + ] ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [ + "-DSANITIZER_CXX_ABI=libcxxabi" + "-DSANITIZER_CXX_ABI_LIBNAME=libcxxabi" + "-DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON" + ] ++ lib.optionals ((!haveLibc || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13")) [ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isDarwinStatic) [ + ] ++ lib.optionals (useLLVM && haveLibc) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=ON" + ] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + ] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary - ] ++ lib.optionals (useLLVM || bareMetal) [ + ] ++ lib.optionals (useLLVM && haveLibc) [ + "-DCOMPILER_RT_BUILD_PROFILE=ON" + ] ++ lib.optionals (!haveLibc || bareMetal) [ "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal || isDarwinStatic) [ + ] ++ lib.optionals (!haveLibc || bareMetal || isDarwinStatic) [ "-DCMAKE_CXX_COMPILER_WORKS=ON" - ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ + ] ++ lib.optionals (!haveLibc || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ lib.optionals (useLLVM && !haveLibc) [ + ] ++ lib.optionals (!haveLibc) [ "-DCMAKE_C_FLAGS=-nodefaultlibs" ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" @@ -133,7 +146,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 && !haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") '' + '' + lib.optionalString (!haveLibc) ((lib.optionalString (lib.versionAtLeast release_version "18") '' substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \ --replace "<stdlib.h>" "<stddef.h>" '') + '' @@ -149,7 +162,13 @@ stdenv.mkDerivation ({ --replace "#include <assert.h>" "" substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ --replace "#include <assert.h>" "" - '')); + '')) + lib.optionalString (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "14") '' + # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py + # Seems to only be used in v13 though it's present in v12 and v14, and dropped in v15. + substituteInPlace ../libcxx/utils/merge_archives.py \ + --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \ + --replace-fail "distutils.spawn." "" + ''; # Hack around weird upsream RPATH bug postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' @@ -185,8 +204,12 @@ stdenv.mkDerivation ({ # "All of the code in the compiler-rt project is dual licensed under the MIT # license and the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; - # compiler-rt requires a Clang stdenv on 32-bit RISC-V: - # https://reviews.llvm.org/D43106#1019077 - broken = stdenv.hostPlatform.isRiscV32 && !stdenv.cc.isClang; + broken = + # compiler-rt requires a Clang stdenv on 32-bit RISC-V: + # https://reviews.llvm.org/D43106#1019077 + (stdenv.hostPlatform.isRiscV32 && !stdenv.cc.isClang) + # emutls wants `<pthread.h>` which isn't avaiable (without exeprimental WASM threads proposal). + # `enable_execute_stack.c` Also doesn't sound like something WASM would support. + || (stdenv.hostPlatform.isWasm && haveLibc); }; } // (if lib.versionOlder release_version "16" then { inherit preConfigure; } else {})) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix new file mode 100644 index 0000000000000..1ec50ce87db37 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -0,0 +1,868 @@ +{ + lowPrio, + newScope, + pkgs, + lib, + stdenv, + preLibcCrossHeaders, + libxcrypt, + substitute, + substituteAll, + fetchFromGitHub, + fetchpatch, + overrideCC, + wrapCCWith, + wrapBintoolsWith, + buildLlvmTools, # tools, but from the previous stage, for cross + targetLlvmLibraries, # libraries, but from the next stage, for cross + targetLlvm, + # This is the default binutils, but with *this* version of LLD rather + # than the default LLVM version's, if LLD is the choice. We use these for + # the `useLLVM` bootstrapping below. + bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, + bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, + darwin, + gitRelease ? null, + officialRelease ? null, + monorepoSrc ? null, + version ? null, + ... +}@args: + +assert lib.assertMsg (lib.xor (gitRelease != null) (officialRelease != null)) ( + "must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both") +); + +let + monorepoSrc' = monorepoSrc; + + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit + (import ./common-let.nix { + inherit (args) + lib + gitRelease + officialRelease + version + ; + }) + releaseInfo + ; + inherit (releaseInfo) release_version version; + inherit + (import ./common-let.nix { + inherit + lib + fetchFromGitHub + release_version + gitRelease + officialRelease + monorepoSrc' + version + ; + }) + llvm_meta + monorepoSrc + ; + src = monorepoSrc; + versionDir = + (builtins.toString ../.) + + "/${if (gitRelease != null) then "git" else lib.versions.major release_version}"; + getVersionFile = + p: + builtins.path { + name = builtins.baseNameOf p; + path = "${metadata.versionDir}/${p}"; + }; + }; + + lldbPlugins = lib.makeExtensible ( + lldbPlugins: + let + callPackage = newScope ( + lldbPlugins + // { + inherit stdenv; + inherit (tools) lldb; + } + ); + in + { + llef = callPackage ./lldb-plugins/llef.nix { }; + } + ); + + tools = lib.makeExtensible ( + tools: + let + callPackage = newScope ( + tools + // args + // metadata + # Previously monorepoSrc was erroneously not being passed through. + // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. + ); + clangVersion = + if (lib.versionOlder metadata.release_version "16") then + metadata.release_version + else + lib.versions.major metadata.release_version; + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${clangVersion}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommandsBasicRt = + cc: + mkExtraBuildCommands0 cc + + '' + ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/share" "$rsrc/share" + ''; + mkExtraBuildCommands = + cc: + mkExtraBuildCommands0 cc + + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = if bootBintoolsNoLibc == null then tools.bintoolsNoLibc else bootBintoolsNoLibc; + bintools' = if bootBintools == null then tools.bintools else bootBintools; + in + { + libllvm = callPackage ./llvm { + patches = + lib.optional (lib.versionOlder metadata.release_version "14") ./llvm/llvm-config-link-static.patch + ++ [ (metadata.getVersionFile "llvm/gnu-install-dirs.patch") ] + ++ lib.optionals (lib.versionAtLeast metadata.release_version "15") [ + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + (metadata.getVersionFile "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch") + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + (metadata.getVersionFile "llvm/lit-shell-script-runner-set-dyld-library-path.patch") + ] + ++ + lib.optional (lib.versions.major metadata.release_version == "13") + # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 + ( + fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; + sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; + stripLen = 1; + } + ) + ++ + lib.optional (lib.versionOlder metadata.release_version "16") + # Fix musl build. + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; + relative = "llvm"; + hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; + } + ) + ++ lib.optionals (lib.versions.major metadata.release_version == "13") [ + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) + ] + ++ lib.optionals (lib.versions.major metadata.release_version == "14") [ + # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; + relative = "llvm"; + hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; + }) + ] + ++ + lib.optional (lib.versions.major metadata.release_version == "17") + # resolves https://github.com/llvm/llvm-project/issues/75168 + ( + fetchpatch { + name = "fix-fzero-call-used-regs.patch"; + url = "https://github.com/llvm/llvm-project/commit/f800c1f3b207e7bcdc8b4c7192928d9a078242a0.patch"; + stripLen = 1; + hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8="; + } + ) + ++ lib.optionals (lib.versions.major metadata.release_version == "18") [ + # Reorgs one test so the next patch applies + (fetchpatch { + name = "osabi-test-reorg.patch"; + url = "https://github.com/llvm/llvm-project/commit/06cecdc60ec9ebfdd4d8cdb2586d201272bdf6bd.patch"; + stripLen = 1; + hash = "sha256-s9GZTNgzLS511Pzh6Wb1hEV68lxhmLWXjlybHBDMhvM="; + }) + # Sets the OSABI for OpenBSD, needed for an LLD patch for OpenBSD. + # https://github.com/llvm/llvm-project/pull/98553 + (fetchpatch { + name = "mc-set-openbsd-osabi.patch"; + url = "https://github.com/llvm/llvm-project/commit/b64c1de714c50bec7493530446ebf5e540d5f96a.patch"; + stripLen = 1; + hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; + }) + ]; + pollyPatches = + [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "15") + # Just like the `llvm-lit-cfg` patch, but for `polly`. + (metadata.getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch"); + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm; + + libclang = callPackage ./clang { + patches = + [ + (metadata.getVersionFile "clang/purity.patch") + # https://reviews.llvm.org/D51899 + (metadata.getVersionFile "clang/gnu-install-dirs.patch") + ] + ++ lib.optional (lib.versions.major metadata.release_version == "13") + # Revert of https://reviews.llvm.org/D100879 + # The malloc alignment assumption is incorrect for jemalloc and causes + # mis-compilation in firefox. + # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 + (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch") + ++ [ + ./clang/add-nostdlibinc-flag.patch + (substituteAll { + src = + if (lib.versionOlder metadata.release_version "16") then + ./clang/clang-11-15-LLVMgold-path.patch + else + ./clang/clang-at-least-16-LLVMgold-path.patch; + libllvmLibdir = "${tools.libllvm.lib}/lib"; + }) + ] + ++ lib.optional (lib.versions.major metadata.release_version == "18") (fetchpatch { + name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch"; + url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch"; + # TreeTransform.h is not affected in LLVM 18. + excludes = [ + "docs/ReleaseNotes.rst" + "lib/Sema/TreeTransform.h" + ]; + stripLen = 1; + hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E="; + }); + }; + + clang-unwrapped = tools.libclang; + + llvm-manpages = lowPrio ( + tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + } + ); + + clang-manpages = lowPrio ( + tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + } + ); + + # Wrapper for standalone command line utilities + clang-tools = callPackage ./clang-tools { }; + + # pick clang appropriate for package set we are targeting + clang = + if stdenv.targetPlatform.libc == null then + tools.clangNoLibc + else if stdenv.targetPlatform.useLLVM or false then + tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then + tools.libstdcxxClang + else + tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + patches = + [ (metadata.getVersionFile "lld/gnu-install-dirs.patch") ] + ++ lib.optional (lib.versions.major metadata.release_version == "14") ( + metadata.getVersionFile "lld/fix-root-src-dir.patch" + ) + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "18" + ) (metadata.getVersionFile "lld/add-table-base.patch") + ++ lib.optional (lib.versions.major metadata.release_version == "18") ( + # https://github.com/llvm/llvm-project/pull/97122 + fetchpatch { + name = "more-openbsd-program-headers.patch"; + url = "https://github.com/llvm/llvm-project/commit/d7fd8b19e560fbb613159625acd8046d0df75115.patch"; + stripLen = 1; + hash = "sha256-7wTy7XDTx0+fhWQpW1KEuz7xJvpl42qMTUfd20KGOfA="; + } + ); + }; + + lldb = callPackage ./lldb.nix ( + { + patches = + let + resourceDirPatch = callPackage ( + { substituteAll, libclang }: + (substituteAll { + src = metadata.getVersionFile "lldb/resource-dir.patch"; + clangLibDir = "${libclang.lib}/lib"; + }).overrideAttrs + (_: _: { name = "resource-dir.patch"; }) + ) { }; + in + lib.optional (lib.versionOlder metadata.release_version "16") + # FIXME: do we need this after 15? + (metadata.getVersionFile "lldb/procfs.patch") + ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch + ++ lib.optional (lib.versionOlder metadata.release_version "14") ( + metadata.getVersionFile "lldb/gnu-install-dirs.patch" + ) + ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" + ) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch"); + } + // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") { + src = callPackage ( + { runCommand }: + runCommand "lldb-src-${metadata.version}" { } '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/lldb "$out" + '' + ) { }; + } + ); + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools.nix { }; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; }; + + clangUseLLVM = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = + [ targetLlvmLibraries.compiler-rt ] + ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") ( + '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags + '' + + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + ) + + mkExtraBuildCommands cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) "--unwindlib=libunwind" + ++ lib.optional ( + !stdenv.targetPlatform.isWasm + && !stdenv.targetPlatform.isFreeBSD + && stdenv.targetPlatform.useLLVM or false + ) "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = + lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) + ( + [ "-L${targetLlvmLibraries.libunwind}/lib" ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version" + ); + } + ); + + clangWithLibcAndBasicRtAndLibcxx = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = + [ targetLlvmLibraries.compiler-rt-no-libc ] + ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") ( + '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags + '' + + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags + '' + + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + ) + + mkExtraBuildCommandsBasicRt cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" + ] + ++ lib.optional ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) "--unwindlib=libunwind" + ++ lib.optional ( + !stdenv.targetPlatform.isWasm + && !stdenv.targetPlatform.isFreeBSD + && stdenv.targetPlatform.useLLVM or false + ) "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals ( + !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; + } + ); + + clangWithLibcAndBasicRt = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + + mkExtraBuildCommandsBasicRt cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" + "-nostdlib++" + ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) "-fno-exceptions"; + } + ); + + clangNoLibcWithBasicRt = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags + '' + + mkExtraBuildCommandsBasicRt cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" + ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) "-fno-exceptions"; + } + ); + + clangNoLibcNoRt = wrapCCWith ( + rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = + lib.optionalString (lib.versions.major metadata.release_version == "13") '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + '' + + mkExtraBuildCommands0 cc; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") { + nixSupport.cc-cflags = + [ "-nostartfiles" ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) "-fno-exceptions"; + } + ); + + # This is an "oddly ordered" bootstrap just for Darwin. Probably + # don't want it otherwise. + clangNoCompilerRtWithLibc = + wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + } + // lib.optionalAttrs ( + lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm + ) { nixSupport.cc-cflags = [ "-fno-exceptions" ]; }; + + # Aliases + clangNoCompilerRt = tools.clangNoLibcNoRt; + clangNoLibc = tools.clangNoLibcWithBasicRt; + clangNoLibcxx = tools.clangWithLibcAndBasicRt; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "15") { + # TODO: pre-15: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' + lldb-manpages = lowPrio ( + tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + } + ); + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "16") { + mlir = callPackage ./mlir { }; + libclc = callPackage ./libclc.nix { }; + } + // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") { + bolt = callPackage ./bolt { + patches = lib.optionals (lib.versions.major metadata.release_version == "19") [ + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; + hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; + }) + ]; + }; + } + ); + + libraries = lib.makeExtensible ( + libraries: + let + callPackage = newScope ( + libraries + // buildLlvmTools + // args + // metadata + # Previously monorepoSrc was erroneously not being passed through. + // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. + ); + + compiler-rtPatches = + lib.optional (lib.versionOlder metadata.release_version "15") ( + metadata.getVersionFile "compiler-rt/codesign.patch" + ) # Revert compiler-rt commit that makes codesign mandatory + ++ [ + (metadata.getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config + ] + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18" + ) (metadata.getVersionFile "compiler-rt/gnu-install-dirs.patch") + ++ [ + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + (metadata.getVersionFile "compiler-rt/normalize-var.patch") + ] + ++ + lib.optional (lib.versionOlder metadata.release_version "18") + # Prevent a compilation error on darwin + (metadata.getVersionFile "compiler-rt/darwin-targetconditionals.patch") + ++ + lib.optional (lib.versionAtLeast metadata.release_version "15") + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ./compiler-rt/darwin-plistbuddy-workaround.patch + ++ + lib.optional (lib.versions.major metadata.release_version == "15") + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + ./compiler-rt/armv7l-15.patch + ++ lib.optionals (lib.versionOlder metadata.release_version "15") [ + ./compiler-rt/darwin-plistbuddy-workaround.patch + (metadata.getVersionFile "compiler-rt/armv7l.patch") + # Fix build on armv6l + ./compiler-rt/armv6-mcr-dmb.patch + ./compiler-rt/armv6-sync-ops-no-thumb.patch + ./compiler-rt/armv6-no-ldrexd-strexd.patch + ./compiler-rt/armv6-scudo-no-yield.patch + ./compiler-rt/armv6-scudo-libatomic.patch + ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch { + url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; + hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; + relative = "compiler-rt"; + }); + in + { + compiler-rt-libc = callPackage ./compiler-rt ( + let + # temp rename to avoid infinite recursion + stdenv = + if args.stdenv.hostPlatform.useLLVM or false then + overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx + else if + lib.versionAtLeast metadata.release_version "16" + && args.stdenv.hostPlatform.isDarwin + && args.stdenv.hostPlatform.isStatic + then + overrideCC args.stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else + args.stdenv; + in + { + patches = compiler-rtPatches; + inherit stdenv; + } + // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ "--disable-symvers" ]; + }); + } + ); + + compiler-rt-no-libc = callPackage ./compiler-rt { + patches = compiler-rtPatches; + doFakeLibgcc = stdenv.hostPlatform.useLLVM or false; + stdenv = + if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform then + stdenv + else + # TODO: make this branch unconditional next rebuild + overrideCC stdenv buildLlvmTools.clangNoLibcNoRt; + }; + + compiler-rt = + if + stdenv.hostPlatform.libc == null + # Building the with-libc compiler-rt and WASM doesn't yet work, + # because wasilibc doesn't provide some expected things. See + # compiler-rt's file for further details. + || stdenv.hostPlatform.isWasm + # Failing `#include <term.h>` in + # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp` + # sanitizers, not sure where to get it. + || stdenv.hostPlatform.isFreeBSD + then + libraries.compiler-rt-no-libc + else + libraries.compiler-rt-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libcxx ( + { + patches = + lib.optionals (lib.versionOlder metadata.release_version "16") ( + lib.optional (lib.versions.major metadata.release_version == "15") + # See: + # - https://reviews.llvm.org/D133566 + # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 + # !!! Drop in LLVM 16+ + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; + hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY="; + } + ) + ++ [ + (substitute { + src = ./libcxxabi/wasm.patch; + substitutions = [ + "--replace-fail" + "/cmake/" + "/llvm/cmake/" + ]; + }) + ] + ++ lib.optional stdenv.hostPlatform.isMusl (substitute { + src = ./libcxx/libcxx-0001-musl-hacks.patch; + substitutions = [ + "--replace-fail" + "/include/" + "/libcxx/include/" + ]; + }) + ) + ++ + lib.optional + ( + lib.versions.major metadata.release_version == "17" + && stdenv.isDarwin + && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" + ) + # https://github.com/llvm/llvm-project/issues/64226 + ( + fetchpatch { + name = "0042-mbstate_t-not-defined.patch"; + url = "https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch"; + hash = "sha256-jo+DYA6zuSv9OH3A0bYwY5TlkWprup4OKQ7rfK1WHBI="; + } + ) + ++ + lib.optional + ( + lib.versionAtLeast metadata.release_version "18" + && stdenv.isDarwin + && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" + ) + # https://github.com/llvm/llvm-project/issues/64226 + (metadata.getVersionFile "libcxx/0001-darwin-10.12-mbstate_t-fix.patch"); + stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; + } + // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { + # TODO: remove this, causes LLVM 13 packages rebuild. + inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor. + } + ); + + libunwind = callPackage ./libunwind { + patches = lib.optional (lib.versionOlder metadata.release_version "17") ( + metadata.getVersionFile "libunwind/gnu-install-dirs.patch" + ); + stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt; + }; + + openmp = callPackage ./openmp { + patches = + lib.optional (lib.versionAtLeast metadata.release_version "15") ( + metadata.getVersionFile "openmp/fix-find-tool.patch" + ) + ++ lib.optional ( + lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18" + ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch") + ++ lib.optional (lib.versionAtLeast metadata.release_version "14") ( + metadata.getVersionFile "openmp/run-lit-directly.patch" + ) + ++ + lib.optional (lib.versionOlder metadata.release_version "14") + # Fix cross. + ( + fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + } + ); + }; + } + ); + + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; +in +{ + inherit tools libraries lldbPlugins; + inherit (metadata) release_version; +} +// (noExtend libraries) +// (noExtend tools) diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 646d435489c64..f646edf03019d 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -6,7 +6,6 @@ , src ? null , patches ? [] , runCommand -, substitute , cmake , lndir , ninja diff --git a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix index f671132aa61e0..c06aeb187105f 100644 --- a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix +++ b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix @@ -5,15 +5,15 @@ , lldb }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "llef"; - version = "unstable-2023-10-18"; + version = "1.1.0"; src = fetchFromGitHub { owner = "foundryzero"; repo = "llef"; - rev = "629bd75f44c356f7a3576a6436d3919ce111240d"; - hash = "sha256-JtCHG89s436Di/6+V7Le4CZnkIPh/RYIllfXEO/B7+8"; + rev = "v${finalAttrs.version}"; + hash = "sha256-tta99ncWJdnnSkVdnOwx36utEcefMy7fb5NDN2aZ5F0="; }; dontBuild = true; @@ -40,4 +40,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nrabulinski ]; mainProgram = "llef"; }; -} +}) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 71afcb159a440..2b2ffb009a6f7 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -50,7 +50,9 @@ stdenv.mkDerivation (rec { src = src'; inherit patches; - outputs = [ "out" "lib" "dev" ]; + # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of + # the `lib` output because that would create a cycle between it and the `out` output. + outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "lib" ]; sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}"; @@ -101,7 +103,7 @@ stdenv.mkDerivation (rec { ++ lib.optional ( stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 + && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0" && (lib.versionAtLeast release_version "15") ) ( diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index f780c87d0e4b1..9f9f91ee2d2e8 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -102,6 +102,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" "python" ]; + hardeningDisable = [ + "trivialautovarinit" + ]; + nativeBuildInputs = [ cmake ] ++ (lib.optional (lib.versionAtLeast release_version "15") ninja) ++ [ python ] @@ -417,9 +421,11 @@ stdenv.mkDerivation (rec { + optionalString (stdenv.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' + ln -s $dev/bin/llvm-config $dev/bin/llvm-config-native + '' else '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; + ''); inherit doCheck; @@ -535,6 +541,4 @@ stdenv.mkDerivation (rec { check_version minor ${minor} check_version patch ${patch} ''; -} // lib.optionalAttrs (lib.versionOlder release_version "17" || lib.versionAtLeast release_version "18") { - hardeningDisable = [ "trivialautovarinit" ]; }) diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 7d9d813f024c7..0de91473dd8c4 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,7 +14,6 @@ , clang-unwrapped , perl , pkg-config -, xcbuild , version }: let diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix new file mode 100644 index 0000000000000..5eb28661e992d --- /dev/null +++ b/pkgs/development/compilers/llvm/default.nix @@ -0,0 +1,77 @@ +{ + lib, + callPackage, + stdenvAdapters, + buildPackages, + targetPackages, + stdenv, + gcc12Stdenv, + pkgs, + # This is the default binutils, but with *this* version of LLD rather + # than the default LLVM version's, if LLD is the choice. We use these for + # the `useLLVM` bootstrapping below. + bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc, + bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools, + llvmVersions ? { }, +}: +let + versions = { + "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; + "14.0.6".officialRelease.sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + "15.0.7".officialRelease.sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; + "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; + "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; + "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; + "19.1.0-rc1".officialRelease.sha256 = "sha256-uaM+CKE+l+ksLtfhVMTLXbLlu+lUZScf+ucBcRENSDM="; + "20.0.0-git".gitRelease = { + rev = "5f7e921fe3b5402127868faf5855a835cf238196"; + rev-version = "20.0.0-unstable-2024-08-04"; + sha256 = "sha256-gW5yPHqmM3sbL9KCt7oXHG8I1ECdKAxNlSZkubve60A="; + }; + } // llvmVersions; + + mkPackage = + { + name ? null, + officialRelease ? null, + gitRelease ? null, + monorepoSrc ? null, + version ? null, + }@args: + let + inherit + (import ./common/common-let.nix { + inherit lib; + inherit gitRelease officialRelease version; + }) + releaseInfo + ; + inherit (releaseInfo) release_version; + attrName = + args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version); + in + lib.nameValuePair attrName ( + callPackage ./common { + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools; + targetLlvmLibraries = + targetPackages."llvmPackages_${attrName}".libraries or llvmPackages."${attrName}".libraries; + targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm; + stdenv = + if (lib.versions.major release_version == "13" && stdenv.cc.cc.isGNU or false) then + gcc12Stdenv + else + stdenv; # does not build with gcc13 + inherit bootBintoolsNoLibc bootBintools; + inherit + officialRelease + gitRelease + monorepoSrc + version + ; + } + ); + + llvmPackages = lib.mapAttrs' (version: args: mkPackage (args // { inherit version; })) versions; +in +llvmPackages diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix deleted file mode 100644 index a023e0b7a5e87..0000000000000 --- a/pkgs/development/compilers/llvm/git/default.nix +++ /dev/null @@ -1,419 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv -, preLibcCrossHeaders -, substitute, substituteAll, fetchFromGitHub, fetchpatch -, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM verion's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -, darwin -# LLVM release information; specify one of these but not both: -, gitRelease ? { - version = "19.0.0-git"; - rev = "9b9405621bcc55b74d2177c960c21f62cc95e6fd"; - rev-version = "19.0.0-unstable-2024-06-30"; - sha256 = "sha256-Tlk+caav7e7H6bha8YQyOl+x2iNk9iH7xKpHQkWQyJ4="; -} - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "15.0.0-unstable-2022-07-26" */; - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -, officialRelease ? null - # i.e.: - # { - # version = /* i.e. "15.0.0" */; - # candidate = /* optional; if specified, should be: "rcN" */ - # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; - # } -# By default, we'll try to fetch a release from `github:llvm/llvm-project` -# corresponding to the `gitRelease` or `officialRelease` specified. -# -# You can provide your own LLVM source by specifying this arg but then it's up -# to you to make sure that the LLVM repo given matches the release configuration -# specified. -, monorepoSrc ? null -# Allows passthrough to packages via newScope. This makes it possible to -# do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get -# an llvmPackages whose packages are overridden in an internally consistent way. -, ... -}@args: - -assert - lib.assertMsg - (lib.xor - (gitRelease != null) - (officialRelease != null)) - ("must specify `gitRelease` or `officialRelease`" + - (lib.optionalString (gitRelease != null) " — not both")); -let - monorepoSrc' = monorepoSrc; -in let - - metadata = rec { - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // args // metadata); - major = lib.versions.major metadata.release_version; - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ../common/llvm { - patches = [ - ./llvm/gnu-install-dirs.patch - - # Running the tests involves invoking binaries (like `opt`) that depend on - # the LLVM dylibs and reference them by absolute install path (i.e. their - # nix store path). - # - # Because we have not yet run the install phase (we're running these tests - # as part of `checkPhase` instead of `installCheckPhase`) these absolute - # paths do not exist yet; to work around this we point the loader (`ld` on - # unix, `dyld` on macOS) at the `lib` directory which will later become this - # package's `lib` output. - # - # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` - # dir but: - # - this doesn't generalize well to other platforms; `lit` doesn't forward - # `DYLD_LIBRARY_PATH` (macOS): - # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 - # - even if `lit` forwarded this env var, we actually cannot set - # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because - # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for - # "protected processes" (i.e. the python interpreter that runs `lit`): - # https://stackoverflow.com/a/35570229 - # - other LLVM subprojects deal with this issue by having their `lit` - # configuration set these env vars for us; it makes sense to do the same - # for LLVM: - # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 - # - # !!! TODO: look into upstreaming this patch - ./llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch - - # `lit` has a mode where it executes run lines as a shell script which is - # constructs; this is problematic for macOS because it means that there's - # another process in between `lit` and the binaries being tested. As noted - # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our - # tests fail with dyld errors. - # - # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when - # present in the test configuration. - # - # It's not clear to me why this isn't an issue for LLVM developers running - # on macOS (nothing about this _seems_ nix specific).. - ./llvm/lit-shell-script-runner-set-dyld-library-path.patch - ]; - pollyPatches = [ - ./llvm/gnu-install-dirs-polly.patch - - # Just like the `llvm-lit-cfg` patch, but for `polly`. - ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch - ]; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libclang = callPackage ../common/clang { - patches = [ - ./clang/purity.patch - # https://reviews.llvm.org/D51899 - ./clang/gnu-install-dirs.patch - ../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../common/clang/clang-at-least-16-LLVMgold-path.patch; - libllvmLibdir = "${tools.libllvm.lib}/lib"; - }) - ]; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - lldb-manpages = lowPrio (tools.lldb.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # Wrapper for standalone command line utilities - clang-tools = callPackage ../common/clang-tools { }; - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ../common/lld { - patches = [ - ./lld/gnu-install-dirs.patch - ]; - }; - - mlir = callPackage ../common/mlir {}; - - lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/lldb "$out" - '') { }; - patches = - [ - # FIXME: do we need this? ./procfs.patch - ../common/lldb/gnu-install-dirs.patch - ] - # This is a stopgap solution if/until the macOS SDK used for x86_64 is - # updated. - # - # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` - # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use - # of this preprocessor symbol in `lldb` with its expansion. - # - # See here for some context: - # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 - ++ lib.optional ( - stdenv.targetPlatform.isDarwin - && !stdenv.targetPlatform.isAarch64 - && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") - ) ./lldb/cpu_subtype_arm64e_replacement.patch; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ "-rtlib=compiler-rt" - "-Wno-unused-command-line-argument" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind" - ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) - "-lunwind" - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = - [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = - [ - "-nostartfiles" - ] - ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - }; - - clangNoCompilerRtWithLibc = wrapCCWith (rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - } // lib.optionalAttrs stdenv.targetPlatform.isWasm { - nixSupport.cc-cflags = [ "-fno-exceptions" ]; - }); - - # Has to be in tools despite mostly being a library, - # because we use a native helper executable from a - # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix {}; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // args // metadata); - in { - - compiler-rt-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ../common/compiler-rt { - patches = [ - ./compiler-rt/X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the - # extra `/`. - ./compiler-rt/normalize-var.patch - # See: https://github.com/NixOS/nixpkgs/pull/186575 - ../common/compiler-rt/darwin-plistbuddy-workaround.patch - # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - # ../common/compiler-rt/armv7l-15.patch - ]; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - # `libcxx` requires a fairly modern C++ compiler, - # so: we use the clang from this LLVM package set instead of the regular - # stdenv's compiler. - libcxx = callPackage ../common/libcxx { - patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ - # https://github.com/llvm/llvm-project/issues/64226 - ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch - ]; - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - libunwind = callPackage ../common/libunwind { - stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - }; - - openmp = callPackage ../common/openmp { - patches = [ - ./openmp/fix-find-tool.patch - ./openmp/run-lit-directly.patch - ]; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index a3705de4ccb5c..42c519e5021cc 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; - maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; + maintainers = with maintainers; [ thoughtpolice obadz ]; license = with licenses; [ /* runtime, compilers, tools and most class libraries licensed */ mit /* runtime includes some code licensed */ bsd3 diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index ab5b9d7d21661..9fd9d95e0b729 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -3,7 +3,6 @@ , mrustc , mrustc-minicargo , llvm_12 -, llvmPackages_12 , libffi , cmake , python3 diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 0ac32994b00d6..4655cb03ad7b2 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -76,12 +76,12 @@ in { nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.0.4"; + version = "2.0.8"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-cVJr0HQ53I43j6Gm60B+2hKY8fPU30R23KDjyjy+Pwk="; + hash = "sha256-VwLahEcA0xKdtzFwtcYGrb37h+grgWwNkRB+ogpl3xY="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] @@ -303,7 +303,7 @@ in { meta = nim'.meta // { description = nim'.meta.description + " (${targetPlatformConfig} wrapper)"; - platforms = with lib.platforms; unix ++ genode; + platforms = with lib.platforms; unix ++ genode ++ windows; }; }); in { diff --git a/pkgs/development/compilers/nim/nixbuild.patch b/pkgs/development/compilers/nim/nixbuild.patch index afadd16602bde..59e54ca780c63 100644 --- a/pkgs/development/compilers/nim/nixbuild.patch +++ b/pkgs/development/compilers/nim/nixbuild.patch @@ -6,7 +6,7 @@ index f31ae94dd..debed9c07 100644 import strutils -+when defined(nixbuild): ++when defined(nixbuild) and not defined(windows): + import os + type @@ -16,7 +16,7 @@ index f31ae94dd..debed9c07 100644 libCandidates(prefix & middle & suffix, dest) else: add(dest, s) -+ when defined(nixbuild): ++ when defined(nixbuild) and not defined(windows): + # Nix doesn't have a global library directory so + # load libraries using an absolute path if one + # can be derived from NIX_LDFLAGS. diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix deleted file mode 100644 index ef6dc0ce91ba1..0000000000000 --- a/pkgs/development/compilers/opendylan/bin.nix +++ /dev/null @@ -1,43 +0,0 @@ -# Binaries provided by Open Dylan to be used to bootstrap from source. -# The binaries can also be used as is. -{lib, stdenv, fetchurl, patchelf, boehmgc, gcc, makeWrapper}: - -stdenv.mkDerivation rec { - pname = "opendylan"; - version = "2013.2"; - - src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86_64-linux.tar.bz2"; - sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; - } - else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86-linux.tar.bz2"; - sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; - } - else throw "platform ${stdenv.hostPlatform.system} not supported."; - - nativeBuildInputs = [ patchelf boehmgc makeWrapper ]; - - buildCommand = '' - mkdir -p "$out" - tar --strip-components=1 -xjf "$src" -C "$out" - - interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for a in "$out"/bin/*; do - patchelf --set-interpreter "$interpreter" "$a" - patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" - done - for a in "$out"/lib/*.so; do - patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" - done - sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam - wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin - ''; - - meta = { - homepage = "https://opendylan.org"; - description = "Multi-paradigm functional and object-oriented programming language"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix deleted file mode 100644 index b34f348519afb..0000000000000 --- a/pkgs/development/compilers/opendylan/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Build Open Dylan from source using the binary builds to bootstrap. -{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: - -stdenv.mkDerivation { - pname = "opendylan"; - version = "2016.1pre"; - - src = fetchFromGitHub { - owner = "dylan-lang"; - repo = "opendylan"; - rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; - sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ makeWrapper autoconf automake ]; - buildInputs = (if stdenv.hostPlatform.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ - opendylan-bootstrap boehmgc perl - ]; - - preConfigure = if stdenv.hostPlatform.system == "i686-linux" then '' - mkdir -p $TMPDIR/mps - tar --strip-components=1 -xf ${mps.src} -C $TMPDIR/mps - ./autogen.sh - '' - else '' - ./autogen.sh - ''; - - configureFlags = [ - (if stdenv.hostPlatform.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.out}") - ]; - buildPhase = "make 3-stage-bootstrap"; - - postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; - - meta = { - homepage = "https://opendylan.org"; - description = "Multi-paradigm functional and object-oriented programming language"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - broken = true; # last successful build 2020-12-11 - }; -} diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 04df2d28a45ca..089e8411210c2 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +, enableGtk ? true, gtk3, glib }: let @@ -33,8 +33,8 @@ let cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib + ] ++ lib.optionals (!headless && enableGtk) [ + gtk3 glib ]; patches = [ @@ -51,7 +51,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk10.patch ]; @@ -74,9 +74,19 @@ let "--with-lcms=system" "--with-stdc++lib=dynamic" "--disable-warnings-as-errors" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + ] + # Cannot be built by recent versions of Clang, as far as I can tell (see + # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to + # compile with LLVM 12. + ++ lib.optionals stdenv.cc.isClang [ + "--with-toolchain-type=clang" + # Explicitly tell Clang to compile C++ files as C++, see + # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 + "--with-extra-cxxflags=-xc++" + ] + ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -87,8 +97,8 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ] ++ lib.optionals (!headless && enableGtk) [ + "-lgtk-3" "-lgio-2.0" ]); # -j flag is explicitly rejected by the build system: diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix deleted file mode 100644 index ab0696e172c05..0000000000000 --- a/pkgs/development/compilers/openjdk/12.nix +++ /dev/null @@ -1,172 +0,0 @@ -{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - major = "12"; - update = ".0.2"; - build = "ga"; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation rec { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}-${build}"; - - src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7"; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap.patch - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - # Fix gnumake 4.3 incompatibility - (fetchpatch { - url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; - sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk10.patch - ]; - - prePatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; - - NIX_LDFLAGS = lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - postBuild = '' - cd build/linux* - make images - cd - - ''; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - meta = import ./meta.nix lib version; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix deleted file mode 100644 index 5d5d9f774771e..0000000000000 --- a/pkgs/development/compilers/openjdk/13.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - major = "13"; - update = ".0.2"; - build = "-ga"; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk13-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation rec { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}${build}"; - - src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - # Fix gnumake 4.3 incompatibility - (fetchpatch { - url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch"; - sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h"; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - prePatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - postBuild = '' - cd build/linux* - make images - cd - - ''; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - meta = (import ./meta.nix lib version) // { broken = true; }; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix deleted file mode 100644 index 348fd3996c9f2..0000000000000 --- a/pkgs/development/compilers/openjdk/14.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - major = "14"; - update = ".0.2"; - build = "-ga"; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk14-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation rec { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}${build}"; - - src = fetchurl { - url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - prePatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - postBuild = '' - cd build/linux* - make images - cd - - ''; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - meta = (import ./meta.nix lib version) // { broken = true; }; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix deleted file mode 100644 index 2447b0783ca4c..0000000000000 --- a/pkgs/development/compilers/openjdk/15.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip -, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2 -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - version = { - major = "15"; - update = ".0.1"; - build = "-ga"; - __toString = self: "${self.major}${self.update}${self.build}"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk15-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - inherit version; - - src = fetchurl { - url = "https://hg.openjdk.java.net/jdk-updates/jdk${version.major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; - buildInputs = [ - cpio perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - prePatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - postBuild = '' - cd build/linux* - make images - cd - - ''; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "major" version; - meta = import ./meta.nix lib version.major; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix deleted file mode 100644 index 12ba5c9c16dbb..0000000000000 --- a/pkgs/development/compilers/openjdk/16.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib -, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst -, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - version = { - feature = "16"; - interim = ".0.2-ga"; - build = "1"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk16-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}"; - # rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - ./fix-glibc-2.34.patch - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - prePatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-build=${version.build}" - "--with-version-opt=nixos" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "all" ]; - - postBuild = '' - cd build/linux* - make images - cd - - ''; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 1c9aee9af5e95..d0c954d1b023f 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -5,7 +5,7 @@ , setJavaClassPath , headless ? false , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +, enableGtk ? true, gtk3, glib }: let @@ -34,8 +34,8 @@ let cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib + ] ++ lib.optionals (!headless && enableGtk) [ + gtk3 glib ]; patches = [ @@ -69,7 +69,15 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + + # Backport fixes for musl 1.2.4 which are already applied in jdk21+ + # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17 + (fetchurl { + name = "lfs64.patch"; + url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch"; + hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4="; + }) + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -98,8 +106,15 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + ] + ++ lib.optionals stdenv.cc.isClang [ + "--with-toolchain-type=clang" + # Explicitly tell Clang to compile C++ files as C++, see + # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 + "--with-extra-cxxflags=-xc++" + ] + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -107,8 +122,8 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ] ++ lib.optionals (!headless && enableGtk) [ + "-lgtk-3" "-lgio-2.0" ]); # -j flag is explicitly rejected by the build system: diff --git a/pkgs/development/compilers/openjdk/18.nix b/pkgs/development/compilers/openjdk/18.nix deleted file mode 100644 index 5ce4ff8f54671..0000000000000 --- a/pkgs/development/compilers/openjdk/18.nix +++ /dev/null @@ -1,191 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib -, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst -, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap -, setJavaClassPath -, headless ? false -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - version = { - feature = "18"; - interim = ".0.2.1"; - build = "1"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk18-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-L6dsN0kqWcfemM8LBg62qtHQdymwRQoV1ndc8r+0qn8="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. - # This is applied anywhere to prevent patchrot. - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/testing/openjdk18/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f"; - hash = "sha256-nvO8RcmKwMcPdzq28mZ4If1XJ6FQ76CYWqRIozPCk5U="; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-build=${version.build}" - "--with-version-opt=nixos" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-freetype=system" - "--with-harfbuzz=system" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - postBuild = '' - cd build/linux* - make images - cd - - ''; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/19.nix b/pkgs/development/compilers/openjdk/19.nix deleted file mode 100644 index 187d724b57b55..0000000000000 --- a/pkgs/development/compilers/openjdk/19.nix +++ /dev/null @@ -1,196 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib -, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst -, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap -, ensureNewerSourcesForZipFilesHook -, setJavaClassPath -# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages -# which should be fixable, this is a no-rebuild workaround for GHC. -, headless ? stdenv.targetPlatform.isGhcjs -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - version = { - feature = "19"; - interim = "-ga"; - build = ""; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk19-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}"; - # version = "${version.feature}${version.interim}+${version.build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}"; - # rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-XbYTku/nWF+maBvYz2rJYIUBEgOmqICKjk9wufHqyj0="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. - # This is applied anywhere to prevent patchrot. - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560"; - hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k="; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-build=${version.build}" - "--with-version-opt=nixos" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/20.nix b/pkgs/development/compilers/openjdk/20.nix deleted file mode 100644 index bdb7d057f2633..0000000000000 --- a/pkgs/development/compilers/openjdk/20.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio -, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib -, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst -, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk20-bootstrap -, ensureNewerSourcesForZipFilesHook -, setJavaClassPath -# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages -# which should be fixable, this is a no-rebuild workaround for GHC. -, headless ? stdenv.targetPlatform.isGhcjs -, enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - version = { - feature = "20"; - interim = ".0.2"; - build = "9"; - }; - - # when building a headless jdk, also bootstrap it with a headless jdk - openjdk-bootstrap = openjdk20-bootstrap.override { gtkSupport = !headless; }; - - openjdk = stdenv.mkDerivation { - pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${version.feature}${version.interim}+${version.build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jdk${version.feature}u"; - rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-CZH2JwR+MrkTlLdcVYuFRB3McdrM0A+1YaSjNpjYwak="; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; - buildInputs = [ - cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib - libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Patch borrowed from Alpine to fix build errors with musl libc and recent gcc. - # This is applied anywhere to prevent patchrot. - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560"; - hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k="; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = ["build" "host"]; - - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-build=${version.build}" - "--with-version-opt=nixos" - "--with-version-pre=" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = builtins.unsafeGetAttrPos "feature" version; - meta = import ./meta.nix lib version.feature; - - passthru = { - architecture = ""; - home = "${openjdk}/lib/openjdk"; - inherit gtk3; - }; - }; -in openjdk diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix index 160b3da4c8eee..9c403fb2755dc 100644 --- a/pkgs/development/compilers/openjdk/21.nix +++ b/pkgs/development/compilers/openjdk/21.nix @@ -8,7 +8,7 @@ # which should be fixable, this is a no-rebuild workaround for GHC. , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false, openjfx -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +, enableGtk ? true, gtk3, glib }: let @@ -37,8 +37,8 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 gnome_vfs GConf glib + ] ++ lib.optionals (!headless && enableGtk) [ + gtk3 glib ]; patches = [ @@ -64,7 +64,7 @@ let url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -91,9 +91,16 @@ let "--with-zlib=system" "--with-lcms=system" "--with-stdc++lib=dynamic" - ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + ] + ++ lib.optionals stdenv.cc.isClang [ + "--with-toolchain-type=clang" + # Explicitly tell Clang to compile C++ files as C++, see + # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 + "--with-extra-cxxflags=-xc++" + ] + ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; separateDebugInfo = true; @@ -101,8 +108,8 @@ let NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ] ++ lib.optionals (!headless && enableGtk) [ + "-lgtk-3" "-lgio-2.0" ]); # -j flag is explicitly rejected by the build system: diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix index 97d1a3b3b44df..18ab52f089d33 100644 --- a/pkgs/development/compilers/openjdk/22.nix +++ b/pkgs/development/compilers/openjdk/22.nix @@ -38,11 +38,9 @@ , headless ? stdenv.targetPlatform.isGhcjs , enableJavaFX ? false , openjfx -, enableGnome2 ? true +, enableGtk ? true , gtk3 -, gnome_vfs , glib -, GConf , writeShellScript }: @@ -101,10 +99,8 @@ stdenv.mkDerivation (finalAttrs: { libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ gtk3 - gnome_vfs - GConf glib ]; @@ -131,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk13.patch ]; @@ -160,6 +156,12 @@ stdenv.mkDerivation (finalAttrs: { "--with-lcms=system" "--with-stdc++lib=dynamic" ] + ++ lib.optionals stdenv.cc.isClang [ + "--with-toolchain-type=clang" + # Explicitly tell Clang to compile C++ files as C++, see + # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859 + "--with-extra-cxxflags=-xc++" + ] ++ lib.optional headless "--enable-headless-only" ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; @@ -173,11 +175,9 @@ stdenv.mkDerivation (finalAttrs: { "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ "-lgtk-3" "-lgio-2.0" - "-lgnomevfs-2" - "-lgconf-2" ]); # -j flag is explicitly rejected by the build system: diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 70561d83f3088..b77b058e2cac2 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -5,7 +5,7 @@ , openjdk8-bootstrap , setJavaClassPath , headless ? false -, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf +, enableGtk ? true, gtk2, glib }: let @@ -43,8 +43,8 @@ let cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk2 gnome_vfs GConf glib + ] ++ lib.optionals (!headless && enableGtk) [ + gtk2 glib ]; patches = [ @@ -52,7 +52,7 @@ let ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch ./fix-library-path-jdk8.patch - ] ++ lib.optionals (!headless && enableGnome2) [ + ] ++ lib.optionals (!headless && enableGtk) [ ./swing-use-gtk-jdk8.patch ]; @@ -96,8 +96,8 @@ let NIX_LDFLAGS= toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ] ++ lib.optionals (!headless && enableGtk) [ + "-lgtk-x11-2.0" "-lgio-2.0" ]); # -j flag is explicitly rejected by the build system: @@ -215,6 +215,10 @@ let maintainers = with maintainers; [ edwtjo ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; mainProgram = "java"; + # Broken for musl at 2024-01-17. Tracking issue: + # https://github.com/NixOS/nixpkgs/issues/281618 + # error: ‘isnanf’ was not declared in this scope + broken = stdenv.hostPlatform.isMusl; }; passthru = { diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json index d4df70b8597f7..d55f95f799aee 100644 --- a/pkgs/development/compilers/openjdk/info.json +++ b/pkgs/development/compilers/openjdk/info.json @@ -1,8 +1,8 @@ { "22": { - "version": "22.0.1-ga", + "version": "22.0.2-ga", "repo": "jdk22u", - "hash": "sha256-wCHgharBnvRSB3dWW8C3e80AZtxyFgP0SS5X1d4LzMc=" + "hash": "sha256-Zo1LOumkt9zTaPqbDcRL8lVJMqVle0QqzThtIz0JRNo=" }, "21": { "version": "21.0.3-ga", diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix index 02f6da928cdd3..da3bd16bcb544 100644 --- a/pkgs/development/compilers/openjdk/jre.nix +++ b/pkgs/development/compilers/openjdk/jre.nix @@ -30,10 +30,10 @@ let passthru = { home = "${jre}"; - tests = [ - (callPackage ./tests/test_jre_minimal.nix {}) - (callPackage ./tests/test_jre_minimal_with_logging.nix {}) - ]; + tests = { + jre_minimal-hello = callPackage ./tests/test_jre_minimal.nix {}; + jre_minimal-hello-logging = callPackage ./tests/test_jre_minimal_with_logging.nix {}; + }; }; }; in jre diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix deleted file mode 100644 index 22b844bb1d67c..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand -, openjdk11-bootstrap -, withMedia ? true -, withWebKit ? false -}: - -let - major = "11"; - update = ".0.20"; - build = "1"; - repover = "${major}${update}+${build}"; - gradle_ = (gradle_7.override { - java = openjdk11-bootstrap; - }); - - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - substituteInPlace buildSrc/linux.gradle \ - --replace ', "-Werror=implicit-function-declaration"' "" - - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk11-bootstrap.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9="; - }; - -in makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - - # Remove licenses, otherwise they may conflict with the ones included in the openjdk - rm -rf $out/modules_legal/* - ''; - - disallowedReferences = [ openjdk11-bootstrap ]; - - passthru.deps = deps; - - # Uses a lot of RAM, OOMs otherwise - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - homepage = "http://openjdk.java.net/projects/openjfx/"; - license = licenses.gpl2; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix new file mode 100644 index 0000000000000..79df8c0da3649 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/11/default.nix @@ -0,0 +1,102 @@ +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_6-headless, python3, ruby +, openjdk11-bootstrap +, withMedia ? true +, withWebKit ? false +}: + +let + pname = "openjfx-modular-sdk"; + major = "11"; + update = ".0.20"; + build = "1"; + repover = "${major}${update}+${build}"; + jdk = openjdk11-bootstrap; + gradle = gradle_7; + +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}-${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; + }; + + patches = [ + ../backport-ffmpeg-6-support-jfx11.patch + ]; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + postPatch = '' + substituteInPlace buildSrc/linux.gradle \ + --replace ', "-Werror=implicit-function-declaration"' "" + + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties + ''; + + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${jdk.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + # Remove licenses, otherwise they may conflict with the ones included in the openjdk + rm -rf $out/modules_legal/* + ''; + + disallowedReferences = [ jdk gradle.jdk ]; + + # Uses a lot of RAM, OOMs otherwise + requiredSystemFeatures = [ "big-parallel" ]; + + meta = with lib; { + homepage = "http://openjdk.java.net/projects/openjfx/"; + license = licenses.gpl2; + description = "Next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/openjdk/openjfx/11/deps.json b/pkgs/development/compilers/openjdk/openjfx/11/deps.json new file mode 100644 index 0000000000000..7c8167124430b --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/11/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.1.0": { + "jar": "sha256-vG3+7tCrp0MCqSCBH/1snkVlvviTzMOvg2Iz36s8UTo=", + "pom": "sha256-d7ysnMSDKiKSGJgng2ASB8yYvldcyIRDNtWuBzkbPuE=" + }, + "org/apache/lucene#lucene-grouping/7.1.0": { + "jar": "sha256-5wh/sGDRWa1xvW7p6W8BYGpaM1OgxJofHQ49oPUaTlo=", + "pom": "sha256-738k/3YjlZSfxMiDl1npJhD8mx8Nifmbtw+haHNh2Ec=" + }, + "org/apache/lucene#lucene-parent/7.1.0": { + "pom": "sha256-l7M9mcedTRIoIuWDY0cGvGmfRCvp3tksZiKdEn+WoAc=" + }, + "org/apache/lucene#lucene-queries/7.1.0": { + "jar": "sha256-qamOR/ueclsDerV+wZts4QVBIoTLXl2aGs99Xv8TSTY=", + "pom": "sha256-pvMWrRvMdKy3f3mP/AIKy9aD3nx5OUrFNgAdE6vktVY=" + }, + "org/apache/lucene#lucene-queryparser/7.1.0": { + "jar": "sha256-HNuCsiqq3bGJW9OjSVinyaOgb/0NZ6sskNvDegRshlQ=", + "pom": "sha256-K7m67AcL6g3a5aj1rrDOZlJpBeA4THS+18OrIJ52hdM=" + }, + "org/apache/lucene#lucene-sandbox/7.1.0": { + "jar": "sha256-wZA9Xag+IIZp2NkzdJeeFAIUNYsq32c1sa488kkJW+E=", + "pom": "sha256-WL5E6wSMD0If6eul+30xhr7gk7g72F4w5EKbbctVZMU=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.1.0": { + "pom": "sha256-3NW0Q/KK2QPk/wfTMigGxTF4BWuctNQU+2gMyArhGsU=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix deleted file mode 100644 index 77c8e4678d6c9..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby -, withMedia ? true -, withWebKit ? false -}: - -let - major = "15"; - update = ".0.1"; - build = "+1"; - repover = "${major}${update}${build}"; - gradle_ = (gradle_6.override { - java = openjdk11_headless; - }); - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx"; - rev = repover; - sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk11_headless.home} - '' + args.gradleProperties or ""); - - env.NIX_CFLAGS_COMPILE = toString [ - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - - # gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - "-fcommon" - ]; - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI="; - }; - -in makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - # glib-2.62 deprecations - # -fcommon: gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${openjdk11_headless.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ openjdk11_headless ]; - - passthru.deps = deps; - - meta = with lib; { - homepage = "http://openjdk.java.net/projects/openjfx/"; - license = licenses.gpl2; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - knownVulnerabilities = [ - "This OpenJFX version has reached its end of life." - ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix deleted file mode 100644 index 00fa6af725e5b..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 -, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand -, withMedia ? true -, withWebKit ? false -}: - -let - major = "17"; - update = ".0.11"; - build = "-ga"; - repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - java = openjdk17_headless; - }); - - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk17_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; - }; - -in makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${openjdk17_headless.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ openjdk17_headless ]; - - passthru.deps = deps; - - meta = with lib; { - homepage = "http://openjdk.java.net/projects/openjfx/"; - license = licenses.gpl2; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix new file mode 100644 index 0000000000000..1b19ee30eca69 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17/default.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, ffmpeg_6-headless, python3, ruby +, withMedia ? true +, withWebKit ? false +}: + +let + pname = "openjfx-modular-sdk"; + major = "17"; + update = ".0.11"; + build = "-ga"; + repover = "${major}${update}${build}"; + jdk = openjdk17_headless; + gradle = gradle_7; + +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; + }; + + patches = [ + ../backport-ffmpeg-6-support-jfx11.patch + ]; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties + ''; + + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${jdk.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ jdk gradle.jdk ]; + + meta = with lib; { + homepage = "http://openjdk.java.net/projects/openjfx/"; + license = licenses.gpl2; + description = "Next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/openjdk/openjfx/17/deps.json b/pkgs/development/compilers/openjdk/openjfx/17/deps.json new file mode 100644 index 0000000000000..a9fa40a91be1f --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19.nix deleted file mode 100644 index 38720efaba545..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/19.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless -, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand -, withMedia ? true -, withWebKit ? false -}: - -let - major = "19"; - update = ".0.2.1"; - build = "+1"; - repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); - - icuVersionWithSep = s: "68${s}2"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "."}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx"; - rev = repover; - hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs="; - }; - - patches = [ - # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 - (fetchpatch { - url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; - hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; - }) - # ditto - (fetchpatch { - url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; - hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; - }) - ]; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk19_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; - }; - -in makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${openjdk19_headless.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ openjdk17_headless openjdk19_headless ]; - - passthru.deps = deps; - - meta = with lib; { - homepage = "https://openjdk.org/projects/openjfx/"; - license = licenses.gpl2Classpath; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - knownVulnerabilities = [ - "This OpenJFX version has reached its end of life." - ]; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20.nix deleted file mode 100644 index 0aa7b262e834e..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/20.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless -, openjdk20_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand -, withMedia ? true -, withWebKit ? false -}: - -let - major = "20"; - update = ".0.2"; - build = "-ga"; - repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); - - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx20u"; - rev = repover; - hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk20_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; - }; - -in makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${openjdk20_headless.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ openjdk17_headless openjdk20_headless ]; - - passthru.deps = deps; - - meta = with lib; { - homepage = "https://openjdk.org/projects/openjfx/"; - license = licenses.gpl2Classpath; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - knownVulnerabilities = [ - "This OpenJFX version has reached its end of life." - ]; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix deleted file mode 100644 index ee262eb8b950b..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless -, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand -, withMedia ? true -, withWebKit ? false -}: - -let - major = "21"; - update = ".0.3"; - build = "-ga"; - repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); - - icuVersionWithSep = s: "73${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx21u"; - rev = repover; - hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include <cstdio>' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk21_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; - }; - -in makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${openjdk21_headless.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ openjdk17_headless openjdk21_headless ]; - - passthru.deps = deps; - - meta = with lib; { - homepage = "https://openjdk.org/projects/openjfx/"; - license = licenses.gpl2Classpath; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix new file mode 100644 index 0000000000000..85fe036fe767e --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/21/default.nix @@ -0,0 +1,90 @@ +{ stdenv, lib, pkgs, fetchFromGitHub, writeText +, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst +, libXxf86vm, glib, alsa-lib, ffmpeg_6, python3, ruby +, withMedia ? true +, withWebKit ? false +}: + +let + pname = "openjfx-modular-sdk"; + major = "21"; + update = ".0.3"; + build = "-ga"; + repover = "${major}${update}${build}"; + jdk = openjdk21_headless; + gradle = gradle_7; + +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx21u"; + rev = repover; + hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include <cstdio>' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties + ''; + + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${jdk.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ jdk gradle.jdk ]; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "Next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/openjdk/openjfx/21/deps.json b/pkgs/development/compilers/openjdk/openjfx/21/deps.json new file mode 100644 index 0000000000000..ec1816339f403 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/21/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22.nix deleted file mode 100644 index c34ff04668954..0000000000000 --- a/pkgs/development/compilers/openjdk/openjfx/22.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchurl -, runCommand -, writeText -, openjdk21_headless -, gradle -, pkg-config -, perl -, cmake -, gperf -, gtk2 -, gtk3 -, libXtst -, libXxf86vm -, glib -, alsa-lib -, ffmpeg_4 -, python3 -, ruby -, withMedia ? true -, withWebKit ? false -}: - -let - major = "22"; - update = ".0.1"; - build = "-ga"; - repover = "${major}${update}${build}"; - - icuVersionWithSep = s: "73${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; - - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx22u"; - rev = repover; - hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk21_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-2I7LvYcudlB4DKJ/wEiTjY6nICUxUY52euosUqOA+Bs="; - }; - -in -makePackage { - pname = "openjfx-modular-sdk"; - - gradleProperties = '' - COMPILE_MEDIA = ${lib.boolToString withMedia} - COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} - ''; - - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" - ''; - - installPhase = '' - cp -r build/modular-sdk $out - ''; - - stripDebugList = [ "." ]; - - postFixup = '' - # Remove references to bootstrap. - export openjdkOutPath='${openjdk21_headless.outPath}' - find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" - patchelf --set-rpath "$new_refs" "$lib" - done - ''; - - disallowedReferences = [ openjdk21_headless openjdk21_headless ]; - - passthru.deps = deps; - - meta = with lib; { - homepage = "https://openjdk.org/projects/openjfx/"; - license = licenses.gpl2Classpath; - description = "Next-generation Java client toolkit"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix new file mode 100644 index 0000000000000..4359a880ec04a --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/22/default.nix @@ -0,0 +1,101 @@ +{ stdenv +, lib +, pkgs +, fetchFromGitHub +, writeText +, openjdk21_headless +, gradle +, pkg-config +, perl +, cmake +, gperf +, gtk2 +, gtk3 +, libXtst +, libXxf86vm +, glib +, alsa-lib +, ffmpeg_6 +, python3 +, ruby +, withMedia ? true +, withWebKit ? false +}: + +let + pname = "openjfx-modular-sdk"; + major = "22"; + update = ".0.1"; + build = "-ga"; + repover = "${major}${update}${build}"; + jdk = openjdk21_headless; + +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx22u"; + rev = repover; + hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + postPatch = '' + ln -s $config gradle.properties + ''; + + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${jdk.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ jdk gradle.jdk ]; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "Next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/development/compilers/openjdk/openjfx/22/deps.json new file mode 100644 index 0000000000000..9ce577967ae24 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/22/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { + "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch new file mode 100644 index 0000000000000..2d75ecb9562a1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-6-support-jfx11.patch @@ -0,0 +1,70 @@ +Backported from <https://github.com/openjdk/jfx/pull/1259>. + +Original author: Alexander Matveev <alexander.matveev@oracle.com> + +diff --git a/build.gradle b/build.gradle +index 82dc7a7fa9..d1ae3b401f 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -3342,6 +3342,7 @@ + media name: "ffmpeg-3.3.3", ext: "tar.gz" + media name: "ffmpeg-4.0.2", ext: "tar.gz" + media name: "ffmpeg-5.1.2", ext: "tar.gz" ++ media name: "ffmpeg-6.0", ext: "tar.gz" + } + implementation project(":base") + implementation project(":graphics") +@@ -3484,7 +3485,7 @@ + if (t.name == "linux") { + // Pre-defined command line arguments + def cfgCMDArgs = ["sh", "configure"] +- def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-yasm", "--disable-doc", "--disable-programs", "--disable-everything"] ++ def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-asm", "--disable-doc", "--disable-programs", "--disable-everything"] + def codecsCfgArgs = ["--enable-decoder=aac,mp3,mp3float,h264", "--enable-parser=aac,h264", "--enable-demuxer=aac,h264,mpegts,mpegtsraw"] + + def copyLibAVStubs = {String fromDir, String toDir -> +@@ -3688,8 +3689,8 @@ + doLast { + project.ext.libav = [:] + project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg" +- project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2" ] +- project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59" ] ++ project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ] ++ project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ] + + libav.versions.each { version -> + def libavDir = "${libav.basedir}/ffmpeg-${version}" +@@ -3769,7 +3770,7 @@ + project.ext.libav.libavffmpeg.versions = [ "56" ] + project.ext.libav.ffmpeg = [:] + project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg" +- project.ext.libav.ffmpeg.versions = [ "57", "58", "59" ] ++ project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ] + + project.ext.libav.versions.each { version -> + def libavDir = "${project.ext.libav.basedir}-${version}" +diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +index 05f98ad3d1..b05bb68341 100644 +--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java ++++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java +@@ -125,6 +125,7 @@ + dependencies.add("avplugin-ffmpeg-57"); + dependencies.add("avplugin-ffmpeg-58"); + dependencies.add("avplugin-ffmpeg-59"); ++ dependencies.add("avplugin-ffmpeg-60"); + } + if (HostUtils.isMacOSX()) { + dependencies.add("fxplugins"); +diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c +index 9f67de9062..ee64e4bafd 100644 +--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c ++++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c +@@ -146,7 +146,7 @@ + // For ffmpeg (libavcodec-ffmpeg.so) + static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 }; + // For libav or ffmpeg (libavcodec.so) +-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59 }; ++static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 }; + + /* + * Callback passed to dl_iterate_phdr(): finds the path of diff --git a/pkgs/development/compilers/openjdk/tests/hello-logging.nix b/pkgs/development/compilers/openjdk/tests/hello-logging.nix index 71f3a5543f7cf..20fbb93ae2be9 100644 --- a/pkgs/development/compilers/openjdk/tests/hello-logging.nix +++ b/pkgs/development/compilers/openjdk/tests/hello-logging.nix @@ -25,12 +25,12 @@ in src = source; buildPhase = '' - runHook preBuildPhase + runHook preBuild ${jdk}/bin/javac src/Hello.java - runHook postBuildPhase + runHook postBuild ''; installPhase = '' - runHook preInstallPhase + runHook preInstall mkdir -p $out/lib cp src/Hello.class $out/lib @@ -42,6 +42,6 @@ in EOF chmod a+x $out/bin/hello - runHook postInstallPhase + runHook postInstall ''; } diff --git a/pkgs/development/compilers/openjdk/tests/hello.nix b/pkgs/development/compilers/openjdk/tests/hello.nix index bc5be4a9e9a96..d55a71eb6659d 100644 --- a/pkgs/development/compilers/openjdk/tests/hello.nix +++ b/pkgs/development/compilers/openjdk/tests/hello.nix @@ -20,12 +20,12 @@ in src = source; buildPhase = '' - runHook preBuildPhase + runHook preBuild ${jdk}/bin/javac src/Hello.java - runHook postBuildPhase + runHook postBuild ''; installPhase = '' - runHook preInstallPhase + runHook preInstall mkdir -p $out/lib cp src/Hello.class $out/lib @@ -37,6 +37,6 @@ in EOF chmod a+x $out/bin/hello - runHook postInstallPhase + runHook postInstall ''; } diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 0b66e0d21a63e..18b99d5ba69a9 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -18,11 +18,11 @@ inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; - version = "0.4.38"; + version = "0.4.39"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "sha256-pVqY1HclZ6o/rtj7hNVAw9t36roW0+LhCwRPvJIoZo0="; + sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index e7bef0e815067..86b7242c31dda 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; + hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 54d2875d1bc30..060e298098236 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: { bison flex cmake + protobuf + python3 ] ++ lib.optionals enableDocumentation [ doxygen graphviz ] ++ lib.optionals enableBPF [ libllvm libbpf ]; @@ -86,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: { boehmgc gmp flex - python3 ]; meta = { diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index a723e314b3cae..04c80884670dd 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation { pname = "picat"; - version = "3.6"; + version = "3.6#8"; src = fetchurl { - url = "http://picat-lang.org/download/picat36_src.tar.gz"; - hash = "sha256-DjP1cjKxRLxMjiHmYX42+kaG5//09IrPIc1O75gLA6k="; + url = "http://picat-lang.org/download/picat368_src.tar.gz"; + hash = "sha256-eJxF5atvJq3fhFltcQCGTP/sgUmfsfCohUgm3x2U1n0="; }; buildInputs = [ zlib ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Logic-based programming langage"; + description = "Logic-based programming language"; mainProgram = "picat"; homepage = "http://picat-lang.org/"; license = licenses.mpl20; @@ -51,4 +51,3 @@ stdenv.mkDerivation { maintainers = with maintainers; [ earldouglas thoughtpolice ]; }; } - diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index c7008ec22a8aa..b10739ca3363d 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -4,7 +4,7 @@ , cmake , coreutils , libxml2 -, lto ? !stdenv.isDarwin +, lto ? true , makeWrapper , openssl , pcre2 @@ -13,6 +13,7 @@ , substituteAll , which , z3 +, cctools , darwin }: @@ -36,7 +37,7 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ cmake makeWrapper which python3 ] - ++ lib.optionals (stdenv.isDarwin) [ darwin.cctools ]; + ++ lib.optionals (stdenv.isDarwin) [ cctools ]; buildInputs = [ libxml2 z3 ]; # Sandbox disallows network access, so disabling problematic networking tests diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 425281ef38762..f0664df84dfe8 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "Package manager for PureScript based on package sets"; mainProgram = "psc-package"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 954c58718cf3e..d66d2c753221e 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "Facebook's friendly syntax to OCaml"; license = licenses.mit; inherit (ocaml.meta) platforms; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 4f6f0df262223..872dcae2e1322 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs --host src/bison.sh ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/development/compilers/rust/1_78.nix b/pkgs/development/compilers/rust/1_79.nix index d81e964fb7458..a749e58c16bc5 100644 --- a/pkgs/development/compilers/rust/1_78.nix +++ b/pkgs/development/compilers/rust/1_79.nix @@ -19,8 +19,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.78.0"; - rustcSha256 = "/1RII6XLJ/JzgShXfx5+AO6PTIPyo0h4GuT8NV6R1ak="; + rustcVersion = "1.79.0"; + rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; }; @@ -34,25 +34,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.77.2"; + bootstrapVersion = "1.78.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "168e653fbc30b3a80801bc7735a79ff644651618434234959925f669bf77d1a2"; - x86_64-unknown-linux-gnu = "b7d12b1b162c36c1fd5234b4b16856aa7eafca91d17c49787f6487cb26f4062d"; - x86_64-unknown-linux-musl = "2e08fe23c4837a780a40ebfac601760cd6297581d21eae2f88cb59060243a375"; - arm-unknown-linux-gnueabihf = "9f14a31dbef0153c0a7463a79cf8f9e8295b355354de41aa054953027beb70d7"; - armv7-unknown-linux-gnueabihf = "b37649399081228244b3ff3acc6047f6c138e602c721cd500efe43715d043c5e"; - aarch64-unknown-linux-gnu = "297c6201edd42e580f242fcd75b521b0392f6f3be02cf03ca76690fece4a74da"; - aarch64-unknown-linux-musl = "fdd9c485f93c73a085c113b4f0fbad0989f79153079d394ec4bbac2b3804f71b"; - x86_64-apple-darwin = "16bbbfcf0c982b35271d8904977d80fda1bb7caa7f898abceed3569a867d9cea"; - aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7"; - powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19"; - riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648"; - x86_64-unknown-freebsd = "72f49040fc2ed4492cddfaef3b4a9cb28d008f9f5ce5cac50802a5fca910f58c"; + i686-unknown-linux-gnu = "8f3f5d2ab7b609ab30d584cfb5cecc3d8b16d2620fffb7643383c8a0a3881e21"; + x86_64-unknown-linux-gnu = "1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87"; + x86_64-unknown-linux-musl = "c11ab908cbffbe98097d99ed62f5db00aa98496520b1e09583a151d36df7fca4"; + arm-unknown-linux-gnueabihf = "2a2b1cf93b31e429624380e5b0d2bcce327274f8593b63657b863e38831f6421"; + armv7-unknown-linux-gnueabihf = "fcce5ddb4f55bbdc9a1359a4cb6e65f2ff790d59ad228102cd472112ea65d3fe"; + aarch64-unknown-linux-gnu = "131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af"; + aarch64-unknown-linux-musl = "f328bcf109bf3eae01559b53939a9afbdb70ef30429f95109f7ea21030d60dfa"; + x86_64-apple-darwin = "6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898"; + aarch64-apple-darwin = "3be74c31ee8dc4f1d49e2f2888228de374138eaeca1876d0c1b1a61df6023b3b"; + powerpc64le-unknown-linux-gnu = "c5aedb12c552daa18072e386697205fb7b91cef1e8791fe6fb74834723851388"; + riscv64gc-unknown-linux-gnu = "847a925ace172d4c0a8d3da8d755b8678071ef73e659886128a3103bb896dcd9"; + x86_64-unknown-freebsd = "b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df"; }; - selectRustPackage = pkgs: pkgs.rust_1_78; + selectRustPackage = pkgs: pkgs.rust_1_79; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index b0c40c5760cb4..9a12537f3e321 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildHost, pkgsHostHost +{ lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index beee43323dad4..640ea7908e252 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, rustc, Security, patchelf }: +{ stdenv, lib, rustPlatform, rustc, Security }: rustPlatform.buildRustPackage { pname = "clippy"; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 31501e668c893..788f8e67da08a 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -65,7 +65,10 @@ in bootRustPlatform = makeRustPlatform bootstrapRustPackages; in { # Packages suitable for build-time, e.g. `build.rs`-type stuff. - buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // { __attrsFailEvaluation = true; }; + buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // { + # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here. + buildRustPackages = self.buildRustPackages // { __attrsFailEvaluation = true; }; + }; # Analogous to stdenv rustPlatform = makeRustPlatform self.buildRustPackages; rustc-unwrapped = self.callPackage ./rustc.nix ({ diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a68e117658fad..487de452b01c3 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -35,6 +35,12 @@ in stdenv.mkDerivation (finalAttrs: { passthru.isReleaseTarball = true; }; + hardeningDisable = optionals stdenv.cc.isClang [ + # remove once https://github.com/NixOS/nixpkgs/issues/318674 is + # addressed properly + "zerocallusedregs" + ]; + __darwinAllowLocalNetworking = true; # rustc complains about modified source files otherwise @@ -303,10 +309,4 @@ in stdenv.mkDerivation (finalAttrs: { "i686-windows" "x86_64-windows" ]; }; -} // lib.optionalAttrs stdenv.cc.isClang { # FIXME: move inside again when rebuilds are OK - hardeningDisable = optionals stdenv.cc.isClang [ - # remove once https://github.com/NixOS/nixpkgs/issues/318674 is - # addressed properly - "zerocallusedregs" - ]; }) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 6676a7ce6c2ee..f523939616654 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,12 +10,12 @@ let versionMap = { - "2.4.5" = { - sha256 = "sha256-TfaOkMkDGAdkK0t2GYjetb9qG9FSxHI0goNO+nNae9E="; - }; "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; + "2.4.7" = { + sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 49818fee3e109..7a63db530f965 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; }; - cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; + cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/compilers/semeru-bin/generate-sources.py b/pkgs/development/compilers/semeru-bin/generate-sources.py index 44ad583ab48f7..b647fca7cf4ec 100755 --- a/pkgs/development/compilers/semeru-bin/generate-sources.py +++ b/pkgs/development/compilers/semeru-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17, 21) +feature_versions = (8, 11, 17, 21) oses = ("mac", "linux") types = ("jre", "jdk") impls = ("openj9",) diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix index 2e9bde029f2d9..0f6e9ca002f8b 100644 --- a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix @@ -4,15 +4,13 @@ let sources = (lib.importJSON ./sources.json).openj9.mac; common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; - EOL = [ "This JDK/JRE version has reached End of Life." ]; + # EOL = [ "This JDK/JRE version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; - jre-16 = common { sourcePerArch = sources.jre.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux.nix b/pkgs/development/compilers/semeru-bin/jdk-linux.nix index 59c6a4862d913..16f14de26209e 100644 --- a/pkgs/development/compilers/semeru-bin/jdk-linux.nix +++ b/pkgs/development/compilers/semeru-bin/jdk-linux.nix @@ -4,15 +4,13 @@ let sources = (lib.importJSON ./sources.json).openj9.linux; common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; - EOL = [ "This JDK/JRE version has reached End of Life." ]; + # EOL = [ "This JDK/JRE version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; - jre-16 = common { sourcePerArch = sources.jre.openjdk16; knownVulnerabilities = EOL; }; jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 31f6b0709da34..670986b3ffc5c 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix index 287862b5f2b8d..4dfc83f9944b3 100644 --- a/pkgs/development/compilers/silice/default.nix +++ b/pkgs/development/compilers/silice/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchFromGitHub, lib , cmake, pkg-config, openjdk , libuuid, python3 -, silice, yosys, nextpnr, verilator +, glfw +, yosys, nextpnr, verilator , dfu-util, icestorm, trellis +, unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "silice"; - version = "unstable-2022-08-05"; + version = "0-unstable-2024-07-22"; src = fetchFromGitHub { owner = "sylefeb"; - repo = pname; - rev = "e26662ac757151e5dd8c60c45291b44906b1299f"; - sha256 = "sha256-Q1JdgDlEErutZh0OfxYy5C4aVijFKlf6Hm5Iv+1jsj4="; + repo = "silice"; + rev = "8f56349f8b143d5a4b9686b1782f1ae66e011be4"; + hash = "sha256-1y2q41XyQLxjUkWKh8Ky/t3uaQXkm0IgMk9r06vKcRg="; fetchSubmodules = true; }; @@ -21,12 +23,16 @@ stdenv.mkDerivation rec { cmake pkg-config openjdk + glfw ]; buildInputs = [ libuuid ]; propagatedBuildInputs = [ - (python3.withPackages (p: with p; [ edalize ])) + (python3.withPackages (p: [ + p.edalize + p.termcolor + ])) ]; postPatch = '' @@ -36,13 +42,18 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + make install mkdir -p $out cp -ar ../{bin,frameworks,lib} $out/ + + runHook postInstall ''; passthru.tests = let + silice = finalAttrs.finalPackage; testProject = project: stdenv.mkDerivation { name = "${silice.name}-test-${project}"; nativeBuildInputs = [ @@ -54,18 +65,24 @@ stdenv.mkDerivation rec { icestorm trellis ]; - src = "${src}/projects"; + src = "${silice.src}/projects"; sourceRoot = "projects/${project}"; buildPhase = '' - targets=$(cut -d " " -f 2 configs | tr -d '\r') - for target in $targets ; do + targets=() + for target in $(cat configs | tr -d '\r') ; do + [[ $target != Makefile* ]] || continue make $target ARGS="--no_program" + targets+=($target) done + if test "''${#targets[@]}" -eq 0; then + >&2 echo "ERROR: no target found!" + false + fi ''; installPhase = '' mkdir $out - for target in $targets ; do - cp -r BUILD_$target $out/ + for target in "''${targets[@]}" ; do + [[ $target != Makefile* ]] || continue done ''; }; @@ -78,10 +95,17 @@ stdenv.mkDerivation rec { pipeline_sort = testProject "pipeline_sort"; }; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { description = "Open source language that simplifies prototyping and writing algorithms on FPGA architectures"; homepage = "https://github.com/sylefeb/Silice"; - license = licenses.bsd2; - maintainers = [ maintainers.astro ]; + license = lib.licenses.bsd2; + mainProgram = "silice"; + maintainers = with lib.maintainers; [ + astro + pbsds + ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index dd6c11120e4d1..b851ac2c1403d 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub , bash-completion, perl, ncurses, zlib, sqlite, libffi , mcpp, cmake, bison, flex, doxygen, graphviz -, makeWrapper +, makeWrapper, python3, callPackage }: let - toolsPath = lib.makeBinPath [ mcpp ]; + toolsPath = lib.makeBinPath [ mcpp python3 ]; in stdenv.mkDerivation rec { pname = "souffle"; @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { patches = [ ./threads.patch + ./includes.patch ]; hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; - buildInputs = [ bash-completion ncurses zlib sqlite libffi ]; + buildInputs = [ bash-completion ncurses zlib sqlite libffi python3 ]; # these propagated inputs are needed for the compiled Souffle mode to work, # since generated compiler code uses them. TODO: maybe write a g++ wrapper # that adds these so we can keep the propagated inputs clean? @@ -42,13 +43,21 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" ''; + postFixup = '' + substituteInPlace "$out/bin/souffle-compile.py" \ + --replace "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \ + "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include" + ''; + outputs = [ "out" ]; + passthru.tests = callPackage ./tests.nix { }; + meta = with lib; { description = "Translator of declarative Datalog programs into the C++ language"; homepage = "https://souffle-lang.github.io/"; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice copumpkin wchresta ]; + maintainers = with maintainers; [ thoughtpolice copumpkin wchresta markusscherer ]; license = licenses.upl; }; } diff --git a/pkgs/development/compilers/souffle/includes.patch b/pkgs/development/compilers/souffle/includes.patch new file mode 100644 index 0000000000000..3e37641a6cab5 --- /dev/null +++ b/pkgs/development/compilers/souffle/includes.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 946a1f8..bc60339 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -428,7 +428,7 @@ set(SOUFFLE_COMPILED_RELEASE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE}) + set(SOUFFLE_COMPILED_DEBUG_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}) + get_target_property(SOUFFLE_COMPILED_DEFS compiled COMPILE_DEFINITIONS) + get_target_property(SOUFFLE_COMPILED_OPTS compiled COMPILE_OPTIONS) +-get_target_property(SOUFFLE_COMPILED_INCS compiled INCLUDE_DIRECTORIES) ++set(SOUFFLE_COMPILED_INCS PLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS) + + set(SOUFFLE_COMPILED_LIBS "") + set(SOUFFLE_COMPILED_RPATHS "") diff --git a/pkgs/development/compilers/souffle/tests.nix b/pkgs/development/compilers/souffle/tests.nix new file mode 100644 index 0000000000000..82b4fa489dae4 --- /dev/null +++ b/pkgs/development/compilers/souffle/tests.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, souffle, runCommand }: +let + simpleTest = { name, commands }: + stdenv.mkDerivation { + inherit name; + meta.timeout = 60; + buildCommand = '' + echo -e '.decl A(X: number)\n.output A\nA(1).' > A.dl + ${commands} + [ "$(cat A.csv)" = "1" ] + touch $out + ''; + }; +in { + interpret = simpleTest { + name = "souffle-test-interpret"; + commands = "${souffle}/bin/souffle A.dl"; + }; + + compile-in-one-step = simpleTest { + name = "souffle-test-compile-in-one-step"; + commands = '' + ${souffle}/bin/souffle -o A A.dl + ./A + ''; + }; + + compile-in-two-steps = simpleTest { + name = "souffle-test-compile-in-two-steps"; + commands = '' + ${souffle}/bin/souffle -g A.cpp A.dl + ${souffle}/bin/souffle-compile.py A.cpp -o A + ./A + ''; + }; +} diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 3e2ef4532c11f..6321b6940ec7a 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -32,9 +32,9 @@ let rev = "v${version}"; hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-02-14"; - rev = "2221771c28dc224d5d560faf6a2cd73f8ecf713d"; - hash = "sha256-J4qOgDdcsPRU1AXXXWN+qe4c47uMCrjmtM8MSrl9NjE="; + version = "14.0.0+unstable-2024-05-27"; + rev = "62f5b09b11b1da42274371b1f7535f6f2ab11485"; + hash = "sha256-lEOdWHyq9hEyBZPz9z1LxUAZqNub+mZFHHWMlzh3HaI="; } else if llvmMajor == "11" then { version = "11.0.0+unstable-2022-05-04"; rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 305c77fbdb8ff..628e69eb5bc9a 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,9 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib -, libarchive, db, pcre2, libedit, libossp_uuid, libxcrypt,libXpm -, libSM, libXt, freetype, pkg-config, fontconfig -, cmake, libyaml, Security -, libjpeg, libX11, libXext, libXft, libXinerama -, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ] +{ + lib, stdenv, fetchFromGitHub, + cmake, ninja, + + libxcrypt, zlib, openssl, + gmp, gperftools, readline, + libedit, libarchive, Security, + + # optional dependencies + withDb ? true, + db, + + withJava ? true, + jdk, + + withOdbc ? true, + unixODBC, + + withPcre ? true, + pcre2, + + withPython ? true, + python3, + + withYaml ? true, + libyaml, + + + withGui ? false, + libX11, libXpm, libXext, libXft, libXinerama, libjpeg, libXt, libSM, freetype, fontconfig, + + # gcc/g++ as runtime dependency + withNativeCompiler ? true + # Packs must be installed from a local directory during the build, with dependencies # resolved manually, e.g. to install the 'julian' pack, which depends on the 'delay', 'list_util' and 'typedef' packs: # julian = pkgs.fetchzip { @@ -30,47 +58,80 @@ # julian delay list_util typedef # ]; }; , extraPacks ? [] -, withGui ? false +, extraLibraries ? [] # removed option - see below }: let - version = "9.1.21"; + # minorVersion is even for stable, odd for unstable + version = "9.2.6"; + + # This package provides several with* options, which replaces the old extraLibraries option. + # This error should help users that still use this option find their way to these flags. + # We can probably remove this after one NixOS version. + extraLibraries' = if extraLibraries == [] then [] else throw + "option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies"; + packInstall = swiplPath: pack: - ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt." + ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false)])." -t "halt." ''; + withGui' = withGui && !stdenv.isDarwin; + optionalDependencies = [] + ++ (lib.optional withDb db) + ++ (lib.optional withJava jdk) + ++ (lib.optional withOdbc unixODBC) + ++ (lib.optional withPcre pcre2) + ++ (lib.optional withPython python3) + ++ (lib.optional withYaml libyaml) + ++ (lib.optionals withGui' [ libXt libXext libXpm libXft libXinerama + libjpeg libSM freetype fontconfig + ]) + ++ (lib.optional stdenv.isDarwin Security) + ++ extraLibraries'; in stdenv.mkDerivation { pname = "swi-prolog"; inherit version; + # SWI-Prolog has two repositories: swipl and swipl-devel. + # - `swipl`, which tracks stable releases and backports + # - `swipl-devel` which tracks continuous development src = fetchFromGitHub { owner = "SWI-Prolog"; - repo = "swipl-devel"; + repo = "swipl"; rev = "V${version}"; - hash = "sha256-c4OSntnwIzo6lGhpyNVtNM4el5FGrn8kcz8WkDRfQhU="; + hash = "sha256-FgEn+Ht45++GFpfcdaJ5In5x+NyIOopSlSAs+t7sPDE="; fetchSubmodules = true; }; # Add the packInstall path to the swipl pack search path postPatch = '' - echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl + echo "user:file_search_path(pack, '$out/lib/swipl/extra-pack')." >> boot/init.pl ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ gmp readline openssl - libarchive libyaml db pcre2 libedit libossp_uuid libxcrypt - zlib ] - ++ lib.optionals (withGui && !stdenv.isDarwin) [ libXpm libX11 libXext libXft libXinerama libjpeg ] - ++ extraLibraries - ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libarchive + libxcrypt + zlib + openssl + gperftools + gmp + readline + libedit + ] ++ optionalDependencies; hardeningDisable = [ "format" ]; - cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ]; + cmakeFlags = [ "-DSWIPL_INSTALL_IN_LIB=ON" ] + ++ lib.optionals (!withNativeCompiler) [ + # without these options, the build will embed full compiler paths + "-DSWIPL_CC=${if stdenv.isDarwin then "clang" else "gcc"}" + "-DSWIPL_CXX=${if stdenv.isDarwin then "clang++" else "g++"}" + ]; preInstall = '' - mkdir -p $out/lib/swipl/pack + mkdir -p $out/lib/swipl/extra-pack ''; postInstall = builtins.concatStringsSep "\n" @@ -83,6 +144,6 @@ stdenv.mkDerivation { license = lib.licenses.bsd2; mainProgram = "swipl"; platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin; - maintainers = [ lib.maintainers.meditans ]; + maintainers = [ lib.maintainers.meditans lib.maintainers.matko ]; }; } diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 4e164f25e9eef..2b2f636feef64 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -364,6 +364,9 @@ in stdenv.mkDerivation { ''} ''; + # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0' + hardeningDisable = lib.optional stdenv.isDarwin "zerocallusedregs"; + configurePhase = '' export SWIFT_SOURCE_ROOT="$PWD" mkdir -p ../build @@ -699,10 +702,9 @@ in stdenv.mkDerivation { meta = { description = "Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; - broken = stdenv.isDarwin; # Swift doesn't support 32-bit Linux, unknown on other platforms. badPlatforms = lib.platforms.i686; timeout = 86400; # 24 hours. diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 2a56a03766b95..e55465e952d54 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -58,7 +58,7 @@ let xcbuild = xcodebuild; swift-unwrapped = callPackage ./compiler { - inherit (darwin) DarwinTools cctools sigtool; + inherit (darwin) DarwinTools sigtool; inherit (apple_sdk) MacOSX-SDK CLTools_Executables; inherit (apple_sdk.frameworks) CoreServices Foundation Combine; }; @@ -85,7 +85,7 @@ let }; swiftpm = callPackage ./swiftpm { - inherit (darwin) DarwinTools cctools; + inherit (darwin) DarwinTools; inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; swift = swiftNoSwiftDriver; }; @@ -108,6 +108,8 @@ let swift-format = callPackage ./swift-format { }; + swiftpm2nix = callPackage ./swiftpm2nix { }; + }; in self diff --git a/pkgs/development/compilers/swift/foundation/default.nix b/pkgs/development/compilers/swift/foundation/default.nix index eab509c5aaa1e..98eff7a31783a 100644 --- a/pkgs/development/compilers/swift/foundation/default.nix +++ b/pkgs/development/compilers/swift/foundation/default.nix @@ -67,6 +67,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-foundation"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix index 4a0616ded5ac5..8478d58494831 100644 --- a/pkgs/development/compilers/swift/libdispatch/default.nix +++ b/pkgs/development/compilers/swift/libdispatch/default.nix @@ -37,6 +37,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-libdispatch"; platforms = lib.platforms.linux; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cmm dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members ++ (with lib.maintainers; [ cmm ]); }; } diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index ec05eea01bf4d..f0c08a41e43e3 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/sourcekit-lsp"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index 5dec14eb475dc..2645f07aa4ec8 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-docc"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index 3245fa1d8787f..ca2b88046c86e 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-driver"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix index a3d939b85cbd8..3ce4c22b69700 100644 --- a/pkgs/development/compilers/swift/swift-format/default.nix +++ b/pkgs/development/compilers/swift/swift-format/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { homepage = "https://github.com/apple/swift-format"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; mainProgram = "swift-format"; }; } diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index ff4f5f1e1b10c..712bc01777a5e 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -459,6 +459,6 @@ in stdenv.mkDerivation (commonAttrs // { homepage = "https://github.com/apple/swift-package-manager"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; }; }) diff --git a/pkgs/development/tools/swiftpm2nix/default.nix b/pkgs/development/compilers/swift/swiftpm2nix/default.nix index d9f50cb801d56..26713860e1989 100644 --- a/pkgs/development/tools/swiftpm2nix/default.nix +++ b/pkgs/development/compilers/swift/swiftpm2nix/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Generate a Nix expression to fetch swiftpm dependencies"; mainProgram = "swiftpm2nix"; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/compilers/swift/swiftpm2nix/support.nix index 3debda233c5f4..3debda233c5f4 100644 --- a/pkgs/development/tools/swiftpm2nix/support.nix +++ b/pkgs/development/compilers/swift/swiftpm2nix/support.nix diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh index eda7f475064a9..eda7f475064a9 100755 --- a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh +++ b/pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh diff --git a/pkgs/development/compilers/swift/xctest/default.nix b/pkgs/development/compilers/swift/xctest/default.nix index c8003d8486f10..d50d11706cbd3 100644 --- a/pkgs/development/compilers/swift/xctest/default.nix +++ b/pkgs/development/compilers/swift/xctest/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/apple/swift-corelibs-xctest"; platforms = lib.platforms.all; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + maintainers = lib.teams.swift.members; }; } diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index befb24422936b..f9e53e197c977 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17, 18, 19, 20, 21, 22) +feature_versions = (8, 11, 17, 21, 22) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 622d1629dbb56..6f591a7e86f56 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -4,7 +4,7 @@ let sources = (lib.importJSON ./sources.json).hotspot.mac; common = opts: callPackage (import ./jdk-darwin-base.nix opts) { }; - EOL = [ "This JDK version has reached End of Life." ]; + # EOL = [ "This JDK version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; @@ -13,20 +13,9 @@ in jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; - jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; - jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; knownVulnerabilities = EOL; }; - jre-18 = common { sourcePerArch = sources.jre.openjdk18; knownVulnerabilities = EOL; }; - - jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; knownVulnerabilities = EOL; }; - jre-19 = common { sourcePerArch = sources.jre.openjdk19; knownVulnerabilities = EOL; }; - - jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; knownVulnerabilities = EOL; }; - jre-20 = common { sourcePerArch = sources.jre.openjdk20; knownVulnerabilities = EOL; }; - jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 2a38e3472d532..e05c5d40ae088 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -5,7 +5,7 @@ let sources = (lib.importJSON ./sources.json).hotspot.${variant}; common = opts: callPackage (import ./jdk-linux-base.nix opts) { }; - EOL = [ "This JDK version has reached End of Life." ]; + # EOL = [ "This JDK version has reached End of Life." ]; in { jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; @@ -14,20 +14,9 @@ in jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; - jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; }; - jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; - jdk-18 = common { sourcePerArch = sources.jdk.openjdk18; knownVulnerabilities = EOL; }; - jre-18 = common { sourcePerArch = sources.jre.openjdk18; knownVulnerabilities = EOL; }; - - jdk-19 = common { sourcePerArch = sources.jdk.openjdk19; knownVulnerabilities = EOL; }; - jre-19 = common { sourcePerArch = sources.jre.openjdk19; knownVulnerabilities = EOL; }; - - jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; knownVulnerabilities = EOL; }; - jre-20 = common { sourcePerArch = sources.jre.openjdk20; knownVulnerabilities = EOL; }; - jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 908e025bf3322..1d50d6e23ddbe 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, llvmPackages_16, ncurses, cmake, libxml2 -, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false +, symlinkJoin, cudaPackages, enableCUDA ? false , libffi, libobjc, libpfm, Cocoa, Foundation }: diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch index d108efe17115a..4bfefe1aeaa29 100644 --- a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch +++ b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch @@ -1,7 +1,7 @@ diff --git a/GNUmakefile b/GNUmakefile --- a/GNUmakefile +++ b/GNUmakefile -@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11 +@@ -14,11 +14,6 @@ LLVM_VERSIONS = 18 17 16 15 errifempty = $(if $(1),$(1),$(error $(2))) detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2))) toolSearchPathsVersion = $(1)-$(2) @@ -13,7 +13,7 @@ diff --git a/GNUmakefile b/GNUmakefile # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -707,9 +702,8 @@ endif +@@ -816,9 +811,8 @@ endif wasmtest: $(GO) test ./tests/wasm @@ -24,26 +24,26 @@ diff --git a/GNUmakefile b/GNUmakefile @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -721,15 +715,8 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - @mkdir -p build/release/tinygo/lib/picolibc/newlib/libc - @mkdir -p build/release/tinygo/lib/picolibc/newlib/libm - @mkdir -p build/release/tinygo/lib/wasi-libc +@@ -832,15 +826,11 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN + @mkdir -p build/release/tinygo/lib/wasi-libc/libc-bottom-half/headers + @mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch + @mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src - @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0 - @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus - @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 @echo copying source files @cp -p build/tinygo$(EXE) build/release/tinygo/bin --ifneq ($(USE_SYSTEM_BINARYEN),1) -- @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin --endif + ifneq ($(USE_SYSTEM_BINARYEN),1) + @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin + endif - @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -768,16 +755,9 @@ endif - @cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm - @cp -rp lib/picolibc-stdio.c build/release/tinygo/lib - @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot +@@ -891,16 +881,9 @@ endif + @cp -rp lib/wasi-libc/libc-top-half/musl/src/string build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src + @cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl + @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot - @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins - @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins + @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 36412b7993a9c..38f75608b3c73 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildPackages , buildGoModule , fetchFromGitHub , makeWrapper @@ -29,17 +28,17 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.31.2"; + version = "0.32.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-e0zXxIdAtJZXJdP/S6lHRnPm5Rsf638Fhox8XcqOWrk="; + hash = "sha256-zoXruGoWitx6kietF3HKTYCtUrXp5SOrf2FEGgVPzkQ="; fetchSubmodules = true; }; - vendorHash = "sha256-HZiyAgsTEBQv+Qp0T9RXTV1lkxvIGh7Q45rd45cfvjo="; + vendorHash = "sha256-rJ8AfJkIpxDkk+9Tf7ORnn7ueJB1kjJUBiLMDV5tias="; patches = [ ./0001-GNUmakefile.patch @@ -111,7 +110,7 @@ buildGoModule rec { installPhase = '' runHook preInstall - make build/release + make build/release USE_SYSTEM_BINARYEN=1 wrapProgram $out/bin/tinygo \ --prefix PATH : ${lib.makeBinPath runtimeDeps } diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 97c335cff09f4..cb8705eb4de0b 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-g8Z5MRM3KIgCjGxtU9JLEsFUjFxPKmc6OwY17C59cxg="; + hash = "sha256-g8Z5MRM3KIgCjGxtU9JLEsFUjFxPKmc6OwY17C59cxg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 587ca9d7f35e0..67dbb9e57677c 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.22"; + version = "0.5.24"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-Exgi0eKk+ZngpnbfY/btHf+uiXcmummnWKfmCUESWgc="; + hash = "sha256-5LVcN7ly0n68DFqIjA8EJabZa3WwJf1ueqgJ+gPHNbA="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-EWfyqaFtGJJ5GE0mRTtNC9hHOzbqG9MsvRh5sFq5pRY="; + hash = "sha256-nCNmUYkBWhXL2eN+uQblf7oPkiVwfAKi6v+Cb9Co19g="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 06ce12d642e3a..a312114e6abd2 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, bash , bison , boost , fetchFromGitHub @@ -12,7 +11,7 @@ , readline , symlinkJoin , tcl -, verilog +, iverilog , zlib , yosys , yosys-bluespec @@ -76,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.42"; + version = "0.44"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-P0peg81wxCG0Bw2EJEX5WuDYU7GmRqgRw2SyWK/CGNI="; + rev = "refs/tags/yosys-${finalAttrs.version}"; + hash = "sha256-aMVWmryMbVlEm1RNj1ENpLHOpuKRQTJMFZCn+WuaR04="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -122,7 +121,6 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace ./Makefile \ --replace-fail 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' - chmod +x ./misc/yosys-config.in patchShebangs tests ./misc/yosys-config.in ''; @@ -149,7 +147,7 @@ in stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; doCheck = true; - nativeCheckInputs = [ verilog ]; + nativeCheckInputs = [ iverilog ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/development/compilers/yosys/fix-clang-build.patch index 7f93594d0c1d7..05ba4fbc59290 100644 --- a/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -9,6 +9,14 @@ ./cxxrtl-test-${subtest} } +@@ -14,4 +14,4 @@ run_subtest value_fuzz + + # Compile-only test. + ../../yosys -p "read_verilog test_unconnected_output.v; proc; clean; write_cxxrtl cxxrtl-test-unconnected_output.cc" +-${CC:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc ++${CXX:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc +diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh +index 998047f83..2a4a59f01 100644 --- a/tests/fmt/run-test.sh +++ b/tests/fmt/run-test.sh @@ -51,7 +51,7 @@ test_cxxrtl () { diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index a3217f5732c23..cd95406c84d8f 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "z88dk"; repo = "z88dk"; rev = "v${version}"; - sha256 = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; + hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/zig/0.10/hook.nix b/pkgs/development/compilers/zig/0.10/hook.nix index 1d3439b1af620..aec36a2c0a825 100644 --- a/pkgs/development/compilers/zig/0.10/hook.nix +++ b/pkgs/development/compilers/zig/0.10/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.11/hook.nix b/pkgs/development/compilers/zig/0.11/hook.nix index fb0e1aa564d15..399b3889a2266 100644 --- a/pkgs/development/compilers/zig/0.11/hook.nix +++ b/pkgs/development/compilers/zig/0.11/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.12/hook.nix b/pkgs/development/compilers/zig/0.12/hook.nix index 8d3e6206d155e..1f920af318be8 100644 --- a/pkgs/development/compilers/zig/0.12/hook.nix +++ b/pkgs/development/compilers/zig/0.12/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zig/0.13/hook.nix b/pkgs/development/compilers/zig/0.13/hook.nix index a56b1a21e961d..1618702ecaec0 100644 --- a/pkgs/development/compilers/zig/0.13/hook.nix +++ b/pkgs/development/compilers/zig/0.13/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; @@ -18,6 +14,7 @@ makeSetupHook { zig_default_flags = [ "-Dcpu=baseline" "--release=safe" + "--color off" # Turn off progress output ]; }; diff --git a/pkgs/development/compilers/zig/0.9/hook.nix b/pkgs/development/compilers/zig/0.9/hook.nix index 1d3439b1af620..aec36a2c0a825 100644 --- a/pkgs/development/compilers/zig/0.9/hook.nix +++ b/pkgs/development/compilers/zig/0.9/hook.nix @@ -1,8 +1,4 @@ -{ - lib, - makeSetupHook, - zig, -}: +{ makeSetupHook, zig }: makeSetupHook { name = "zig-hook"; diff --git a/pkgs/development/compilers/zulu/18.nix b/pkgs/development/compilers/zulu/18.nix deleted file mode 100644 index cbee8ac6e5bd9..0000000000000 --- a/pkgs/development/compilers/zulu/18.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ callPackage -, enableJavaFX ? false -, ... -}@args: - -callPackage ./common.nix ({ - # Details from https://www.azul.com/downloads/?version=java-18-sts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-darwin = { - zuluVersion = "18.32.13"; - jdkVersion = "18.0.2.1"; - hash = - if enableJavaFX then "sha256-ZVZ1gbpJwxTduq2PPOCKqbSl+shq2NTFgqG++OXvFcg=" - else "sha256-uHPcyOgxUdTgzmIVRp/awtwve9zSt+1TZNef7DUuoRg="; - }; - - aarch64-darwin = { - zuluVersion = "18.32.13"; - jdkVersion = "18.0.2.1"; - hash = - if enableJavaFX then "sha256-tNx0a1u9iamcN9VFOJ3eqDEA6C204dtIBJZvuAH2Vjk=" - else "sha256-jAZDgxtWMq/74yKAxA69oOU0C9nXvKG5MjmZLsK04iM="; - }; - }; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/19.nix b/pkgs/development/compilers/zulu/19.nix deleted file mode 100644 index 28dbf58876164..0000000000000 --- a/pkgs/development/compilers/zulu/19.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ callPackage -, enableJavaFX ? false -, ... -}@args: - -callPackage ./common.nix ({ - # Details from https://www.azul.com/downloads/?version=java-19-sts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-darwin = { - zuluVersion = if enableJavaFX then "19.32.15" else "19.32.13"; - jdkVersion = "19.0.2"; - hash = - if enableJavaFX then "sha256-AwLcIId0gH5D6DUU8CgJ3qnKVQm28LXYirBeXBHwPYE=" - else "sha256-KARXWumsY+OcqpEOV2EL9SsPni1nGSipjRji/Mn2KsE="; - }; - - aarch64-darwin = { - zuluVersion = if enableJavaFX then "19.32.15" else "19.32.13"; - jdkVersion = "19.0.2"; - hash = - if enableJavaFX then "sha256-/R2rrcBr64qPGEtvhruXBhPwnvurt/hiR1ICzZAdYxE=" - else "sha256-F30FjZaLL756X/Xs6xjNwW9jds4pEATxoxOeeLL7Y5E="; - }; - }; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/compilers/zulu/20.nix b/pkgs/development/compilers/zulu/20.nix deleted file mode 100644 index 38083a881f512..0000000000000 --- a/pkgs/development/compilers/zulu/20.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ callPackage -, enableJavaFX ? false -, ... -}@args: - -callPackage ./common.nix ({ - # Details from https://www.azul.com/downloads/?version=java-20-sts&package=jdk - # Note that the latest build may differ by platform - dists = { - x86_64-darwin = { - zuluVersion = "20.32.11"; - jdkVersion = "20.0.2"; - hash = - if enableJavaFX then "sha256-hyxQAivZAXtqMebe30L+EYa7p+TdSdKNYj7Rl/ZwRNQ=" - else "sha256-Ev9KG6DvuBnsZrOguLsO1KQzudHCBcJNwKh45Inpnfo="; - }; - - aarch64-darwin = { - zuluVersion = "20.32.11"; - jdkVersion = "20.0.2"; - hash = - if enableJavaFX then "sha256-iPQzZS4CwaoqT8cSzg4kWCT1OyGBSJLq+NETcbucLo4=" - else "sha256-15uNZ6uMfSASV3QU2q2oA/jBk2PCHOfSjn1GY7/7qIY="; - }; - }; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index a39e29d25f880..629e752ca6287 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: -let recent = lib.versions.isGe "8.7" coq.coq-version; in +let recent = lib.versions.isGe "8.7" coq.coq-version || coq.coq-version == "dev"; in (mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; @@ -40,6 +40,9 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in preConfigure = lib.optionalString recent "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; + useDuneifVersion = v: lib.versions.isGe "2.1" v || v == "dev"; + opam-name = "coq-quickchick"; + mlPlugin = true; nativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; propagatedBuildInputs = [ ssreflect ] @@ -54,9 +57,11 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in }; }).overrideAttrs (o: let after_1_6 = lib.versions.isGe "1.6" o.version || o.version == "dev"; + after_2_1 = lib.versions.isGe "2.1" o.version || o.version == "dev"; in { nativeBuildInputs = o.nativeBuildInputs - ++ lib.optional after_1_6 coq.ocamlPackages.cppo; + ++ lib.optional after_1_6 coq.ocamlPackages.cppo + ++ lib.optional after_2_1 coq.ocamlPackages.menhir; propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optionals after_1_6 (with coq.ocamlPackages; [ findlib zarith ]); }) diff --git a/pkgs/development/coq-modules/coinduction/default.nix b/pkgs/development/coq-modules/coinduction/default.nix new file mode 100644 index 0000000000000..3cb264378e8e3 --- /dev/null +++ b/pkgs/development/coq-modules/coinduction/default.nix @@ -0,0 +1,22 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +mkCoqDerivation { + pname = "coinduction"; + owner = "damien-pous"; + inherit version; + defaultVersion = let inherit (lib.versions) range; in + lib.switch coq.coq-version [ + { case = range "8.19" "8.19"; out = "1.9"; } + ] null; + release = { + "1.9".sha256 = "sha256-bBU+xDklnzJBeN41GarW5KXzD8eKsOYtb//ULYumwWE="; + }; + releaseRev = v: "v${v}"; + + mlPlugin = true; + + meta = { + description = "A library for doing proofs by (enhanced) coinduction"; + license = lib.licenses.lgpl3Plus; + }; +} diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 59cfd680427b6..7d78a2d376863 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,5 +1,5 @@ { lib, mkCoqDerivation -, coq, flocq, compcert +, coq, flocq , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null @@ -66,8 +66,8 @@ compcert = mkCoqDerivation { -coqdevdir $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ \ -toolprefix ${tools}/bin/ \ -use-external-Flocq \ - ${target} - ''; + ${target} \ + ''; # don't remove the \ above, the command gets appended in override below installTargets = "documentation install"; installFlags = []; # trust ./configure @@ -100,8 +100,8 @@ compcert = mkCoqDerivation { platforms = builtins.attrNames targets; maintainers = with maintainers; [ thoughtpolice jwiegley vbgl ]; }; -}; in -compcert.overrideAttrs (o: +}; +patched_compcert = compcert.overrideAttrs (o: { patches = with lib.versions; lib.switch [ coq.version o.version ] [ { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; @@ -210,5 +210,8 @@ compcert.overrideAttrs (o: ]; } ] []; - } + }); in +patched_compcert.overrideAttrs (o: + lib.optionalAttrs (coq.version != null && coq.version == "dev") + { configurePhase = "${o.configurePhase} -ignore-ocaml-version -ignore-coq-version"; } ) diff --git a/pkgs/development/coq-modules/coq-hammer/default.nix b/pkgs/development/coq-modules/coq-hammer/default.nix index f332f0e3a82e3..33785178228f7 100644 --- a/pkgs/development/coq-modules/coq-hammer/default.nix +++ b/pkgs/development/coq-modules/coq-hammer/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: +{ mkCoqDerivation, coq, coq-hammer-tactics, version ? null }: mkCoqDerivation { inherit version; diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index 8a031ba84d7af..3224e1c337aaa 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, serapi, makeWrapper, version ? null }: -mkCoqDerivation rec { +(mkCoqDerivation rec { pname = "coq-lsp"; owner = "ejgallego"; namePrefix = [ ]; @@ -24,13 +24,13 @@ mkCoqDerivation rec { installPhase = '' runHook preInstall - dune install ${pname} --prefix=$out + dune install -p ${pname} --prefix=$out --libdir $OCAMLFIND_DESTDIR wrapProgram $out/bin/coq-lsp --prefix OCAMLPATH : $OCAMLPATH runHook postInstall ''; - propagatedBuildInputs = [ serapi ] - ++ (with coq.ocamlPackages; [ camlp-streams dune-build-info menhir uri yojson ]); + propagatedBuildInputs = + with coq.ocamlPackages; [ dune-build-info menhir uri yojson ]; meta = with lib; { description = "Language Server Protocol and VS Code Extension for Coq"; @@ -39,4 +39,12 @@ mkCoqDerivation rec { maintainers = with maintainers; [ alizter ]; license = licenses.lgpl21Only; }; -} +}).overrideAttrs (o: + with coq.ocamlPackages; + { propagatedBuildInputs = o.propagatedBuildInputs ++ + (if o.version != null && lib.versions.isLe "0.1.9+8.19" o.version && o.version != "dev" then + [ camlp-streams serapi ] + else + [ cmdliner ppx_deriving ppx_deriving_yojson ppx_import ppx_sexp_conv + ppx_compare ppx_hash sexplib ]); +}) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index edf573bcccf5b..2db9b6c969f08 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -1,3 +1,9 @@ +################################################################### +# # +# /!\ This coqhammer package is deprecated in favor of coq-hammer # +# # +################################################################### + { lib, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index f9a4d6e7956df..2382141f2232b 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,4 +1,4 @@ -{ which, lib, mkCoqDerivation, coq, bignums, version ? null }: +{ lib, mkCoqDerivation, coq, bignums, version ? null }: mkCoqDerivation { diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 76fb985c2c017..90ea6d6294664 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,13 +7,14 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.19"; out = "3.4.1"; } + { case = range "8.12" "8.20"; out = "3.4.2"; } { case = range "8.12" "8.18"; out = "3.4.0"; } { case = range "8.12" "8.17"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } ] null; + release."3.4.2".sha256 = "sha256-aBTF8ZKu67Rb3ryCqFyejUXf/65KgG8i5je/ZMFSrj4="; release."3.4.1".sha256 = "sha256-REhvIBl3EaL8CQqI34Gn7Xjf9NhPI3nrUAO26pSLbm0="; release."3.4.0".sha256 = "sha256-LIj2SwTvVBxSAO58VYCQix/uxQQe8ey6hqFOSh3PNcg="; release."3.3.1".sha256 = "sha256-YCvd4aIt2BxLKBYSWzN7aqo0AuY7z8oADmKvybhYBQI="; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 83662720c7f72..b517d16ab2d47 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -6,6 +6,7 @@ repo = "Coq-Equations"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.20"; out = "1.3.1+8.20"; } { case = "8.19"; out = "1.3+8.19"; } { case = "8.18"; out = "1.3+8.18"; } { case = "8.17"; out = "1.3+8.17"; } @@ -63,6 +64,8 @@ release."1.3+8.18".sha256 = "sha256-8MZO9vWdr8wlAov0lBTYMnde0RuMyhaiM99zp7Zwfao="; release."1.3+8.19".rev = "v1.3-8.19"; release."1.3+8.19".sha256 = "sha256-roBCWfAHDww2Z2JbV5yMI3+EOfIsv3WvxEcUbBiZBsk="; + release."1.3.1+8.20".rev = "v1.3.1-8.20"; + release."1.3.1+8.20".sha256 = "sha256-u8LB1KiACM5zVaoL7dSdHYvZgX7pf30VuqtjLLGuTzc="; mlPlugin = true; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 34c79818642b0..a7ff7044257fd 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,5 +1,4 @@ -{ lib, bash, autoconf, automake, - mkCoqDerivation, coq, version ? null }: +{ lib, bash, autoconf, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "flocq"; @@ -7,13 +6,14 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.19"; out = "4.1.4"; } + { case = range "8.14" "8.20"; out = "4.2.0"; } { case = range "8.14" "8.18"; out = "4.1.3"; } { case = range "8.14" "8.17"; out = "4.1.1"; } { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."4.2.0".sha256 = "sha256-uTeo4GCs6wTLN3sLKsj0xLlt1fUDYfozXtq6iooLUgM="; release."4.1.4".sha256 = "sha256-Use6Mlx79yef1CkCPyGoOItsD69B9KR+mQArCtmre4s="; release."4.1.3".sha256 = "sha256-os3cI885xNpxI+1p5rb8fSNnxKr7SFxqh83+3AM3t4I="; release."4.1.1".sha256 = "sha256-FbClxlV0ZaxITe7s9SlNbpeMNDJli+Dfh2TMrjaMtHo="; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 94994fb857358..4bf4ae771a0e4 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -24,7 +24,7 @@ mkCoqDerivation { propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = with lib; { - description = "Formal proof of the Four Color Theorem "; + description = "Formal proof of the Four Color Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; platforms = platforms.unix; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 83285d187f467..0fbf19d24a456 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,4 +1,4 @@ -{ which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: +{ lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: mkCoqDerivation { pname = "gappalib"; diff --git a/pkgs/development/coq-modules/high-school-geometry/default.nix b/pkgs/development/coq-modules/high-school-geometry/default.nix new file mode 100644 index 0000000000000..2f478978bd580 --- /dev/null +++ b/pkgs/development/coq-modules/high-school-geometry/default.nix @@ -0,0 +1,27 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +mkCoqDerivation { + pname = "high-school-geometry"; + inherit version; + repo = "HighSchoolGeometry"; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.16" "8.20"; out = "8.16"; } + { case = range "8.12" "8.16"; out = "8.13"; } + { case = "8.12"; out = "8.12"; } + { case = "8.11"; out = "8.11"; } + ] null; + + release = { + "8.16".sha256 = "sha256-HvUrZ6l7wCshuKUZs8rvfMkTEv+oXuogI5LICcD8Bn8="; + "8.13".sha256 = "sha256-5F/6155v0bWi5t7n4qU/GuR6jENngvWIIqJGPURzIeQ="; + "8.12".sha256 = "sha256-OF7sahU+5Ormkcrd8t6p2Kp/B2/Q/6zYTV3/XBvlGHc="; + "8.11".sha256 = "sha256-sVGeBBAJ7a7f+EJU1aSUvIVe9ip9PakY4379XWvvoqw="; + }; + releaseRev = v: "v${v}"; + + meta = with lib; { + description = "Geometry in Coq for French high school"; + maintainers = with maintainers; [ definfo ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index c9d6845aa9380..11fa1af24de60 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, coq, version ? null }: +{ lib, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "ltac2"; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index df7a7e27c93dc..99d0a96cf7980 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -3,9 +3,12 @@ let namePrefix = [ "coq" "mathcomp" ]; pname = "word"; - fetcher = { domain, owner, repo, rev, sha256, ...}: + fetcher = { domain, owner, repo, rev, sha256 ? null, ...}: + let prefix = "https://${domain}/${owner}/${repo}/"; in + if sha256 == null then + fetchTarball { url = "${prefix}archive/refs/heads/${rev}.tar.gz"; } else fetchurl { - url = "https://${domain}/${owner}/${repo}/releases/download/${rev}/${lib.concatStringsSep "-" (namePrefix ++ [ pname ])}-${rev}.tbz"; + url = "${prefix}releases/download/${rev}/${lib.concatStringsSep "-" (namePrefix ++ [ pname ])}-${rev}.tbz"; inherit sha256; }; in diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 51accc11d2491..f3f20adc72885 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -12,7 +12,7 @@ { lib, ncurses, graphviz, lua, fetchzip, mkCoqDerivation, withDoc ? false, single ? false, - coqPackages, coq, hierarchy-builder, version ? null }@args: + coq, hierarchy-builder, version ? null }@args: let repo = "math-comp"; diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index bfd5baf97d4c4..ef1a2131af2c6 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchzip, +{ lib, mkCoqDerivation, single ? false, - coqPackages, coq, equations, version ? null }@args: + coq, equations, version ? null }@args: let repo = "metacoq"; @@ -15,7 +15,7 @@ let { case = "8.16"; out = "1.1-8.16"; } { case = "8.17"; out = "1.3.1-8.17"; } { case = "8.18"; out = "1.3.1-8.18"; } - { case = "8.19"; out = "1.3.1-8.19"; } + { case = "8.19"; out = "1.3.2-8.19"; } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -32,11 +32,12 @@ let "1.3.1-8.17".sha256 = "sha256-l0/QLC7V3zSk/FsaE2eL6tXy2BzbcI5MAk/c+FESwnc="; "1.3.1-8.18".sha256 = "sha256-L6Ym4Auwqaxv5tRmJLSVC812dxCqdUU5aN8+t5HVYzY="; "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64="; + "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA="; }; releaseRev = v: "v${v}"; # list of core metacoq packages sorted by dependency order - packages = if lib.versionAtLeast coq.coq-version "8.17" + packages = if lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev" then [ "utils" "common" "template-coq" "pcuic" "safechecker" "template-pcuic" "erasure" "quotation" "safechecker-plugin" "erasure-plugin" "all" ] else [ "template-coq" "pcuic" "safechecker" "erasure" "all" ]; @@ -57,7 +58,7 @@ let mlPlugin = true; propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps; - patchPhase = if lib.versionAtLeast coq.coq-version "8.17" then '' + patchPhase = if lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev" then '' patchShebangs ./configure.sh patchShebangs ./template-coq/update_plugin.sh patchShebangs ./template-coq/gen-src/to-lower.sh diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 89297a6fd0ea5..6b61d9545f880 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -41,7 +41,7 @@ "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = lib.versions.range "1.5.3" "2.2.0"; preConfigure = '' patchShebangs configure || true diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 51d9590490f0c..cc42c515c09e7 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.2.1"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.2.1"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.20") (isLt "2.0.0") ]; out = "1.1.3"; } ] null; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index b7aa0ecff25e4..ac61e4eed0184 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, mkCoqDerivation, coq, version ? null }: +{ lib, fetchzip, mkCoqDerivation, coq, coq-lsp, version ? null }: let release = { @@ -17,6 +17,7 @@ in (with lib; mkCoqDerivation { pname = "serapi"; + repo = "coq-serapi"; inherit version release; defaultVersion = with versions; @@ -35,20 +36,15 @@ in useDune = true; - patches = [ ./janestreet-0.15.patch ]; - propagatedBuildInputs = with coq.ocamlPackages; [ cmdliner findlib # run time dependency of SerAPI ppx_deriving - ppx_deriving_yojson ppx_import ppx_sexp_conv ppx_hash sexplib - yojson - zarith # needed because of Coq ]; installPhase = '' @@ -64,6 +60,7 @@ in maintainers = with maintainers; [ alizter Zimmi48 ]; }; }).overrideAttrs(o: +if lib.versions.isLe "8.19.0+0.19.3" o.version && o.version != "dev" then let inherit (o) version; in { src = fetchzip { url = @@ -98,8 +95,9 @@ in else [ ]; - propagatedBuildInputs = o.propagatedBuildInputs ++ - lib.optional (version == "8.16.0+0.16.3" || version == "dev") coq.ocamlPackages.ppx_hash - ; - -}) + propagatedBuildInputs = o.propagatedBuildInputs + ++ (with coq.ocamlPackages; [ ppx_deriving_yojson yojson zarith ]) # zarith needed because of Coq + ; } +else + { propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq-lsp ]; } +) diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 719c09630dba5..a5418ce08dc31 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -20,6 +20,10 @@ doCheck = true; checkTarget = "test"; + useDuneifVersion = v: + (lib.versionAtLeast v "1.8.0" || v == "dev") + && (lib.versionAtLeast coq.version "8.20" || coq.version == "dev"); + passthru.tests.HelloWorld = callPackage ./test.nix {}; meta = with lib; { @@ -29,5 +33,4 @@ }; }).overrideAttrs (o: lib.optionalAttrs (lib.versionAtLeast o.version "1.8.0" || o.version == "dev") { doCheck = false; - useDune = true; }) diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 942ba1dc18bd1..e8c9442540919 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: +{ lib, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: let # version of veriT that works with SMTCoq diff --git a/pkgs/development/coq-modules/stalmarck/default.nix b/pkgs/development/coq-modules/stalmarck/default.nix new file mode 100644 index 0000000000000..88ea437937268 --- /dev/null +++ b/pkgs/development/coq-modules/stalmarck/default.nix @@ -0,0 +1,37 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +let + repo = "stalmarck"; + defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = isEq "8.20"; out = "8.20.0"; } + ] null; + release = { + "8.20.0".sha256 = "sha256-jITxQT1jLyZvWCGPnmK8i3IrwsZwMPOV0aBe9r22TIQ="; + }; + releaseRev = v: "v${v}"; + + packages = [ "stalmarck" "stalmarck-tactic" ]; + + stalmarck_ = package: let + pname = package; + istac = package == "stalmarck-tactic"; + propagatedBuildInputs = + lib.optional istac (stalmarck_ "stalmarck"); + description = + if istac then + "Coq tactic and verified tool for proving tautologies using Stålmarck's algorithm" + else + "A two-level approach to prove tautologies using Stålmarck's algorithm in Coq."; + in mkCoqDerivation { + inherit version pname defaultVersion release releaseRev repo + propagatedBuildInputs; + + mlPlugin = istac; + useDune = istac; + + meta = { inherit description; license = lib.licenses.lgpl21Plus; }; + + passthru = lib.genAttrs packages stalmarck_; + }; +in +stalmarck_ "stalmarck-tactic" diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 00506bf0eea7d..39e940a0b5f86 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -23,7 +23,7 @@ maintainers = [ maintainers.vbgl ]; }; }).overrideAttrs (x: - lib.optionalAttrs (lib.versionOlder x.version "20210316") { + lib.optionalAttrs (lib.versionOlder x.version "20210316" && x.version != "dev") { installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; } ) diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 9ffe598156c08..d50c83f0745eb 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: +{ lib, mkCoqDerivation, coq, zorns-lemma, version ? null }: mkCoqDerivation rec { pname = "topology"; diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index 565f83da06d6e..b9cdb622d9ca4 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,8 +1,9 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, +{ metaFetch, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.18" "8.20"; out = "2.1.4"; } { case = range "8.18" "8.19"; out = "2.1.2"; } { case = isEq "8.18"; out = "2.0.3+coq8.18"; } ] null; @@ -12,6 +13,8 @@ let ocamlPackages = coq.ocamlPackages; release."2.0.3+coq8.18".rev = "v2.0.3+coq8.18"; release."2.1.2".rev = "v2.1.2"; release."2.1.2".sha256 = "sha256-GloY68fLmIv3oiEGNWwmgKv1CMAReBuXzMTUsKOs328="; + release."2.1.4".rev = "v2.1.4"; + release."2.1.4".sha256 = "sha256-Vwve1sCg5OsGmhDLlOyGCwP6A8g618IzD79vLPw/JtQ="; inherit location; }); fetched = fetch (if version != null then version else defaultVersion); in diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md index 76732c5ddfb31..fadf5664de0df 100644 --- a/pkgs/development/cuda-modules/README.md +++ b/pkgs/development/cuda-modules/README.md @@ -23,7 +23,7 @@ scope. These are typically required for the creation of the finalized ## Top-level directories - `cuda`: CUDA redistributables! Provides extension to `cudaPackages` scope. -- `cudatoolkit`: monolothic CUDA Toolkit run-file installer. Provides extension +- `cudatoolkit`: monolithic CUDA Toolkit run-file installer. Provides extension to `cudaPackages` scope. - `cudnn`: NVIDIA cuDNN library. - `cutensor`: NVIDIA cuTENSOR library. diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix index 7f28f2c76d471..4e25dc44ca9af 100644 --- a/pkgs/development/cuda-modules/aliases.nix +++ b/pkgs/development/cuda-modules/aliases.nix @@ -1,18 +1,14 @@ -# Packges which have been deprecated or removed from cudaPackages +# Packages which have been deprecated or removed from cudaPackages final: prev: let + inherit (prev.lib) warn; + inherit (builtins) mapAttrs; + mkRenamed = - oldName: newName: newPkg: - final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg; + oldName: + { path, package }: + warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package; in -{ - - # Deprecated: an alias kept for compatibility. Consider removing after 24.05 - autoFixElfFiles = mkRenamed "autoFixElfFiles" "pkgs.autoFixElfFiles" final.pkgs.autoFixElfFiles; # Added 2024-03-30 - autoAddDriverRunpath = - mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath" - final.pkgs.autoAddDriverRunpath; # Added 2024-03-30 - autoAddOpenGLRunpathHook = - mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpathHook" - final.pkgs.autoAddDriverRunpath; # Added 2024-03-30 +mapAttrs mkRenamed { + # A comment to prevent empty { } from collapsing into a single line } diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix index 64131ab59b82e..f5d1c250cfca4 100644 --- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix @@ -3,7 +3,7 @@ backendStdenv, fetchFromGitHub, cmake, - addOpenGLRunpath, + addDriverRunpath, cudatoolkit, cutensor, }: @@ -20,12 +20,12 @@ let version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; nativeBuildInputs = [ cmake - addOpenGLRunpath + addDriverRunpath ]; buildInputs = [ cudatoolkit ]; postFixup = '' for exe in $out/bin/*; do - addOpenGLRunpath $exe + addDriverRunpath $exe done ''; meta = { diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix index 7b3a46acea920..ed9c57f3d00c5 100644 --- a/pkgs/development/cuda-modules/cuda-samples/generic.nix +++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix @@ -24,7 +24,7 @@ backendStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "NVIDIA"; - repo = finalAttrs.pname; + repo = "cuda-samples"; rev = "v${finalAttrs.version}"; inherit hash; }; diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 46e4401f6a26e..3970830e75674 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -156,13 +156,17 @@ filterAndCreateOverrides { { cudaAtLeast, gmp, + expat, + stdenv, lib, }: prevAttrs: { buildInputs = prevAttrs.buildInputs # x86_64 only needs gmp from 12.0 and on - ++ lib.lists.optionals (cudaAtLeast "12.0") [ gmp ]; + ++ lib.lists.optionals (cudaAtLeast "12.0") [ gmp ] + # aarch64,sbsa needs expat + ++ lib.lists.optionals (stdenv.hostPlatform.isAarch64) [ expat ]; }; cuda_nvcc = diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix index d2f8e2ce3fdf8..f7be0aa9f4fd2 100644 --- a/pkgs/development/cuda-modules/cudatoolkit/default.nix +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -3,7 +3,7 @@ runPatches ? [ ], autoPatchelfHook, autoAddDriverRunpath, - addOpenGLRunpath, + addDriverRunpath, alsa-lib, curlMinimal, expat, @@ -74,7 +74,7 @@ backendStdenv.mkDerivation rec { perl makeWrapper rsync - addOpenGLRunpath + addDriverRunpath autoPatchelfHook autoAddDriverRunpath markForCudatoolkitRootHook diff --git a/pkgs/development/cuda-modules/cudnn/fixup.nix b/pkgs/development/cuda-modules/cudnn/fixup.nix index 26c8ec63f13e8..183f38cfd4cf3 100644 --- a/pkgs/development/cuda-modules/cudnn/fixup.nix +++ b/pkgs/development/cuda-modules/cudnn/fixup.nix @@ -38,12 +38,19 @@ finalAttrs: prevAttrs: { ++ lists.optionals finalAttrs.passthru.useCudatoolkitRunfile [ final.cudatoolkit ] ++ lists.optionals (!finalAttrs.passthru.useCudatoolkitRunfile) [ final.libcublas.lib ]; - # Tell autoPatchelf about runtime dependencies. + # Tell autoPatchelf about runtime dependencies. *_infer* libraries only + # exist in CuDNN 8. # NOTE: Versions from CUDNN releases have four components. - postFixup = strings.optionalString (strings.versionAtLeast finalAttrs.version "8.0.5.0") '' - ${meta.getExe' patchelf "patchelf"} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - ${meta.getExe' patchelf "patchelf"} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so - ''; + postFixup = + strings.optionalString + ( + strings.versionAtLeast finalAttrs.version "8.0.5.0" + && strings.versionOlder finalAttrs.version "9.0.0.0" + ) + '' + ${meta.getExe patchelf} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + ${meta.getExe patchelf} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + ''; passthru.useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999"; diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix index a0e9d8083b7a9..26acaf4a36400 100644 --- a/pkgs/development/cuda-modules/cudnn/releases.nix +++ b/pkgs/development/cuda-modules/cudnn/releases.nix @@ -257,6 +257,21 @@ url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz"; hash = "sha256-R1MzYlx+QqevPKCy91BqEG4wyTsaoAgc2cE++24h47s="; } + { + version = "9.3.0.75"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.6"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.3.0.75_cuda12-archive.tar.xz"; + hash = "sha256-PW7xCqBtyTOaR34rBX4IX/hQC73ueeQsfhNlXJ7/LCY="; + } + { + version = "9.3.0.75"; + minCudaVersion = "11.8"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.3.0.75_cuda11-archive.tar.xz"; + hash = "sha256-Bp2ghM02jzn7gw1MTpMYAwZPtl52b0z33y2ko0aiup8"; + } + ]; }; } diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix index 5fdf356df916e..1f6ea36552425 100644 --- a/pkgs/development/cuda-modules/cutensor/extension.nix +++ b/pkgs/development/cuda-modules/cutensor/extension.nix @@ -40,6 +40,7 @@ let "1.5.0" "1.6.2" "1.7.0" + "2.0.2" ]; # Manifests :: { redistrib, feature } @@ -96,11 +97,14 @@ let redistArch = flags.getRedistArch hostPlatform.system; # platformIsSupported :: Manifests -> Boolean platformIsSupported = - { feature, ... }: + { feature, redistrib, ... }: (attrsets.attrByPath [ pname redistArch - ] null feature) != null; + ] null feature) != null + + # NOTE: This is an ad hoc hack; manifest schemas do not support version constraints yet + && !(lib.versionOlder cudaVersion "11.0" && lib.versionAtLeast redistrib.${pname}.version "2.0.2"); # TODO(@connorbaker): With an auxilliary file keeping track of the CUDA versions each release supports, # we could filter out releases that don't support our CUDA version. @@ -140,7 +144,7 @@ let maintainers = prevAttrs.meta.maintainers ++ [ lib.maintainers.obsidian-systems-maintenance ]; license = lib.licenses.unfreeRedistributable // { shortName = "cuTENSOR EULA"; - name = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; + fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; url = "https://docs.nvidia.com/cuda/cutensor/license.html"; }; }; diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json new file mode 100644 index 0000000000000..99679aecbc448 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json @@ -0,0 +1,44 @@ +{ + "libcutensor": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json new file mode 100644 index 0000000000000..cf790b7746c22 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json @@ -0,0 +1,35 @@ +{ + "release_date": "2024-06-24", + "release_label": "2.0.2", + "release_product": "cutensor", + "libcutensor": { + "name": "NVIDIA cuTENSOR", + "license": "cuTensor", + "license_path": "libcutensor/LICENSE.txt", + "version": "2.0.2.4", + "linux-x86_64": { + "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.0.2.4-archive.tar.xz", + "sha256": "957b04ef6343aca404fe5f4a3f1f1d3ac0bd04ceb3acecc93e53f4d63bd91157", + "md5": "2b994ecba434e69ee55043cf353e05b4", + "size": "545271628" + }, + "linux-ppc64le": { + "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-2.0.2.4-archive.tar.xz", + "sha256": "db2c05e231a26fb5efee470e1d8e11cb1187bfe0726b665b87cbbb62a9901ba0", + "md5": "6b00e29407452333946744c4084157e8", + "size": "543070992" + }, + "linux-sbsa": { + "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.0.2.4-archive.tar.xz", + "sha256": "9712b54aa0988074146867f9b6f757bf11a61996f3b58b21e994e920b272301b", + "md5": "c9bb31a92626a092d0c7152b8b3eaa18", + "size": "540299376" + }, + "windows-x86_64": { + "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.0.2.4-archive.zip", + "sha256": "ab2fca16d410863d14f2716cec0d07fb21d20ecd24ee47d309e9970c9c01ed4a", + "md5": "f6cfdb29a9a421a1ee4df674dd54028c", + "size": "921154033" + } + } +} diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 4af16c8921cb2..eccc7c2d216fa 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -6,7 +6,6 @@ backendStdenv, fetchurl, lib, - lndir, markForCudatoolkitRootHook, flags, stdenv, diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/nccl-tests/default.nix index 84575234a7691..10dd488abbaf1 100644 --- a/pkgs/development/cuda-modules/nccl-tests/default.nix +++ b/pkgs/development/cuda-modules/nccl-tests/default.nix @@ -29,7 +29,7 @@ backendStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "NVIDIA"; - repo = finalAttrs.pname; + repo = "nccl-tests"; rev = "v${finalAttrs.version}"; hash = "sha256-QYuMBPhvHHVo2ku14jD1CVINLPW0cyiXJkXxb77IxbE="; }; diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index e838bac3abc3c..3dd36e17f0a42 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -29,7 +29,7 @@ backendStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "NVIDIA"; - repo = finalAttrs.pname; + repo = "nccl"; rev = "v${finalAttrs.version}"; hash = "sha256-IF2tILwW8XnzSmfn7N1CO7jXL95gUp02guIW5n1eaig="; }; diff --git a/pkgs/development/cuda-modules/write-gpu-python-test.nix b/pkgs/development/cuda-modules/write-gpu-python-test.nix deleted file mode 100644 index 5f0d5c6b8fe68..0000000000000 --- a/pkgs/development/cuda-modules/write-gpu-python-test.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - writers, - runCommand, -}: -{ - feature ? "cuda", - name ? feature, - libraries ? [ ], -}: -content: - -let - tester = writers.writePython3Bin "tester-${name}" { inherit libraries; } content; - tester' = tester.overrideAttrs (oldAttrs: { - passthru.gpuCheck = - runCommand "test-${name}" - { - nativeBuildInputs = [ tester' ]; - requiredSystemFeatures = [ feature ]; - } - '' - set -e - ${tester.meta.mainProgram or (lib.getName tester')} - touch $out - ''; - }); -in -tester' diff --git a/pkgs/development/cuda-modules/write-gpu-test-python.nix b/pkgs/development/cuda-modules/write-gpu-test-python.nix new file mode 100644 index 0000000000000..23282e9169291 --- /dev/null +++ b/pkgs/development/cuda-modules/write-gpu-test-python.nix @@ -0,0 +1,66 @@ +{ + lib, + runCommand, + python3Packages, + makeWrapper, +}: +{ + feature ? "cuda", + name ? if feature == null then "cpu" else feature, + libraries ? [ ], # [PythonPackage] | (PackageSet -> [PythonPackage]) + ... +}@args: + +let + inherit (builtins) isFunction all; + librariesFun = if isFunction libraries then libraries else (_: libraries); +in + +assert lib.assertMsg ( + isFunction libraries || all (python3Packages.hasPythonModule) libraries +) "writeGpuTestPython was passed `libraries` from the wrong python release"; + +content: + +let + interpreter = python3Packages.python.withPackages librariesFun; + tester = + runCommand "tester-${name}" + ( + lib.removeAttrs args [ + "libraries" + "name" + ] + // { + inherit content; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ makeWrapper ]; + passAsFile = args.passAsFile or [ ] ++ [ "content" ]; + } + ) + '' + mkdir -p "$out"/bin + cat << EOF >"$out/bin/$name" + #!${lib.getExe interpreter} + EOF + cat "$contentPath" >>"$out/bin/$name" + chmod +x "$out/bin/$name" + + if [[ -n "''${makeWrapperArgs+''${makeWrapperArgs[@]}}" ]] ; then + wrapProgram "$out/bin/$name" ''${makeWrapperArgs[@]} + fi + ''; + tester' = tester.overrideAttrs (oldAttrs: { + passthru.gpuCheck = + runCommand "test-${name}" + { + nativeBuildInputs = [ tester' ]; + requiredSystemFeatures = lib.optionals (feature != null) [ feature ]; + } + '' + set -e + ${tester.meta.mainProgram or (lib.getName tester')} + touch $out + ''; + }); +in +tester' diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix deleted file mode 100644 index 9e1325a434578..0000000000000 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSEnv, installShellFiles, go-task }: - -let - - pkg = buildGoModule rec { - pname = "arduino-cli"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "arduino"; - repo = pname; - rev = "v${version}"; - hash = "sha256-lRCkUF0BBX0nej/HxfV9u8NIuA5W0aBKP2xPR8C61NY="; - }; - - nativeBuildInputs = [ - installShellFiles - ]; - - nativeCheckInputs = [ - go-task - ]; - - subPackages = [ "." ]; - - vendorHash = "sha256-lB/PfUZFL5+YBcAhrMMV2ckAHPhtW2SL3/zM3L4XGVc="; - - postPatch = let - skipTests = [ - # tries to "go install" - "TestDummyMonitor" - # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2" - "TestDownloadAndChecksums" - "TestParseArgs" - "TestParseReferenceCores" - "TestPlatformSearch" - "TestPlatformSearchSorting" - ]; - in '' - substituteInPlace Taskfile.yml \ - --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'" - ''; - - doCheck = stdenv.isLinux; - - checkPhase = '' - runHook preCheck - task go:test - runHook postCheck - ''; - - ldflags = [ - "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" - ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - export HOME="$(mktemp -d)" - installShellCompletion --cmd arduino-cli \ - --bash <($out/bin/arduino-cli completion bash) \ - --zsh <($out/bin/arduino-cli completion zsh) \ - --fish <($out/bin/arduino-cli completion fish) - unset HOME - ''; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Arduino from the command line"; - mainProgram = "arduino-cli"; - changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}"; - license = [ licenses.gpl3Only licenses.asl20 ]; - maintainers = with maintainers; [ ryantm sfrijters ]; - }; - - }; - -in -if stdenv.isLinux then -# buildFHSEnv is needed because the arduino-cli downloads compiler -# toolchains from the internet that have their interpreters pointed at -# /lib64/ld-linux-x86-64.so.2 - buildFHSEnv - { - inherit (pkg) name meta; - - runScript = "${pkg.outPath}/bin/arduino-cli"; - - extraInstallCommands = '' - mv $out/bin/$name $out/bin/arduino-cli - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - cp -r ${pkg.outPath}/share $out/share - ''; - passthru.pureGoPkg = pkg; - - targetPkgs = pkgs: with pkgs; [ - zlib - ]; - } -else - pkg diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/development/embedded/bossa/arduino.nix index 04e483ff38b5e..519b9820278b9 100644 --- a/pkgs/development/embedded/bossa/arduino.nix +++ b/pkgs/development/embedded/bossa/arduino.nix @@ -1,4 +1,4 @@ -{ bossa, git, fetchFromGitHub }: +{ bossa, fetchFromGitHub }: bossa.overrideAttrs (attrs: rec { pname = "bossa-arduino"; diff --git a/pkgs/development/embedded/edl/default.nix b/pkgs/development/embedded/edl/default.nix index 2e1f09ffd2089..23fbc7310ce01 100644 --- a/pkgs/development/embedded/edl/default.nix +++ b/pkgs/development/embedded/edl/default.nix @@ -1,25 +1,17 @@ { lib, stdenv, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "edl"; version = "unstable-2022-09-07"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "bkerler"; repo = "edl"; rev = "f6b94da5faa003b48d24a5f4a8f0b8495626fd5b"; fetchSubmodules = true; hash = "sha256-bxnRy+inWNArE2gUA/qDPy7NKvqBm43sbxdIaTc9N28="; }; - # edl has a spurious dependency on "usb" which has nothing to do with the - # project and was probably added by accident trying to add pyusb - postPatch = '' - sed -i '/'usb'/d' setup.py - ''; - # No tests set up - doCheck = false; - # EDL loaders are ELFs but shouldn't be touched, rest is Python anyways - dontStrip = true; + propagatedBuildInputs = with python3Packages; [ pyusb pyserial @@ -28,11 +20,26 @@ python3Packages.buildPythonPackage rec { pycryptodome lxml colorama - # usb capstone keystone-engine ]; + # No tests set up + doCheck = false; + # EDL loaders are ELFs but shouldn't be touched, rest is Python anyways + dontStrip = true; + + # edl has a spurious dependency on "usb" which has nothing to do with the + # project and was probably added by accident trying to add pyusb + postPatch = '' + sed -i '/'usb'/d' setup.py + ''; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp $src/Drivers/51-edl.rules $out/etc/udev/rules.d/51-edl.rules + ''; + meta = with lib; { homepage = "https://github.com/bkerler/edl"; description = "Qualcomm EDL tool (Sahara / Firehose / Diag)"; diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index e02b54a8d12cb..b3091df1e3f65 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; + hash = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/development/embedded/fpga/openfpgaloader/default.nix index 5309093f17800..2a84bfdc8c9ac 100644 --- a/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "openFPGALoader"; homepage = "https://github.com/trabucayre/openFPGALoader"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix index b5a9937ad2af4..0e962d2f2a2b7 100644 --- a/pkgs/development/embedded/fpga/tinyprog/default.nix +++ b/pkgs/development/embedded/fpga/tinyprog/default.nix @@ -34,7 +34,7 @@ with python3Packages; buildPythonApplication rec { homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; mainProgram = "tinyprog"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 5efd11c65f98e..366d1ed832c21 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , hidapi +, tcl , jimtcl , libjaylink , libusb1 @@ -12,8 +13,12 @@ # Allow selection the hardware targets (SBCs, JTAG Programmers, JTAG Adapters) , extraHardwareSupport ? [] -}: +}: let + isWindows = stdenv.hostPlatform.isWindows; + notWindows = !isWindows; + +in stdenv.mkDerivation rec { pname = "openocd"; version = "0.12.0"; @@ -22,23 +27,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-ryVHiL6Yhh8r2RA/5uYKd07Jaow3R0Tu+Rl/YEMHWvo="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config tcl ]; - buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ] + buildInputs = [ libusb1 ] + ++ lib.optionals notWindows [ hidapi jimtcl libftdi1 libjaylink ] ++ # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ lib.optional stdenv.isLinux libgpiod_1; configureFlags = [ "--disable-werror" - "--disable-internal-jimtcl" - "--disable-internal-libjaylink" "--enable-jtag_vpi" - "--enable-buspirate" "--enable-remote-bitbang" - (lib.enableFeature enableFtdi "ftdi") + (lib.enableFeature notWindows "buspirate") + (lib.enableFeature (notWindows && enableFtdi) "ftdi") (lib.enableFeature stdenv.isLinux "linuxgpiod") (lib.enableFeature stdenv.isLinux "sysfsgpio") + (lib.enableFeature isWindows "internal-jimtcl") + (lib.enableFeature isWindows "internal-libjaylink") ] ++ map (hardware: "--enable-${hardware}") extraHardwareSupport ; @@ -75,6 +81,6 @@ stdenv.mkDerivation rec { homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor prusnak ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index f2ebeba39361a..6890a2b1b35eb 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -11,7 +11,7 @@ with python3Packages; buildPythonApplication rec { pname = "platformio"; - version = "6.1.11"; + version = "6.1.15"; pyproject = true; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 @@ -19,7 +19,7 @@ with python3Packages; buildPythonApplication rec { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - hash = "sha256-NR4UyAt8q5sUGtz1Sy6E8Of7y9WrH9xpcAWzLBeDQmo="; + hash = "sha256-w5JUAqQRNxq8ZrX8ffny2K7xWBkGr2H3+apYqCPXw9c="; }; outputs = [ "out" "udev" ]; @@ -132,6 +132,7 @@ with python3Packages; buildPythonApplication rec { # requires internet connection "test_api_cache" "test_ping_internet_ips" + "test_metadata_dump" ]; pytestFlagsArray = [ diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index ba9b55b788a1b..f2b9f5015adc4 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -1,12 +1,12 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index 95e08108..6c2cfaed 100644 +index c1d22ab5..6c2cfaed 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py @@ -276,9 +276,6 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.21" +- version = "3.23" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - f"v{version}/json/licenses.json" diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index b42651aa1404c..926832ec6ea5c 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.32"; + version = "0.0.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; + hash = "sha256-yD4F4xZpHaID5aXZ5tbCZB24a/+FtyobmAOV5GOJMMU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix deleted file mode 100644 index 8127385a79d52..0000000000000 --- a/pkgs/development/embedded/svdtools/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -}: - -rustPlatform.buildRustPackage rec { - pname = "svdtools"; - version = "0.3.15"; - - src = fetchCrate { - inherit version pname; - hash = "sha256-P4XwIJnXnIQcp/l8GR7Mx8ybn1GdtiXVpQcky1JYVuU="; - }; - - cargoHash = "sha256-dBqbZWVTrIj2ji7JmLnlglvt4GkKef48kcl/V54thaQ="; - - meta = with lib; { - description = "Tools to handle vendor-supplied, often buggy SVD files"; - mainProgram = "svdtools"; - homepage = "https://github.com/stm32-rs/svdtools"; - changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-rust.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/development/embedded/teensy-cmake-macros/hook.nix index b0abdbdc681ee..55f9aec729f57 100644 --- a/pkgs/development/embedded/teensy-cmake-macros/hook.nix +++ b/pkgs/development/embedded/teensy-cmake-macros/hook.nix @@ -1,5 +1,4 @@ -{ lib -, makeSetupHook +{ makeSetupHook , teensy-cmake-macros }: diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 8155f39ee6891..66a6e82fff8b6 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -57,6 +58,9 @@ mkDerivation rec { homepage = "https://github.com/bistromath/gr-ais"; license = licenses.gpl3Plus; platforms = platforms.unix; + # rpcserver_aggregator.h:111:54: error: no template named 'unary_function' + # in namespace 'std'; did you mean '__unary_function'? + broken = stdenv.isDarwin; maintainers = with maintainers; [ mog ]; }; } diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix index bdd541f04432f..62db654270b91 100644 --- a/pkgs/development/gnuradio-modules/limesdr/default.nix +++ b/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -5,7 +5,6 @@ , thrift , cmake , pkg-config -, doxygen , swig , python , logLib diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index ef5213b26cbeb..d2f6e8e5b2cbe 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU="; + hash = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU="; }; strictDeps = true; diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix index cb44606b29407..5d2102a04d129 100644 --- a/pkgs/development/hare-third-party/hare-ev/default.nix +++ b/pkgs/development/hare-third-party/hare-ev/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "hare-ev"; - version = "0-unstable-2024-01-04"; + version = "0-unstable-2024-07-11"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-ev"; - rev = "736ab9bb17257ee5eba3bc96f6650fc4a14608ea"; - hash = "sha256-SXExwDZKlW/2XYzmJUhkLWj6NF/znrv3vY9V0mD5iFQ="; + rev = "ed023beb4b4db88e22f608aa001682ac18cad230"; + hash = "sha256-bZWVrxk3CMAHRnizRAqgT5wmRQaQ/Ua3AIAR5HZxMbE="; }; nativeCheckInputs = [ hareHook ]; diff --git a/pkgs/development/hare-third-party/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix index d78b384cb94b7..a96de33b914a6 100644 --- a/pkgs/development/hare-third-party/hare-json/default.nix +++ b/pkgs/development/hare-third-party/hare-json/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hare-json"; - version = "0-unstable-2023-03-13"; + version = "0-unstable-2024-04-19"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-json"; - rev = "88256102a9fec62d494628e32cb406574e49e5e1"; - hash = "sha256-Sx+RBiLhR3ftP89AwinVlBg0u0HX4GVP7TLmuofgC9s="; + rev = "b6aeae96199607a1f3b4d437d5c99f821bd6a6b6"; + hash = "sha256-mgUzHGXbaJdWm7qUn7mWdDUQBgbEjh42O+Lo0ok80Wo="; }; nativeBuildInputs = [ hareHook ]; diff --git a/pkgs/development/hare-third-party/hare-toml/default.nix b/pkgs/development/hare-third-party/hare-toml/default.nix index 9f2ab6f366f73..cce8f8f744ca1 100644 --- a/pkgs/development/hare-third-party/hare-toml/default.nix +++ b/pkgs/development/hare-third-party/hare-toml/default.nix @@ -1,5 +1,6 @@ { fetchFromGitea, + fetchpatch, hareHook, lib, nix-update-script, @@ -8,16 +9,24 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hare-toml"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lunacb"; repo = "hare-toml"; rev = "v${finalAttrs.version}"; - hash = "sha256-r8T7Gy9c5polP+R12q0QRy4075nfGssDnNPQ8ARx/0M="; + hash = "sha256-MfflJElDMu15UBuewssqhCEsNtzmN/H421H4HV+JCWc="; }; + patches = [ + # Update strconv module functions for 0.24.2 + (fetchpatch { + url = "https://codeberg.org/lunacb/hare-toml/commit/9849908ba1fd3457abd6c708272ecb896954d2bc.patch"; + hash = "sha256-herJZXJ8uusTO2b7Ddby2chIvDRuAPDFOPEt+wotTA0="; + }) + ]; + nativeBuildInputs = [ scdoc hareHook diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb6f9608b76df..9da4a424c23c0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -27,6 +27,20 @@ self: super: { process = self.process_1_6_20_0; })); + Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_12_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_20_0; + })); + + # hackage-security == 0.6.2.6 has a wider support range in theory, but it only + # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12 + hackage-security_0_6_2_6 = super.hackage-security_0_6_2_6.override { + Cabal = self.Cabal_3_12_1_0; + Cabal-syntax = self.Cabal-syntax_3_12_1_0; + }; + # cabal-install needs most recent versions of Cabal and Cabal-syntax, # so we need to put some extra work for non-latest GHCs inherit ( @@ -34,25 +48,10 @@ self: super: { # !!! Use cself/csuper inside for the actual overrides cabalInstallOverlay = cself: csuper: { - # Needs to be downgraded compared to Stackage LTS 21 - resolv = cself.resolv_0_1_2_0; + hackage-security = self.hackage-security_0_6_2_6; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10") { - Cabal = cself.Cabal_3_10_3_0; - Cabal-syntax = cself.Cabal-syntax_3_10_3_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { - # We need at least directory >= 1.3.7.0. Using the latest version - # 1.3.8.* is not an option since it causes very annoying dependencies - # on newer versions of unix and filepath than GHC 9.2 ships - directory = cself.directory_1_3_7_1; - # GHC 9.2.5 starts shipping 1.6.16.0 which is required by - # cabal-install, but we need to recompile process even if the correct - # version is available to prevent inconsistent dependencies: - # process depends on directory. - process = cself.process_1_6_20_0; - - # Prevent dependency on doctest which causes an inconsistent dependency - # due to depending on ghc which depends on directory etc. - vector = dontCheck csuper.vector; + Cabal = cself.Cabal_3_12_1_0; + Cabal-syntax = cself.Cabal-syntax_3_12_1_0; }; in { @@ -103,7 +102,8 @@ self: super: { ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### - haskell-language-server = dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: { + # All jailbreaks in this section due to: https://github.com/haskell/haskell-language-server/pull/4316#discussion_r1667684895 + haskell-language-server = doJailbreak (dontCheck (super.haskell-language-server.overrideScope (lself: lsuper: { # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -114,7 +114,9 @@ self: super: { # otherwise we have different versions of ghc-paths # around which have the same abi-hash, which can lead to confusions and conflicts. ghc-paths = lsuper.ghc-paths.override { Cabal = null; }; - })); + }))); + hls-plugin-api = doJailbreak super.hls-plugin-api; + ghcide = doJailbreak super.ghcide; # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex); @@ -163,6 +165,9 @@ self: super: { alex = self.alex_3_5_1_0; }; + # 2024-07-09: rhine 1.4.* needs newer monad-schedule than stackage (and is only consumer) + monad-schedule = assert super.monad-schedule.version == "0.1.2.2"; doDistribute self.monad-schedule_0_2; + aeson = # aeson's test suite includes some tests with big numbers that fail on 32bit # https://github.com/haskell/aeson/issues/1060 @@ -246,6 +251,20 @@ self: super: { }; }) super.leveldb-haskell; + # 2024-06-23: Hourglass is archived and had its last commit 6 years ago. + # Patch is needed to add support for time 1.10, which is only used in the tests + # https://github.com/vincenthz/hs-hourglass/pull/56 + # Jailbreak is needed because a hackage revision added the (correct) time <1.10 bound. + hourglass = doJailbreak + (appendPatches [ + (pkgs.fetchpatch { + name = "hourglass-pr-56.patch"; + url = + "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; + sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; + }) + ] super.hourglass); + # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the # store. Testing is done upstream. @@ -393,7 +412,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-adV7I1P0O/dqH1rEyf3c2Vp4GSiiHReJyqnkSOYQGT0="; + hash = "sha256-/NbwuVTx517DGyr2k1AdQqJaVEc8lrtuO9EliiCZdps="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -409,6 +428,12 @@ self: super: { # (this should be possible by also taking PREFIX into account). ./patches/git-annex-no-usr-prefix.patch ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \ + 'InstallDesktopFile git-annex' + ''; }) super.git-annex; # Too strict bounds on servant @@ -470,7 +495,6 @@ self: super: { # Tests require older versions of tasty. hzk = dontCheck super.hzk; - resolv_0_1_2_0 = doJailbreak super.resolv_0_1_2_0; # Test suite doesn't compile with 9.6, 9.8 # https://github.com/sebastiaanvisser/fclabels/issues/45 @@ -551,9 +575,8 @@ self: super: { HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; - # 2022-01-29: Tests fail: https://github.com/psibi/streamly-bytestring/issues/27 # 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30 - streamly-bytestring = dontCheck (doJailbreak super.streamly-bytestring); + streamly-bytestring = doJailbreak super.streamly-bytestring; # 2024-05-18: Upstream tests against a different pandoc version pandoc-crossref = dontCheck super.pandoc-crossref; @@ -766,9 +789,6 @@ self: super: { # 2023-06-26: Test failure: https://hydra.nixos.org/build/224869905 comfort-blas = dontCheck super.comfort-blas; - # 2022-06-26: Too strict lower bound on semialign. - trie-simple = doJailbreak super.trie-simple; - # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; @@ -1277,6 +1297,10 @@ self: super: { ''; }) super.hpack; + # Upstream stack-0.15.7 is compiled with hpack-0.36.0, and we make sure to + # keep the same hpack version in Nixpkgs. + stack = super.stack.override { hpack = self.hpack_0_36_0; }; + # hslua has tests that break when using musl. # https://github.com/hslua/hslua/issues/106 hslua-core = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.hslua-core else super.hslua-core; @@ -1351,11 +1375,7 @@ self: super: { pkgs.postgresqlTestHook ] super.users-postgresql-simple; - # Need https://github.com/obsidiansystems/gargoyle/pull/45 - gargoyle = doJailbreak super.gargoyle; - gargoyle-postgresql = doJailbreak super.gargoyle-postgresql; - gargoyle-postgresql-nix = doJailbreak (addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix); - gargoyle-postgresql-connect = doJailbreak super.gargoyle-postgresql-connect; + gargoyle-postgresql-nix = addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix; # PortMidi needs an environment variable to have ALSA find its plugins: # https://github.com/NixOS/nixpkgs/issues/6860 @@ -1531,8 +1551,10 @@ self: super: { # https://github.com/commercialhaskell/stackage/issues/6884 persistent-sqlite = dontCheck super.persistent-sqlite; - # 2021-12-26: Too strict bounds on doctest - polysemy-plugin = doJailbreak super.polysemy-plugin; + # Needs matching lsp-types + lsp_2_4_0_0 = super.lsp_2_4_0_0.override { + lsp-types = self.lsp-types_2_1_1_0; + }; # 2024-02-28: The Hackage version dhall-lsp-server-1.1.3 requires # lsp-1.4.0.0 which is hard to build with this LTS. However, the latest @@ -1852,10 +1874,6 @@ self: super: { }) ] super.binary-strict; - # 2020-11-15: nettle tests are pre MonadFail change - # https://github.com/stbuehler/haskell-nettle/issues/10 - nettle = dontCheck super.nettle; - # The tests for semver-range need to be updated for the MonadFail change in # ghc-8.8: # https://github.com/adnelson/semver-range/issues/15 @@ -1864,8 +1882,6 @@ self: super: { # 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475 reflex = doJailbreak (dontCheck super.reflex); - # 2024-03-02: hspec <2.11, primitive <0.8 - https://github.com/reflex-frp/reflex-vty/pull/80 - reflex-vty = assert super.reflex-vty.version == "0.5.2.0"; doJailbreak super.reflex-vty; # 2024-03-02: vty <5.39 - https://github.com/reflex-frp/reflex-ghci/pull/33 reflex-ghci = assert super.reflex-ghci.version == "0.2.0.1"; doJailbreak super.reflex-ghci; @@ -1916,22 +1932,12 @@ self: super: { (self.generateOptparseApplicativeCompletions [ "hci" ]) ]; - pipes-aeson = appendPatches [ - # Dependency of the aeson-2 patch - (fetchpatch { - name = "pipes-aeson-add-loop.patch"; - url = "https://github.com/k0001/pipes-aeson/commit/d22133b4a678edbb52bcaec5079dc88ccc0de1d3.patch"; - sha256 = "sha256-5o5ys1P1+QB4rjLCYok5AcPRWCtRiecP/TqCFm8ulVY="; - includes = ["src/Pipes/Aeson.hs" "src/Pipes/Aeson/Internal.hs" "src/Pipes/Aeson/Unchecked.hs"]; - }) - # https://github.com/k0001/pipes-aeson/pull/20 - (fetchpatch { - name = "pipes-aeson-aeson-2.patch"; - url = "https://github.com/hercules-ci/pipes-aeson/commit/ac735c9cd459c6ef51ba82325d1c55eb67cb7b2c.patch"; - sha256 = "sha256-viWZ6D5t79x50RXiOjP6UeQ809opgNFYZOP+h+1KJh0="; - includes = ["src/Pipes/Aeson.hs" "src/Pipes/Aeson/Internal.hs" "src/Pipes/Aeson/Unchecked.hs"]; - }) - ] super.pipes-aeson; + # https://github.com/k0001/pipes-aeson/pull/21 + pipes-aeson = appendPatch (fetchpatch { + url = "https://github.com/k0001/pipes-aeson/commit/08c25865ef557b41d7e4a783f52e655d2a193e18.patch"; + relative = "pipes-aeson"; + sha256 = "sha256-kFV6CcwKdMq+qSgyc+eIApnaycq5A++pEEVr2A9xvts="; + }) super.pipes-aeson; # Needs bytestring 0.11 # https://github.com/Gabriella439/Haskell-Pipes-HTTP-Library/pull/17 @@ -1945,7 +1951,7 @@ self: super: { relative = "moto-postgresql"; sha256 = "sha256-f2JVX9VveShCeV+T41RQgacpUoh1izfyHlE6VlErkZM="; }) - ] (unmarkBroken super.moto-postgresql); + ] super.moto-postgresql; moto = appendPatches [ # https://gitlab.com/k0001/moto/-/merge_requests/3 @@ -2049,28 +2055,6 @@ self: super: { # test suite doesn't compile anymore due to changed hunit/tasty APIs fullstop = dontCheck super.fullstop; - crypton-x509 = - lib.pipe - super.crypton-x509 - [ - # Mistype in a dependency in a test. - # https://github.com/kazu-yamamoto/crypton-certificate/pull/3 - (appendPatch - (fetchpatch { - name = "crypton-x509-rename-dep.patch"; - url = "https://github.com/kazu-yamamoto/crypton-certificate/commit/5281ff115a18621407b41f9560fd6cd65c602fcc.patch"; - hash = "sha256-pLzuq+baSDn+MWhtYIIBOrE1Js+tp3UsaEZy5MhWAjY="; - relative = "x509"; - }) - ) - # There is a revision in crypton-x509, so the above patch won't - # apply because of line endings in revised .cabal files. - (overrideCabal { - editedCabalFile = null; - revision = null; - }) - ]; - # * doctests don't work without cabal # https://github.com/noinia/hgeometry/issues/132 # * Too strict version bound on vector-builder @@ -2094,20 +2078,16 @@ self: super: { # https://github.com/faylang/fay/pull/474 fay = doJailbreak super.fay; - # Too strict version bounds on cryptonite. - # Issue reported upstream, no bug tracker url yet. - darcs = doJailbreak super.darcs; + # Requests latest versions of crypton-connection and tls + darcs = super.darcs.overrideScope (self: super: { + crypton-connection = self.crypton-connection_0_4_1; + tls = self.tls_2_0_6; + }); # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; - # https://github.com/obsidiansystems/cli-git/pull/7 turned into a flat patch cli-git = lib.pipe super.cli-git [ - (appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/cli-git/commit/be378a97e2f46522174231b77c952f759df3fad6.patch"; - sha256 = "sha256-6RrhqkKpnb+FTHxccHNx6pdC7ClfqcJ2eoo+W7h+JUo="; - excludes = [ ".github/**" ]; - })) doJailbreak (addBuildTool pkgs.git) ]; @@ -2118,21 +2098,11 @@ self: super: { pkgs.nix-prefetch-git ] (doJailbreak super.cli-nix); - # https://github.com/obsidiansystems/nix-thunk/pull/51/ - nix-thunk = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/nix-thunk/commit/c3dc3e799e8ce7756330f98b9f73f59c4b7a5502.patch"; - sha256 = "sha256-C1ii1FXiCPFfw5NzyQZ0cEG6kIYGohVsnHycpYEJ24Q="; - }) (doJailbreak super.nix-thunk); + nix-thunk = doJailbreak super.nix-thunk; # list `modbus` in librarySystemDepends, correct to `libmodbus` libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus); - # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream. - trial-optparse-applicative = assert super.trial-optparse-applicative.version == "0.0.0.0"; doJailbreak super.trial-optparse-applicative; - - # 2022-12-28: Too strict version bounds on bytestring - iconv = doJailbreak super.iconv; - ginger = doJailbreak super.ginger; # 2024-05-05 syntax changes: https://github.com/obsidiansystems/haveibeenpwned/pull/9 @@ -2185,10 +2155,6 @@ self: super: { ]; }; - # 2021-04-09: outdated base and alex-tools - # PR pending https://github.com/glguy/language-lua/pull/6 - language-lua = doJailbreak super.language-lua; - # 2021-04-09: too strict time bound # PR pending https://github.com/zohl/cereal-time/pull/2 cereal-time = doJailbreak super.cereal-time; @@ -2290,24 +2256,17 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; - # https://github.com/haskell-gi/haskell-gi/issues/431 - haskell-gi = appendPatch (fetchpatch { - url = "https://github.com/haskell-gi/haskell-gi/pull/430/commits/9ee545ad5028e5de8e1e1d96bbba2b9dbab47480.diff"; - hash = "sha256-kh32mZ7EdlOsg7HQILB7Y/EkHIqG/mozbnd/kbP+WDk="; - }) - super.haskell-gi; - # Too strict version bounds on haskell-gi # https://github.com/owickstrom/gi-gtk-declarative/issues/100 gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - gi-gtk_4 = self.gi-gtk_4_0_8; - gi-gtk_4_0_8 = doDistribute (super.gi-gtk_4_0_8.override { + gi-gtk_4 = self.gi-gtk_4_0_9; + gi-gtk_4_0_9 = doDistribute (super.gi-gtk_4_0_9.override { gi-gdk = self.gi-gdk_4; }); - gi-gdk_4 = self.gi-gdk_4_0_7; - gi-gdk_4_0_7 = doDistribute super.gi-gdk_4_0_7; + gi-gdk_4 = self.gi-gdk_4_0_8; + gi-gdk_4_0_8 = doDistribute super.gi-gdk_4_0_8; # GSK is only used for GTK 4. gi-gsk = super.gi-gsk.override { gi-gdk = self.gi-gdk_4; @@ -2317,22 +2276,6 @@ self: super: { gi-gtk = self.gi-gtk_4; }; - # Missing dependency on gi-cairo - # https://github.com/haskell-gi/haskell-gi/pull/420 - gi-vte = - overrideCabal - (oldAttrs: { - # This is implemented as a sed expression instead of pulling a patch - # from upstream because the gi-vte repo doesn't actually contain a - # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata - # in the repo. - postPatch = (oldAttrs.postPatch or "") + '' - sed -i 's/\(gi-gtk == .*\),/\1, gi-cairo == 1.0.*,/' ./gi-vte.cabal - ''; - buildDepends = (oldAttrs.buildDepends or []) ++ [self.gi-cairo]; - }) - super.gi-vte; - # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck @@ -2416,10 +2359,6 @@ self: super: { # https://github.com/muesli4/table-layout/issues/16 table-layout = doJailbreak super.table-layout; - # 2021-06-20: Outdated upper bounds - # https://github.com/Porges/email-validate-hs/issues/58 - email-validate = doJailbreak super.email-validate; - # https://github.com/plow-technologies/hspec-golden-aeson/issues/17 hspec-golden-aeson = dontCheck super.hspec-golden-aeson; @@ -2436,9 +2375,6 @@ self: super: { # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - # 2022-12-30: Restrictive upper bound on optparse-applicative - retrie = doJailbreak super.retrie; - # 2022-08-30 Too strict bounds on finite-typelits # https://github.com/jumper149/blucontrol/issues/1 blucontrol = doJailbreak super.blucontrol; @@ -2588,7 +2524,7 @@ self: super: { validation = doJailbreak super.validation; # 2022-03-16: strict upper bounds https://github.com/monadfix/shower/issues/18 - shower = doJailbreak (dontCheck super.shower); + shower = doJailbreak super.shower; # Test suite isn't supposed to succeed yet, apparently… # https://github.com/andrewufrank/uniform-error/blob/f40629ad119e90f8dae85e65e93d7eb149bddd53/test/Uniform/Error_test.hs#L124 @@ -2641,24 +2577,9 @@ self: super: { # 2022-02-25: Unmaintained and to strict upper bounds paths = doJailbreak super.paths; - # 2022-02-26: https://github.com/emilypi/base64/issues/39 - base64 = dontCheck super.base64; - # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; - # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 - dependent-monoidal-map = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/dependent-monoidal-map/commit/3f8be15fa9bd2796d1c917e9f0979b4d6c62cf91.patch"; - hash = "sha256-QKDUh4jO8xZrThrkjTVNnkoVY+GejxOhpXOVA4+n1H8="; - }) super.dependent-monoidal-map; - - # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 - dependent-sum-aeson-orphans = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/9b4698154303a9865d7d68a2f01d280a8a39f108.patch"; - hash = "sha256-Pzjl2yp01XsYWcyhpLnsuccg7bOACgv+RpafauUox8c="; - }) super.dependent-sum-aeson-orphans; - # https://github.com/obsidiansystems/dependent-sum/pull/73 dependent-sum-template = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/dependent-sum/commit/619727ba1792e39a68d23c62e75a923672e87a54.patch"; @@ -2666,12 +2587,6 @@ self: super: { relative = "dependent-sum-template"; }) super.dependent-sum-template; - aeson-gadt-th = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/aeson-gadt-th/commit/8f6922a6440019dece637d73d70766c473bcd6c0.patch"; - hash = "sha256-564DhfiubwNV8nAj8L5DzsWn4MdzqqaYYNmOSPUa7ys="; - excludes = [ ".github/**" ]; - }) super.aeson-gadt-th; - # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; @@ -2693,9 +2608,6 @@ self: super: { sha256 = "sha256-iHiF4EWL/GjJFnr/6aR+yMZKLMLAZK+gsgSxG8YaeDI="; }) super.records-sop; - # Need https://github.com/well-typed/large-records/pull/151 - large-generics = doJailbreak super.large-generics; - # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) polynomial = appendPatch (fetchpatch { name = "haskell-polynomial.20.patch"; @@ -2781,6 +2693,14 @@ self: super: { lib.pipe (super.purescript.overrideScope purescriptOverlay) ([ + # https://github.com/purescript/purescript/pull/4547 + (appendPatches [ + (pkgs.fetchpatch { + name = "purescript-import-fix"; + url = "https://github.com/purescript/purescript/commit/c610ec18391139a67dc9dcf19233f57d2c5413f7.patch"; + hash = "sha256-7s/ygzAFJ1ocZIj3OSd3TbsmGki46WViPIZOU1dfQFg="; + }) + ]) # PureScript uses nodejs to run tests, so the tests have been disabled # for now. If someone is interested in figuring out how to get this # working, it seems like it might be possible. @@ -2793,15 +2713,29 @@ self: super: { (self.generateOptparseApplicativeCompletions [ "purs" ]) ]); - purenix = super.purenix.overrideScope purescriptOverlay; + purenix = + lib.pipe + (super.purenix.overrideScope purescriptOverlay) + [ + (appendPatches [ + # https://github.com/purenix-org/purenix/pull/63 + (pkgs.fetchpatch { + name = "purenix-purescript-0_15_12"; + url = "https://github.com/purenix-org/purenix/commit/2dae563f887c7c8daf3dd3e292ee3580cb70d528.patch"; + hash = "sha256-EZXf95BJINyqnRb2t/Ao/9C8ttNp3A27rpKiEKJjO6Y="; + }) + (pkgs.fetchpatch { + name = "purenix-import-fix"; + url = "https://github.com/purenix-org/purenix/commit/f1890690264e7e5ce7f5b0a32d73d910ce2cbd73.patch"; + hash = "sha256-MRITcNOiaWmzlTd9l7sIz/LhlnpW8T02CXdcc1qQt3c="; + }) + ]) + ]; }) purescript purenix ; - # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3 - tzdata = dontCheck super.tzdata; - # We provide newer dependencies than upstream expects. swarm = doJailbreak super.swarm; @@ -2860,6 +2794,21 @@ self: super: { # base <4.14 decimal-literals = doJailbreak super.decimal-literals; + # 2024-06-22: hevm ghc96 fixes + hevm = lib.pipe super.hevm [ + (appendPatch (fetchpatch { + url = "https://github.com/ethereum/hevm/compare/02c072f...hellwolf:hevm:c29d3a7.patch"; + hash = "sha256-cL26HD77vXsiKqo5G6PXgK0q19MUGMwaNium5x93CBI="; + })) + (overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/^ *brick .*,/brick,/' hevm.cabal + sed -i 's/^ *vty .*,/vty,/' hevm.cabal + ''; + })) + doJailbreak + ]; + # multiple bounds too strict snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; @@ -2908,6 +2857,27 @@ self: super: { # https://github.com/brandonchinn178/tasty-autocollect/issues/54 tasty-autocollect = dontCheck super.tasty-autocollect; + # https://github.com/UnkindPartition/tasty/pull/420#issuecomment-2187406691 + # Note also 1.5.1 was faux-revoked because of this. See + # https://github.com/UnkindPartition/tasty/issues/426 + tasty_1_5_1 = lib.pipe super.tasty_1_5_1 [ + (appendPatch + (fetchpatch2 { + name = "tasty-1.5.1-revert-cr-sufficient-to-clear-line"; + url = "https://github.com/UnkindPartition/tasty/commit/b152a0bc63166a4592e1f3639ef09e78a43f2b57.diff"; + hash = "sha256-tlFCyEnIp8geNlJSkye32tUOaPMwkdqLHBMzpAwSDVQ="; + revert = true; + stripLen = 1; + }) + ) + (overrideCabal + (drv: assert drv.revision == "1"; { + revision = null; + editedCabalFile = null; + }) + ) + ]; + postgrest = lib.pipe super.postgrest [ # 2023-12-20: New version needs extra dependencies (addBuildDepends [ self.extra self.fuzzyset_0_2_4 self.cache self.timeit ]) @@ -2958,20 +2928,6 @@ self: super: { # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 diagrams-gtk = doJailbreak super.diagrams-gtk; - tomland = overrideCabal (drv: { - # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). - # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd - jailbreak = true; - # Fix compilation of test suite with GHC >= 9.8 - patches = drv.patches or [ ] ++ [ - (pkgs.fetchpatch { - name = "tomland-disambiguate-string-type-for-ghc-9.8.patch"; - url = "https://github.com/kowainik/tomland/commit/0f107269b8835a8253f618b75930b11d3a3f1337.patch"; - sha256 = "13ndlfw32xh8jz5g6lpxzn2ks8zchb3y4j1jbbm2x279pdyvvars"; - }) - ]; - }) super.tomland; - # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; @@ -3024,7 +2980,7 @@ self: super: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; }) super.kmonad; - ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { + ghc-syntax-highlighter_0_0_12_0 = super.ghc-syntax-highlighter_0_0_12_0.overrideScope(self: super: { ghc-lib-parser = self.ghc-lib-parser_9_10_1_20240511; }); @@ -3125,10 +3081,9 @@ self: super: { # https://github.com/isovector/cornelis/issues/150 cornelis = dontCheck super.cornelis; - cabal-gild = super.cabal-gild.overrideScope (self: super: { - tasty = super.tasty_1_5; - tasty-quickcheck = super.tasty-quickcheck_0_10_3; - }); + lzma = doJailbreak (super.lzma.overrideScope (self: super: { + tasty = super.tasty_1_5_1; + })); # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 commutative-semigroups = appendPatch (fetchpatch { @@ -3139,10 +3094,43 @@ self: super: { # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged currencies = doJailbreak super.currencies; - # https://github.com/awakesecurity/proto3-wire/pull/104 - proto3-wire = appendPatch (pkgs.fetchpatch { - url = "https://github.com/awakesecurity/proto3-wire/commit/c1cadeb5fca2e82c5b28e2811c01f5b37eb21ed8.patch"; - hash = "sha256-tFOWpjGmZANC7H82QapZ36raaNWuZ6F3BgjxnfTXpMs="; - }) super.proto3-wire; + argon2 = appendPatch (fetchpatch { + # https://github.com/haskell-hvr/argon2/pull/20 + url = "https://github.com/haskell-hvr/argon2/commit/f7cc92f18e233e6b1dabf1798dd099e17b6a81a1.patch"; + hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0="; + }) (doJailbreak super.argon2); # Unmaintained + + # 2024-07-09: zinza has bumped their QuickCheck and tasty dependencies beyond stackage lts. + # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5 + zinza = dontCheck super.zinza; + + # Doesn't officially support hedgehog > 1.3 yet: https://github.com/coot/free-algebras/pull/33 + free-algebras = doJailbreak super.free-algebras; + + # https://github.com/haskell-works/avro/pull/195 + avro = appendPatch (pkgs.fetchpatch { + url = "https://github.com/haskell-works/avro/commit/5f6eb1ec8c8bac325d84b44757d4e2f8608d6939.patch"; + sha256 = "sha256-1QEaoO8BTdvfFzMrybrf0v7cK0NbYrWOj4Mqexr+ylc="; + }) super.avro; + + pdftotext = overrideCabal (drv: { + postPatch = '' + # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6 + substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources + + # Fix cabal ignoring cxx because the cabal format version is too old + substituteInPlace pdftotext.cabal --replace-quiet ">=1.10" 2.2 + + # Fix wrong license name that breaks recent cabal version + substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause + '' + (drv.postPatch or ""); + }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext))); + + # 2024-07-27: building test component requires non-trivial custom build steps + # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311 + proto3-suite = lib.pipe super.proto3-suite [ + dontCheck # Hackage release trails a good deal behind master + doJailbreak + ]; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 16e5d2613fb2e..2b1fc45debdf6 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -79,6 +79,10 @@ self: super: ({ proteaaudio = addExtraLibrary darwin.apple_sdk.frameworks.AudioToolbox super.proteaaudio; + # issues finding libcharset.h without libiconv in buildInputs on darwin. + with-utf8 = addExtraLibrary pkgs.libiconv super.with-utf8; + with-utf8_1_1_0_0 = addExtraLibrary pkgs.libiconv super.with-utf8_1_1_0_0; + # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = dontCheck super.system-fileio; @@ -341,9 +345,11 @@ self: super: ({ libraryFrameworkDepends = with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ]; libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; # cabal2nix doesn't add darwin-only deps }) super.jsaddle-wkwebview; - reflex-dom = overrideCabal (drv: { - libraryHaskellDepends = with self; [ base bytestring jsaddle-wkwebview reflex reflex-dom-core text ]; # cabal2nix doesn't add darwin-only deps - }) super.reflex-dom; + + # cabal2nix doesn't add darwin-only deps + reflex-dom = addBuildDepend self.jsaddle-wkwebview (super.reflex-dom.override (drv: { + jsaddle-webkit2gtk = null; + })); # Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin di-core = overrideCabal (drv: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index a631a2f60db34..33b2da04f7713 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -119,6 +119,10 @@ self: super: { algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; }); + # Uses haddock placement that isn't supported by the versions of haddock + # bundled with GHC < 9.0. + wai-extra = dontHaddock super.wai-extra; + # Overly-strict bounds introducted by a revision in version 0.3.2. text-metrics = doJailbreak super.text-metrics; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index bcafc8c3fb78b..2da13fccb7089 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -70,16 +70,6 @@ self: super: { (disableCabalFlag "fourmolu") (disableCabalFlag "ormolu") (disableCabalFlag "stylishHaskell") - (overrideCabal (drv: { - # Disabling the build flags isn't enough: `Setup configure` still configures - # every component for building and complains about missing dependencies. - # Thus we have to mark the undesired components as non-buildable. - postPatch = drv.postPatch or "" + '' - for lib in hls-ormolu-plugin hls-fourmolu-plugin; do - sed -i "/^library $lib/a\ buildable: False" haskell-language-server.cabal - done - ''; - })) (d: d.override { ormolu = null; fourmolu = null; @@ -101,9 +91,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - # Tests depend on `parseTime` which is no longer available - hourglass = dontCheck super.hourglass; - # Needs to match ghc version ghc-tags = doDistribute self.ghc-tags_1_5; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 94cf15df5dff6..9969456cee09d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -78,9 +78,6 @@ in { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - # Tests depend on `parseTime` which is no longer available - hourglass = dontCheck super.hourglass; - # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 4edc24f10add2..fcd97a908af5f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -89,25 +89,6 @@ self: super: { # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; - # - # Too strict bounds, waiting on Hackage release in nixpkgs - # - - # - # Compilation failure workarounds - # - - # Add support for time 1.10 - # https://github.com/vincenthz/hs-hourglass/pull/56 - hourglass = appendPatches [ - (pkgs.fetchpatch { - name = "hourglass-pr-56.patch"; - url = - "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; - sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; - }) - ] (super.hourglass); - # Jailbreaks for servant <0.20 servant-lucid = doJailbreak super.servant-lucid; @@ -163,15 +144,6 @@ self: super: { }) super.ascii-numbers; - # Fix ghc-9.6.x build errors. - libmpd = appendPatch - # https://github.com/vimus/libmpd-haskell/pull/138 - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; - name = "vimus-libmpd-haskell-pull-138.patch"; - sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; - }) - super.libmpd; - # Apply patch from PR with mtl-2.3 fix. ConfigFile = overrideCabal (drv: { editedCabalFile = null; @@ -193,6 +165,8 @@ self: super: { lambdabot lambdabot-haskell-plugins ; + + singletons-base = dontCheck super.singletons-base; } # super.ghc is required to break infinite recursion as Nix is strict in the attrNames // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && lib.versionOlder super.ghc.version "9.6.4") { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index c8750bc22631d..4883c5b0326c7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -57,9 +57,9 @@ self: super: { ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; megaparsec = doDistribute self.megaparsec_9_6_1; - # TODO: remove when aeson updates or launches a revision - # see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088 - aeson = doJailbreak (doDistribute self.aeson_2_2_2_0); + # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable + # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f + aeson = doJailbreak (doDistribute self.aeson_2_2_3_0); attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; @@ -67,8 +67,12 @@ self: super: { fourmolu = self.fourmolu_0_15_0_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; - ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; + ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_12_0; websockets = self.websockets_0_13_0_0; + th-desugar = doJailbreak self.th-desugar_1_16; # th-abstraction >=0.6 && <0.7 + singletons-th = self.singletons-th_3_3; + singletons-base = self.singletons-base_3_3; + ghc-tags = self.ghc-tags_1_8; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; @@ -119,7 +123,6 @@ self: super: { # unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20 lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.* - hourglass = dontCheck super.hourglass; # umaintained, test suite doesn't compile anymore bsb-http-chunked = dontCheck super.bsb-http-chunked; # umaintained, test suite doesn't compile anymore pcre-heavy = dontCheck super.pcre-heavy; # GHC warnings cause the tests to fail @@ -131,15 +134,6 @@ self: super: { # A factor of 100 is insufficent, 200 seems seems to work. hip = appendConfigureFlag "--ghc-options=-fsimpl-tick-factor=200" super.hip; - # Fix build with text-2.x. - libmpd = appendPatch - (pkgs.fetchpatch { - name = "138.patch"; # https://github.com/vimus/libmpd-haskell/pull/138 - url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...f1cbf247261641565a3937b90721f7955d254c5e.patch"; - sha256 = "Q4fA2J/Tq+WernBo+UIMdj604ILOMlIYkG4Pr046DfM="; - }) - super.libmpd; - # Loosen bounds patch = appendPatch (pkgs.fetchpatch { url = "https://github.com/reflex-frp/patch/commit/91fed138483a7bf2b098d45b9e5cc36191776320.patch"; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix index 3b1f8dc4558e1..1f5a62549b786 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix @@ -3,6 +3,7 @@ with haskellLib; # cabal2nix doesn't properly add dependencies conditional on arch(javascript) + (self: super: { ghcjs-base = addBuildDepends (with self; [ aeson @@ -19,4 +20,8 @@ with haskellLib; ghcjs-dom-javascript = addBuildDepend self.ghcjs-base super.ghcjs-dom-javascript; jsaddle = addBuildDepend self.ghcjs-base super.jsaddle; jsaddle-dom = addBuildDepend self.ghcjs-base super.jsaddle-dom; + + reflex-dom = super.reflex-dom.override (drv: { + jsaddle-webkit2gtk = null; + }); }) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ebc065df7ef47..55cf2586e5c59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -114,6 +114,7 @@ broken-packages: - ag-pictgen # failure in job https://hydra.nixos.org/build/233252615 at 2023-09-02 - AhoCorasick # failure in job https://hydra.nixos.org/build/233204899 at 2023-09-02 - aig # failure in job https://hydra.nixos.org/build/233199755 at 2023-09-02 + - aip-version # failure in job https://hydra.nixos.org/build/267985101 at 2024-07-31 - airbrake # failure in job https://hydra.nixos.org/build/233199319 at 2023-09-02 - air-extra # failure in job https://hydra.nixos.org/build/233250519 at 2023-09-02 - airship # failure in job https://hydra.nixos.org/build/233239011 at 2023-09-02 @@ -224,7 +225,6 @@ broken-packages: - archnews # failure in job https://hydra.nixos.org/build/233192480 at 2023-09-02 - arena # failure in job https://hydra.nixos.org/build/233252500 at 2023-09-02 - argo # failure in job https://hydra.nixos.org/build/233216252 at 2023-09-02 - - argon2 # failure in job https://hydra.nixos.org/build/233207704 at 2023-09-02 - argparser # failure in job https://hydra.nixos.org/build/233222416 at 2023-09-02 - arguedit # failure in job https://hydra.nixos.org/build/233211367 at 2023-09-02 - arion # failure in job https://hydra.nixos.org/build/233254120 at 2023-09-02 @@ -311,7 +311,6 @@ broken-packages: - avatar-generator # failure in job https://hydra.nixos.org/build/233214253 at 2023-09-02 - aviation-units # failure in job https://hydra.nixos.org/build/233245762 at 2023-09-02 - avl-static # failure in job https://hydra.nixos.org/build/233199062 at 2023-09-02 - - avro # failure in job https://hydra.nixos.org/build/252731168 at 2024-03-16 - avro-piper # failure in job https://hydra.nixos.org/build/233197510 at 2023-09-02 - avr-shake # failure in job https://hydra.nixos.org/build/233223187 at 2023-09-02 - avwx # failure in job https://hydra.nixos.org/build/233258167 at 2023-09-02 @@ -401,6 +400,7 @@ broken-packages: - bet # failure in job https://hydra.nixos.org/build/233205655 at 2023-09-02 - betris # failure in job https://hydra.nixos.org/build/233200110 at 2023-09-02 - bff-mono # failure in job https://hydra.nixos.org/build/252710505 at 2024-03-16 + - bglib # failure in job https://hydra.nixos.org/build/265955624 at 2024-07-14 - bgmax # failure in job https://hydra.nixos.org/build/233222709 at 2023-09-02 - bgzf # failure in job https://hydra.nixos.org/build/233224580 at 2023-09-02 - bhoogle # failure in job https://hydra.nixos.org/build/252712137 at 2024-03-16 @@ -570,6 +570,7 @@ broken-packages: - bumper # failure in job https://hydra.nixos.org/build/233234378 at 2023-09-02 - bunz # failure in job https://hydra.nixos.org/build/233193945 at 2023-09-02 - burst-detection # failure in job https://hydra.nixos.org/build/233254074 at 2023-09-02 + - bus-pirate # failure in job https://hydra.nixos.org/build/265955589 at 2024-07-14 - buster # failure in job https://hydra.nixos.org/build/233197502 at 2023-09-02 - Buster # failure in job https://hydra.nixos.org/build/233214182 at 2023-09-02 - bustle # failure in job https://hydra.nixos.org/build/252728683 at 2024-03-16 @@ -1531,6 +1532,7 @@ broken-packages: - enum-text # failure in job https://hydra.nixos.org/build/233194373 at 2023-09-02 - enum-utf8 # failure in job https://hydra.nixos.org/build/233234628 at 2023-09-02 - envelope # failure in job https://hydra.nixos.org/build/233199309 at 2023-09-02 + - env-extra # failure in job https://hydra.nixos.org/build/265267827 at 2024-07-14 - env-parser # failure in job https://hydra.nixos.org/build/233237933 at 2023-09-02 - envstatus # failure in job https://hydra.nixos.org/build/233257940 at 2023-09-02 - envy-extensible # failure in job https://hydra.nixos.org/build/233229313 at 2023-09-02 @@ -1699,6 +1701,7 @@ broken-packages: - fgl-extras-decompositions # failure in job https://hydra.nixos.org/build/233237744 at 2023-09-02 - fib # failure in job https://hydra.nixos.org/build/233225971 at 2023-09-02 - fibon # failure in job https://hydra.nixos.org/build/233215748 at 2023-09-02 + - fields-and-cases # failure in job https://hydra.nixos.org/build/267971589 at 2024-07-31 - fields # failure in job https://hydra.nixos.org/build/233197886 at 2023-09-02 - fieldwise # failure in job https://hydra.nixos.org/build/233202285 at 2023-09-02 - fig # failure in job https://hydra.nixos.org/build/233212262 at 2023-09-02 @@ -1805,6 +1808,7 @@ broken-packages: - formattable # failure in job https://hydra.nixos.org/build/233230195 at 2023-09-02 - formura # failure in job https://hydra.nixos.org/build/233193674 at 2023-09-02 - Fortnite-Hack-Cheats-Free-V-Bucks-Generator # failure in job https://hydra.nixos.org/build/233233147 at 2023-09-02 + - fortran-src # failure in job https://hydra.nixos.org/build/265955626 at 2024-07-14 - fortran-vars # failure in job https://hydra.nixos.org/build/233257719 at 2023-09-02 - fortytwo # failure in job https://hydra.nixos.org/build/233209552 at 2023-09-02 - foscam-filename # failure in job https://hydra.nixos.org/build/233237326 at 2023-09-02 @@ -1822,9 +1826,9 @@ broken-packages: - franz # failure in job https://hydra.nixos.org/build/252725109 at 2024-03-16 - fraxl # failure in job https://hydra.nixos.org/build/233219345 at 2023-09-02 - freddy # failure in job https://hydra.nixos.org/build/233208999 at 2023-09-02 - - free-algebras # failure in job https://hydra.nixos.org/build/252728477 at 2024-03-16 - free-applicative-t # failure in job https://hydra.nixos.org/build/252715728 at 2024-03-16 - free-concurrent # failure in job https://hydra.nixos.org/build/233257070 at 2023-09-02 + - free-foil # failure in job https://hydra.nixos.org/build/265268910 at 2024-07-14 - f-ree-hack-cheats-free-v-bucks-generator # failure in job https://hydra.nixos.org/build/233225159 at 2023-09-02 - free-http # failure in job https://hydra.nixos.org/build/233227362 at 2023-09-02 - freenect # failure in job https://hydra.nixos.org/build/233196105 at 2023-09-02 @@ -1896,6 +1900,8 @@ broken-packages: - fuzzy-timings # failure in job https://hydra.nixos.org/build/233235765 at 2023-09-02 - fvars # failure in job https://hydra.nixos.org/build/234461649 at 2023-09-13 - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02 + - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09 + - fxpak # failure in job https://hydra.nixos.org/build/265955610 at 2024-07-14 - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02 - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16 - gameclock # failure in job https://hydra.nixos.org/build/233234964 at 2023-09-02 @@ -1986,6 +1992,7 @@ broken-packages: - ghc-gc-hook # failure in job https://hydra.nixos.org/build/233195053 at 2023-09-02 - ghc-generic-instances # failure in job https://hydra.nixos.org/build/233259298 at 2023-09-02 - ghc-hotswap # failure in job https://hydra.nixos.org/build/233220146 at 2023-09-02 + - ghcide-bench # failure in job https://hydra.nixos.org/build/265539170 at 2024-07-14 - ghcide-test-utils # failure in job https://hydra.nixos.org/build/253687657 at 2024-03-31 - ghci-diagrams # failure in job https://hydra.nixos.org/build/233194407 at 2023-09-02 - ghci-haskeline # failure in job https://hydra.nixos.org/build/233216940 at 2023-09-02 @@ -1998,8 +2005,8 @@ broken-packages: - ghcjs-dom-jsffi # failure in job https://hydra.nixos.org/build/233215225 at 2023-09-02 - ghcjs-fetch # timeout - ghcjs-promise # failure in job https://hydra.nixos.org/build/233243985 at 2023-09-02 - - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghcjs-websockets # Does not work on the js backend added in 9.6+, only on ghcjs, where we markUnbroken + - ghcjs-xhr # failure in job https://hydra.nixos.org/build/233235693 at 2023-09-02 - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02 - ghclive # failure in job https://hydra.nixos.org/build/233231592 at 2023-09-02 - ghc-man-completion # failure in job https://hydra.nixos.org/build/233245740 at 2023-09-02 @@ -2032,6 +2039,7 @@ broken-packages: - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02 - gi-gtksource # failure in job https://hydra.nixos.org/build/233215342 at 2023-09-02 - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02 + - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14 - gingersnap # failure in job https://hydra.nixos.org/build/233227186 at 2023-09-02 - ginsu # failure in job https://hydra.nixos.org/build/233223259 at 2023-09-02 - gipeda # failure in job https://hydra.nixos.org/build/233228149 at 2023-09-02 @@ -2075,6 +2083,7 @@ broken-packages: - GLMatrix # failure in job https://hydra.nixos.org/build/233202880 at 2023-09-02 - global-variables # failure in job https://hydra.nixos.org/build/233204607 at 2023-09-02 - glob-posix # failure in job https://hydra.nixos.org/build/233253059 at 2023-09-02 + - globus # failure in job https://hydra.nixos.org/build/267976018 at 2024-07-31 - GlomeTrace # failure in job https://hydra.nixos.org/build/233211872 at 2023-09-02 - gloss-banana # failure in job https://hydra.nixos.org/build/234464253 at 2023-09-13 - gloss-examples # failure in job https://hydra.nixos.org/build/252718124 at 2024-03-16 @@ -2165,6 +2174,7 @@ broken-packages: - growler # failure in job https://hydra.nixos.org/build/233207497 at 2023-09-02 - grow-vector # failure in job https://hydra.nixos.org/build/233196279 at 2023-09-02 - grpc-api-etcd # failure in job https://hydra.nixos.org/build/233239600 at 2023-09-02 + - grpc-haskell-core # failure in job https://hydra.nixos.org/build/267997256 at 2024-07-31 - gsl-random # failure in job https://hydra.nixos.org/build/233191503 at 2023-09-02 - gstreamer # failure in job https://hydra.nixos.org/build/233239224 at 2023-09-02 - GTALib # failure in job https://hydra.nixos.org/build/233250568 at 2023-09-02 @@ -2184,6 +2194,7 @@ broken-packages: - gym-http-api # failure in job https://hydra.nixos.org/build/233219968 at 2023-09-02 - h2048 # failure in job https://hydra.nixos.org/build/233231384 at 2023-09-02 - h2c # failure in job https://hydra.nixos.org/build/233196032 at 2023-09-02 + - h3-hs # failure in job https://hydra.nixos.org/build/267984231 at 2024-07-31 - haar # failure in job https://hydra.nixos.org/build/233217259 at 2023-09-02 - HABQT # failure in job https://hydra.nixos.org/build/233256547 at 2023-09-02 - hack2-contrib # failure in job https://hydra.nixos.org/build/233251090 at 2023-09-02 @@ -2245,6 +2256,8 @@ broken-packages: - halive # failure in job https://hydra.nixos.org/build/233215317 at 2023-09-02 - halma # failure in job https://hydra.nixos.org/build/233245758 at 2023-09-02 - halves # failure in job https://hydra.nixos.org/build/233214240 at 2023-09-02 + - ham # failure in job https://hydra.nixos.org/build/265955715 at 2024-07-14 + - HaMinitel # failure in job https://hydra.nixos.org/build/265955632 at 2024-07-14 - hampp # failure in job https://hydra.nixos.org/build/233239269 at 2023-09-02 - hamsql # failure in job https://hydra.nixos.org/build/233241294 at 2023-09-02 - hamtmap # failure in job https://hydra.nixos.org/build/233225685 at 2023-09-02 @@ -2333,6 +2346,7 @@ broken-packages: - haskelldb-wx # failure in job https://hydra.nixos.org/build/233197525 at 2023-09-02 - haskell-disque # failure in job https://hydra.nixos.org/build/233226200 at 2023-09-02 - haskell-docs-cli # failure in job https://hydra.nixos.org/build/252718877 at 2024-03-16 + - haskell-ffprobe # failure in job https://hydra.nixos.org/build/267973417 at 2024-07-31 - HaskellForMaths # failure in job https://hydra.nixos.org/build/233237608 at 2023-09-02 - haskell-formatter # failure in job https://hydra.nixos.org/build/233237167 at 2023-09-02 - haskell-generate # failure in job https://hydra.nixos.org/build/233197927 at 2023-09-02 @@ -2503,7 +2517,6 @@ broken-packages: - heterogeneous-list-literals # failure in job https://hydra.nixos.org/build/233212297 at 2023-09-02 - hetris # failure in job https://hydra.nixos.org/build/233256814 at 2023-09-02 - heukarya # failure in job https://hydra.nixos.org/build/233247440 at 2023-09-02 - - hevm # failure in job https://hydra.nixos.org/build/254311642 at 2024-03-31 - HExcel # failure in job https://hydra.nixos.org/build/233211971 at 2023-09-02 - hexchat # failure in job https://hydra.nixos.org/build/233234161 at 2023-09-02 - hexif # failure in job https://hydra.nixos.org/build/233245470 at 2023-09-02 @@ -2592,6 +2605,7 @@ broken-packages: - historian # failure in job https://hydra.nixos.org/build/233210703 at 2023-09-02 - hist-pl-types # failure in job https://hydra.nixos.org/build/233245977 at 2023-09-02 - hit-on # failure in job https://hydra.nixos.org/build/233233939 at 2023-09-02 + - hix # failure in job https://hydra.nixos.org/build/267986775 at 2024-07-31 - HJavaScript # failure in job https://hydra.nixos.org/build/233191718 at 2023-09-02 - hjcase # failure in job https://hydra.nixos.org/build/233195095 at 2023-09-02 - hjs # failure in job https://hydra.nixos.org/build/233215541 at 2023-09-02 @@ -2791,6 +2805,8 @@ broken-packages: - hs-dotnet # failure in job https://hydra.nixos.org/build/233232755 at 2023-09-02 - hs-duktape # failure in job https://hydra.nixos.org/build/233223882 at 2023-09-02 - hsebaysdk # failure in job https://hydra.nixos.org/build/233251126 at 2023-09-02 + - hsec-sync # failure in job https://hydra.nixos.org/build/265274250 at 2024-07-14 + - hsec-tools # failure in job https://hydra.nixos.org/build/265287998 at 2024-07-14 - hsenv # failure in job https://hydra.nixos.org/build/233196846 at 2023-09-02 - HSet # failure in job https://hydra.nixos.org/build/233202216 at 2023-09-02 - hs-excelx # failure in job https://hydra.nixos.org/build/233230761 at 2023-09-02 @@ -3037,6 +3053,7 @@ broken-packages: - ihaskell-hvega # failure in job https://hydra.nixos.org/build/241514418 at 2023-11-20 - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02 - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02 + - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14 - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02 - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02 - imagepaste # failure in job https://hydra.nixos.org/build/233211716 at 2023-09-02 @@ -3300,6 +3317,7 @@ broken-packages: - keycloak-hs # failure in job https://hydra.nixos.org/build/233193019 at 2023-09-02 - keyed # failure in job https://hydra.nixos.org/build/233251186 at 2023-09-02 - key # failure in job https://hydra.nixos.org/build/252710595 at 2024-03-16 + - keysafe # failure in job https://hydra.nixos.org/build/265284122 at 2024-07-14 - khph # failure in job https://hydra.nixos.org/build/233258109 at 2023-09-02 - kickass-torrents-dump-parser # failure in job https://hydra.nixos.org/build/233210355 at 2023-09-02 - kickchan # failure in job https://hydra.nixos.org/build/233216091 at 2023-09-02 @@ -3307,6 +3325,7 @@ broken-packages: - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 + - knead-arithmetic # failure in job https://hydra.nixos.org/build/266355645 at 2024-07-14 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 - koneko # failure in job https://hydra.nixos.org/build/233204838 at 2023-09-02 @@ -3363,6 +3382,7 @@ broken-packages: - language-conf # failure in job https://hydra.nixos.org/build/233208178 at 2023-09-02 - language-csharp # failure in job https://hydra.nixos.org/build/233240911 at 2023-09-02 - language-dart # failure in job https://hydra.nixos.org/build/233220340 at 2023-09-02 + - language-dickinson # failure in job https://hydra.nixos.org/build/265284074 at 2024-07-14 - language-dockerfile # failure in job https://hydra.nixos.org/build/233197924 at 2023-09-02 - language-ecmascript # failure in job https://hydra.nixos.org/build/252712957 at 2024-03-16 - language-elm # failure in job https://hydra.nixos.org/build/233214012 at 2023-09-02 @@ -3390,7 +3410,6 @@ broken-packages: - language-webidl # failure in job https://hydra.nixos.org/build/233194656 at 2023-09-02 - laop # failure in job https://hydra.nixos.org/build/233204106 at 2023-09-02 - LargeCardinalHierarchy # failure in job https://hydra.nixos.org/build/233250339 at 2023-09-02 - - large-records - Lastik # failure in job https://hydra.nixos.org/build/233194460 at 2023-09-02 - latest-npm-version # failure in job https://hydra.nixos.org/build/233239108 at 2023-09-02 - latex-formulae-image # failure in job https://hydra.nixos.org/build/233251243 at 2023-09-02 @@ -3545,13 +3564,13 @@ broken-packages: - ll-picosat # failure in job https://hydra.nixos.org/build/233206257 at 2023-09-02 - llsd # failure in job https://hydra.nixos.org/build/233241590 at 2023-09-02 - llvm-base # failure in job https://hydra.nixos.org/build/233244366 at 2023-09-02 + - llvm-extension # failure in job https://hydra.nixos.org/build/266355631 at 2024-07-14 - llvm-general-pure # failure in job https://hydra.nixos.org/build/233246430 at 2023-09-02 - llvm-hs # failure in job https://hydra.nixos.org/build/233205149 at 2023-09-02 - llvm-hs-pure # failure in job https://hydra.nixos.org/build/252721738 at 2024-03-16 - llvm-ht # failure in job https://hydra.nixos.org/build/233203770 at 2023-09-02 - llvm-party # failure in job https://hydra.nixos.org/build/233221113 at 2023-09-02 - llvm-pretty # failure in job https://hydra.nixos.org/build/233206445 at 2023-09-02 - - llvm-tf # failure in job https://hydra.nixos.org/build/233211770 at 2023-09-02 - lmdb-high-level # failure in job https://hydra.nixos.org/build/233238988 at 2023-09-02 - lmdb-simple # failure in job https://hydra.nixos.org/build/233206781 at 2023-09-02 - lmonad # failure in job https://hydra.nixos.org/build/233246737 at 2023-09-02 @@ -3601,7 +3620,7 @@ broken-packages: - L-seed # failure in job https://hydra.nixos.org/build/233222324 at 2023-09-02 - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 - - lsp-client # failure in job https://hydra.nixos.org/build/233219871 at 2023-09-02 + - lsp-client # failure in job https://hydra.nixos.org/build/265539053 at 2024-07-14 - ltext # failure in job https://hydra.nixos.org/build/255686825 at 2024-04-16 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 @@ -3675,6 +3694,7 @@ broken-packages: - massiv-scheduler # failure in job https://hydra.nixos.org/build/233196778 at 2023-09-02 - massiv-serialise # failure in job https://hydra.nixos.org/build/233242284 at 2023-09-02 - master-plan # failure in job https://hydra.nixos.org/build/233208718 at 2023-09-02 + - matcha # failure in job https://hydra.nixos.org/build/265271888 at 2024-07-14 - matcher # failure in job https://hydra.nixos.org/build/233198640 at 2023-09-02 - mathflow # failure in job https://hydra.nixos.org/build/233195457 at 2023-09-02 - math-grads # failure in job https://hydra.nixos.org/build/233222629 at 2023-09-02 @@ -3896,6 +3916,7 @@ broken-packages: - monoids # failure in job https://hydra.nixos.org/build/233231684 at 2023-09-02 - monomer-hagrid # failure in job https://hydra.nixos.org/build/252729072 at 2024-03-16 - monopati # failure in job https://hydra.nixos.org/build/233234119 at 2023-09-02 + - months # failure in job https://hydra.nixos.org/build/267981052 at 2024-07-31 - monus # failure in job https://hydra.nixos.org/build/233252424 at 2023-09-02 - monus-weighted-search # timeout - monzo # failure in job https://hydra.nixos.org/build/233254681 at 2023-09-02 @@ -4119,6 +4140,7 @@ broken-packages: - normalization-insensitive # failure in job https://hydra.nixos.org/build/233239612 at 2023-09-02 - no-role-annots # failure in job https://hydra.nixos.org/build/233229589 at 2023-09-02 - notcpp # failure in job https://hydra.nixos.org/build/233216543 at 2023-09-02 + - notifications-tray-icon # failure in job https://hydra.nixos.org/build/267969113 at 2024-07-31 - notmuch-haskell # failure in job https://hydra.nixos.org/build/233332618 at 2023-09-02 - not-prelude # failure in job https://hydra.nixos.org/build/233248453 at 2023-09-02 - NoTrace # failure in job https://hydra.nixos.org/build/233229305 at 2023-09-02 @@ -4148,10 +4170,12 @@ broken-packages: - numtype-tf # failure in job https://hydra.nixos.org/build/233243483 at 2023-09-02 - Nutri # failure in job https://hydra.nixos.org/build/233244244 at 2023-09-02 - NXTDSL # failure in job https://hydra.nixos.org/build/233193483 at 2023-09-02 + - NXT # failure in job https://hydra.nixos.org/build/265955670 at 2024-07-14 - nylas # failure in job https://hydra.nixos.org/build/233193540 at 2023-09-02 - oanda-rest-api # failure in job https://hydra.nixos.org/build/233250190 at 2023-09-02 - oasis-xrd # failure in job https://hydra.nixos.org/build/233199264 at 2023-09-02 - oauthenticated # failure in job https://hydra.nixos.org/build/233257682 at 2023-09-02 + - obd # failure in job https://hydra.nixos.org/build/265955660 at 2024-07-14 - Object # failure in job https://hydra.nixos.org/build/233191909 at 2023-09-02 - ObjectIO # failure in job https://hydra.nixos.org/build/233242132 at 2023-09-02 - ocaml-export # failure in job https://hydra.nixos.org/build/233218217 at 2023-09-02 @@ -4166,6 +4190,7 @@ broken-packages: - ogma-language-jsonspec # failure in job https://hydra.nixos.org/build/255671054 at 2024-04-16 - ogma-language-smv # failure in job https://hydra.nixos.org/build/233239832 at 2023-09-02 - ogmarkup # failure in job https://hydra.nixos.org/build/233229980 at 2023-09-02 + - ohhecs # failure in job https://hydra.nixos.org/build/267987310 at 2024-07-31 - ohloh-hs # failure in job https://hydra.nixos.org/build/233228177 at 2023-09-02 - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 @@ -4414,7 +4439,6 @@ broken-packages: - pdfinfo # failure in job https://hydra.nixos.org/build/233214432 at 2023-09-02 - pdf-slave-template # failure in job https://hydra.nixos.org/build/233217870 at 2023-09-02 - pdf-toolbox-viewer # failure in job https://hydra.nixos.org/build/233196461 at 2023-09-02 - - pdftotext # failure in job https://hydra.nixos.org/build/233242086 at 2023-09-02 - pdynload # failure in job https://hydra.nixos.org/build/233226504 at 2023-09-02 - PeanoWitnesses # failure in job https://hydra.nixos.org/build/233207451 at 2023-09-02 - pecoff # failure in job https://hydra.nixos.org/build/233231268 at 2023-09-02 @@ -4505,7 +4529,6 @@ broken-packages: - pinchot # failure in job https://hydra.nixos.org/build/233230585 at 2023-09-02 - piped # failure in job https://hydra.nixos.org/build/252729903 at 2024-03-16 - Pipe # failure in job https://hydra.nixos.org/build/233243604 at 2023-09-02 - - pipes-aeson # failure in job https://hydra.nixos.org/build/252733735 at 2024-03-16 - pipes-async # failure in job https://hydra.nixos.org/build/233194729 at 2023-09-02 - pipes-bgzf # failure in job https://hydra.nixos.org/build/233238921 at 2023-09-02 - pipes-break # failure in job https://hydra.nixos.org/build/233250730 at 2023-09-02 @@ -4779,6 +4802,7 @@ broken-packages: - proxy-kindness # failure in job https://hydra.nixos.org/build/233204762 at 2023-09-02 - proxy-mapping # failure in job https://hydra.nixos.org/build/233227151 at 2023-09-02 - prune-juice # failure in job https://hydra.nixos.org/build/233198633 at 2023-09-02 + - psc-ide # failure in job https://hydra.nixos.org/build/267966912 at 2024-07-31 - pseudo-trie # failure in job https://hydra.nixos.org/build/233230636 at 2023-09-02 - psi # failure in job https://hydra.nixos.org/build/233222861 at 2023-09-02 - pstemmer # failure in job https://hydra.nixos.org/build/233241342 at 2023-09-02 @@ -4800,7 +4824,7 @@ broken-packages: - pure-priority-queue # failure in job https://hydra.nixos.org/build/233258014 at 2023-09-02 - purescript-ast # failure in job https://hydra.nixos.org/build/233204157 at 2023-09-02 - purescript-cst # failure in job https://hydra.nixos.org/build/233197178 at 2023-09-02 - - purescript # failure in job https://hydra.nixos.org/build/253692073 at 2024-03-31 + - purescript-tsd-gen # failure in job https://hydra.nixos.org/build/267964841 at 2024-07-31 - pure-zlib # failure in job https://hydra.nixos.org/build/233241392 at 2023-09-02 - purview # failure in job https://hydra.nixos.org/build/233208821 at 2023-09-02 - pushbullet # failure in job https://hydra.nixos.org/build/233209340 at 2023-09-02 @@ -4879,6 +4903,8 @@ broken-packages: - rakhana # failure in job https://hydra.nixos.org/build/233256901 at 2023-09-02 - rakuten # failure in job https://hydra.nixos.org/build/233196803 at 2023-09-02 - ralist # failure in job https://hydra.nixos.org/build/233195682 at 2023-09-02 + - ral-lens # failure in job https://hydra.nixos.org/build/265286119 at 2024-07-14 + - ral-optics # failure in job https://hydra.nixos.org/build/265292108 at 2024-07-14 - raml # failure in job https://hydra.nixos.org/build/233212517 at 2023-09-02 - rando # failure in job https://hydra.nixos.org/build/233257817 at 2023-09-02 - random-access-list # failure in job https://hydra.nixos.org/build/233233464 at 2023-09-02 @@ -5068,7 +5094,6 @@ broken-packages: - rfc-prelude # failure in job https://hydra.nixos.org/build/233227572 at 2023-09-02 - r-glpk-phonetic-languages-ukrainian-durations # failure in job https://hydra.nixos.org/build/253703155 at 2024-03-31 - rhbzquery # failure in job https://hydra.nixos.org/build/233259706 at 2023-09-02 - - rhine # failure in job https://hydra.nixos.org/build/233245503 at 2023-09-02 - riak # failure in job https://hydra.nixos.org/build/233192622 at 2023-09-02 - riak-protobuf-lens # failure in job https://hydra.nixos.org/build/233203142 at 2023-09-02 - ribbit # failure in job https://hydra.nixos.org/build/233191000 at 2023-09-02 @@ -5268,7 +5293,6 @@ broken-packages: - serf # failure in job https://hydra.nixos.org/build/233251981 at 2023-09-02 - serial # failure in job https://hydra.nixos.org/build/252729356 at 2024-03-16 - serialize-instances # failure in job https://hydra.nixos.org/build/233239330 at 2023-09-02 - - serialport # failure in job https://hydra.nixos.org/build/233201348 at 2023-09-02 - serokell-util # failure in job https://hydra.nixos.org/build/233209952 at 2023-09-02 - servant-aeson-specs # failure in job https://hydra.nixos.org/build/233202245 at 2023-09-02 - servant-auth-cookie # failure in job https://hydra.nixos.org/build/233235829 at 2023-09-02 @@ -5442,7 +5466,6 @@ broken-packages: - simplistic-generics # failure in job https://hydra.nixos.org/build/233217412 at 2023-09-02 - singlethongs # failure in job https://hydra.nixos.org/build/233202756 at 2023-09-02 - singleton-dict # failure in job https://hydra.nixos.org/build/233245405 at 2023-09-02 - - singletons-base # failure in job https://hydra.nixos.org/build/252714303 at 2024-03-16 - singleton-typelits # failure in job https://hydra.nixos.org/build/233250877 at 2023-09-02 - single-tuple # failure in job https://hydra.nixos.org/build/233204418 at 2023-09-02 - singnal # failure in job https://hydra.nixos.org/build/233214111 at 2023-09-02 @@ -5733,6 +5756,7 @@ broken-packages: - strict-ghc-plugin # failure in job https://hydra.nixos.org/build/233246830 at 2023-09-02 - strict-impl-params # failure in job https://hydra.nixos.org/build/252732248 at 2024-03-16 - strictly # failure in job https://hydra.nixos.org/build/233197142 at 2023-09-02 + - strict-optics # failure in job https://hydra.nixos.org/build/267983907 at 2024-07-31 - strict-tuple-lens # failure in job https://hydra.nixos.org/build/233194548 at 2023-09-02 - strict-writer # failure in job https://hydra.nixos.org/build/252725649 at 2024-03-16 - string-class # failure in job https://hydra.nixos.org/build/233230041 at 2023-09-02 @@ -5774,6 +5798,7 @@ broken-packages: - suitable # failure in job https://hydra.nixos.org/build/233225075 at 2023-09-02 - summer # failure in job https://hydra.nixos.org/build/252728622 at 2024-03-16 - summoner # failure in job https://hydra.nixos.org/build/233232530 at 2023-09-02 + - sump # failure in job https://hydra.nixos.org/build/265955678 at 2024-07-14 - sum-type-boilerplate # failure in job https://hydra.nixos.org/build/233251040 at 2023-09-02 - sunlight # failure in job https://hydra.nixos.org/build/233212375 at 2023-09-02 - sunroof-compiler # failure in job https://hydra.nixos.org/build/233228734 at 2023-09-02 @@ -5830,6 +5855,7 @@ broken-packages: - syntax-trees-fork-bairyn # failure in job https://hydra.nixos.org/build/233216989 at 2023-09-02 - synthesizer # failure in job https://hydra.nixos.org/build/233259139 at 2023-09-02 - synthesizer-filter # failure in job https://hydra.nixos.org/build/252718079 at 2024-03-16 + - synthesizer-llvm # failure in job https://hydra.nixos.org/build/266355681 at 2024-07-14 - Sysmon # failure in job https://hydra.nixos.org/build/233224152 at 2023-09-02 - system-canonicalpath # failure in job https://hydra.nixos.org/build/233254297 at 2023-09-02 - system-command # failure in job https://hydra.nixos.org/build/233239356 at 2023-09-02 @@ -6034,6 +6060,7 @@ broken-packages: - tictactoe3d # failure in job https://hydra.nixos.org/build/233193080 at 2023-09-02 - TicTacToe # failure in job https://hydra.nixos.org/build/233256784 at 2023-09-02 - tidal-midi # failure in job https://hydra.nixos.org/build/233194389 at 2023-09-02 + - tidal-serial # failure in job https://hydra.nixos.org/build/265955616 at 2024-07-14 - tidal-vis # failure in job https://hydra.nixos.org/build/234465445 at 2023-09-13 - tie-knot # failure in job https://hydra.nixos.org/build/233201321 at 2023-09-02 - tiempo # failure in job https://hydra.nixos.org/build/233250728 at 2023-09-02 @@ -6063,6 +6090,7 @@ broken-packages: - tinyid # failure in job https://hydra.nixos.org/build/233249999 at 2023-09-02 - TinyLaunchbury # failure in job https://hydra.nixos.org/build/233233671 at 2023-09-02 - tinylog # failure in job https://hydra.nixos.org/build/233198434 at 2023-09-02 + - tinyMesh # failure in job https://hydra.nixos.org/build/265955590 at 2024-07-14 - tiny-scheduler # failure in job https://hydra.nixos.org/build/233224849 at 2023-09-02 - tinytemplate # failure in job https://hydra.nixos.org/build/233208032 at 2023-09-02 - TinyURL # failure in job https://hydra.nixos.org/build/233200716 at 2023-09-02 @@ -6212,7 +6240,6 @@ broken-packages: - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02 - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02 - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02 - - typelet # failure in job https://hydra.nixos.org/build/236691051 at 2023-10-04 - type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02 - type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02 - type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02 @@ -6379,7 +6406,9 @@ broken-packages: - vcf # failure in job https://hydra.nixos.org/build/233246613 at 2023-09-02 - vcswrapper # failure in job https://hydra.nixos.org/build/233228400 at 2023-09-02 - Vec-Boolean # failure in job https://hydra.nixos.org/build/233218305 at 2023-09-02 + - vec-lens # failure in job https://hydra.nixos.org/build/265284617 at 2024-07-14 - Vec-OpenGLRaw # failure in job https://hydra.nixos.org/build/233230560 at 2023-09-02 + - vec-optics # failure in job https://hydra.nixos.org/build/265281367 at 2024-07-14 - vect-floating # failure in job https://hydra.nixos.org/build/233196146 at 2023-09-02 - vect-opengl # failure in job https://hydra.nixos.org/build/233230142 at 2023-09-02 - vector-bytestring # failure in job https://hydra.nixos.org/build/233209167 at 2023-09-02 @@ -6778,6 +6807,7 @@ broken-packages: - zendesk-api # failure in job https://hydra.nixos.org/build/233257269 at 2023-09-02 - zeno # failure in job https://hydra.nixos.org/build/233218338 at 2023-09-02 - zeolite-lang # failure in job https://hydra.nixos.org/build/233217146 at 2023-09-02 + - zephyr # failure in job https://hydra.nixos.org/build/267966227 at 2024-07-31 - zero # failure in job https://hydra.nixos.org/build/233209286 at 2023-09-02 - zeromq3-haskell # failure in job https://hydra.nixos.org/build/233215557 at 2023-09-02 - zeromq4-clone-pattern # timeout diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc102cb88861d..1e8c0d9419c85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -28,10 +28,6 @@ default-package-overrides: - gi-gdkx11 < 4 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 - # 2024-05-18: Various overrides for hls compatibility - - lsp < 2.5 - - lsp-types < 2.2 - - lsp-test < 0.17.0.1 - extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10 # 2024-05-10: need to match hlegder from stackage - hledger-ui < 1.33 @@ -83,6 +79,7 @@ extra-packages: - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 - hnix-store-core < 0.7 # 2023-12-11: required by hnix-store-remote 0.6 + - hpack == 0.36.0 # 2024-07-27: required for stack-2.15.7 to match upstream stack release - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 @@ -96,16 +93,18 @@ extra-packages: - lens-aeson < 1.2 # 2022-12-17: For aeson < 2.0 compat - lsp == 2.1.0.0 # 2024-02-28: need for dhall-lsp-server unstable - lsp-types == 2.0.2.0 # 2024-02-28: need for dhall-lsp-server unstable + - lsp < 2.5 # 2024-07-08: need for koka + - lsp-types < 2.2 # 2024-07-08: need for koka - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - fourmolu == 0.15.0.0 # 2024-07-07: for ghc 9.8 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - ormolu == 0.7.4.0 # 2024-07-07: for ghc 9.8 compat - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 - sbv == 7.13 # required for pkgs.petrinizer - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format @@ -120,12 +119,17 @@ extra-packages: - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.* - ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.* + - ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.* - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* - algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0 - fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10 - ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci - versions < 6 # 2024-04-22: required by spago-0.21 - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 + - th-desugar == 1.16 # 2024-06-28: preserve for GHC 9.8 + - singletons-th == 3.3 # 2024-06-28: preserve for GHC 9.8 + - singletons-base == 3.3 # 2024-06-28: preserve for GHC 9.8 + - tls < 2.1.0 # 2024-07-19: requested by darcs == 2.18.3 package-maintainers: abbradar: @@ -659,6 +663,7 @@ package-maintainers: - typerep-map - minio-hs - smtp-mail + - pdftotext unsupported-platforms: Allure: [ platforms.darwin ] @@ -775,6 +780,7 @@ unsupported-platforms: xmobar: [ platforms.darwin ] xmonad-extras: [ platforms.darwin ] xmonad-volume: [ platforms.darwin ] + kmonad: [ platforms.darwin ] supported-platforms: AWin32Console: [ platforms.windows ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c1d2610360c22..40c5f7fc8cf01 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.22 +# Stackage LTS 22.29 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -297,6 +297,7 @@ default-package-overrides: - amazonka-scheduler ==2.0 - amazonka-schemas ==2.0 - amazonka-sdb ==2.0 + - amazonka-secretsmanager ==2.0 - amazonka-securityhub ==2.0 - amazonka-securitylake ==2.0 - amazonka-servicecatalog ==2.0 @@ -361,6 +362,7 @@ default-package-overrides: - appendful ==0.1.0.0 - appendful-persistent ==0.1.0.1 - appendmap ==0.1.5 + - apply-merge ==0.1.1.0 - apply-refact ==0.13.0.0 - apportionment ==0.0.0.4 - approximate ==0.3.5 @@ -394,7 +396,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - - atomic-primops ==0.8.7 + - atomic-primops ==0.8.8 - atomic-write ==0.2.0.7 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 @@ -402,8 +404,8 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-data ==1.0.5.4 - attoparsec-expr ==0.1.1.2 - - attoparsec-framer ==0.1.0.3 - - attoparsec-iso8601 ==1.1.0.1 + - attoparsec-framer ==0.1.0.4 + - attoparsec-iso8601 ==1.1.1.0 - attoparsec-path ==0.0.0.1 - attoparsec-run ==0.0.2.0 - attoparsec-time ==1.0.3.1 @@ -411,11 +413,11 @@ default-package-overrides: - audacity ==0.0.2.2 - authenticate ==1.3.5.2 - authenticate-oauth ==1.7 - - autodocodec ==0.2.2.0 + - autodocodec ==0.2.3.0 - autodocodec-openapi3 ==0.2.1.1 - - autodocodec-schema ==0.1.0.3 + - autodocodec-schema ==0.1.0.4 - autodocodec-yaml ==0.2.0.3 - - autoexporter ==2.0.0.9 + - autoexporter ==2.0.0.12 - auto-update ==0.1.6 - avro ==0.6.1.2 - aws ==0.24.1 @@ -453,11 +455,11 @@ default-package-overrides: - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - beam-core ==0.10.1.0 - - bech32 ==1.1.6 - - bech32-th ==1.1.6 + - bech32 ==1.1.7 + - bech32-th ==1.1.7 - benchpress ==0.2.2.23 - bencode ==0.6.1.1 - - benri-hspec ==0.1.0.2 + - benri-hspec ==0.1.0.3 - between ==0.11.0.0 - bibtex ==0.1.0.7 - bifunctor-classes-compat ==0.1 @@ -472,7 +474,7 @@ default-package-overrides: - binary-ieee754 ==0.1.0.0 - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - - binary-orphans ==1.0.4.1 + - binary-orphans ==1.0.5 - binary-parser ==0.5.7.6 - binary-search ==2.0.0 - binary-shared ==0.8.3 @@ -490,7 +492,7 @@ default-package-overrides: - bitwise ==1.0.0.1 - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0.1 - - Blammo ==1.1.2.3 + - Blammo ==1.1.3.0 - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 @@ -507,7 +509,7 @@ default-package-overrides: - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 - bm ==0.2.0.0 - - bmp ==1.2.6.3 + - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 - BNFC ==2.9.5 - BNFC-meta ==0.6.1 @@ -516,10 +518,10 @@ default-package-overrides: - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolsimplifier ==0.1.8 - - boomerang ==1.4.9.2 + - boomerang ==1.4.9.3 - boomwhacker ==0.0.1 - bordacount ==0.1.0.0 - - boring ==0.2.1 + - boring ==0.2.2 - bound ==2.0.7 - BoundedChan ==1.0.3.0 - bounded-qsem ==0.1.0.2 @@ -527,10 +529,10 @@ default-package-overrides: - boundingboxes ==0.2.3 - box ==0.9.3.1 - boxes ==0.1.5 - - breakpoint ==0.1.3.1 + - breakpoint ==0.1.4.0 - brick ==2.1.1 - broadcast-chan ==0.2.1.2 - - brotli ==0.0.0.1 + - brotli ==0.0.0.2 - brotli-streams ==0.0.0.0 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -544,7 +546,7 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - - burrito ==2.0.1.9 + - burrito ==2.0.1.10 - bv ==0.5 - bv-little ==1.3.2 - bv-sized ==1.0.5 @@ -576,16 +578,15 @@ default-package-overrides: - cabal-appimage ==0.4.0.4 - cabal-clean ==0.2.20230609 - cabal-debian ==5.2.3 - - cabal-doctest ==1.0.9 + - cabal-doctest ==1.0.10 - cabal-file ==0.1.1 - - cabal-install-solver ==3.10.2.1 - cabal-plan ==0.7.3.0 - cabal-rpm ==2.1.5 - cabal-sort ==0.1.2 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 - - cairo ==0.13.10.0 + - cairo ==0.13.11.0 - cairo-image ==0.1.0.3 - calendar-recycling ==0.0.0.1 - call-alloy ==0.4.1.1 @@ -631,7 +632,7 @@ default-package-overrides: - checkers ==0.6.0 - checksum ==0.0.0.1 - chimera ==0.3.4.0 - - choice ==0.2.3 + - choice ==0.2.4.1 - chronologique ==0.3.1.3 - chronos ==1.1.6.1 - chronos-bench ==0.2.0.2 @@ -641,7 +642,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.4.0.3 - - citeproc ==0.8.1 + - citeproc ==0.8.1.1 - clash-prelude ==1.8.1 - classy-prelude ==1.5.0.3 - classy-prelude-conduit ==1.5.0 @@ -666,8 +667,8 @@ default-package-overrides: - collect-errors ==0.1.6.0 - co-log ==0.6.1.0 - co-log-concurrent ==0.5.1.0 - - co-log-core ==0.3.2.1 - - co-log-polysemy ==0.0.1.4 + - co-log-core ==0.3.2.2 + - co-log-polysemy ==0.0.1.5 - colonnade ==1.2.0.2 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 @@ -676,14 +677,14 @@ default-package-overrides: - colourista ==0.1.0.2 - columnar ==1.0.0.0 - combinatorial ==0.1.1 - - comfort-array ==0.5.4.2 + - comfort-array ==0.5.5 - comfort-array-shape ==0.0 - - comfort-blas ==0.0.2 + - comfort-blas ==0.0.3 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - commonmark ==0.2.6 - - commonmark-extensions ==0.2.5.4 + - commonmark-extensions ==0.2.5.5 - commonmark-pandoc ==0.2.2.1 - commutative ==0.0.2 - commutative-semigroups ==0.1.1.0 @@ -713,7 +714,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - cond ==0.5.1 - conduit ==1.3.5 - - conduit-aeson ==0.1.0.1 + - conduit-aeson ==0.1.1.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.3 - conduit-extra ==1.3.6 @@ -729,7 +730,7 @@ default-package-overrides: - configurator-pg ==0.2.10 - config-value ==0.8.3 - constraints ==0.14.2 - - constraints-extras ==0.4.0.0 + - constraints-extras ==0.4.0.1 - constraint-tuples ==0.1.2 - construct ==0.3.1.2 - context ==0.2.1.0 @@ -759,7 +760,7 @@ default-package-overrides: - core-telemetry ==0.2.9.4 - core-text ==0.3.8.1 - countable ==1.2 - - country ==0.2.4.1 + - country ==0.2.4.2 - covariance ==0.2.0.1 - cpphs ==1.20.9.1 - cpu ==0.1.2 @@ -788,7 +789,7 @@ default-package-overrides: - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypton-x509 ==1.7.6 + - crypton-x509 ==1.7.7 - crypton-x509-store ==1.6.9 - crypton-x509-system ==1.6.7 - crypton-x509-validation ==1.6.12 @@ -797,7 +798,7 @@ default-package-overrides: - cryptostore ==0.3.1.0 - crypt-sha512 ==0 - csp ==1.4.0 - - css-syntax ==0.1.0.1 + - css-syntax ==0.1.0.2 - css-text ==0.1.3.0 - c-struct ==0.1.3.0 - csv ==0.1.2 @@ -837,7 +838,7 @@ default-package-overrides: - datadog ==0.3.0.0 - data-dword ==0.3.2.1 - data-endian ==0.1.1 - - data-fix ==0.3.3 + - data-fix ==0.3.4 - data-forest ==0.1.0.12 - data-functor-logistic ==0.0 - data-has ==0.4.0.0 @@ -865,7 +866,7 @@ default-package-overrides: - debian ==4.0.5 - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - - dec ==0.0.5 + - dec ==0.0.6 - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 @@ -934,7 +935,7 @@ default-package-overrides: - dockerfile ==0.2.0 - doclayout ==0.4.0.1 - doctemplates ==0.11 - - doctest ==0.22.2 + - doctest ==0.22.4 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.8 - doctest-exitcode-stdio ==0.0 @@ -977,9 +978,9 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - effectful ==2.3.0.0 - - effectful-core ==2.3.0.1 - - effectful-plugin ==1.1.0.2 + - effectful ==2.3.1.0 + - effectful-core ==2.3.1.0 + - effectful-plugin ==1.1.0.3 - effectful-th ==1.0.0.1 - egison-pattern-src ==0.2.1.2 - either ==5.0.2 @@ -991,7 +992,7 @@ default-package-overrides: - elm-bridge ==0.8.3 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm-street ==0.2.2.0 + - elm-street ==0.2.2.1 - elynx ==0.7.2.2 - elynx-markov ==0.7.2.2 - elynx-nexus ==0.7.2.2 @@ -1000,7 +1001,7 @@ default-package-overrides: - elynx-tree ==0.7.2.2 - emacs-module ==0.2.1 - email-validate ==2.3.2.20 - - emojis ==0.1.3 + - emojis ==0.1.4.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.10 @@ -1014,7 +1015,7 @@ default-package-overrides: - epub-metadata ==5.2 - eq ==4.3 - equal-files ==0.0.5.4 - - equational-reasoning ==0.7.0.2 + - equational-reasoning ==0.7.0.3 - equivalence ==0.4.1 - erf ==2.0.0.0 - errata ==0.4.0.2 @@ -1061,10 +1062,11 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.7 + - faktory ==1.1.3.0 + - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.2 + - fast-logger ==3.2.3 - fast-math ==1.0.2 - fast-myers-diff ==0.0.0 - fb ==2.1.1.1 @@ -1082,7 +1084,7 @@ default-package-overrides: - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 - file-embed-lzma ==0.0.1 - - file-io ==0.1.1 + - file-io ==0.1.2 - filelock ==0.1.1.7 - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 @@ -1113,7 +1115,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.4 + - flow ==2.0.0.5 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 @@ -1228,46 +1230,46 @@ default-package-overrides: - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.6.5.20240423 - - ghc-lib-parser ==9.6.5.20240423 + - ghc-lib ==9.6.6.20240701 + - ghc-lib-parser ==9.6.6.20240701 - ghc-lib-parser-ex ==9.6.0.2 - ghc-parser ==0.2.6.0 - ghc-paths ==0.1.0.12 - ghc-syntax-highlighter ==0.0.10.0 - - ghc-tcplugins-extra ==0.4.5 - - ghc-trace-events ==0.1.2.8 - - ghc-typelits-extra ==0.4.6 - - ghc-typelits-knownnat ==0.7.10 - - ghc-typelits-natnormalise ==0.7.9 - - ghc-typelits-presburger ==0.7.3.0 + - ghc-tcplugins-extra ==0.4.6 + - ghc-trace-events ==0.1.2.9 + - ghc-typelits-extra ==0.4.7 + - ghc-typelits-knownnat ==0.7.12 + - ghc-typelits-natnormalise ==0.7.10 + - ghc-typelits-presburger ==0.7.4.0 - ghost-buster ==0.1.1.0 - ghostscript-parallel ==0.0.1 - - gi-atk ==2.0.27 - - gi-cairo ==1.0.29 + - gi-atk ==2.0.28 + - gi-cairo ==1.0.30 - gi-cairo-render ==0.1.2 - - gi-dbusmenu ==0.4.13 - - gi-dbusmenugtk3 ==0.4.14 - - gi-freetype2 ==2.0.4 - - gi-gdk ==3.0.28 - - gi-gdkpixbuf ==2.0.31 - - gi-gdkx11 ==3.0.15 - - gi-gio ==2.0.32 - - gi-glib ==2.0.29 - - gi-gmodule ==2.0.5 - - gi-gobject ==2.0.30 - - gi-graphene ==1.0.7 - - gi-gtk ==3.0.41 + - gi-dbusmenu ==0.4.14 + - gi-dbusmenugtk3 ==0.4.15 + - gi-freetype2 ==2.0.5 + - gi-gdk ==3.0.29 + - gi-gdkpixbuf ==2.0.32 + - gi-gdkx11 ==3.0.16 + - gi-gio ==2.0.34 + - gi-glib ==2.0.30 + - gi-gmodule ==2.0.6 + - gi-gobject ==2.0.31 + - gi-graphene ==1.0.8 + - gi-gtk ==3.0.43 - gi-gtk-hs ==0.3.16 - - gi-gtksource ==3.0.28 - - gi-harfbuzz ==0.0.9 - - gi-javascriptcore ==4.0.27 + - gi-gtksource ==3.0.29 + - gi-harfbuzz ==0.0.10 + - gi-javascriptcore ==4.0.28 - ginger ==0.10.5.2 - - gio ==0.13.10.0 - - gi-pango ==1.0.29 - - gi-soup ==2.4.28 + - gio ==0.13.11.0 + - gi-pango ==1.0.30 + - gi-soup ==2.4.29 - githash ==0.1.7.0 - github ==0.29 - - github-release ==2.0.0.10 + - github-release ==2.0.0.11 - github-rest ==1.1.4 - github-types ==0.2.1 - github-webhooks ==0.17.0 @@ -1275,14 +1277,14 @@ default-package-overrides: - gitlib ==3.1.3 - git-mediate ==1.0.9 - gitrev ==1.3.1 - - gi-vte ==2.91.32 - - gi-webkit2 ==4.0.30 - - gi-xlib ==2.0.13 + - gi-vte ==2.91.33 + - gi-webkit2 ==4.0.31 + - gi-xlib ==2.0.14 - gl ==0.9 - glabrous ==2.0.6.3 - glasso ==0.1.0 - GLFW-b ==3.3.9.0 - - glib ==0.13.10.0 + - glib ==0.13.11.0 - glib-stopgap ==0.1.0.0 - Glob ==0.10.2 - glob-posix ==0.2.0.1 @@ -1311,17 +1313,17 @@ default-package-overrides: - groom ==0.1.2.1 - group-by-date ==0.1.0.5 - groups ==0.5.3 - - gtk ==0.15.8 - - gtk2hs-buildtools ==0.13.10.0 - - gtk3 ==0.15.8 + - gtk ==0.15.9 + - gtk2hs-buildtools ==0.13.11.0 + - gtk3 ==0.15.9 - gtk-strut ==0.1.3.2 - guarded-allocation ==0.0.1 - H ==1.0.0 - - hackage-cli ==0.1.0.1 + - hackage-cli ==0.1.0.2 - hackage-security ==0.6.2.4 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.2.0 + - hakyll ==4.16.2.2 - hakyllbars ==1.0.1.0 - hal ==1.0.1 - half ==0.3.1 @@ -1341,8 +1343,8 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.8 - - haskell-gi-base ==0.26.4 + - haskell-gi ==0.26.10 + - haskell-gi-base ==0.26.6 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 - HaskellNet ==0.6.1.2 @@ -1350,7 +1352,7 @@ default-package-overrides: - haskell-src-exts ==1.23.1 - haskell-src-exts-simple ==1.23.0.0 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.13 + - haskell-src-meta ==0.8.14 - haskintex ==0.8.0.2 - haskoin-core ==1.0.4 - haskoin-node ==1.0.1 @@ -1361,15 +1363,15 @@ default-package-overrides: - hasql-implicits ==0.1.1.3 - hasql-interpolate ==0.2.2.0 - hasql-listen-notify ==0.1.0.1 - - hasql-migration ==0.3.0 + - hasql-migration ==0.3.1 - hasql-notifications ==0.2.2.0 - hasql-optparse-applicative ==0.7.1.3 - hasql-pool ==0.10.1 - - hasql-th ==0.4.0.21 + - hasql-th ==0.4.0.22 - hasql-transaction ==1.0.1.4 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.4.1 + - HaTeX ==3.22.4.2 - HaXml ==1.25.13 - haxr ==3000.11.5 - HCodecs ==0.5.2 @@ -1411,7 +1413,7 @@ default-package-overrides: - histogram-fill ==0.9.1.0 - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - - hkgr ==0.4.4 + - hkgr ==0.4.6 - hledger ==1.32.3 - hledger-iadd ==1.3.20 - hledger-interest ==1.6.6 @@ -1443,7 +1445,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.10 - - hpack ==0.36.0 + - hpack ==0.36.1 - hpc-codecov ==0.5.0.0 - hpc-lcov ==1.1.2 - HPDF ==1.6.2 @@ -1470,15 +1472,15 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.3.1.1 - hslua ==2.3.1 - - hslua-aeson ==2.3.1 + - hslua-aeson ==2.3.1.1 - hslua-classes ==2.3.1 - - hslua-cli ==1.4.2 + - hslua-cli ==1.4.3 - hslua-core ==2.3.2 - hslua-list ==1.1.1 - hslua-marshalling ==2.3.1 - - hslua-module-doclayout ==1.1.1 + - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 - - hslua-module-system ==1.1.1 + - hslua-module-system ==1.1.2 - hslua-module-text ==1.1.1 - hslua-module-version ==1.1.1 - hslua-module-zip ==1.1.3 @@ -1488,15 +1490,15 @@ default-package-overrides: - hslua-typing ==0.1.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.6 + - HsOpenSSL ==0.11.7.7 - HsOpenSSL-x509-system ==0.1.0.4 - - hspec ==2.11.8 - - hspec-api ==2.11.8 + - hspec ==2.11.9 + - hspec-api ==2.11.9 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.2 - - hspec-core ==2.11.8 - - hspec-discover ==2.11.8 + - hspec-core ==2.11.9 + - hspec-discover ==2.11.9 - hspec-expectations ==0.8.4 - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 @@ -1504,10 +1506,10 @@ default-package-overrides: - hspec-golden ==0.2.2.0 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.1.1.0 - - hspec-junit-formatter ==1.1.0.2 + - hspec-junit-formatter ==1.1.2.1 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.1 - - hspec-meta ==2.11.8 + - hspec-meta ==2.11.9 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 - hspec-tmp-proc ==0.5.2.0 @@ -1548,7 +1550,7 @@ default-package-overrides: - http-link-header ==1.2.1 - http-media ==0.8.1.1 - http-query ==0.1.3 - - http-reverse-proxy ==0.6.0.2 + - http-reverse-proxy ==0.6.1.0 - http-streams ==0.8.9.9 - http-types ==0.12.4 - human-readable-duration ==0.2.1.4 @@ -1611,13 +1613,13 @@ default-package-overrides: - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1.1 - - indexed-traversable ==0.1.3 - - indexed-traversable-instances ==0.1.1.2 + - indexed-traversable ==0.1.4 + - indexed-traversable-instances ==0.1.2 - inf-backprop ==0.1.0.2 - infer-license ==0.2.0 - infinite-list ==0.1.1 - inflections ==0.4.0.7 - - influxdb ==1.9.3.1 + - influxdb ==1.9.3.2 - ini ==0.4.2 - inj ==1.0 - inline-c ==0.9.1.10 @@ -1654,7 +1656,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip ==1.7.8 - ip6addr ==1.0.4 - - iproute ==1.7.12 + - iproute ==1.7.14 - IPv6Addr ==2.0.6 - ipynb ==0.2 - ipython-kernel ==0.11.0.0 @@ -1679,18 +1681,18 @@ default-package-overrides: - jose ==0.11 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.6 - - jsaddle ==0.9.9.0 + - jsaddle ==0.9.9.2 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.11 - - json-feed ==2.0.0.11 + - json-feed ==2.0.0.12 - jsonifier ==0.2.1.3 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 - json-stream ==0.4.5.3 - - JuicyPixels ==3.3.8 + - JuicyPixels ==3.3.9 - JuicyPixels-extra ==0.6.0 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.3 @@ -1700,9 +1702,9 @@ default-package-overrides: - kansas-comet ==0.4.2 - katip ==0.8.8.0 - katip-logstash ==0.1.0.2 - - katip-wai ==0.1.2.3 + - katip-wai ==0.1.2.4 - kazura-queue ==0.1.0.4 - - kdt ==0.2.5 + - kdt ==0.2.6 - keep-alive ==0.2.1.0 - keter ==2.1.5 - keycode ==0.2.2 @@ -1723,7 +1725,7 @@ default-package-overrides: - koji-tool ==1.1.1 - kvitable ==1.0.3.0 - labels ==0.3.3 - - lackey ==2.0.0.7 + - lackey ==2.0.0.8 - lambdabot-core ==5.3.1.2 - lambdabot-irc-plugins ==5.3.1.2 - LambdaHack ==0.11.0.1 @@ -1733,7 +1735,7 @@ default-package-overrides: - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 - - language-c-quote ==0.13.0.1 + - language-c-quote ==0.13.0.2 - language-docker ==12.1.0 - language-dot ==0.1.2 - language-glsl ==0.3.0 @@ -1742,7 +1744,7 @@ default-package-overrides: - language-lua ==0.11.0.2 - language-protobuf ==1.0.1 - language-python ==0.5.8 - - lapack ==0.5.1.1 + - lapack ==0.5.2 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 @@ -1750,7 +1752,7 @@ default-package-overrides: - lapack-hmatrix ==0.0.0.2 - largeword ==1.2.5 - latex ==0.1.0.4 - - lattices ==2.2 + - lattices ==2.2.1 - lawful ==0.1.0.0 - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 @@ -1774,7 +1776,7 @@ default-package-overrides: - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 - - libBF ==0.6.7 + - libBF ==0.6.8 - libffi ==0.2.1 - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 @@ -1797,9 +1799,9 @@ default-package-overrides: - ListLike ==4.7.8.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-shuffle ==1.0.0 + - list-shuffle ==1.0.0.1 - list-t ==1.0.5.7 - - list-transformer ==1.1.0 + - list-transformer ==1.1.1 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 - literatex ==0.3.0.0 @@ -1808,7 +1810,7 @@ default-package-overrides: - lmdb ==0.2.5 - load-env ==0.2.1.0 - loc ==0.2.0.0 - - locators ==0.3.0.3 + - locators ==0.3.0.5 - loch-th ==0.2.2 - lockfree-queue ==0.2.4 - log-base ==0.12.0.1 @@ -1835,17 +1837,17 @@ default-package-overrides: - lumberjack ==1.0.3.0 - lz4 ==0.2.3.1 - lz4-frame-conduit ==0.1.0.1 - - lzma ==0.0.1.0 + - lzma ==0.0.1.1 - lzma-clib ==5.2.2 - machines ==0.7.3 - magic ==1.1 - magico ==0.0.2.3 - mailtrap ==0.1.2.1 - - mainland-pretty ==0.7.1 + - mainland-pretty ==0.7.1.1 - main-tester ==0.2.0.1 - managed ==1.0.10 - mandrill ==0.5.7.0 - - mappings ==0.3.0.0 + - mappings ==0.3.1.0 - map-syntax ==0.3 - markdown ==0.1.17.5 - markdown-unlit ==0.6.0 @@ -1892,7 +1894,7 @@ default-package-overrides: - messagepack ==0.5.5 - metrics ==0.4.1.1 - mfsolve ==0.3.2.2 - - microaeson ==0.1.0.1 + - microaeson ==0.1.0.2 - microlens ==0.4.13.1 - microlens-aeson ==2.5.2 - microlens-contra ==0.1.0.3 @@ -1913,7 +1915,7 @@ default-package-overrides: - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minisat-solver ==0.1 - - miniterion ==0.1.1.0 + - miniterion ==0.1.1.1 - miniutter ==0.5.1.2 - min-max-pqueue ==0.1.0.2 - mintty ==0.1.4 @@ -1923,7 +1925,7 @@ default-package-overrides: - MissingH ==1.6.0.1 - mixed-types-num ==0.5.12 - mmap ==0.5.9 - - mmark ==0.0.7.6 + - mmark ==0.0.8.0 - mmark-cli ==0.0.5.2 - mmark-ext ==0.2.1.5 - mmorph ==1.2.0 @@ -1936,7 +1938,7 @@ default-package-overrides: - moffy ==0.1.1.0 - moffy-samples ==0.1.0.3 - moffy-samples-events ==0.2.2.5 - - monad-chronicle ==1.0.1 + - monad-chronicle ==1.0.2 - monad-control ==1.0.3.1 - monad-control-aligned ==0.0.2.1 - monad-control-identity ==0.2.0.0 @@ -1950,7 +1952,7 @@ default-package-overrides: - monad-logger-logstash ==0.2.0.2 - monad-loops ==0.4.3 - monad-memo ==0.5.4 - - monad-metrics ==0.2.2.1 + - monad-metrics ==0.2.2.2 - monadoid ==0.0.3 - monadology ==0.3 - monad-par ==0.3.6 @@ -1965,10 +1967,10 @@ default-package-overrides: - monads-tf ==0.3.0.1 - monad-time ==0.4.0.0 - mongoDB ==2.7.1.4 - - monoidal-containers ==0.6.4.0 + - monoidal-containers ==0.6.5.0 - monoidal-functors ==0.2.3.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.5 + - monoid-subclasses ==1.2.5.1 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 - mono-traversable ==1.0.17.0 @@ -2003,11 +2005,11 @@ default-package-overrides: - mustache ==2.4.2 - mutable-containers ==0.3.4.1 - mwc-probability ==2.3.1 - - mwc-random ==0.15.0.2 + - mwc-random ==0.15.1.0 - mx-state-codes ==1.0.0.0 - myers-diff ==0.3.0.0 - mysql ==0.2.1 - - mysql-haskell ==1.1.4 + - mysql-haskell ==1.1.5 - mysql-haskell-nem ==0.1.0.0 - mysql-json-table ==0.1.4.0 - mysql-simple ==0.4.9 @@ -2029,17 +2031,17 @@ default-package-overrides: - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - - netlib-ffi ==0.1.1 + - netlib-ffi ==0.1.2 - net-mqtt ==0.8.6.0 - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 - - netrc ==0.2.0.0 + - netrc ==0.2.0.1 - netwire ==5.0.3 - netwire-input ==0.0.7 - network ==3.1.4.0 - network-bsd ==2.8.1.0 - network-byte-order ==0.1.7 - - network-conduit-tls ==1.4.0 + - network-conduit-tls ==1.4.0.1 - network-control ==0.0.2 - network-info ==0.2.1 - network-ip ==0.3.0.3 @@ -2064,6 +2066,7 @@ default-package-overrides: - non-empty ==0.3.5 - nonempty-containers ==0.3.4.5 - non-empty-sequence ==0.2.0.4 + - non-empty-text ==0.2.1 - nonempty-vector ==0.2.3 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 @@ -2104,7 +2107,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.3.0 + - opaleye ==0.10.3.1 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2136,9 +2139,9 @@ default-package-overrides: - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 - - ordered-containers ==0.2.3 + - ordered-containers ==0.2.4 - ormolu ==0.7.2.0 - - os-string ==2.0.2.2 + - os-string ==2.0.6 - overhang ==1.0.0 - packcheck ==0.6.0 - pager ==0.1.1.0 @@ -2150,12 +2153,12 @@ default-package-overrides: - pandoc-cli ==3.1.11.1 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-engine ==0.2.1.2 - - pandoc-lua-marshal ==0.2.7 + - pandoc-lua-marshal ==0.2.7.1 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.23.1 - - pango ==0.13.10.0 + - pango ==0.13.11.0 - panic ==0.4.0.1 - pantry ==0.9.3.2 - parallel ==3.2.2.0 @@ -2184,13 +2187,13 @@ default-package-overrides: - path-dhall-instance ==0.2.1.0 - path-extensions ==0.1.1.0 - path-extra ==0.3.1 - - path-io ==1.8.1 + - path-io ==1.8.2 - path-like ==0.2.0.2 - path-pieces ==0.2.1 - pathtype ==0.8.1.3 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - - patrol ==1.0.0.7 + - patrol ==1.0.0.8 - pava ==0.1.1.4 - pcf-font ==0.2.2.1 - pcg-random ==0.1.4.0 @@ -2199,9 +2202,9 @@ default-package-overrides: - pcre-light ==0.4.1.2 - pcre-utils ==0.1.9 - pdc ==0.1.1 - - pdf-toolbox-content ==0.1.1 - - pdf-toolbox-core ==0.1.1 - - pdf-toolbox-document ==0.1.2 + - pdf-toolbox-content ==0.1.2 + - pdf-toolbox-core ==0.1.3 + - pdf-toolbox-document ==0.1.4 - peano ==0.1.0.2 - pedersen-commitment ==0.2.0 - pem ==0.2.4 @@ -2231,7 +2234,7 @@ default-package-overrides: - phantom-state ==0.2.1.4 - phatsort ==0.6.0.0 - pid1 ==0.1.3.1 - - pinch ==0.5.1.0 + - pinch ==0.5.2.0 - pipes ==4.3.16 - pipes-attoparsec ==0.6.0 - pipes-binary ==0.4.4 @@ -2264,11 +2267,11 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.3 + - polysemy ==1.9.2.0 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.2 - polysemy-webserver ==0.2.1.2 - - pontarius-xmpp ==0.5.6.8 + - pontarius-xmpp ==0.5.7.0 - pooled-io ==0.0.2.3 - portable-lines ==0.1 - port-utils ==0.2.1.0 @@ -2333,7 +2336,7 @@ default-package-overrides: - prospect ==0.1.0.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.1 - - protocol-radius ==0.0.1.1 + - protocol-radius ==0.0.1.2 - protocol-radius-test ==0.1.0.1 - proto-lens ==0.7.1.5 - proto-lens-arbitrary ==0.1.2.13 @@ -2354,7 +2357,7 @@ default-package-overrides: - pusher-http-haskell ==2.1.0.17 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - - PyF ==0.11.2.1 + - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.9 @@ -2367,11 +2370,11 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - - quickcheck-groups ==0.0.1.2 + - quickcheck-groups ==0.0.1.3 - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - - quickcheck-monoid-subclasses ==0.3.0.3 + - quickcheck-monoid-subclasses ==0.3.0.4 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.8.0 @@ -2385,7 +2388,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.7 + - rampart ==2.0.0.8 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.2 @@ -2399,12 +2402,12 @@ default-package-overrides: - ranges ==0.2.4 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - - rank2classes ==1.5.3 + - rank2classes ==1.5.3.1 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.11 + - ratel ==2.0.0.12 - rate-limit ==1.4.3 - - ratel-wai ==2.0.0.6 + - ratel-wai ==2.0.0.7 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==12.1.3 @@ -2428,7 +2431,7 @@ default-package-overrides: - rec-def ==0.2.2 - record-hasfield ==1.0.1 - records-sop ==0.1.1.1 - - recursion-schemes ==5.2.2.5 + - recursion-schemes ==5.2.3 - recv ==0.1.0 - redact ==0.5.0.0 - reddit-scrape ==0.0.1 @@ -2480,12 +2483,12 @@ default-package-overrides: - rfc5051 ==0.2 - rg ==1.4.0.0 - riak-protobuf ==0.25.0.0 - - richenv ==0.1.0.1 + - richenv ==0.1.0.2 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 - - roc-id ==0.2.0.2 + - roc-id ==0.2.0.3 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.6 - rocksdb-query ==0.4.2 @@ -2524,7 +2527,7 @@ default-package-overrides: - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - saltine ==0.2.1.0 - - salve ==2.0.0.4 + - salve ==2.0.0.5 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2558,13 +2561,13 @@ default-package-overrides: - securemem ==0.1.10 - selections ==0.3.0.0 - selective ==0.7.0.1 - - semialign ==1.3 + - semialign ==1.3.1 - semigroupoids ==6.0.1 - semigroups ==0.20 - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - - sendfile ==0.7.11.5 + - sendfile ==0.7.11.6 - sendgrid-v3 ==1.0.0.1 - seqalign ==0.2.0.4 - seqid ==0.6.3 @@ -2615,7 +2618,7 @@ default-package-overrides: - serversession-frontend-yesod ==1.0.1 - servius ==1.2.3.0 - ses-html ==0.4.0.0 - - set-cover ==0.1.1 + - set-cover ==0.1.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - set-monad ==0.3.0.0 @@ -2651,28 +2654,28 @@ default-package-overrides: - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - simple-pango ==0.1.0.1 - - simple-prompt ==0.2.2 + - simple-prompt ==0.2.3 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 - simple-session ==2.0.0 - simple-templates ==2.0.0 - simple-vec3 ==0.6.0.1 - since ==0.0.0 - - singleton-bool ==0.1.7 + - singleton-bool ==0.1.8 - singleton-nats ==0.4.7 - singletons ==3.0.3 - singletons-base ==3.2 - - singletons-presburger ==0.7.3.0 + - singletons-presburger ==0.7.4.0 - singletons-th ==3.2 - Sit ==0.2023.8.3 - sitemap-gen ==0.1.0.0 - size-based ==0.1.3.2 - - sized ==1.1.0.1 + - sized ==1.1.0.2 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.14.1.2 - - skylighting-core ==0.14.1.2 + - skylighting ==0.14.2 + - skylighting-core ==0.14.2 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1.2 - skylighting-format-context ==0.1.0.2 @@ -2734,7 +2737,7 @@ default-package-overrides: - statistics ==0.16.2.1 - statistics-linreg ==0.3 - status-notifier-item ==0.3.1.0 - - step-function ==0.2.0.1 + - step-function ==0.2.1 - stitch ==0.6.0.0 - stm-chans ==3.0.0.9 - stm-conduit ==4.0.1 @@ -2767,16 +2770,16 @@ default-package-overrides: - strict-base-types ==0.8 - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.3 - - strict-list ==0.1.7.4 - - strict-tuple ==0.1.5.3 + - strict-list ==0.1.7.5 + - strict-tuple ==0.1.5.4 - strict-wrapper ==0.0.1.0 - stringable ==0.1.3 - stringbuilder ==0.5.1 - - string-class ==0.1.7.1 + - string-class ==0.1.7.2 - string-combinators ==0.6.0.5 - string-conv ==0.2.0 - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.3.0 + - string-interpolate ==0.3.4.0 - stringprep ==1.0.0 - string-qq ==0.0.6 - string-random ==0.1.4.3 @@ -2785,18 +2788,18 @@ default-package-overrides: - stripe-concepts ==1.0.3.3 - stripe-signature ==1.0.0.16 - stripe-wreq ==1.0.1.16 - - strive ==6.0.0.11 + - strive ==6.0.0.12 - structs ==0.1.9 - structured ==0.1.1 - stylish-haskell ==0.14.5.0 - - subcategories ==0.2.1.0 + - subcategories ==0.2.1.1 - sundown ==0.6 - superbuffer ==0.3.1.2 - svg-builder ==0.1.1 - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.8 - - swish ==0.10.8.0 + - swish ==0.10.9.0 - syb ==0.7.2.4 - sydtest ==0.15.1.1 - sydtest-aeson ==0.1.0.0 @@ -2818,7 +2821,7 @@ default-package-overrides: - sydtest-webdriver-screenshot ==0.0.0.2 - sydtest-webdriver-yesod ==0.0.0.1 - sydtest-yesod ==0.3.0.2 - - symbol ==0.2.4 + - symbol ==0.2.4.1 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 - synthesizer-alsa ==0.5.0.6 @@ -2847,7 +2850,7 @@ default-package-overrides: - tar-conduit ==0.4.1 - tasty ==1.4.3 - tasty-ant-xml ==1.1.9 - - tasty-autocollect ==0.4.2 + - tasty-autocollect ==0.4.3 - tasty-bench ==0.3.5 - tasty-bench-fit ==0.1 - tasty-checklist ==1.0.6.0 @@ -2861,12 +2864,13 @@ default-package-overrides: - tasty-hslua ==1.1.1 - tasty-hspec ==1.2.0.4 - tasty-html ==0.4.2.1 - - tasty-hunit ==0.10.1 + - tasty-hunit ==0.10.2 - tasty-hunit-compat ==0.2.0.1 - tasty-inspection-testing ==0.2.1 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.2 - tasty-lua ==1.1.1 + - tasty-papi ==0.1.2.0 - tasty-program ==1.1.0 - tasty-quickcheck ==0.10.2 - tasty-rerun ==1.1.19 @@ -2878,7 +2882,7 @@ default-package-overrides: - tasty-wai ==0.1.2.0 - TCache ==0.13.3 - tce-conf ==1.3 - - tdigest ==0.3 + - tdigest ==0.3.1 - teardown ==0.5.0.1 - tempgres-client ==1.0.0 - template ==0.2.0.10 @@ -2908,12 +2912,12 @@ default-package-overrides: - text-ansi ==0.3.0.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7.2 - - text-builder-dev ==0.3.4.2 - - text-builder-linear ==0.1.2 + - text-builder-dev ==0.3.4.4 + - text-builder-linear ==0.1.3 - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - text-icu ==0.8.0.5 - - text-iso8601 ==0.1 + - text-iso8601 ==0.1.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2936,9 +2940,9 @@ default-package-overrides: - th-data-compat ==0.1.3.1 - th-desugar ==1.15 - th-env ==0.1.1 - - these ==1.2 - - these-lens ==1.0.1.3 - - these-optics ==1.0.1.2 + - these ==1.2.1 + - these-lens ==1.0.2 + - these-optics ==1.0.2 - these-skinny ==0.7.6 - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.8 @@ -2964,7 +2968,7 @@ default-package-overrides: - tidal-link ==1.0.3 - tile ==0.3.0.0 - time-compat ==1.9.6.1 - - time-domain ==0.1.0.4 + - time-domain ==0.1.0.5 - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 @@ -2974,7 +2978,7 @@ default-package-overrides: - time-parsers ==0.2 - timerep ==2.1.0.0 - timers-tick ==0.5.0.4 - - timer-wheel ==1.0.0 + - timer-wheel ==1.0.0.1 - timespan ==0.4.0.0 - time-units ==1.0.0 - time-units-types ==0.2.0.1 @@ -2996,8 +3000,8 @@ default-package-overrides: - toml-parser ==1.3.2.0 - toml-reader ==0.2.1.0 - toml-reader-parse ==0.1.1.1 - - tophat ==1.0.7.0 - - topograph ==1.0.0.2 + - tophat ==1.0.8.0 + - topograph ==1.0.1 - torrent ==10000.1.3 - torsor ==0.1.0.1 - tostring ==0.2.1.1 @@ -3090,8 +3094,8 @@ default-package-overrides: - universe-some ==1.2.1 - universum ==1.8.2.1 - unix-bytestring ==0.4.0.1 - - unix-compat ==0.7.1 - - unix-time ==0.4.12 + - unix-compat ==0.7.2 + - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -3110,7 +3114,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.4.0 - utf8-string ==1.0.2 - - utility-ht ==0.0.17.1 + - utility-ht ==0.0.17.2 - uuid ==1.3.15 - uuid-types ==1.0.5.1 - valida ==1.1.0 @@ -3138,7 +3142,7 @@ default-package-overrides: - vcs-ignore ==0.0.2.0 - vec ==0.5 - vector ==0.13.1.0 - - vector-algorithms ==0.9.0.1 + - vector-algorithms ==0.9.0.2 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - vector-builder ==0.3.8.5 @@ -3155,7 +3159,7 @@ default-package-overrides: - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - verset ==0.0.1.9 - - versions ==6.0.6 + - versions ==6.0.7 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -3176,7 +3180,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.14 + - wai-extra ==3.1.15 - wai-feature-flags ==0.1.0.8 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 @@ -3187,7 +3191,7 @@ default-package-overrides: - wai-middleware-clacks ==0.1.0.1 - wai-middleware-delegate ==0.1.4.1 - wai-middleware-metrics ==0.2.4 - - wai-middleware-prometheus ==1.0.0.1 + - wai-middleware-prometheus ==1.0.1.0 - wai-middleware-static ==0.9.2 - wai-middleware-throttle ==0.3.0.1 - wai-rate-limit ==0.3.0.0 @@ -3201,7 +3205,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.31 - - warp-tls ==3.4.5 + - warp-tls ==3.4.6 - wave ==0.2.1 - wcwidth ==0.0.2 - webdriver ==0.12.0.0 @@ -3218,7 +3222,7 @@ default-package-overrides: - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.1.0 + - witch ==1.2.1.1 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -3241,7 +3245,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - wss-client ==0.3.0.0 - - wuss ==2.0.1.8 + - wuss ==2.0.1.9 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3271,12 +3275,12 @@ default-package-overrides: - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 - xmonad ==0.17.2 - - xor ==0.0.1.2 + - xor ==0.0.1.3 - xss-sanitize ==0.3.7.2 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.8 + - Yampa ==0.14.9 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 02e2d5954d20f..847cb1975f01b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -199,7 +199,6 @@ dont-distribute-packages: - HStringTemplateHelpers - HTab - HXMPP - - HaMinitel - HaRe - HaTeX-meta - HaTeX-qq @@ -287,7 +286,6 @@ dont-distribute-packages: - MutationOrder - NGLess - NTRU - - NXT - NaCl - NaperianNetCDF - NearContextAlgebra @@ -611,7 +609,7 @@ dont-distribute-packages: - bamstats - barley - base32-bytestring - - base_4_20_0_0 + - base_4_20_0_1 - baserock-schema - basic - batchd @@ -632,11 +630,9 @@ dont-distribute-packages: - bearriver - beautifHOL - bech32-th - - bech32-th_1_1_7 - bein - belka - bff - - bglib - bifunctor - billboard-parser - billeksah-forms @@ -689,7 +685,6 @@ dont-distribute-packages: - blink1 - blip - blogination - - bloohm - bloxorz - blubber - bluetile @@ -727,7 +722,6 @@ dont-distribute-packages: - bulletproofs - bulmex - burnt-explorer - - bus-pirate - buster-gtk - buster-network - butterflies @@ -983,10 +977,14 @@ dont-distribute-packages: - copilot-cbmc - copilot-frp-sketch - copilot-language + - copilot-language_3_20 - copilot-libraries + - copilot-libraries_3_20 - copilot-sbv - copilot-theorem + - copilot-theorem_3_20 - copilot-verifier + - copilot_3_20 - corenlp-parser - coroutine-enumerator - coroutine-iteratee @@ -1176,6 +1174,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora + - dl-fedora_1_1 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1239,8 +1238,6 @@ dont-distribute-packages: - elasticsearch-interchange - electrs-client - elerea-examples - - eliminators - - eliminators_0_9_5 - elliptic-curve - elsa - ema-extra @@ -1310,11 +1307,6 @@ dont-distribute-packages: - eventuo11y-prometheus - every-bit-counts - exference - - exinst-aeson - - exinst-base - - exinst-bytes - - exinst-cereal - - exinst-serialise - exist - exist-instances - expand @@ -1419,7 +1411,6 @@ dont-distribute-packages: - forms-data-format - forsyde-deep - forth-hll - - fortran-src - fortran-src-extras - foscam-directory - foscam-sort @@ -1428,7 +1419,6 @@ dont-distribute-packages: - fpnla-examples - frame-markdown - freckle-app - - free-category - free-functors - free-game - free-theorems-seq-webui @@ -1469,8 +1459,6 @@ dont-distribute-packages: - funnyprint - funsat - fwgl-glfw - - fwgl-javascript - - fxpak - g2 - g2q - g3p-hash @@ -1801,7 +1789,6 @@ dont-distribute-packages: - groundhog-th - grpc-etcd-client - grpc-haskell - - grpc-haskell-core - gruff - gruff-examples - gsc-weighting @@ -1822,7 +1809,6 @@ dont-distribute-packages: - guarded-rewriting - guess-combinator - h3spec - - hArduino - hOff-display - hPDB - hPDB-examples @@ -1864,7 +1850,6 @@ dont-distribute-packages: - hall-symbols - halma-gui - halma-telegram-bot - - ham - hamilton - hamusic - hans-pcap @@ -1964,7 +1949,7 @@ dont-distribute-packages: - haskoin-bitcoind - haskoin-crypto - haskoin-node - - haskoin-node_1_1_0 + - haskoin-node_1_1_3 - haskoin-protocol - haskoin-script - haskoon @@ -1985,7 +1970,9 @@ dont-distribute-packages: - haskus-web - haslo - hasloGUI + - hasmtlib - hasql-cursor-query + - hasql-interpolate_1_0_0_0 - hasql-postgres - hasql-postgres-options - hasql-queue @@ -2224,7 +2211,6 @@ dont-distribute-packages: - hsx-xhtml - hsyslog-tcp - html-kure - - html-parse-util - html2hamlet - htoml-parse - htsn-import @@ -2260,7 +2246,6 @@ dont-distribute-packages: - hw-json-lens - hw-json-simple-cursor - hw-json-standard-cursor - - hw-kafka-avro - hw-polysemy - hw-uri - hworker-ses @@ -2303,7 +2288,6 @@ dont-distribute-packages: - igrf - ihaskell-inline-r - ihaskell-rlangqq - - ihaskell-widgets - ihttp - imap - imgurder @@ -2398,6 +2382,7 @@ dont-distribute-packages: - jespresso - jmacro-rpc-happstack - jmacro-rpc-snap + - job - jobs-ui - join - jordan-openapi @@ -2466,7 +2451,6 @@ dont-distribute-packages: - kevin - key-vault - keyring - - keysafe - keystore - keyvaluehash - keyword-args @@ -2476,8 +2460,6 @@ dont-distribute-packages: - kit - kmeans-par - kmeans-vector - - knead - - knead-arithmetic - knit-haskell - koji-install - koji-tool @@ -2486,7 +2468,6 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita - - kvitable - laborantin-hs - labsat - labyrinth @@ -2514,7 +2495,6 @@ dont-distribute-packages: - lang - language-Modula2 - language-ats - - language-avro - language-boogie - language-ecmascript-analysis - language-eiffel @@ -2525,7 +2505,6 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling - - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -2539,7 +2518,6 @@ dont-distribute-packages: - layouting - lazy-hash-cache - lda - - ldap-client - ldap-client-og - ldap-scim-bridge - ldapply @@ -2572,6 +2550,7 @@ dont-distribute-packages: - libraft - librarian - librato + - libriscv - libxml-enumerator - lifted-base-tf - lightning-haskell @@ -2613,9 +2592,6 @@ dont-distribute-packages: - llvm-base-types - llvm-base-util - llvm-data-interop - - llvm-dsl - - llvm-extension - - llvm-extra - llvm-general - llvm-general-quote - llvm-hs-pretty @@ -2798,8 +2774,6 @@ dont-distribute-packages: - morloc - morpheus-graphql - morphisms-functors-inventory - - moto - - moto-postgresql - motor - motor-diagrams - mp @@ -2960,7 +2934,6 @@ dont-distribute-packages: - nyx-game - oath - oauth2-jwt-bearer - - obd - obdd - oberon0 - obj @@ -3000,11 +2973,12 @@ dont-distribute-packages: - opentracing-zipkin-common - opentracing-zipkin-v1 - opentracing-zipkin-v2 + - opt-env-conf + - opt-env-conf-test - optima-for-hasql - optimal-blocks - optimusprime - optparse-enum - - orbits - orchid - orchid-demo - order-maintenance @@ -3043,7 +3017,6 @@ dont-distribute-packages: - partage - partial-semigroup-test - passman-cli - - patch-image - pathfindingcore - patterns - paypal-rest-client @@ -3229,12 +3202,10 @@ dont-distribute-packages: - proplang - prosidyc - proto-lens-descriptors - - proto3-suite - protobuf-native - protocol-buffers-descriptor - protocol-buffers-descriptor-fork - proton - - psc-ide - psql - publicsuffixlist - puffytools @@ -3244,9 +3215,7 @@ dont-distribute-packages: - puppetresources - pure-cdb - pure-priority-queue-tests - - purenix - purescript-iso - - purescript-tsd-gen - pursuit-client - push-notify - push-notify-ccs @@ -3440,8 +3409,6 @@ dont-distribute-packages: - rfc-redis - rfc-servant - rhine-bayes - - rhine-gloss - - rhine-terminal - rhythm-game-tutorial - rib - ribosome @@ -3665,8 +3632,6 @@ dont-distribute-packages: - simple-postgresql-orm - simpleirc-lens - simseq - - singleton-nats - - singletons-presburger - siphon - siren-json - sirkel @@ -3832,7 +3797,6 @@ dont-distribute-packages: - sugar-json - sugar-scheme - summoner-tui - - sump - sunroof-examples - sunroof-server - supercollider-ht @@ -3869,11 +3833,11 @@ dont-distribute-packages: - syntax-pretty - syntax-printer - syntaxnet-haskell - - synthesizer-llvm - sys-process - syslog - systemd-api - systemstats + - systranything - t3-client - ta - tag-stream @@ -3903,7 +3867,6 @@ dont-distribute-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-sugar - tateti-tateti - tbox - tccli @@ -3936,7 +3899,6 @@ dont-distribute-packages: - thumbnail-polish - tic-tac-toe - tickle - - tidal-serial - tighttp - timberc - time-exts @@ -3947,7 +3909,6 @@ dont-distribute-packages: - timezone-unix - tinkoff-invest-sdk - tintin - - tinyMesh - tinytools - tinytools-vty - tip-haskell-frontend @@ -4043,7 +4004,6 @@ dont-distribute-packages: - typed-streams - typedflow - typelevel - - typesafe-precure - typescript-docs - typson-beam - typson-esqueleto @@ -4075,8 +4035,6 @@ dont-distribute-packages: - uniqueness-periods-vector-filters - uniqueness-periods-vector-general - uniqueness-periods-vector-properties - - units - - units-defs - unitym-servant - unitym-yesod - universal @@ -4360,7 +4318,6 @@ dont-distribute-packages: - yu-launch - yuuko - zasni-gerna - - zephyr - zephyr-copilot - zerobin - zeromq3-conduit diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f20b0f5bddea..008a0d34e49f4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -62,7 +62,7 @@ self: super: builtins.intersectAttrs super { # This prevents linking issues when running TH splices. postInstall = '' mv "$out/bin/haskell-language-server" "$out/bin/.haskell-language-server-${self.ghc.version}-unwrapped" - BOOT_PKGS=`ghc-pkg-${self.ghc.version} --global list --simple-output` + BOOT_PKGS="ghc-${self.ghc.version} template-haskell-$(ghc-pkg-${self.ghc.version} --global --simple-output field template-haskell version)" ${pkgs.buildPackages.gnused}/bin/sed \ -e "s!@@EXE_DIR@@!$out/bin!" \ -e "s/@@EXE_NAME@@/.haskell-language-server-${self.ghc.version}-unwrapped/" \ @@ -242,6 +242,19 @@ self: super: builtins.intersectAttrs super { cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix; arbtt = overrideCabal (drv: { + buildTools = drv.buildTools or [] ++ [ + pkgs.buildPackages.installShellFiles + pkgs.buildPackages.libxslt + ]; + postBuild = '' + xsl=${pkgs.buildPackages.docbook_xsl}/share/xml/docbook-xsl + make -C doc man XSLTPROC_MAN_STYLESHEET=$xsl/manpages/profile-docbook.xsl + ''; + postInstall = '' + for f in doc/man/man[1-9]/*; do + installManPage $f + done + ''; # The test suite needs the packages's executables in $PATH to succeed. preCheck = '' for i in $PWD/dist/build/*; do @@ -356,6 +369,11 @@ self: super: builtins.intersectAttrs super { warp = addTestToolDepend pkgs.curl super.warp; warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30; + safe-exceptions = overrideCabal (drv: { + # Fix strictDeps build error "could not execute: hspec-discover" + testToolDepends = drv.testToolDepends or [] ++ [ self.hspec-discover ]; + }) super.safe-exceptions; + # Test suite requires running a database server. Testing is done upstream. hasql = dontCheck super.hasql; hasql-dynamic-statements = dontCheck super.hasql-dynamic-statements; @@ -1199,15 +1217,11 @@ self: super: builtins.intersectAttrs super { ''; }); in - - { - fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; - fourmolu_0_15_0_0 = fourmoluTestFix super.fourmolu_0_15_0_0; - }) + builtins.mapAttrs (_: fourmoluTestFix) super + ) fourmolu - fourmolu_0_14_1_0 fourmolu_0_15_0_0 + fourmolu_0_16_2_0 ; # Test suite needs to execute 'disco' binary @@ -1342,18 +1356,20 @@ self: super: builtins.intersectAttrs super { gi-javascriptcore gi-webkit2webextension gi-gtk_4_0_8 - gi-gdk_4_0_7 + gi-gdk_4_0_8 gi-gsk gi-adwaita ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; gi-webkit2 = lib.pipe super.gi-webkit2 [ (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 73ce1af7735a0..db247f7030527 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -20,6 +20,8 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; inherit stdenv haskellLib ghc extensible-self all-cabal-hashes; + + # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here. buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; }; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 6c60efe1bce50..c54553d66dc74 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, buildHaskellPackages, ghc -, jailbreak-cabal, hscolour, cpphs +, jailbreak-cabal, hscolour, cpphs, runCommand , ghcWithHoogle, ghcWithPackages , nodejs }: @@ -150,6 +150,35 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false; let + # This is a workaround for the 2024-07-20 staging-next cycle to avoid causing mass rebuilds. + # todo(@reckenrode) Remove this workaround and remove `NIX_COREFOUNDATION_RPATH`, the related hooks, and ld-wrapper support. + nixCoreFoundationRpathWorkaround = stdenv.mkDerivation { + name = "nix-corefoundation-rpath-workaround"; + buildCommand = '' + mkdir -p "$out/nix-support" + cat <<-EOF > "$out/nix-support/setup-hook" + removeUseSystemCoreFoundationFrameworkHook() { + unset NIX_COREFOUNDATION_RPATH + local _hook + for _hook in envBuildBuildHooks envBuildHostHooks envBuildTargetHooks envHostHostHooks envHostTargetHooks envTargetTargetHooks; do + local _index=0 + local _var="\$_hook[@]" + for _var in "\''${!_var}"; do + if [ "\$_var" = "useSystemCoreFoundationFramework" ]; then + unset "\$_hook[\$_index]" + fi + ((++_index)) + done + unset _index + unset _var + done + unset _hook + } + addEnvHooks "\$hostOffset" removeUseSystemCoreFoundationFrameworkHook + EOF + ''; + }; + inherit (lib) optional optionals optionalString versionAtLeast concatStringsSep enableFeature optionalAttrs; @@ -430,7 +459,8 @@ stdenv.mkDerivation ({ inherit depsBuildBuild nativeBuildInputs; buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs # For patchShebangsAuto in fixupPhase - ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ]; + ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ] + ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ nixCoreFoundationRpathWorkaround ]; propagatedBuildInputs = optionals isLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. @@ -790,8 +820,8 @@ stdenv.mkDerivation ({ lib.optionals (!isCross) setupHaskellDepends); ghcCommandCaps = lib.toUpper ghcCommand'; - in stdenv.mkDerivation { - inherit name shellHook; + in runCommand name { + inherit shellHook; depsBuildBuild = lib.optional isCross ghcEnvForBuild; nativeBuildInputs = @@ -799,8 +829,6 @@ stdenv.mkDerivation ({ collectedToolDepends; buildInputs = otherBuildInputsSystem; - phases = ["installPhase"]; - installPhase = "echo $nativeBuildInputs $buildInputs > $out"; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; @@ -810,7 +838,7 @@ stdenv.mkDerivation ({ "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}"; - }; + } "echo $nativeBuildInputs $buildInputs > $out"; env = envFunc { }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3f82461c4f1cc..9ddab4c5d3552 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2109,8 +2109,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.1.2.3"; - sha256 = "1qiya1wd0crisjxcnjbxadkbb6ll3zzb102w4q82ga0mglxx5i4r"; + version = "1.1.3.0"; + sha256 = "1wwxiyshsx0lgb99vdliippszl2lrplwji4saavks2fgpqllgsly"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2126,6 +2126,32 @@ self: { license = lib.licenses.mit; }) {}; + "Blammo_1_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock + , containers, dlist, envparse, exceptions, fast-logger, hspec + , http-types, lens, markdown-unlit, monad-logger-aeson, mtl, text + , time, unliftio, unliftio-core, unordered-containers, vector, wai + }: + mkDerivation { + pname = "Blammo"; + version = "1.2.1.0"; + sha256 = "1hirn71nqghv1y7p7217h7kjpv6p9hglhpsxp007vnnhas7my6il"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive clock containers dlist + envparse exceptions fast-logger http-types lens monad-logger-aeson + mtl text time unliftio unliftio-core unordered-containers vector + wai + ]; + testHaskellDepends = [ + aeson base bytestring envparse hspec lens markdown-unlit mtl text + time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Batteries-included Structured Logging library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "BlastHTTP" = callPackage ({ mkDerivation, base, BiobaseBlast, BiobaseFasta, bytestring , conduit, either-unwrap, HTTP, http-conduit, hxt, mtl, network @@ -2880,15 +2906,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_12_0_0" = callPackage + "Cabal_3_12_1_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, time , transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.12.0.0"; - sha256 = "0cqs1i4qyf4y2xyq8wgk1xbjy5ra9bk5pc8y9bhl82cvqm625qpp"; + version = "3.12.1.0"; + sha256 = "1lmnmp1ag9lwaxks66ba26mi4q10afnl0a82nj1fv27bnjzz8hkn"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2977,17 +3003,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal-syntax_3_12_0_0" = callPackage + "Cabal-syntax_3_12_1_0" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers }: mkDerivation { pname = "Cabal-syntax"; - version = "3.12.0.0"; - sha256 = "090zv977zp85q6kwa2nwyh0plrb73dhss2wx00jdxz7v8zl2masp"; - revision = "1"; - editedCabalFile = "1sm453m6ba2k1jdqvag53sakifkjy3c4rrcbx6n7z8lxp0cdzbgh"; + version = "3.12.1.0"; + sha256 = "1d045h470yykabz5d89896d6v2p1vng373s7bgysfdmzqhgd7wp5"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers @@ -3309,6 +3333,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.14"; sha256 = "0rmpi7n0b9spvx84645z2zcnnvg75s40zl05c8iigzciyjax3v5y"; + revision = "1"; + editedCabalFile = "12ndnigvq4bhw65ia2ahy741krph0p1w50d8q9irw3ggaic9ijry"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -6387,8 +6413,8 @@ self: { }: mkDerivation { pname = "FiniteCategories"; - version = "0.6.5.0"; - sha256 = "00vdcd8lliwril814r9da57cdjfkq6fpa613j2kadhx9bic5rphs"; + version = "0.6.5.1"; + sha256 = "0wjq5z9rh7c1c08s0vqr45nkvqlimlllh5bdpqi6pajyf3x58504"; libraryHaskellDepends = [ base containers directory filepath random text WeakSets ]; @@ -7184,8 +7210,8 @@ self: { pname = "GLUT"; version = "2.7.0.16"; sha256 = "0vdkfj4wjzigdpzgr5l001y9wkhwgl00mclr26gf93kps14fkymn"; - revision = "2"; - editedCabalFile = "17vwn7v1ia98q4kwnac1qlk4gxw6pg2mr9av6gw4a7mymjccdmra"; + revision = "3"; + editedCabalFile = "00jj0f8vxfz11kpw673v5hs72xciyz4jvhp8p74cbqyj11dbp35d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -7398,19 +7424,19 @@ self: { "Gamgine" = callPackage ({ mkDerivation, array, base, bytestring, composition, cpphs - , data-lens, directory, filepath, GLFW-b, ListZipper, mtl + , data-lens-light, directory, filepath, GLFW-b, ListZipper, mtl , OpenGLRaw, parsec, pretty-show, StateVar, time , unordered-containers, utility-ht, Vec, zlib }: mkDerivation { pname = "Gamgine"; - version = "0.6.0"; - sha256 = "171mfxq7s719j3h2nfsck2qmwrkmlp3731na6nd81b5x3jvl3ma0"; + version = "0.7.0"; + sha256 = "01vgfs8yqzplimczjyy2jahm8777vxm23s3qvfy4h6dd32nvp15a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring composition data-lens directory filepath - GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time - unordered-containers utility-ht Vec zlib + array base bytestring composition data-lens-light directory + filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show + StateVar time unordered-containers utility-ht Vec zlib ]; libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; @@ -9893,8 +9919,8 @@ self: { pname = "HStringTemplate"; version = "0.8.8"; sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; - revision = "6"; - editedCabalFile = "1pwsga0ymdmd5ig9nzy3z4z61d0blgnybll7ik409x1wc4y2w692"; + revision = "8"; + editedCabalFile = "12mlncv6xfn68m28m3jc8bq9yipc7y38rly49y9srl8ml6yi8a49"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -10211,6 +10237,7 @@ self: { description = "An Haskell library to drive the french Minitel through a serial port"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "HaPy" = callPackage @@ -10271,8 +10298,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.4.1"; - sha256 = "0iql04fbv5ldjpcdkl1ah563v7a29p2l1525pp5dkwjq21lys40b"; + version = "3.22.4.2"; + sha256 = "1wfyzv5kpi5npqfya11dalrxffygcz7rdsmk8kk85fvzyka8p5kf"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -11451,10 +11478,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.6"; - sha256 = "18n7yhffqhgl2favmwlky9j0xx61bhs1akhf7ccc3ajapf8y4bb6"; - revision = "1"; - editedCabalFile = "0nqvb9g1wxz7ydpx9qc9lq9piwsy5zfk454v7mxlwng4i1jsgpk1"; + version = "0.11.7.7"; + sha256 = "0aza9w7ny1aangaspg4wkzhy0s26ngvfdq4zrd24iha1d9qh4nq8"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11574,6 +11599,8 @@ self: { pname = "HsYAML"; version = "0.2.1.4"; sha256 = "09hsva1qnnnyvbf7860wqpi5b3i6hbshf3wmhx3fm4hi7i3ak05m"; + revision = "1"; + editedCabalFile = "04yd612hlm8v660p1ww823kci59vi9myljcqsf0pajvfaaf4v0kx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11881,8 +11908,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.1"; - sha256 = "0nccfhm8a30ckl5lkaah0nhyikwry12d832wcknzl14jpj6r116d"; + version = "0.3.3.3"; + sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12405,10 +12432,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.3.8"; - sha256 = "0gmndzcbqys34sf6y8db13r5gaqa1cp9zxyb4vav788m6p5gd86k"; - revision = "2"; - editedCabalFile = "0xc9qlfgrlf6v4h5m9rcwy58wsa4ksm8fpnx3fyh5ld9x3nhgfpd"; + version = "3.3.9"; + sha256 = "0kc68bjj3izbdvw67kyzg74fv1ksj2dclq5gxzlnajv87rfsqi1y"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -14305,8 +14330,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.8.0"; - sha256 = "1k96nngfn57fb81wxpkksnmvq2nr7davn8wdwix2w2pk5v67m3fw"; + version = "0.9.11.0"; + sha256 = "1iclg19sxirz7p4r5q2r42w4iibswfinqkn45xqw6h617crwl2pk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -15130,6 +15155,7 @@ self: { description = "A Haskell interface to Lego Mindstorms NXT"; license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {bluetooth = null;}; "NXTDSL" = callPackage @@ -15196,8 +15222,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.4.0.1"; - sha256 = "1g32iiwrs2fhf7l4sjc2l0s51yc3a102scvbwq1ip7532bvmwy23"; + version = "3.4.0.2"; + sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16121,8 +16147,8 @@ self: { pname = "OpenGL"; version = "3.0.3.0"; sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as"; - revision = "3"; - editedCabalFile = "0fa64dn7wyxvi7vbz7lha64v9ld3xn2mqd3xlhm9rknhkzh3vbm9"; + revision = "4"; + editedCabalFile = "121998ckmpama7cfl63m5nvin46cqzip3ypzmy7v4y96ks6s1n5w"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -16153,8 +16179,8 @@ self: { pname = "OpenGLRaw"; version = "3.3.4.1"; sha256 = "07nk0rgm6jcxz6yshwhv5lj5frs6371w3hdjxwa4biws2kmbs6hj"; - revision = "2"; - editedCabalFile = "1wrkv4ll7iag0a1liw6jqffhqg2nbfpdg1sa9dy88n9jli1jmikd"; + revision = "3"; + editedCabalFile = "1wbqfgcswng27v76r7rgy1zlb4wpap2ibjf3hbcrdz39sbxlbdq1"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -16443,8 +16469,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; - revision = "1"; - editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126"; + revision = "2"; + editedCabalFile = "1cxv515z5ni102jwgadzsnaphimldrjz1klg33dbha87yblj2pgv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -17411,26 +17437,6 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.11.2.1"; - sha256 = "02i2h8dj228w0d4vsjrllrc25hgmx7wys2jzlgq61z13jddc8rg8"; - libraryHaskellDepends = [ - base bytestring ghc mtl parsec template-haskell text time - ]; - testHaskellDepends = [ - base bytestring deepseq filepath hspec HUnit process - template-haskell temporary text time - ]; - description = "Quasiquotations for a python like interpolated string formatter"; - license = lib.licenses.bsd3; - }) {}; - - "PyF_0_11_3_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, hspec - , HUnit, mtl, parsec, process, template-haskell, temporary, text - , time - }: - mkDerivation { - pname = "PyF"; version = "0.11.3.0"; sha256 = "1nwn3pf3wmi08jrfrmk8rbgfviha48ackm6crxrsxxcmmlrmsncy"; libraryHaskellDepends = [ @@ -17442,7 +17448,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formatter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "QIO" = callPackage @@ -17568,14 +17573,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "QuickCheck_2_15" = callPackage + "QuickCheck_2_15_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, process, random , splitmix, template-haskell, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.15"; - sha256 = "10hd896c8vb19aj3q0dg90aymsiq73ffxgx8z1p39w7x21m2vdnc"; + version = "2.15.0.1"; + sha256 = "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -17764,20 +17769,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "RLP" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec }: - mkDerivation { - pname = "RLP"; - version = "1.1.1"; - sha256 = "075hv3ljc47zr5xkvmbiqq666cgicvwl90isq2n45x9nsbg441d1"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base binary bytestring hspec ]; - description = "RLP serialization as defined in Ethereum Yellow Paper"; - license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "RMP" = callPackage ({ mkDerivation, allocated-processor, base, canlib, cv-combinators , ftd2xx, HOpenCV, vector-space @@ -18960,6 +18951,8 @@ self: { pname = "STMonadTrans"; version = "0.4.8"; sha256 = "0ldqsl5axz1xlzha4b58kzpf35nr81ki3psy91zx7lpiv4agz7l3"; + revision = "1"; + editedCabalFile = "0bmmlg4kwsarkkm214fcqdvkah3pbk9ay8m9bnggb3ds7sc897i2"; libraryHaskellDepends = [ array base mtl transformers ]; testHaskellDepends = [ array base tasty tasty-hunit tasty-quickcheck transformers @@ -22888,12 +22881,12 @@ self: { "WringTwistree" = callPackage ({ mkDerivation, arithmoi, array, base, bytestring, containers , deepseq, mod, multiarg, parallel, sort, split, tasty, tasty-hunit - , tasty-quickcheck, utf8-string, vector + , tasty-quickcheck, terminal-progress-bar, utf8-string, vector }: mkDerivation { pname = "WringTwistree"; - version = "0.0.1.1"; - sha256 = "10hbg89y1bs4b8nmw3v5amffgmjmija89c639mk9g8hs3zddgb53"; + version = "0.1.0.0"; + sha256 = "1zslzl8ffw9bf3lm21zj7hr9xsd4503cmvznzsl9fsqgp8ssy533"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22902,7 +22895,7 @@ self: { ]; executableHaskellDepends = [ arithmoi array base bytestring containers deepseq multiarg parallel - sort split utf8-string vector + sort split terminal-progress-bar utf8-string vector ]; testHaskellDepends = [ array base bytestring containers tasty tasty-hunit tasty-quickcheck @@ -23328,8 +23321,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.8"; - sha256 = "0w33n17haja7jzwhha7j6psqkcyq0k06ddckbs96yqldmq96il18"; + version = "0.14.9"; + sha256 = "0khlr63l3xrhylapr5ql62b3kzfak97vlz1cjd15pzfain7pvbds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23456,8 +23449,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "2.0.0.2"; - sha256 = "1ix3bdhb8291wgh3iaiwfhkkkcbp51r50xszs4i1x57kzzxbsjf3"; + version = "2.0.1.0"; + sha256 = "17rz3yasgjvw3sbzzwc2xr4hf05nmgxcvhlqrk77w3wcf18fixj6"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq hashable @@ -23920,6 +23913,8 @@ self: { pname = "acc"; version = "0.2.0.3"; sha256 = "13gx2d2bdwkcdk8q06hq3q4a6jlamljbimd57ck2lfmr1lm5r1w9"; + revision = "1"; + editedCabalFile = "0qsggnxzzb1awfcjqm7xihr6lxjpx0yxpvwd6hzvd52s3j0qbz1a"; libraryHaskellDepends = [ base deepseq semigroupoids ]; testHaskellDepends = [ quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck @@ -25403,8 +25398,8 @@ self: { pname = "active"; version = "0.2.1"; sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1"; - revision = "2"; - editedCabalFile = "16gc6vksf5gn5v6m9zbiphb2bd2chbypk8iykn1y7ak3f8g30asn"; + revision = "3"; + editedCabalFile = "0hpnbr1q5nkqp4l7hycba6lnmw22b0ccv2l62lqvis96xw47n75k"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -26050,8 +26045,8 @@ self: { pname = "aeson"; version = "2.1.2.1"; sha256 = "1ii26lz9czxqhck11pzhqlhfhm9zgbrhiydv4gh1w66f0fwl4h2x"; - revision = "3"; - editedCabalFile = "19qj4s625b34kw8ryb2ji0hs6dg2m116x913s722bab316k653av"; + revision = "4"; + editedCabalFile = "0lb30fwqr6q3xzvhi3vv2g0yw3bmwmzfp45jsplhakq2mmzbxa5a"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist exceptions generically ghc-prim hashable @@ -26073,7 +26068,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_2_2_0" = callPackage + "aeson_2_2_3_0" = callPackage ({ mkDerivation, base, base-compat, base-orphans, base16-bytestring , bytestring, character-ps, containers, data-fix, deepseq, Diff , directory, dlist, exceptions, filepath, generic-deriving @@ -26087,10 +26082,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.2.2.0"; - sha256 = "0xk2zl4j64zjymib0qyx889jyghx0fa1nvsz0fx2py9kcd2f3gdk"; - revision = "1"; - editedCabalFile = "18kglyqghxv5gpp9c8kn2rr0h2c09x3rw9rl3a4j3h2l23y0s3dc"; + version = "2.2.3.0"; + sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns"; libraryHaskellDepends = [ base bytestring character-ps containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable @@ -26512,8 +26505,8 @@ self: { }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.5.1"; - sha256 = "15d706h09igm9ic0sgjamwngghvcqhs2pir5pqb2crlkvmhr25cb"; + version = "0.2.5.2"; + sha256 = "16lzp5rjjsj3l5bazc33r6pn6llz2ycfikxsvzk6bf5b157gzpjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26771,8 +26764,8 @@ self: { }: mkDerivation { pname = "aeson-possible"; - version = "0.1.0.0"; - sha256 = "0m360yvah04d7wi9g50r4bg7g3m86z47l7x09dk2rbdzwfzdzn15"; + version = "0.1.0.1"; + sha256 = "0zikrnbd4y1d38giq6i3fpvpy9465v5mlfkif8xhmg7jagn6a85z"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base QuickCheck tasty tasty-hunit tasty-quickcheck @@ -26927,6 +26920,8 @@ self: { pname = "aeson-schemas"; version = "1.4.2.1"; sha256 = "1rsbkav2c76g6b2cbhjwhlhnwz0w9fwiq1bf2cbikgbrabbi9h7c"; + revision = "1"; + editedCabalFile = "0ncpw82shjdwy87b3yrmc43y0zc0f4f8mfdzb9sg4hwvwacz8sqm"; libraryHaskellDepends = [ aeson base first-class-families hashable megaparsec template-haskell text unordered-containers @@ -27621,6 +27616,27 @@ self: { mainProgram = "aip"; }) {}; + "aip-version" = callPackage + ({ mkDerivation, base, bytestring, http-client, lens + , optparse-applicative, parsec, time, wreq + }: + mkDerivation { + pname = "aip-version"; + version = "0.0.0.2"; + sha256 = "0gcdbvcikiqg86nvcf6b8b897fq9mciilc9p0sfnfphabqlb1q55"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring http-client lens optparse-applicative parsec time + wreq + ]; + description = "Version of AIP documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "aip-version"; + broken = true; + }) {}; + "air" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, mtl, text, time @@ -27712,8 +27728,8 @@ self: { }: mkDerivation { pname = "airgql"; - version = "0.7.1.2"; - sha256 = "1fcin7c223xfgyksa50dw8vnxvs0rkwzi16ia5x0rrnfsjv83jwm"; + version = "0.7.1.3"; + sha256 = "1vb5qmvdm803nllfddzh6q89ln5ldxy974yj4v36gjmaqs3wq2dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27795,8 +27811,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "6.1"; - sha256 = "16f4vp2xfkb7y62kcb3rmfs8ksj1hrn92add446pi6lsrcrz4pk6"; + version = "6.1.1"; + sha256 = "0g6f1048bxcyhp1kq7bjyrjfv96fawi5n0j5nvfjq544sc3s7b3m"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -27811,8 +27827,8 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.4"; - sha256 = "0civg85a1rv3n2400fi9hi30zb1l1sycxjccxxmkd8kk4izcjxkz"; + version = "0.4.1"; + sha256 = "0c1yh44n5dadia6qb02lc7v12kbzh28kk2lw2fg6azllbb0q3s39"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl mwc-random random ]; @@ -27823,15 +27839,16 @@ self: { "aivika-distributed" = callPackage ({ mkDerivation, aivika, aivika-transformers, array, base, binary , containers, distributed-process, exceptions, mtl, mwc-random - , random, stm, time + , random, stm, time, vector }: mkDerivation { pname = "aivika-distributed"; - version = "1.4"; - sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k"; + version = "1.5.1"; + sha256 = "03l6fas3lna2zw3s4wjq4s3521qfc6v58mi06ja4y9p8a3fffzbs"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time + vector ]; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = lib.licenses.bsd3; @@ -27844,8 +27861,8 @@ self: { }: mkDerivation { pname = "aivika-experiment"; - version = "5.4.0"; - sha256 = "1b4izqmafs1biak33fgz5pr8xcjsr35g19r9d3y6sznjcc48d58b"; + version = "5.4.1"; + sha256 = "1wbq3m3w3maxnk0lby2ccspjdcm3ma4pp6j5s1lvp70ccvmcrj1g"; libraryHaskellDepends = [ aivika aivika-transformers base containers directory filepath mtl network-uri parallel-io split @@ -27959,8 +27976,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "6.1"; - sha256 = "14x2ddny5a68bm66w29nzsmvmwhxj37yf4jl60wp4h5bvf3k7s3j"; + version = "6.1.1"; + sha256 = "1wzmm5jxqzwkgpirq3krn0n8nh40rjcmhb5j5qv08cd04l6zjn2r"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -36241,6 +36258,35 @@ self: { mainProgram = "amqp-builder"; }) {}; + "amqp_0_23_0" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, containers + , crypton-connection, data-binary-ieee754, data-default-class + , hspec, hspec-expectations, monad-control, network, network-uri + , split, stm, text, vector, xml + }: + mkDerivation { + pname = "amqp"; + version = "0.23.0"; + sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock containers crypton-connection + data-binary-ieee754 data-default-class monad-control network + network-uri split stm text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock containers crypton-connection + data-binary-ieee754 data-default-class hspec hspec-expectations + network network-uri split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "amqp-builder"; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -36752,8 +36798,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, vector }: mkDerivation { pname = "anitomata"; - version = "0.1.0.0"; - sha256 = "1gswhhwrjkhy90x23r0lnlyii07vjc85h99b265pm8fzqqgcdyqf"; + version = "0.1.0.2"; + sha256 = "01c1cjczb2mvgl93iqf3zg9sm9rz307bi8f96nk113r036db6nh9"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec QuickCheck vector ]; testToolDepends = [ hspec-discover ]; @@ -36768,8 +36814,8 @@ self: { }: mkDerivation { pname = "anitomata-aseprite"; - version = "0.1.1.0"; - sha256 = "0qskdfj595gwppaj34krsdfmk8vjwzmrig8ajaddni7znag89gl4"; + version = "0.1.1.2"; + sha256 = "177gqb3p64h8ymw5i20fd0xba1hqcw4j4prqnp6hs1h6wgrcmppq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36880,6 +36926,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "annotated-exception_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , safe-exceptions, text, unliftio-core + }: + mkDerivation { + pname = "annotated-exception"; + version = "0.3.0.1"; + sha256 = "09lgqzx5g7wnfpj9a8zn10s8v919psxrzzg50vllryaqxxkfmj4a"; + libraryHaskellDepends = [ + base containers safe-exceptions text unliftio-core + ]; + testHaskellDepends = [ + base containers hspec safe-exceptions text unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Exceptions, with checkpoints and context"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "annotated-fix" = callPackage ({ mkDerivation, base, recursion-schemes }: mkDerivation { @@ -38655,6 +38721,17 @@ self: { broken = true; }) {}; + "applicative-logic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "applicative-logic"; + version = "0.1.0.2"; + sha256 = "0jr81m0mksfxbvzjs3c73kilr09w4gh7zv1amdx9xcvq5zb96imd"; + libraryHaskellDepends = [ base ]; + description = "Generalized logic operations for Applicative and Alternative functors"; + license = lib.licenses.bsd3; + }) {}; + "applicative-numbers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -38725,8 +38802,8 @@ self: { pname = "apply-merge"; version = "0.1.1.0"; sha256 = "1snm9m35r3px9vgn64ygcqq37ay6jvwc5jsi3s62rxrh8biy8ir8"; - revision = "1"; - editedCabalFile = "0xlwl7ya683pf1zi478s0p10zn8pks56gmvfdagbxk8hapy4n6lp"; + revision = "2"; + editedCabalFile = "1k5iajw80v2i40zmks4h8f9pfy8nq5zx55dwxgvn5z1k44wxa5z6"; libraryHaskellDepends = [ base containers pqueue reflection ]; testHaskellDepends = [ base containers data-ordlist pqueue reflection tasty @@ -39023,8 +39100,8 @@ self: { pname = "approximate"; version = "0.3.5"; sha256 = "1f168ac9xryrv50k7gvh89xv0mj6c42cxw7pj01pqcbppbs0rm3g"; - revision = "3"; - editedCabalFile = "10y11nm6rfh5s6vzw0z7zn29gv6z6ll8q7gmw30yc1xxmy78rxqj"; + revision = "4"; + editedCabalFile = "0b33a1y198m8fjp1aarx3h02c6qkdnpm5wwphzwavhph2hshdqv4"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens log-domain pointed safecopy semigroupoids semigroups vector @@ -39720,8 +39797,6 @@ self: { ]; description = "Memory-hard password hash and proof-of-work function"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "argparser" = callPackage @@ -39954,8 +40029,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; - revision = "3"; - editedCabalFile = "1v8d7dpzlqqmlfmwb0jylic09yr3f69wpkqxp8kyy1hgbczaig3l"; + revision = "4"; + editedCabalFile = "1dmmbf3bcs4x0w9f609zrwnvrn9ngcqv9l5xgwhf0qxgpizgps2q"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -41201,6 +41276,20 @@ self: { broken = true; }) {}; + "assignment" = callPackage + ({ mkDerivation, array, base, criterion, hspec, QuickCheck, weigh + }: + mkDerivation { + pname = "assignment"; + version = "0.0.1.0"; + sha256 = "0pvlygd086izlx670hgnp0w5s6c273gl4lhacd2x40q265ag7qxw"; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "A solution to the assignment problem"; + license = lib.licenses.bsd3; + }) {}; + "assimp" = callPackage ({ mkDerivation, assimp, base, c2hs, haskell98, vect }: mkDerivation { @@ -41973,8 +42062,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; - version = "0.8.7"; - sha256 = "1xwws46hwb0m2zqyllkb9rb0jjiqq0xp128dv03w3l5kz0ixk9jv"; + version = "0.8.8"; + sha256 = "1sp7ffyybnvq9s0b73rr33wjck3ffip2v56q1l87d1r5150wwh60"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "A safe approach to CAS and other atomic ops in Haskell"; license = lib.licenses.bsd3; @@ -42542,8 +42631,8 @@ self: { }: mkDerivation { pname = "attoparsec-framer"; - version = "0.1.0.3"; - sha256 = "0lwrnka25f5a27ym3w48qdrkv3q62q9rs5r6kpgbr7nckcmb9b03"; + version = "0.1.0.4"; + sha256 = "1ijb8br55pchrn525dhsqhmpy9mlzg6as40mpjgmv567ngjp4ia5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42561,6 +42650,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-framer_0_1_0_8" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, hspec, network, network-run, QuickCheck, text + }: + mkDerivation { + pname = "attoparsec-framer"; + version = "0.1.0.8"; + sha256 = "0s5pyf9ncnmw5cn5rkij7s2p21625cz2pfa6pnj3h4fbsra06jfc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring exceptions text + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions network + network-run QuickCheck text + ]; + testHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions hspec + QuickCheck text + ]; + description = "Use Attoparsec to parse framed protocol byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-ip" = callPackage ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty , tasty-quickcheck, text, vector @@ -42583,21 +42698,6 @@ self: { }: mkDerivation { pname = "attoparsec-iso8601"; - version = "1.1.0.1"; - sha256 = "0swi953apv2mm1q213afxiv2mmknzz5pmpdk824n1s26rfwny83k"; - libraryHaskellDepends = [ - attoparsec base integer-conversion text time time-compat - ]; - description = "Parsing of ISO 8601 dates, originally from aeson"; - license = lib.licenses.bsd3; - }) {}; - - "attoparsec-iso8601_1_1_1_0" = callPackage - ({ mkDerivation, attoparsec, base, integer-conversion, text, time - , time-compat - }: - mkDerivation { - pname = "attoparsec-iso8601"; version = "1.1.1.0"; sha256 = "0yn9l9drza1wcj59a9dzm4vnihwmsxk6zd3fqg6kgww1an8x3k9l"; libraryHaskellDepends = [ @@ -42605,7 +42705,6 @@ self: { ]; description = "Parsing of ISO 8601 dates, originally from aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iteratee" = callPackage @@ -43094,14 +43193,14 @@ self: { license = lib.licenses.mit; }) {}; - "auto-update_0_2_0" = callPackage + "auto-update_0_2_1" = callPackage ({ mkDerivation, base, exceptions, hspec, hspec-discover, HUnit , retry }: mkDerivation { pname = "auto-update"; - version = "0.2.0"; - sha256 = "13z0h0zjccf8fj0lfcbjhrzfpq1cw9kc9aciycs97lrr6iz7y6m2"; + version = "0.2.1"; + sha256 = "19rpplsvakhw91iszddjsk2bfhj5w26715yz0ld71xpcnwdi8ym5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base exceptions hspec HUnit retry ]; testToolDepends = [ hspec-discover ]; @@ -43137,8 +43236,8 @@ self: { }: mkDerivation { pname = "autodocodec"; - version = "0.2.2.0"; - sha256 = "1dvrd08bzay1c59bklqn55ba1k2p0pjdzlnj807g28v9wb2ahkgf"; + version = "0.2.3.0"; + sha256 = "11d0hqm431gm04f593048r615nx16nm9blhg2hyf6rasrdmfp9iv"; libraryHaskellDepends = [ aeson base bytestring containers hashable mtl scientific text time unordered-containers validity validity-scientific vector @@ -43172,8 +43271,8 @@ self: { }: mkDerivation { pname = "autodocodec-schema"; - version = "0.1.0.3"; - sha256 = "1rb9ff1n0pllx02g1741mkvil2hz5km306pbyqm15h17vlpa5kdw"; + version = "0.1.0.4"; + sha256 = "185z4k43r8w03gsq8r9qv6jg6ay34j2my5l9xybvadxgnp9zcc10"; libraryHaskellDepends = [ aeson autodocodec base containers mtl text unordered-containers validity validity-aeson validity-containers validity-text @@ -43234,22 +43333,25 @@ self: { license = lib.licenses.mit; }) {}; - "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: + "autodocodec-yaml_0_3_0_0" = callPackage + ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring + , containers, path, path-io, safe-coloured-text, scientific, text + , vector, yaml + }: mkDerivation { - pname = "autoexporter"; - version = "2.0.0.9"; - sha256 = "1rkql1v29gsgq3y9gmsrfxgm43rgwhk32g32gjxbfgr4ky79696g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; + pname = "autodocodec-yaml"; + version = "0.3.0.0"; + sha256 = "0p3f7n3acvb5csr7j8lfy811w54jrmwn1c8p8xx5xv1wbqdf06in"; + libraryHaskellDepends = [ + autodocodec autodocodec-schema base bytestring containers path + path-io safe-coloured-text scientific text vector yaml + ]; + description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; - mainProgram = "autoexporter"; + hydraPlatforms = lib.platforms.none; }) {}; - "autoexporter_2_0_0_12" = callPackage + "autoexporter" = callPackage ({ mkDerivation, base, Cabal-syntax, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -43261,7 +43363,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatically re-export modules"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "autoexporter"; }) {}; @@ -43314,8 +43415,8 @@ self: { }: mkDerivation { pname = "automaton"; - version = "1.3"; - sha256 = "04mgsc9cg1w9afica540mgxykdnid4d88j1dn3lnlsm2z3gkh2gx"; + version = "1.4"; + sha256 = "0g04as057ya3r698q8kwc73lzj2pzqwns7pd6dy84qs7rsxyj1fj"; libraryHaskellDepends = [ base mmorph MonadRandom mtl profunctors selective semialign simple-affine-space these transformers @@ -43744,8 +43845,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "avro-piper" = callPackage @@ -45837,12 +45936,12 @@ self: { broken = true; }) {}; - "base_4_20_0_0" = callPackage + "base_4_20_0_1" = callPackage ({ mkDerivation, ghc-internal, ghc-prim }: mkDerivation { pname = "base"; - version = "4.20.0.0"; - sha256 = "15l9g5v12411baix23ck30s2633mw957xsh2bnxjlrcqjfpqhqbw"; + version = "4.20.0.1"; + sha256 = "0pg93zvlvx56ffz8b2gf920an4jzqyd1305h59c7slx51ibf2aww"; libraryHaskellDepends = [ ghc-internal ghc-prim ]; description = "Core data structures and operations"; license = lib.licenses.bsd3; @@ -46305,6 +46404,8 @@ self: { pname = "base64"; version = "1.0"; sha256 = "1dmjy4pkz66s3wa99lkc0wc4bdjkdkr57a8rsgb5z50432gj6hkr"; + revision = "1"; + editedCabalFile = "0b02k2r5dkzm8rapypkcjl08mz97z5qh4yfxyxn0vwq5hmh8905b"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -46375,8 +46476,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "19"; - editedCabalFile = "001hlnsldkiw1lr188n13j41fzfl157ba0y4qdcnzygnj5wa66ac"; + revision = "20"; + editedCabalFile = "0zp0c7n6gnxg37azc63xxrqchdzk2srf0zykccvndr3xlw1v83kc"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -47363,6 +47464,8 @@ self: { pname = "beam-core"; version = "0.10.1.0"; sha256 = "0h1kr653wd00m5pypj4ia8d1ni6m2qrzqqqh19hnd8wz1n0pfd1h"; + revision = "1"; + editedCabalFile = "0sjc2zyy9f5r3qg4yxl1dq0c4ybvqvgh64vy078507sl8jxxl7v7"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47385,6 +47488,8 @@ self: { pname = "beam-migrate"; version = "0.5.2.1"; sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc"; + revision = "1"; + editedCabalFile = "0cc0pbll3w08c3birv8isfvn8a6yd0i837gmkl12lh0gvshqph82"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47443,6 +47548,8 @@ self: { pname = "beam-postgres"; version = "0.5.3.1"; sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; + revision = "1"; + editedCabalFile = "17ssja9yy1yzjyngrvyr72gr8hrvkw4q8w8cb20kdfrz0m83c17w"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47470,6 +47577,8 @@ self: { pname = "beam-sqlite"; version = "0.5.3.0"; sha256 = "050nqjx6916j9c499i5zskankpg3bbh9f4m8lrnmf0mj4hsl96m4"; + revision = "1"; + editedCabalFile = "17n59xf66hmsiwlv3f4ybwa8wnkgawl2m93pylmaw6hg939d5518"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable monad-control mtl network-uri scientific sqlite-simple @@ -47537,8 +47646,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.8"; - sha256 = "06wnlshgf2anp3xg3vf0cz6lxjn0rpfvnjfn568dj007km8y2n9p"; + version = "0.14.9"; + sha256 = "10xcl4nms1bcfni9z7mqirf6ifii99y6yb16r2pwrfs20vnhwx7w"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -47570,37 +47679,6 @@ self: { }: mkDerivation { pname = "bech32"; - version = "1.1.6"; - sha256 = "03a0xf1c7zjirg4y3rv0frrqifzqsqx327hdcvxzbpgflwgs225h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers extra text - ]; - executableHaskellDepends = [ - base base58-bytestring bytestring extra memory optparse-applicative - prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - base base58-bytestring bytestring containers deepseq extra hspec - memory process QuickCheck text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - mainProgram = "bech32"; - broken = true; - }) {}; - - "bech32_1_1_7" = callPackage - ({ mkDerivation, array, base, base58-bytestring, bytestring - , containers, deepseq, extra, hspec, hspec-discover, memory - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , process, QuickCheck, text, vector - }: - mkDerivation { - pname = "bech32"; version = "1.1.7"; sha256 = "1ql79scbjxrmllizywhzdys1bx565lqvj81851wzdkww662lhvpg"; isLibrary = true; @@ -47630,22 +47708,6 @@ self: { }: mkDerivation { pname = "bech32-th"; - version = "1.1.6"; - sha256 = "0y1hw7419sw84gs13wh40qj9m1snyz0ly5aasmkynjpb9ixhn54k"; - libraryHaskellDepends = [ base bech32 template-haskell text ]; - testHaskellDepends = [ base bech32 hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Template Haskell extensions to the Bech32 library"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - - "bech32-th_1_1_7" = callPackage - ({ mkDerivation, base, bech32, hspec, hspec-discover - , template-haskell, text - }: - mkDerivation { - pname = "bech32-th"; version = "1.1.7"; sha256 = "0a71jcvgnfsn24d2bppiprx4yb5cnsr85rsgzax3547shiqpli1n"; libraryHaskellDepends = [ base bech32 template-haskell text ]; @@ -47976,8 +48038,8 @@ self: { ({ mkDerivation, base, doctest, hspec }: mkDerivation { pname = "benri-hspec"; - version = "0.1.0.2"; - sha256 = "10c4ivnszsk8nnd8l5dvqx61lw1d23l9d99gk50wz9y3yx514ciy"; + version = "0.1.0.3"; + sha256 = "1yax85kfh9pl6h466d2xlpbk3801aia6ypl4359an8vbrhqfws95"; libraryHaskellDepends = [ base hspec ]; testHaskellDepends = [ base doctest hspec ]; description = "Simplify tests where Either or Maybe types are returned from monadic code"; @@ -48219,6 +48281,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "bglibtest"; + broken = true; }) {}; "bgmax" = callPackage @@ -48669,6 +48732,22 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "bin_0_1_4" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, fin, hashable + , QuickCheck, some + }: + mkDerivation { + pname = "bin"; + version = "0.1.4"; + sha256 = "0amz5naq6p2jpm4rb9ycjg7j75qylp3d689cl55f71rs2idrazpp"; + libraryHaskellDepends = [ + base boring dec deepseq fin hashable QuickCheck some + ]; + description = "Bin: binary natural numbers"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "binance-exports" = callPackage ({ mkDerivation, aeson, base, bytedump, bytestring, cassava , cmdargs, cryptohash-sha256, directory, hedgehog, http-client @@ -48926,6 +49005,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_5" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck + , text, time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.5"; + sha256 = "01ycp0dn96n4zavrw1rr5ly0isr3kq16jihwcdg6c022v9w73wkf"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + primitive scientific tagged text time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable primitive + QuickCheck quickcheck-instances scientific tagged tasty + tasty-quickcheck text time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -48977,26 +49082,6 @@ self: { "binary-orphans" = callPackage ({ mkDerivation, base, binary, OneTuple, QuickCheck , quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "binary-orphans"; - version = "1.0.4.1"; - sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; - revision = "3"; - editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"; - libraryHaskellDepends = [ base binary transformers ]; - testHaskellDepends = [ - base binary OneTuple QuickCheck quickcheck-instances tagged tasty - tasty-quickcheck - ]; - description = "Compatibility package for binary; provides instances"; - license = lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_5" = callPackage - ({ mkDerivation, base, binary, OneTuple, QuickCheck - , quickcheck-instances, tagged, tasty, tasty-quickcheck }: mkDerivation { pname = "binary-orphans"; @@ -49009,7 +49094,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -49110,8 +49194,8 @@ self: { pname = "binary-serialise-cbor"; version = "0.2.2.0"; sha256 = "16yhimka17dza5nda62927k5x66c0yrsxzz92kya3gicd6vaga2g"; - revision = "1"; - editedCabalFile = "1kampfsd9mm2qv726v4dyq0ssx8ismj4hjm61h0jjx9644c8cr18"; + revision = "2"; + editedCabalFile = "1ff948jlri6dz86l45bzlv057mazl1jw1kvj0m8awmy5w4xhjhmp"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = lib.licenses.bsd3; @@ -51678,8 +51762,8 @@ self: { ({ mkDerivation, base, containers, directory, regexpr, text }: mkDerivation { pname = "bizzlelude"; - version = "4.17.2.1"; - sha256 = "07p2h7n3zysir4cfd8pn9yph43wbb1p2ar7cipxz1ysz9saxvgam"; + version = "4.17.2.2"; + sha256 = "1b89vnf7zhhwyzjhhigiy7pp7v46w6js4d1z924ch853q52822wq"; libraryHaskellDepends = [ base containers directory regexpr text ]; description = "A lousy Prelude replacement by a lousy dude"; license = lib.licenses.bsd3; @@ -51688,12 +51772,12 @@ self: { }) {}; "bizzlelude-js" = callPackage - ({ mkDerivation, base, containers, text }: + ({ mkDerivation, base, containers, regexpr, text }: mkDerivation { pname = "bizzlelude-js"; - version = "1.0.4"; - sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij"; - libraryHaskellDepends = [ base containers text ]; + version = "4.17.2.2"; + sha256 = "14m45gcsbykij506id738zjw7jck14f8rqii0xx5qs5y3wrdwr1g"; + libraryHaskellDepends = [ base containers regexpr text ]; description = "A lousy Prelude replacement by a lousy dude"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -52163,6 +52247,8 @@ self: { pname = "blaze-html"; version = "0.9.2.0"; sha256 = "13v0l776b4dmzh9p6ssi8xllqcrydnbypbgwdbbs6i3nkzrjwm35"; + revision = "1"; + editedCabalFile = "0n4w9id53mckgrh3hb9jncxvplxdd588dq7v8j4c9lpayj22zi45"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -52265,8 +52351,8 @@ self: { pname = "blaze-markup"; version = "0.8.3.0"; sha256 = "1s1hb477smr0m8rvpp7vr768hvwv5rsv4w07phdqyzqz9a5sq1l6"; - revision = "1"; - editedCabalFile = "1f97jb8xz7i713jsisnibixfpfmhv6y2ss3751f0cf47p745ldm8"; + revision = "2"; + editedCabalFile = "1r6pkaip7bgv6i4f3klxbqa2vaas9rn4agdr6c57r2njh65j2zq2"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -52728,7 +52814,6 @@ self: { testHaskellDepends = [ base hedgehog ]; description = "visual bloom filter for neotrellis m4 output"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "bloohm"; }) {}; @@ -53061,8 +53146,8 @@ self: { pname = "bm"; version = "0.2.0.0"; sha256 = "17dnv1vdsh43nc8b0p92d01nz1zvxd9bfcghlz0w6c8wc5yflg31"; - revision = "4"; - editedCabalFile = "11mj69y43chqr50m9g8shqdyc3q31hha9gjqx05dn1dnkz3xgzxb"; + revision = "5"; + editedCabalFile = "0db964rq3sxrsa23vxk7sj1cqfxzyv375grxrfnxf0m1sf2finfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53082,10 +53167,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bmp"; - version = "1.2.6.3"; - sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw"; - revision = "2"; - editedCabalFile = "05ywlglsg9jw1cgdhrz9f4vbm775yvyysmmvjs0xj0dm2ljyskrx"; + version = "1.2.6.4"; + sha256 = "0ifk160rdc7428zkd6a3wfn2c6iv805z731gvbpm58jyv4q7jbhn"; libraryHaskellDepends = [ base binary bytestring ]; description = "Read and write uncompressed BMP image files"; license = lib.licenses.mit; @@ -53695,8 +53778,8 @@ self: { }: mkDerivation { pname = "boomerang"; - version = "1.4.9.2"; - sha256 = "15y098dsbaxk6hyjziwc24yrhv0276jpr3ahp4zlgcyl3axpsncq"; + version = "1.4.9.3"; + sha256 = "1ilai1svi9j10wjll1r082v76299jnd7nznk7bxqgnvn59n43xik"; libraryHaskellDepends = [ base mtl semigroups template-haskell text th-abstraction ]; @@ -53941,25 +54024,11 @@ self: { ({ mkDerivation, base, tagged, transformers }: mkDerivation { pname = "boring"; - version = "0.2.1"; - sha256 = "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"; - revision = "1"; - editedCabalFile = "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"; - libraryHaskellDepends = [ base tagged transformers ]; - description = "Boring and Absurd types"; - license = lib.licenses.bsd3; - }) {}; - - "boring_0_2_2" = callPackage - ({ mkDerivation, base, tagged, transformers }: - mkDerivation { - pname = "boring"; version = "0.2.2"; sha256 = "11pgndkjvy2j0jfaww92nmlkn2r27v6a253hzdc7dcb9zwgsz2wj"; libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "boring-game" = callPackage @@ -54004,8 +54073,8 @@ self: { pname = "borsh"; version = "0.3.0"; sha256 = "1y3jirkiyq6hvmsga1g7iyrz90zldm97a97zzfv9krqnjg9vbljn"; - revision = "1"; - editedCabalFile = "0ffl1lyx4pxdy1iipadvg3n3ph5iflkn33158vka3nhlhycy96f4"; + revision = "2"; + editedCabalFile = "1n0566adpwq8y3vs1clzr487biz31zc3648ccqsmw6r7aj15vfg0"; libraryHaskellDepends = [ base bytestring containers generics-sop sop-core text vector wide-word @@ -54135,8 +54204,8 @@ self: { pname = "bound"; version = "2.0.7"; sha256 = "1wqvanfp826s89qr4a1rc9f0ldsj45j1rwy9x6a894vndgrxm8dj"; - revision = "1"; - editedCabalFile = "1f2mb3xwv17daff653fjrwpdc72la5nn55qlzgjcw0a1lnkmgyb2"; + revision = "2"; + editedCabalFile = "024q72p316m3sjqp9a63iwrvdmrgs30a0srzq13jybrz00plhkgv"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -54589,8 +54658,8 @@ self: { }: mkDerivation { pname = "breakpoint"; - version = "0.1.3.1"; - sha256 = "1ayf9mwlcawdlr5pm86zca6zwvi7gcrz3vxpmjflz0vlkzsi9nfc"; + version = "0.1.4.0"; + sha256 = "04fgivxwddm8r5hpj8a1v6r4c59yj618cq14rszrd1qrm9sn1qf6"; libraryHaskellDepends = [ ansi-terminal base containers deepseq ghc haskeline mtl pretty-simple template-haskell text transformers @@ -54603,21 +54672,21 @@ self: { "breve" = callPackage ({ mkDerivation, aeson, base, binary, blaze-html, bytestring , configurator, cryptohash, directory, hashtables, http-api-data - , mtl, random, servant, servant-blaze, servant-server + , mtl, random, servant-blaze, servant-rawm-server, servant-server , streaming-commons, text, tls, wai, wai-extra, warp, warp-tls }: mkDerivation { pname = "breve"; - version = "0.5.0.0"; - sha256 = "1rdamkzy502lvz773lh7zjqw76in8v46218dfj4b5xsljkh605jm"; + version = "0.5.1.0"; + sha256 = "03w9x4sv2ynbapva0nl0m1dddh2rq9v3rgz0hrxd463ffi3miaq2"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base binary blaze-html bytestring configurator cryptohash - directory hashtables http-api-data mtl random servant servant-blaze - servant-server streaming-commons text tls wai wai-extra warp - warp-tls + directory hashtables http-api-data mtl random servant-blaze + servant-rawm-server servant-server streaming-commons text tls wai + wai-extra warp warp-tls ]; description = "a url shortener"; license = lib.licenses.gpl3Only; @@ -54695,7 +54764,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_2_3_1" = callPackage + "brick_2_4" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , data-clist, deepseq, directory, exceptions, filepath, microlens , microlens-mtl, microlens-th, mtl, QuickCheck, stm @@ -54704,8 +54773,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "2.3.1"; - sha256 = "160np0bz1mcfkp077yc936i026s3zv1czn8lj3k3qr6scldavw35"; + version = "2.4"; + sha256 = "124l7yay5q5dxmpf48a4m8b7fnkwpv0shsy78qjpw5fdvqf9xkvz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54782,8 +54851,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.12"; - sha256 = "0jvkxp4hvb4jspy0s9i5xkyzkr6ncxiwpsf27vr38v7w5d20zkwh"; + version = "0.1.1.13"; + sha256 = "1n5mp9ikqmlckqywbvb1ry24j927qim3bw8bkw84w72yhlrxsmfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -54837,8 +54906,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.10"; - sha256 = "03fqa71c3nm66gjpyvk49bkfaakxanmniaf10x00i0gk14k047r7"; + version = "2.2.0.11"; + sha256 = "0vikqrrhb94m6xg0k67j626gahx4iiwwywimlsqh96lvs5l07y9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55253,10 +55322,8 @@ self: { }: mkDerivation { pname = "brotli"; - version = "0.0.0.1"; - sha256 = "0fp8vhqzl6i1vvb4fw4zya6cgkzmj0yaaw94jdf2kggm3gn8zwfc"; - revision = "5"; - editedCabalFile = "06a4fsqw1xz4jmvfz4kybf1xg0l5w5klr77c5mibl39aafa0wnf5"; + version = "0.0.0.2"; + sha256 = "09y460adrq6cp9d8qlf8522yb0qc1vgjxv4d56kq2rdf9khqic6z"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ brotli ]; testHaskellDepends = [ @@ -56245,26 +56312,6 @@ self: { }: mkDerivation { pname = "burrito"; - version = "2.0.1.9"; - sha256 = "0sz9j9yv7whwvxrnh4v3r5fz8z4v9c7c2s45kpvsgvshds9vbr7f"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec parsec QuickCheck template-haskell - text transformers - ]; - description = "Parse and render URI templates"; - license = lib.licenses.mit; - }) {}; - - "burrito_2_0_1_10" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; version = "2.0.1.10"; sha256 = "1c8nfh90x0s7ccjznlkk73k99bk2c3n6rdfaw5pszad7ma8zmmc4"; libraryHaskellDepends = [ @@ -56274,7 +56321,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -56307,6 +56353,7 @@ self: { description = "Haskell interface to the Bus Pirate binary interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "buster" = callPackage @@ -56884,8 +56931,8 @@ self: { pname = "bytes"; version = "0.17.3"; sha256 = "1ir9v4gjw7zgm9f55wa3y8wgn4zfpi71pvbsdmjgjk9dh02wy2ni"; - revision = "1"; - editedCabalFile = "1jj5fk23wvvvlbkxcpvgp69gglbf719ard5g795irbcx11zkhjd2"; + revision = "2"; + editedCabalFile = "1l9cc914rrkfw10s6n00azr6f546vr56xmmsd3nplm0pq0q52y2c"; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable scientific text time transformers transformers-compat @@ -57213,6 +57260,8 @@ self: { pname = "bytestring-lexing"; version = "0.5.0.12"; sha256 = "09g5x7jwz9kby578rlj8c6f6zi0pzs169rsqd1vsn3q9gimkpj3j"; + revision = "1"; + editedCabalFile = "0zpqxy4n8mkf6ccmc3jb6ggrqmw9csh1nj08wwq196np28jsbkdv"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring tasty tasty-quickcheck tasty-smallcheck @@ -57553,6 +57602,8 @@ self: { pname = "bytezap"; version = "1.3.0"; sha256 = "0ichvvl1f76m520q3pq0m90wi4f0gzmhbsxkk5xnh72kdbaj164h"; + revision = "1"; + editedCabalFile = "1vqd9hssgdzc8v8rhnzid0bbbld6g5pyfbk7ps8d12l7f0346l4m"; libraryHaskellDepends = [ base bytestring defun-core generic-type-functions primitive text type-level-bytestrings @@ -58060,8 +58111,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.3.0"; - sha256 = "106q5imjznbh7x2pvvgfsn8qx1awb00w0mgfrkkzbwnwc3g8jnw3"; + version = "2.5.0"; + sha256 = "0ddd6yc9ii7ibw7263aq455hwk50ggij28ycjvfi9p4cl6npp1f9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58158,8 +58209,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.3.0"; - sha256 = "08n2n0p3m282yx7cf1nzmlfmw0xikqwrj3l1s8jmx18z2gh0x1h4"; + version = "1.5.0"; + sha256 = "0dmhxrg8d7ajhfg85s7p6py9fywqbrnbd5z9i6mbh3f6cyc9hqak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58342,10 +58393,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.9"; - sha256 = "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"; - revision = "3"; - editedCabalFile = "0mh64vifcy5dbbx2n3llhbxx8mczifmipyqwrsb3vx2p2jyhvskd"; + version = "1.0.10"; + sha256 = "1lwl7q85gfgh5swi9bdck7r5g5s2pc9csgpcpvf2jmv193yd1jl1"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for running doctests"; license = lib.licenses.bsd3; @@ -58532,23 +58581,23 @@ self: { "cabal-gild" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, containers - , directory, exceptions, filepath, hspec, parsec, pretty, temporary - , text, transformers + , directory, exceptions, filepath, filepattern, hspec, parsec + , pretty, temporary, text, transformers }: mkDerivation { pname = "cabal-gild"; - version = "1.3.1.2"; - sha256 = "15ds4x9vh5hfxbrh8k3w719jxs1mfhx8kaj035nj891r5c6llpb2"; + version = "1.5.0.1"; + sha256 = "02bv6yn6z78ikdhkzwj0hwgn0qmqxwylbfv3pprxkmkqpz53fh95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal-syntax containers directory exceptions - filepath parsec pretty text transformers + base bytestring Cabal-syntax containers exceptions filepath + filepattern parsec pretty text transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - temporary transformers + base bytestring containers directory exceptions filepath + filepattern hspec temporary transformers ]; description = "Formats package descriptions"; license = lib.licenses.mit; @@ -58664,37 +58713,36 @@ self: { "cabal-install" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, Cabal-described, cabal-install-solver - , Cabal-QuickCheck, Cabal-syntax, Cabal-tree-diff, containers - , cryptohash-sha256, directory, echo, edit-distance, exceptions - , filepath, hackage-security, hashable, HTTP, lukko, mtl - , network-uri, parsec, pretty, pretty-show, process, QuickCheck - , random, regex-base, regex-posix, resolv, safe-exceptions, stm - , tagged, tar, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unix, zlib + , Cabal-QuickCheck, Cabal-syntax, Cabal-tests, Cabal-tree-diff + , containers, cryptohash-sha256, directory, echo, edit-distance + , exceptions, filepath, hackage-security, hashable, HTTP, lukko + , mtl, network-uri, open-browser, parsec, pretty, pretty-show + , process, QuickCheck, random, regex-base, regex-posix, resolv + , safe-exceptions, semaphore-compat, stm, tagged, tar, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, text, time, tree-diff, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.10.3.0"; - sha256 = "17nslfzhp9nplk5x0i3g6j1mkxpcg89ki2xf0vh93k9hrzq0drx8"; - revision = "1"; - editedCabalFile = "1w3i7rss9q7kyiy0rhxn88w7blx1v19mqkfm0pbdwg9bv0qbv96k"; + version = "3.12.1.0"; + sha256 = "1cmifq189i4x0r0yha3dl8nrzzfh92bnd2saak7dqvvjkkysqj38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal cabal-install-solver Cabal-syntax containers cryptohash-sha256 directory echo edit-distance exceptions filepath hackage-security - hashable HTTP lukko mtl network-uri parsec pretty process random - regex-base regex-posix resolv safe-exceptions stm tar text time - unix zlib + hashable HTTP lukko mtl network-uri open-browser parsec pretty + process random regex-base regex-posix resolv safe-exceptions + semaphore-compat stm tar text time unix zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ array base bytestring Cabal Cabal-described cabal-install-solver - Cabal-QuickCheck Cabal-syntax Cabal-tree-diff containers directory - filepath hashable mtl network-uri pretty-show QuickCheck random - tagged tar tasty tasty-expected-failure tasty-golden tasty-hunit - tasty-quickcheck time tree-diff zlib + Cabal-QuickCheck Cabal-syntax Cabal-tests Cabal-tree-diff + containers directory filepath hashable mtl network-uri pretty-show + QuickCheck random tagged tar tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-quickcheck time tree-diff zlib ]; doCheck = false; postInstall = '' @@ -58708,7 +58756,7 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; broken = true; }) {Cabal-QuickCheck = null; Cabal-described = null; - Cabal-tree-diff = null;}; + Cabal-tests = null; Cabal-tree-diff = null;}; "cabal-install-bundle" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers @@ -58785,8 +58833,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.6.1.1"; - sha256 = "1w4kbc7435qbkflb8rkmfgyqw3fynyfqgvy4mxay1r1zfknqvq0b"; + version = "0.6.2"; + sha256 = "1362p021irm0kaz7n8gdjy1ppjk914zza114cmpm87ris0i1a9jn"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal-syntax containers cryptohash-sha256 deepseq directory @@ -58807,45 +58855,22 @@ self: { "cabal-install-solver" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, Cabal-syntax - , containers, edit-distance, filepath, mtl, pretty, tasty - , tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "cabal-install-solver"; - version = "3.10.2.1"; - sha256 = "02nllpg35i44chs5hi3kmv2kisxqlh27l5vs9aips2abphl0gl4i"; - libraryHaskellDepends = [ - array base bytestring Cabal Cabal-syntax containers edit-distance - filepath mtl pretty transformers - ]; - testHaskellDepends = [ - base Cabal Cabal-syntax tasty tasty-hunit tasty-quickcheck - ]; - description = "The command-line interface for Cabal and Hackage"; - license = lib.licenses.bsd3; - }) {}; - - "cabal-install-solver_3_10_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, Cabal-syntax - , containers, edit-distance, filepath, mtl, pretty, tasty - , tasty-hunit, tasty-quickcheck, text, transformers + , containers, directory, edit-distance, filepath, mtl, network-uri + , pretty, tasty, tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "cabal-install-solver"; - version = "3.10.3.0"; - sha256 = "0zi3pygxiwmzv4h5vfshnbak4r3hz4fragc961xcaq0s8qz4kr71"; - revision = "1"; - editedCabalFile = "1kdh9l8cwvpllsxm1jwzabsg78nsk3r9s2d2g4vn7rxmbffzmbbm"; + version = "3.12.1.0"; + sha256 = "0yjy49awzs79adx1xn705v3cpmqhvgpym49jaws9h0z9ag9s3nvi"; libraryHaskellDepends = [ - array base bytestring Cabal Cabal-syntax containers edit-distance - filepath mtl pretty text transformers + array base bytestring Cabal Cabal-syntax containers directory + edit-distance filepath mtl network-uri pretty text transformers ]; testHaskellDepends = [ base Cabal Cabal-syntax tasty tasty-hunit tasty-quickcheck ]; description = "The command-line interface for Cabal and Hackage"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cabal-lenses" = callPackage @@ -58854,8 +58879,8 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.10.1"; - sha256 = "0pjzz5d2s6b2xaqgb7z3ry5zpba84x3iy2hw3a7xq32ciyl3gnhb"; + version = "0.14.0"; + sha256 = "0ab6j4svnchw741spi1b4zsdiwr7hvl141dn30ggqq6lkn32icwm"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers @@ -58999,6 +59024,35 @@ self: { mainProgram = "cabal-plan"; }) {}; + "cabal-plan_0_7_4_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.4.0"; + sha256 = "10x69i01q8nmdq5q2523rmqfn5nglvmbdysgdn46h1iw2gavar76"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base bytestring containers directory mtl + optics-core optparse-applicative parsec process semialign + singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-plan"; + }) {}; + "cabal-plan-bounds" = callPackage ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax , containers, optparse-applicative, pretty, text @@ -59696,6 +59750,8 @@ self: { pname = "cached-io"; version = "1.3.0.0"; sha256 = "0bxb59brgfv1rgarsc1cix1g1043zl263j5a0rhpzvd80wj6msi2"; + revision = "1"; + editedCabalFile = "184j3550mp5d79ia2a0fzvywgkxzilsnj0f33wh1whaxdw1zwj1i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base exceptions stm time transformers ]; @@ -59792,8 +59848,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.7.3"; - sha256 = "0xgcqgdawzb8ckdc4w0yp5lbdxmj3cd0w93wzp2nx585pi1ils7i"; + version = "1.7.4"; + sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59837,8 +59893,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.7.3"; - sha256 = "0srzvhmvp927qnk31p0nlal7wl14205s1a27frj68g2yi4a1w92j"; + version = "1.7.4"; + sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; libraryHaskellDepends = [ aeson async base bytestring conduit cryptonite deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet @@ -59950,10 +60006,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.10.0"; - sha256 = "16dwjqg8gqk2dzp3qpcvhwdgn16rxxasll8qs2fl2gf84z41h0mf"; - revision = "2"; - editedCabalFile = "1irj5yrz74j6wypni9pk9mbd7v2mzcy3ndyl7irada8szgdl3kkv"; + version = "0.13.11.0"; + sha256 = "1wzk4kviifr65jdagmpgjlfzamarlqws2mghv8z13sh2z6cj56l5"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -60176,8 +60230,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.11.0.0"; - sha256 = "18q9an47zk5j9ank36fws908iqdm9k1v44sy0348qpsaviyw2wlw"; + version = "0.12.0.0"; + sha256 = "00vdj70n5s05xx7yq4d28nbp9vncrdc4a9k3502xslkh6kj7zva2"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -60871,8 +60925,8 @@ self: { pname = "capability"; version = "0.5.0.1"; sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci"; - revision = "3"; - editedCabalFile = "1gh147z0rmxan40wglls6dkm9p0y44wb4h6124g3afkcgpn5vnp0"; + revision = "4"; + editedCabalFile = "00lkh7rnys52wji7301ca1nriypwqd8q7gslz3gvnwqmi6as0grv"; libraryHaskellDepends = [ base constraints dlist exceptions generic-lens lens monad-control mtl mutable-containers primitive reflection safe-exceptions @@ -61698,8 +61752,8 @@ self: { }: mkDerivation { pname = "casr-logbook"; - version = "0.6.13"; - sha256 = "1401mwcf5av11f37kz1hk5axzji21an4irk6fqypakply4q5kvqd"; + version = "0.7.0"; + sha256 = "1l887hfswdaydzqzz2jd9jgmzb8gqi11bwj1kmzlxfynznr6ckvl"; libraryHaskellDepends = [ attoparsec base containers digit lens lucid text time ]; @@ -62053,6 +62107,8 @@ self: { pname = "cassava-streams"; version = "0.3.0.5"; sha256 = "1zv5y5jnzbpm407zz3lhfzsf7hr923dzshb2w2xyh5y3v427rwn5"; + revision = "1"; + editedCabalFile = "1agj18kj3yj6af8nrygdgyqy45my9ny0v00sbsc2z1xlwssgklxl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62572,6 +62628,8 @@ self: { pname = "cborg"; version = "0.2.10.0"; sha256 = "15y7p5rsv76fpklh4rgrxlxxaivpbchxdfdw96mqqjgw7060gzhp"; + revision = "1"; + editedCabalFile = "0x48942znc78nh63lxibaascaj1wxsqjg7r4vifisl9zlzccpcpp"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -62595,8 +62653,8 @@ self: { pname = "cborg-json"; version = "0.2.6.0"; sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; - revision = "1"; - editedCabalFile = "0bgr0m1p4r2snp8d1irsyql2a9kcpp09lkajjfsyqq8riaf75a2v"; + revision = "2"; + editedCabalFile = "1vj7p8k3ksb6fizsl39rb99zsjfh1wm7i9q9m18s4c8llnylhw0a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring cborg scientific text unordered-containers vector @@ -63679,6 +63737,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "char-boxdrawing" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "char-boxdrawing"; + version = "1"; + sha256 = "1nbylqdk8x615kjbpxqa7wp8m75iq7akva8ridym3jsnjhhp7rgn"; + libraryHaskellDepends = [ base ]; + description = "Combinators for unicode or ASCII box drawing characters"; + license = lib.licenses.bsd3; + }) {}; + "char-decode" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -64196,8 +64265,8 @@ self: { ({ mkDerivation, base, containers, doctest, QuickCheck }: mkDerivation { pname = "check-cfg-ambiguity"; - version = "0.1.0.0"; - sha256 = "0iswfg7m9qnhr1128xbhaa06ai2rhnr7c781y7z92v29xd7mjyjg"; + version = "0.1.1.0"; + sha256 = "1h3i3hk6ggsxgcxih0mwljfli0gn8ja7d2vkzz7gxqppwx9ryirj"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Checks context free grammar for ambiguity using brute force up to given limit"; @@ -64642,8 +64711,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "choice"; - version = "0.2.3"; - sha256 = "15nls2azmhwi3nnf5rkl954pa0bjgi231ff74hgw8r3nb5axrgrn"; + version = "0.2.4.1"; + sha256 = "099c5ibal8llzr5nh62dnpb1pwj30gxqwdcjx0rds51ga2j32z5i"; libraryHaskellDepends = [ base ]; description = "A solution to boolean blindness"; license = lib.licenses.publicDomain; @@ -65700,8 +65769,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.8.1"; - sha256 = "003488k6ckfknh62lkxy07w72h95jcdx20kfc1njrxrqijyknlik"; + version = "0.8.1.1"; + sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66083,8 +66152,8 @@ self: { pname = "clash-ghc"; version = "1.8.1"; sha256 = "1xjf3z043sn7r35pkbpyxl4agyl2hz3mj7iikridxsddjqrmr5y4"; - revision = "2"; - editedCabalFile = "1lfmpcrysy7sbgmmls8f1mf6imdccdjhnvscvxg9nh329jp7gpxh"; + revision = "3"; + editedCabalFile = "0mahgzizvk6dy9anlhy2svv9cc6jpihnnaayi6drzfizy5rxfnwx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66121,8 +66190,8 @@ self: { pname = "clash-lib"; version = "1.8.1"; sha256 = "1s31d0pdzm5zk62gz4g1xp2yalyal2gk3n46y2rwpxl440mchyy5"; - revision = "2"; - editedCabalFile = "1b096jx3hqhfhp21y00ayn6l04c29bskb6c96jnn4nckx9gpvq25"; + revision = "3"; + editedCabalFile = "0wljqy8a1fg8zyh59yinp2k21xz9xf8qaxs8wfqscpcqhwjyj7if"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66208,8 +66277,8 @@ self: { pname = "clash-prelude"; version = "1.8.1"; sha256 = "13y43lsw55jpmr04x6yrrppma9qdqzlvrwbs4jkvc3g7jmydnb3y"; - revision = "2"; - editedCabalFile = "1c5sj63rsdb29d837j0y9r6m1zlycnl7m70984a2wz2kyl15wcw5"; + revision = "3"; + editedCabalFile = "01kg5hcw5qybnwallrr8drb55vhssg403y7yvdp07hz0449n8v06"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -66413,8 +66482,8 @@ self: { }: mkDerivation { pname = "classy-effects"; - version = "0.1.0.0"; - sha256 = "15c1sln37qc0b0fdg8pyifp84q829918jvzwbjdvfzkq9hvwdb0w"; + version = "0.1.0.1"; + sha256 = "1k14x1rzwisjivvrsi823yrz3dkj63iahd1gp3r7jgf1xy3fqrpp"; libraryHaskellDepends = [ base classy-effects-base classy-effects-th ]; @@ -66430,8 +66499,8 @@ self: { }: mkDerivation { pname = "classy-effects-base"; - version = "0.1.0.0"; - sha256 = "047bz8ii9qx708cjdgpajrv2lry9wfracj6f1m7rm38vmhr9yj55"; + version = "0.1.0.1"; + sha256 = "1dl638sr5x8hvkyniw00lfq4jbw1ydxqb4jlpqsxpp92y1df11cw"; libraryHaskellDepends = [ base compdata ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -66447,8 +66516,8 @@ self: { }: mkDerivation { pname = "classy-effects-th"; - version = "0.1.0.0"; - sha256 = "1w7gm3nl2ddp19a0g7id6qhdj8vzpvs2y9hvfrcyk81yfhx6km6c"; + version = "0.1.0.1"; + sha256 = "1hxw3vs01ai6qmw3l656lszx45pgqaxvsks4xv6dsvbbwzgphkm0"; libraryHaskellDepends = [ base classy-effects-base extra lens mtl template-haskell th-abstraction @@ -66619,6 +66688,8 @@ self: { pname = "clay"; version = "0.15.0"; sha256 = "1gp7x76cw15jmd3ahqf1q0bc2p6ix182x6s2pzyh8yr4b29b9r3v"; + revision = "1"; + editedCabalFile = "0y6s4digka4b0d238n1vcj2308csxvkr34vfnqr3mc46079vb99k"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; @@ -67173,6 +67244,8 @@ self: { pname = "cli-extras"; version = "0.2.1.0"; sha256 = "1lg0ssbh2qhjjc31ins29ddy4lkzwxhlm3r9vcy1jk8al5aqa03f"; + revision = "1"; + editedCabalFile = "0fcybjf8zqzzjzfc5205plzphzk7z5v9p8nadqq7lp7m10ggjasc"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -67189,8 +67262,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.2.0.0"; - sha256 = "0sv4ycc6n54419bcg0i6vh8l5a1370l0k1qg9n1nydb9wx5n7927"; + version = "0.2.0.1"; + sha256 = "09i3v77xhdfsmvq7c10plxnqmq2wn8gxc16za4h96s7pnvn8bppv"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text which @@ -67208,6 +67281,8 @@ self: { pname = "cli-nix"; version = "0.2.0.0"; sha256 = "02350jvbgapxn14zx0knzyxmdlrq2yk460wiw9p8aq860f299bzh"; + revision = "1"; + editedCabalFile = "1plh0js8lnl2xw3dv5z57ap8g4c9j2n1bzskn993fpgafqlw5mcb"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text which @@ -67312,6 +67387,32 @@ self: { mainProgram = "clientsession-generate"; }) {}; + "clientsession_0_9_3_0" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cereal + , containers, crypto-api, crypton, directory, entropy, hspec, HUnit + , QuickCheck, setenv, skein, tagged, transformers + }: + mkDerivation { + pname = "clientsession"; + version = "0.9.3.0"; + sha256 = "1ahvk9h580dch46b5743zd7630rzanbnmv9v57srp7aqllk21q9q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring bytestring cereal crypto-api crypton + directory entropy setenv skein tagged + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cereal containers hspec HUnit QuickCheck + transformers + ]; + description = "Securely store session data in a client-side cookie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "clientsession-generate"; + }) {}; + "clif" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, tasty-th, time @@ -67812,21 +67913,23 @@ self: { }) {}; "clplug" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit, mtl - , network, text + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bytestring, conduit, mtl, network, stm, text }: mkDerivation { pname = "clplug"; - version = "0.4.0.0"; - sha256 = "02gixg9xww0gis67rap70pwbrg4gpi514iphbfjqjzbh2chdil5j"; + version = "1.0.0.0"; + sha256 = "0x42kx8ia9i3w3b0y3qn8fv6mc88w17nl82z08bsrh9hla2jl2i1"; libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec attoparsec-aeson base bytestring conduit mtl + network stm text ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec attoparsec-aeson base bytestring conduit mtl + network stm text ]; - description = "Create Core Lightning Plugins"; - license = lib.licenses.bsd3; + description = "Easily add functionality to your lightning node"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68566,8 +68669,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.2.1"; - sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; + version = "0.3.2.2"; + sha256 = "1iydf4d9g2nq1aj993s8whp08xbf59071wf6md8zcq6xda8n3cpp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -68593,8 +68696,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.4"; - sha256 = "1cah2a6hz8g30jqfq05r103sj42aix4hqdl8kys57zkfq2ap4myy"; + version = "0.0.1.5"; + sha256 = "1gh02nq42a97lvrqdsjzjjdpfwmdk0ax89fziw3pifdjqs446yz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -68987,8 +69090,8 @@ self: { }: mkDerivation { pname = "codet"; - version = "0.1"; - sha256 = "1npz5wfm9wk9pq4rpq9d8cwxawx75awbai1k5k62w620an0mq6xj"; + version = "0.1.0.1"; + sha256 = "0jv3z28sxdgmbpkxics2c8s4r576fz4r8dv7ai4yy1h4fqsli5vw"; libraryHaskellDepends = [ base bytestring containers template-haskell text time ]; @@ -69008,8 +69111,8 @@ self: { }: mkDerivation { pname = "codet-plugin"; - version = "0.1"; - sha256 = "1npmn69l8n3ni2nd83czq6vvh2j94ik56k9vmprb381mf00zbw5k"; + version = "0.1.0.1"; + sha256 = "11ddf0h01qw00q3dd7gk12j31b98ff0yv5jd04wwngkhpcbshgb6"; libraryHaskellDepends = [ base codet ghc ]; testHaskellDepends = [ base codet directory filepath syb tasty tasty-golden @@ -70196,31 +70299,6 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , non-empty, prelude-compat, primitive, QuickCheck, semigroups - , storable-record, storablevector, tagged, transformers - , transformers-compat, utility-ht - }: - mkDerivation { - pname = "comfort-array"; - version = "0.5.4.2"; - sha256 = "1fyv4m3qb6rbz1inswzwkbrza1wr3x5gr8p4qbh3bvfqfkj3mh4i"; - libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty prelude-compat - primitive QuickCheck semigroups storable-record storablevector - tagged transformers transformers-compat utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms containers deepseq doctest-exitcode-stdio - doctest-lib QuickCheck tagged utility-ht - ]; - description = "Arrays where the index type is a function of the shape type"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-array_0_5_5" = callPackage ({ mkDerivation, base, bifunctors, ChasingBottoms, containers , deepseq, doctest-exitcode-stdio, doctest-lib, guarded-allocation , non-empty, prelude-compat, primitive, QuickCheck, semigroups @@ -70242,7 +70320,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -70278,30 +70355,6 @@ self: { }: mkDerivation { pname = "comfort-blas"; - version = "0.0.2"; - sha256 = "1sw24ai7vlhxvb22y9qf71ak1l55chxdc6x1j5p7m40q5zmahpx6"; - libraryHaskellDepends = [ - base blas-ffi comfort-array containers deepseq guarded-allocation - netlib-ffi non-empty semigroups storablevector transformers - utility-ht - ]; - testHaskellDepends = [ - base comfort-array containers doctest-exitcode-stdio doctest-lib - netlib-ffi QuickCheck utility-ht - ]; - description = "Numerical Basic Linear Algebra using BLAS"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-blas_0_0_3" = callPackage - ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , netlib-ffi, non-empty, QuickCheck, semigroups, storablevector - , transformers, utility-ht - }: - mkDerivation { - pname = "comfort-blas"; version = "0.0.3"; sha256 = "1zadvjx095kxp4rl5ml120xh0ihaz7v5391fim5gdsgwdh00fwmp"; libraryHaskellDepends = [ @@ -70315,7 +70368,6 @@ self: { ]; description = "Numerical Basic Linear Algebra using BLAS"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -70576,8 +70628,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.5.4"; - sha256 = "0249j6yn4y6w2n81ph2ydpqqkbx8y7zba96j50a26jx9l62f1yim"; + version = "0.2.5.5"; + sha256 = "0szi6rdl6cz39bj28mads5gxfyc5bp29gj6fr5y42v7spyn9f5kx"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -70833,8 +70885,8 @@ self: { pname = "compact"; version = "0.2.0.0"; sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; - revision = "2"; - editedCabalFile = "1x38yjkl9b2ss6p9bdhpk5h1p4p3rlar09a31cpa8cgj959ws1da"; + revision = "3"; + editedCabalFile = "198fvj8a5f0wh0wk2k7gzhxczbqlyxafyy6mi5qf5wh9hpj7vb6q"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -71237,8 +71289,8 @@ self: { pname = "compensated"; version = "0.8.3"; sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; - revision = "4"; - editedCabalFile = "101rydn8qixa67fpx2wkliklbiwb76c8hvjqxb08rj01fnj88z5r"; + revision = "5"; + editedCabalFile = "0gbvxp4dka1cs93cq32lmv4ssd9b0gbzqkdzi37aw25k61m3zbb7"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive hashable lens log-domain safecopy semigroupoids semigroups vector @@ -72761,20 +72813,21 @@ self: { }) {}; "conduit-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , conduit-extra, containers, doctest-parallel, hspec, QuickCheck - , scientific, text + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bytestring, conduit, conduit-extra, containers, doctest, hspec + , QuickCheck, scientific, text }: mkDerivation { pname = "conduit-aeson"; - version = "0.1.0.1"; - sha256 = "1jam2d4kk1pky9d88afl467a7sf5q46079cpfx9g2mjx7nc6x6zn"; + version = "0.1.1.0"; + sha256 = "05s379c4hqz46kzps4p1lwgxjv1n5nhpiz730f1drrisi0bf7iwx"; libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra text + aeson attoparsec attoparsec-aeson base bytestring conduit + conduit-extra text ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit containers - doctest-parallel hspec QuickCheck scientific text + aeson attoparsec base bytestring conduit containers doctest hspec + QuickCheck scientific text ]; description = "Short description"; license = lib.licenses.bsd3; @@ -73672,8 +73725,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "4"; - editedCabalFile = "0c6dqygjnsyf986j2f10xvvzkq8h85sad0g9x7wxl42fxlcj1gb6"; + revision = "5"; + editedCabalFile = "0kzsc8v10h3jm2hxx9xc9nfp5f9qc2zp6gplsy4iszgis3spvq9a"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -73707,8 +73760,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "5"; - editedCabalFile = "159xbw9657j7icaway9vv22b0r8bz2s6c8v4w24sldzs7dcbc3sp"; + revision = "6"; + editedCabalFile = "0l4yw8g1f7isr2nj6s4awfm37b4j5pz2pn0wnzwdbain3az4d51v"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -74433,6 +74486,8 @@ self: { pname = "constraints"; version = "0.14.2"; sha256 = "1y0rzl41wwkr3gqzf3ymf0mns86qkafamqindvcfq1qqbn09y92g"; + revision = "1"; + editedCabalFile = "1rx81r735ih046j4afgqlbmqlsf3zk2c5d8k9mj3gndasplm66iq"; libraryHaskellDepends = [ base binary boring deepseq ghc-prim hashable mtl transformers ]; @@ -74485,10 +74540,8 @@ self: { ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.4.0.0"; - sha256 = "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"; - revision = "2"; - editedCabalFile = "0q7kackfb5g9rin3lhccwsf33588f58a61zw7kbisfh6ygfpk6ww"; + version = "0.4.0.1"; + sha256 = "0c5cjh986rqf31f4igjbn72kgz8h9md6ivbyg2hn15kfawsgg47z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -75728,22 +75781,44 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "copilot_3_20" = callPackage + ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language + , copilot-libraries, copilot-prettyprinter, copilot-theorem + , directory, filepath, optparse-applicative + }: + mkDerivation { + pname = "copilot"; + version = "3.20"; + sha256 = "057m56qg4wsqv17hs086ci0nw0r44y3baj9h8w3f4ij2p30zl71n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base copilot-c99 copilot-core copilot-language copilot-libraries + copilot-prettyprinter copilot-theorem directory filepath + optparse-applicative + ]; + description = "A stream DSL for writing embedded C programs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-bluespec" = callPackage ({ mkDerivation, base, copilot-core, directory, filepath, HUnit - , language-bluespec, pretty, process, QuickCheck, random + , ieee754, language-bluespec, pretty, process, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 , unix }: mkDerivation { pname = "copilot-bluespec"; - version = "3.19"; - sha256 = "0zdiiaivby2dxmq81hvxz4drsasbgm2hizr26kr4zara50xifii7"; + version = "3.20"; + sha256 = "0nss9cnhl8dvjnfgkfvhryiib74c5fg6wlfpivrphrbv6jj5pd78"; libraryHaskellDepends = [ base copilot-core directory filepath language-bluespec pretty ]; testHaskellDepends = [ - base copilot-core directory HUnit pretty process QuickCheck random - test-framework test-framework-hunit test-framework-quickcheck2 unix + base copilot-core directory HUnit ieee754 pretty process QuickCheck + random test-framework test-framework-hunit + test-framework-quickcheck2 unix ]; description = "A compiler for Copilot targeting FPGAs"; license = lib.licenses.bsd3; @@ -75775,6 +75850,30 @@ self: { broken = true; }) {}; + "copilot-c99_3_20" = callPackage + ({ mkDerivation, base, copilot-core, directory, filepath, HUnit + , language-c99, language-c99-simple, mtl, pretty, process + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2, unix + }: + mkDerivation { + pname = "copilot-c99"; + version = "3.20"; + sha256 = "0vb4hh72y2l4fwh9p13xj2wf1p8wrssmv9zikz91mpiszcmcl5s4"; + libraryHaskellDepends = [ + base copilot-core directory filepath language-c99 + language-c99-simple mtl pretty + ]; + testHaskellDepends = [ + base copilot-core directory HUnit pretty process QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 unix + ]; + description = "A compiler for Copilot targeting C99"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "copilot-cbmc" = callPackage ({ mkDerivation, base, bytestring, copilot-c99, copilot-core , copilot-sbv, directory, pretty, process @@ -75809,6 +75908,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "copilot-core_3_20" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "copilot-core"; + version = "3.20"; + sha256 = "0ndd6xngcgifk7gklf1r9rzyxvdqxn1zp24wg59wn63l3vqlmrg5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "An intermediate representation for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-frp-sketch" = callPackage ({ mkDerivation, base, containers, copilot, copilot-c99 , copilot-language, directory, filepath, mtl, optparse-applicative @@ -75844,6 +75961,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "copilot-interpreter_3_20" = callPackage + ({ mkDerivation, base, copilot-core, copilot-prettyprinter, pretty + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "copilot-interpreter"; + version = "3.20"; + sha256 = "11lxrghfhw3n1nz3rjmrahslnl10cywaafmaf6w32mzwbz5hlix9"; + libraryHaskellDepends = [ base copilot-core pretty ]; + testHaskellDepends = [ + base copilot-core copilot-prettyprinter pretty QuickCheck + test-framework test-framework-quickcheck2 + ]; + description = "Interpreter for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-language" = callPackage ({ mkDerivation, array, base, containers, copilot-core , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl @@ -75867,6 +76002,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "copilot-language_3_20" = callPackage + ({ mkDerivation, array, base, containers, copilot-core + , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl + , pretty, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "copilot-language"; + version = "3.20"; + sha256 = "12ihidjin19y72ajyn1in4cnqk63v2ifhsb312y3l9biwqlbqd0l"; + libraryHaskellDepends = [ + array base containers copilot-core copilot-interpreter + copilot-theorem data-reify mtl + ]; + testHaskellDepends = [ + base copilot-core copilot-interpreter HUnit pretty QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-libraries" = callPackage ({ mkDerivation, base, containers, copilot-interpreter , copilot-language, copilot-theorem, mtl, parsec, QuickCheck @@ -75888,6 +76046,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "copilot-libraries_3_20" = callPackage + ({ mkDerivation, base, containers, copilot-interpreter + , copilot-language, copilot-theorem, mtl, parsec, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "copilot-libraries"; + version = "3.20"; + sha256 = "0pz42yryjcmmr4rzgy2x9h70v3an0py4wi79sx5yvn6d203h1b0h"; + libraryHaskellDepends = [ + base containers copilot-language mtl parsec + ]; + testHaskellDepends = [ + base copilot-interpreter copilot-language copilot-theorem + QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "Libraries for the Copilot language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-prettyprinter" = callPackage ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { @@ -75899,6 +76078,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "copilot-prettyprinter_3_20" = callPackage + ({ mkDerivation, base, copilot-core, pretty }: + mkDerivation { + pname = "copilot-prettyprinter"; + version = "3.20"; + sha256 = "13kxhismy1ajqzwv4da8qn96xhpx8pnbgbcd7zn35j8fmidfbrmz"; + libraryHaskellDepends = [ base copilot-core pretty ]; + description = "A prettyprinter of Copilot Specifications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-sbv" = callPackage ({ mkDerivation, base, containers, copilot-core, directory , filepath, pretty, sbv @@ -75940,43 +76131,67 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "copilot-theorem_3_20" = callPackage + ({ mkDerivation, base, bimap, bv-sized, containers, copilot-core + , copilot-prettyprinter, data-default, directory, libBF, mtl, panic + , parameterized-utils, parsec, pretty, process, QuickCheck, random + , test-framework, test-framework-quickcheck2, transformers, what4 + , xml + }: + mkDerivation { + pname = "copilot-theorem"; + version = "3.20"; + sha256 = "1d9ivlqyknmlic5v2spl4ak72cf3mk35ljx9sbrps4rxchij807a"; + libraryHaskellDepends = [ + base bimap bv-sized containers copilot-core copilot-prettyprinter + data-default directory libBF mtl panic parameterized-utils parsec + pretty process random transformers what4 xml + ]; + testHaskellDepends = [ + base copilot-core QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "k-induction for Copilot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "copilot-verifier" = callPackage ({ mkDerivation, aeson, base, bv-sized, bytestring , case-insensitive, containers, copilot, copilot-c99, copilot-core - , copilot-language, copilot-libraries, copilot-prettyprinter - , copilot-theorem, crucible, crucible-llvm, crux, crux-llvm - , filepath, lens, llvm-pretty, mtl, optparse-applicative, panic + , copilot-language, copilot-prettyprinter, copilot-theorem + , crucible, crucible-llvm, crux, crux-llvm, filepath, lens + , llvm-pretty, mtl, optparse-applicative, panic , parameterized-utils, prettyprinter, silently, tasty , tasty-expected-failure, tasty-hunit, text, transformers, vector , what4 }: mkDerivation { pname = "copilot-verifier"; - version = "3.19"; - sha256 = "1n0xwfv7wibn8xbhkh05ylxh2jv20sk05415lknm3rrgzhns0p14"; + version = "3.20"; + sha256 = "0dszrayv3i7cvwdnllqnp3xlmnqy836fb0mghf8q6x9r6c8vi91s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bv-sized bytestring case-insensitive containers copilot - copilot-c99 copilot-core copilot-language copilot-libraries - copilot-prettyprinter copilot-theorem crucible crucible-llvm crux - crux-llvm filepath lens llvm-pretty mtl panic parameterized-utils - prettyprinter text transformers vector what4 + copilot-c99 copilot-core copilot-language copilot-prettyprinter + copilot-theorem crucible crucible-llvm crux crux-llvm filepath lens + llvm-pretty mtl panic parameterized-utils prettyprinter text + transformers vector what4 ]; executableHaskellDepends = [ - aeson base bv-sized bytestring case-insensitive containers copilot - copilot-c99 copilot-core copilot-language copilot-libraries - copilot-prettyprinter copilot-theorem crucible crucible-llvm crux - crux-llvm filepath lens llvm-pretty mtl optparse-applicative panic - parameterized-utils prettyprinter text transformers vector what4 + aeson base bv-sized bytestring case-insensitive containers + copilot-c99 copilot-core copilot-theorem crucible crucible-llvm + crux crux-llvm filepath lens llvm-pretty mtl optparse-applicative + panic parameterized-utils prettyprinter text transformers vector + what4 ]; testHaskellDepends = [ - aeson base bv-sized bytestring case-insensitive containers copilot - copilot-c99 copilot-core copilot-language copilot-libraries - copilot-prettyprinter copilot-theorem crucible crucible-llvm crux - crux-llvm filepath lens llvm-pretty mtl panic parameterized-utils - prettyprinter silently tasty tasty-expected-failure tasty-hunit - text transformers vector what4 + aeson base bv-sized bytestring case-insensitive containers + copilot-c99 copilot-core copilot-theorem crucible crucible-llvm + crux crux-llvm filepath lens llvm-pretty mtl panic + parameterized-utils prettyprinter silently tasty + tasty-expected-failure tasty-hunit text transformers vector what4 ]; doHaddock = false; description = "System for verifying the correctness of generated Copilot programs"; @@ -76593,33 +76808,6 @@ self: { "country" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash - , byteslice, bytestring, compact, contiguous, deepseq, entropy - , gauge, hashable, primitive, primitive-unlifted, QuickCheck - , quickcheck-classes, scientific, tasty, tasty-quickcheck, text - , text-short, unordered-containers - }: - mkDerivation { - pname = "country"; - version = "0.2.4.1"; - sha256 = "1nn3vkyczpc3m4bxfkl6px893l63cp0281z4nlp2063d2azb20r8"; - libraryHaskellDepends = [ - aeson attoparsec base bytebuild bytehash byteslice bytestring - contiguous deepseq entropy hashable primitive primitive-unlifted - scientific text text-short unordered-containers - ]; - testHaskellDepends = [ - base byteslice primitive QuickCheck quickcheck-classes tasty - tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base bytehash byteslice bytestring compact gauge primitive text - ]; - description = "Country data type and functions"; - license = lib.licenses.bsd3; - }) {}; - - "country_0_2_4_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash , byteslice, bytestring, compact, contiguous, deepseq, gauge , hashable, primitive, primitive-unlifted, QuickCheck , quickcheck-classes, scientific, tasty, tasty-quickcheck, text @@ -76643,7 +76831,6 @@ self: { ]; description = "Country data type and functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "country-codes" = callPackage @@ -76967,8 +77154,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "4.4.3"; - sha256 = "0pkxwpkiaj4aydifj45wqbhqzqrm92sspgc7m4j1dlxdsj6sbl6h"; + version = "4.4.4"; + sha256 = "0q79ay5zm196sn3xmak9f9swcrgakm9b9w5x86dc4340x30y7i2k"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -77036,8 +77223,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, python3, text }: mkDerivation { pname = "cpython"; - version = "3.8.0"; - sha256 = "18amy26wy01j4gwh5dq1361vzx6p01p7cr46p5zp2x9372klraqb"; + version = "3.9.0"; + sha256 = "0khs0jm0g7frbv5a90h9njj2xjmqpx0qgafpr40783zc6bgp8k62"; libraryHaskellDepends = [ base bytestring text ]; libraryPkgconfigDepends = [ python3 ]; libraryToolDepends = [ c2hs ]; @@ -77581,15 +77768,15 @@ self: { broken = true; }) {}; - "crc32c_0_2_1" = callPackage + "crc32c_0_2_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hspec-core - , QuickCheck + , QuickCheck, system-cxx-std-lib }: mkDerivation { pname = "crc32c"; - version = "0.2.1"; - sha256 = "1w0zp11l6dd5harn3g3hv1zhcdd7wrx005cvwvf2c652k8dl42wf"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.2"; + sha256 = "1qblck677c2y5bxmnr36k0j248wkw6rmsdd2wc8li9lgdzjnnncm"; + libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; testHaskellDepends = [ base bytestring hspec hspec-core QuickCheck ]; @@ -78938,8 +79125,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.101.0"; sha256 = "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"; - revision = "4"; - editedCabalFile = "1m077jax8jz68i9c0nl27465qmcww97wziwmy8apxcfkgfifzlx6"; + revision = "5"; + editedCabalFile = "0j3fdm80scgcvmwhvsashw83a2fhl75nd7hxlwmalr81drddw08s"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -78958,8 +79145,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.101.0"; sha256 = "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"; - revision = "4"; - editedCabalFile = "1m0q2zmljjxr1v5szzb7xlbf2gnmaxnsgbvr9v3lgy3az192gdjr"; + revision = "5"; + editedCabalFile = "1a0j89bqb86ij26aq3hlf1a0fhsaxrc810pq4yxhl2j5f2jvv1zs"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -78978,8 +79165,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.102.1"; sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; - revision = "4"; - editedCabalFile = "1gdc6clkyx5dlf8g9pn8gbknvwjjhbnm1sy6pai7rarvgdm7a390"; + revision = "5"; + editedCabalFile = "1iyy9ssn1q8rs8ijqjmplykjdxyy8cfz2rn2jaxv109dylm4zdmc"; configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; @@ -79001,8 +79188,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.102.0"; sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z"; - revision = "3"; - editedCabalFile = "0n2b0q0a45vrklg69qa4rblijg9j87lqm1v4r3rwkqgl9y2f5bq1"; + revision = "4"; + editedCabalFile = "1aayk268zm42scg75yx90j76sh9yh8xjfdrblzzdhn7vjwn2cqq0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -79183,6 +79370,8 @@ self: { pname = "crypton-connection"; version = "0.3.2"; sha256 = "07lrkv6lwphsyp4797yp8ywnndzd270bk58r8gwyby0hr4xy52r0"; + revision = "1"; + editedCabalFile = "1rkana1ghppras20pgpwp2bc8dnsf8lspq90r6124jqd4ckbvx2b"; libraryHaskellDepends = [ base basement bytestring containers crypton-x509 crypton-x509-store crypton-x509-system crypton-x509-validation data-default-class @@ -79192,15 +79381,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton-connection_0_4_0" = callPackage + "crypton-connection_0_4_1" = callPackage ({ mkDerivation, base, basement, bytestring, containers , crypton-x509, crypton-x509-store, crypton-x509-system , crypton-x509-validation, data-default-class, network, socks, tls }: mkDerivation { pname = "crypton-connection"; - version = "0.4.0"; - sha256 = "0gmmj1r2y21x50ahp35m3zcy7mnsagj8mvp4y2sr4114x5c57gf5"; + version = "0.4.1"; + sha256 = "0s1n1rqp2dmc55sr42nsw2j9k3cs7lgx90bcfi5ckq0jh3mkyy4n"; libraryHaskellDepends = [ base basement bytestring containers crypton-x509 crypton-x509-store crypton-x509-system crypton-x509-validation data-default-class @@ -79214,21 +79403,19 @@ self: { "crypton-x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, crypton, hourglass, memory, mtl, pem - , tasty, tasty-quickcheck, transformers, x509 + , tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "crypton-x509"; - version = "1.7.6"; - sha256 = "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"; - revision = "2"; - editedCabalFile = "1bbn2yv2ldld1cszmq5bq6wplj53ssw2s24xb44c8lirlwrz59hr"; + version = "1.7.7"; + sha256 = "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers crypton hourglass memory pem transformers ]; testHaskellDepends = [ asn1-types base bytestring crypton hourglass mtl tasty - tasty-quickcheck x509 + tasty-quickcheck ]; description = "X509 reader and writer"; license = lib.licenses.bsd3; @@ -79512,8 +79699,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.6.1"; - sha256 = "02lyv19fq80msfsi77bgvwyh13nnvna9jgwwjz4482n8ynpm2h4i"; + version = "0.7.7.0"; + sha256 = "141ybd54bkppk1p2n5yspb99h1bnndvmr5703xffig6dx1nvc5ih"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -79541,8 +79728,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.4.3.1"; - sha256 = "1xcln5787bgiqp49xgf964jyhsgs0myjd669jbih1ihgpdk2032z"; + version = "5.4.4.1"; + sha256 = "13z3sp3q2bswkwlfaazyp964ar5l85k0xz68fajpmc2bkg32ivba"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -79557,17 +79744,17 @@ self: { ({ mkDerivation, array, base, base64-bytestring, Boolean , bytestring, cereal, cereal-text, containers, cryptohash-sha256 , data-default, data-fix, data-fix-cse, deriving-compat, dlist - , pretty-show, safe, text, transformers, unordered-containers - , vector, wl-pprint-text + , hashable, pretty-show, safe, text, transformers + , unordered-containers, vector, wl-pprint-text }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.9.1"; - sha256 = "1xz7cdwk7ck13ja70znlp8qs6f0vpsq5azmhv1kjdbmq4wkpq66g"; + version = "0.4.0.0"; + sha256 = "0kvirsagmlbgsrl9x8a0xmi9rypspsg85l7yqkk3cph4w4s60brl"; libraryHaskellDepends = [ array base base64-bytestring Boolean bytestring cereal cereal-text containers cryptohash-sha256 data-default data-fix data-fix-cse - deriving-compat dlist pretty-show safe text transformers + deriving-compat dlist hashable pretty-show safe text transformers unordered-containers vector wl-pprint-text ]; description = "dynamic core for csound-expression library"; @@ -79580,8 +79767,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.5.3"; - sha256 = "0psq8vyvv8mp9f506kv54j0gyfkjmzp9spmxjkjqjnzwlmya0nh6"; + version = "0.0.5.4"; + sha256 = "07lihnq0360vg6mbvwzgmangzvq796y9v55y33vaw9ppj8spifz3"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -79597,8 +79784,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.7.1"; - sha256 = "0fzlvs6an5q1lxycwifjhp3ydimky61kki1vb030vpmbhd15nczn"; + version = "0.2.9.0"; + sha256 = "0xj77qxdy2ryb4p3fl935bbh12alimih5cdvjk14059rdyj6fhlc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean bytestring colour containers csound-expression-dynamic @@ -79613,8 +79800,8 @@ self: { ({ mkDerivation, base, csound-expression, text, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.10.2"; - sha256 = "1xkv1q67fv5iggn63fz79rwz8m9i3jda26yfrdzh5l88f8lp6vb2"; + version = "0.0.11.0"; + sha256 = "16nrkz5mqjalapyn0skz4hvkqd9ysmpniiawxyrml5bs6sarch4l"; libraryHaskellDepends = [ base csound-expression text transformers ]; @@ -79744,8 +79931,8 @@ self: { }: mkDerivation { pname = "css-syntax"; - version = "0.1.0.1"; - sha256 = "1k0q7sznbkbiivj03n4zq2sm2hmhql5w2rxjp58mcq3b534p15y3"; + version = "0.1.0.2"; + sha256 = "10xl92ib6hkbqhr75n6nla1v1krx251k9k46jyvkr00kz0a9dpbr"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -80169,8 +80356,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; - revision = "3"; - editedCabalFile = "1qs26dnfk33bzlvj8mhaw8h1qrcviqyizzwhi58sff01zzcd0r2y"; + revision = "4"; + editedCabalFile = "1r2sf31lkmx5s48r7n0lcy2z1r2vkir8chnjcfd5hhjmpcbwrng1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -80317,6 +80504,7 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Currencies representation, pretty printing and conversion"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "currency" = callPackage @@ -80850,6 +81038,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "cvss" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, text }: + mkDerivation { + pname = "cvss"; + version = "0.1"; + sha256 = "02ldb650d053hisyb7fdd19x77k8sxvz4y939hj649pjl75b7qdr"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + description = "Common Vulnerability Scoring System"; + license = lib.licenses.bsd3; + }) {}; + "cybus" = callPackage ({ mkDerivation, adjunctions, base, checkers, deepseq, distributive , indexed-traversable, lens, mtl, pos, primus, profunctors @@ -81339,8 +81539,9 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, cryptonite, data-ordlist, directory, exceptions, fgl - , filepath, FindBin, hashable, haskeline, html, http-conduit + , containers, crypton-connection, cryptonite, data-default-class + , data-ordlist, directory, exceptions, fgl, filepath, FindBin + , hashable, haskeline, html, http-client-tls, http-conduit , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck , quickcheck-instances, regex-applicative, regex-base, regex-tdfa @@ -81353,20 +81554,21 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.18.2"; - sha256 = "11ikl5fx7xkr0zb4kam1hr8kcziz9dg00hqj0ygcpv321a552rg6"; + version = "2.18.3"; + sha256 = "16p6z21xiz8p3acj21wbkzr1flv5wsj17l16sa3l7gksj9idiaql"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring - conduit constraints containers cryptonite data-ordlist directory - exceptions fgl filepath hashable haskeline html http-conduit - http-types memory mmap mtl network network-uri old-time parsec - process regex-applicative regex-base regex-tdfa safe stm - strict-identity tar temporary terminal-size terminfo text time tls - transformers unix unix-compat utf8-string vector zip-archive zlib + conduit constraints containers crypton-connection cryptonite + data-default-class data-ordlist directory exceptions fgl filepath + hashable haskeline html http-client-tls http-conduit http-types + memory mmap mtl network network-uri old-time parsec process + regex-applicative regex-base regex-tdfa safe stm strict-identity + tar temporary terminal-size terminfo text time tls transformers + unix unix-compat utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -82619,8 +82821,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "data-fix"; - version = "0.3.3"; - sha256 = "0bnalsgmc6z6l5dbhb2zrs78jsybf10rsw9zqi808h2mwvcnv6qp"; + version = "0.3.4"; + sha256 = "0dxb2s2bxdl4fcd0kfybprz9kwsskdwshdh543lvjyh4ik8m5w4d"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -82798,6 +83000,8 @@ self: { pname = "data-interval"; version = "2.1.2"; sha256 = "01nr9g5phijlchbfc8h8rc1y54igzshnx5ld4fyls3kw8dsr03jf"; + revision = "1"; + editedCabalFile = "1b7l6nc2i4y34fmqr7qx8g154c0fh3cn1h47vy30736b25rfgfx3"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; @@ -84461,7 +84665,7 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_5" = callPackage + "dbus_1_3_6" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -84470,8 +84674,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.3.5"; - sha256 = "1w44asxpvgxpn0rmqagyy25b9in0dy6vis6930q7188pzxlz8q9f"; + version = "1.3.6"; + sha256 = "1hz2qz9lsqs00c2xcdf9p32mg3ycq5p25g859xys9wwqcxvspcq6"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85047,22 +85251,21 @@ self: { "dear-imgui" = callPackage ({ mkDerivation, base, containers, directory, filepath, glew , inline-c, inline-c-cpp, managed, megaparsec, parser-combinators - , scientific, SDL2, sdl2, StateVar, template-haskell, text, th-lift - , transformers, unliftio, unordered-containers, vector + , scientific, SDL2, sdl2, StateVar, system-cxx-std-lib + , template-haskell, text, th-lift, transformers, unliftio + , unordered-containers, vector }: mkDerivation { pname = "dear-imgui"; - version = "2.2.0"; - sha256 = "050xpwsx2ydpq8p81i3dc37a9f0p8z41i3vp84wr26psrqbnv6lx"; - revision = "1"; - editedCabalFile = "1x52qa09p3ql8sykcj3r46bln0gds5c6rix9sybf2vg39j14igfz"; + version = "2.2.1"; + sha256 = "1y9rpn5zjv52nsra00rpclh0dn5yl4rlxaws87zkz3yy9xna2fk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath inline-c inline-c-cpp managed megaparsec parser-combinators scientific sdl2 StateVar - template-haskell text th-lift transformers unliftio - unordered-containers vector + system-cxx-std-lib template-haskell text th-lift transformers + unliftio unordered-containers vector ]; libraryPkgconfigDepends = [ glew SDL2 ]; doHaddock = false; @@ -85345,25 +85548,11 @@ self: { ({ mkDerivation, base, boring }: mkDerivation { pname = "dec"; - version = "0.0.5"; - sha256 = "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071"; - revision = "2"; - editedCabalFile = "1vdnjlhbvh140ml0z4r2w5hl4x4c3fa0cnw68fl65l2mqld44i0h"; - libraryHaskellDepends = [ base boring ]; - description = "Decidable propositions"; - license = lib.licenses.bsd3; - }) {}; - - "dec_0_0_6" = callPackage - ({ mkDerivation, base, boring }: - mkDerivation { - pname = "dec"; version = "0.0.6"; sha256 = "0bbzn9kqb1zdvi4kd37p3lhx0rkdbyq98hqcn9qv5y67s6a3c5gv"; libraryHaskellDepends = [ base boring ]; description = "Decidable propositions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "decepticons" = callPackage @@ -86492,8 +86681,8 @@ self: { pname = "dependent-map"; version = "0.4.0.0"; sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; - revision = "1"; - editedCabalFile = "160p9crvlx1sn60inkwxa6mv1h2d4fgqnpsb2km67zrkpdfyd2s2"; + revision = "2"; + editedCabalFile = "18jqk1p4paaylqdvglw03v7fhyvlg59csl4kpf067wwpdpyaqs3l"; libraryHaskellDepends = [ base constraints-extras containers dependent-sum ]; @@ -86508,8 +86697,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.3"; - sha256 = "12kd8xr32zb21pvns3frabz5p8wlg6s3dcfgmam36hhv0d418r8l"; + version = "0.1.1.4"; + sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -86568,6 +86757,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; + revision = "1"; + editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -86957,6 +87148,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "derive-topdown_0_1_0_0" = callPackage + ({ mkDerivation, base, binary, containers, haskell-src, HUnit, mtl + , primitive, syb, template-haskell, th-abstraction, th-expand-syns + , transformers + }: + mkDerivation { + pname = "derive-topdown"; + version = "0.1.0.0"; + sha256 = "0pxv77r769wg61pp51ibvkd256f2cyrd9k5mrqz68dwi76xk54hr"; + libraryHaskellDepends = [ + base containers mtl primitive syb template-haskell th-abstraction + th-expand-syns transformers + ]; + testHaskellDepends = [ + base binary containers haskell-src HUnit mtl primitive syb + template-haskell th-abstraction th-expand-syns transformers + ]; + description = "Derive type class instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "derive-trie" = callPackage ({ mkDerivation, array, base, containers, template-haskell }: mkDerivation { @@ -88562,8 +88775,8 @@ self: { pname = "diagrams-core"; version = "1.5.1.1"; sha256 = "168kjikw3x21pjgfy3lmxmrm89g9zlhbypkmzdg5xz9rl7acn7rc"; - revision = "1"; - editedCabalFile = "1ii5qcwdzaljzq39vrvrsjf06ydnvvyr5q44ks566c347vna7igb"; + revision = "2"; + editedCabalFile = "0byn0brmsdzhjiiicqbn0b7zd2rjrkcxk4i62ih7bqsw22xids0f"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -88734,6 +88947,8 @@ self: { pname = "diagrams-lib"; version = "1.4.6.2"; sha256 = "0qz5yrrg4k4f72fg20b1rq5mk7n7q531qmj0irpg9lmrr596bdh9"; + revision = "2"; + editedCabalFile = "1mdz1s014pn3v7b301d409zv5npw1gkdqkq2hzn8klnawcnmng57"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -88830,8 +89045,8 @@ self: { pname = "diagrams-postscript"; version = "1.5.1.1"; sha256 = "1kwb100k3qif9gc8kgvglya5by61522128cxsjrxk5a8dzpgwal4"; - revision = "2"; - editedCabalFile = "1gg221ycs2505f43rngaf47j65mh9dk6apfzsmxkdw2zz278cl26"; + revision = "3"; + editedCabalFile = "1yd084lqh2fs2m42a0744b7xlpsxk59ivjnaq99jkf1d6xq8kpak"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib hashable lens monoid-extras mtl semigroups split @@ -88867,8 +89082,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4.2.3"; sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l"; - revision = "1"; - editedCabalFile = "1w1jksdpfra1x76r3dz8lkcbg661ccgi0pwag7kgdi9nj62ahmyh"; + revision = "2"; + editedCabalFile = "1v8djd4qndmkl8lc966pkh9gbgb8rkwqg2395xad6i03gqxvl55d"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -88922,8 +89137,8 @@ self: { pname = "diagrams-solve"; version = "0.1.3"; sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; - revision = "2"; - editedCabalFile = "08l6q5751lrpyrjiliig94a2s7ahlm2045bp5mngnl9nf6xr1rwb"; + revision = "3"; + editedCabalFile = "1x10f75ggnd7357ns4cggncavs9sbiacp13mjbr486ifr24vbws6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -88942,8 +89157,8 @@ self: { pname = "diagrams-svg"; version = "1.4.3.1"; sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237"; - revision = "6"; - editedCabalFile = "1m64lzffszyln6hk35zqnrm32qy8skvz754pdk3xvkv8dspmia4s"; + revision = "7"; + editedCabalFile = "1njcpdk5amymnlp8dq6r8cgj3gm0rqhhi68jywqc5zcscmr77l2m"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -89175,8 +89390,8 @@ self: { pname = "dictionary-sharing"; version = "0.1.0.0"; sha256 = "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc"; - revision = "3"; - editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439"; + revision = "4"; + editedCabalFile = "18v6x0pjih851q5d8cdm79bhpdh6wxv9p6z746y7wppmy9j943qy"; libraryHaskellDepends = [ base containers ]; description = "Sharing/memoization of class members"; license = lib.licenses.bsd3; @@ -91043,8 +91258,8 @@ self: { pname = "distributed-process"; version = "0.7.6"; sha256 = "0kfgz8nrg8pdnw56msdkdlc1y894giz6jmgss6gxmhrr929rsnlz"; - revision = "2"; - editedCabalFile = "1l9sq9xfz7wv6grkmlv3wd0i8vbabvl1ldbavcnqr2gna4q36vqi"; + revision = "3"; + editedCabalFile = "0fnanh4yl1z7v8bqlj8q3r0cgbpllv1md9l1hhi73alpn5fmdwc7"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -91826,8 +92041,8 @@ self: { }: mkDerivation { pname = "djot"; - version = "0.1.2"; - sha256 = "11hd8axafpn07pk48lvppmw8rbwyrziirga6lw42x5rl0js1j5wx"; + version = "0.1.2.1"; + sha256 = "1lkfbxhzfcqpv0nj6kkbfhlskxb85ql72z3w1ivcw3prxs3skaza"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91871,14 +92086,39 @@ self: { mainProgram = "dl-fedora"; }) {}; + "dl-fedora_1_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra + , filepath, http-client, http-client-tls, http-directory + , http-types, optparse-applicative, regex-posix, simple-cmd + , simple-cmd-args, simple-prompt, text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "1.1"; + sha256 = "0mc0sdc6l2aq1vzz8lqxq9v88350rsv15xqn0q7mg1n255xbiclh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args simple-prompt text time unix + xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "dl-fedora"; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; version = "1.0"; sha256 = "0581a60xw4gw7pmqlmg5w2hr4hm9yjgx4c2z6v63y5xv51rn6g8p"; - revision = "1"; - editedCabalFile = "0s758nqs16mzj3vn6dyg7lfsd3c65xzycbil4xvzqf761k96kzsm"; + revision = "2"; + editedCabalFile = "1lk1ladz44chpfi1gx8yglzrxbzd9yyb258gs6rnm0as9icjfiw5"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base QuickCheck ]; description = "Difference lists"; @@ -92041,8 +92281,8 @@ self: { }: mkDerivation { pname = "dnf-repo"; - version = "0.6"; - sha256 = "1420jj5kmvj2h3ix8v6hmf4fdkzn1ixbvxg9fi7zfdfll7831gk0"; + version = "0.6.1"; + sha256 = "0zxbxadvsvj2247npbn35k4vblaf681lgsq40r06vbh0bildy490"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -92616,6 +92856,8 @@ self: { pname = "docopt"; version = "0.7.0.8"; sha256 = "0pcixlpa5cwf531aa5nmwvp50gagm2khwl1xsy8hi4jn7ksnk1y8"; + revision = "1"; + editedCabalFile = "13p8gyib0w3hhbqaijbm0jajnc7cp0bnd23wih2apg9a6aalwsnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers parsec template-haskell @@ -92727,31 +92969,57 @@ self: { "doctest" = callPackage ({ mkDerivation, base, code-page, deepseq, directory, exceptions , filepath, ghc, ghc-paths, hspec, hspec-core, hspec-discover - , HUnit, mockery, process, QuickCheck, setenv, silently - , stringbuilder, syb, transformers + , HUnit, mockery, process, QuickCheck, silently, stringbuilder, syb + , transformers }: mkDerivation { pname = "doctest"; - version = "0.22.2"; - sha256 = "1rf6hbiml8jk5n9j9isqi012chhhzjlp224hqwz7xh8r830kkf5g"; + version = "0.22.4"; + sha256 = "0j0j2n8sd46z3n4zzzp64cwdk8i4vqwj8jdanxk539sjc3sjmc4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base code-page deepseq directory exceptions filepath ghc ghc-paths process syb transformers ]; - executableHaskellDepends = [ + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base code-page deepseq directory exceptions filepath ghc ghc-paths + hspec hspec-core HUnit mockery process QuickCheck silently + stringbuilder syb transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test interactive Haskell examples"; + license = lib.licenses.mit; + mainProgram = "doctest"; + }) {}; + + "doctest_0_22_5" = callPackage + ({ mkDerivation, base, code-page, deepseq, directory, exceptions + , filepath, ghc, ghc-paths, hspec, hspec-core, hspec-discover + , HUnit, mockery, process, QuickCheck, silently, stringbuilder, syb + , transformers + }: + mkDerivation { + pname = "doctest"; + version = "0.22.5"; + sha256 = "1djcqmph7g37c0yngsyy2kz1kwlf6j7i13ym8q6nbpkhhm7k2pb8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base code-page deepseq directory exceptions filepath ghc ghc-paths process syb transformers ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ base code-page deepseq directory exceptions filepath ghc ghc-paths - hspec hspec-core HUnit mockery process QuickCheck setenv silently + hspec hspec-core HUnit mockery process QuickCheck silently stringbuilder syb transformers ]; testToolDepends = [ hspec-discover ]; description = "Test interactive Haskell examples"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "doctest"; }) {}; @@ -92882,6 +93150,8 @@ self: { pname = "doctest-parallel"; version = "0.3.1.1"; sha256 = "1xpk020024vsqh27sp225hx50i1hn5fkhxiyww6wqnhrkxypjkwa"; + revision = "1"; + editedCabalFile = "1l2lzi4iv4d2xx5ry3vib6f0582dy1cia4cni2yfk3h2gywmxa2m"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions filepath ghc ghc-paths Glob process random syb @@ -93138,6 +93408,8 @@ self: { pname = "dom-lt"; version = "0.2.3"; sha256 = "1h73159h61f1wv6kans0nqspfq46wiz77isnjg8vd9m127hqn69x"; + revision = "1"; + editedCabalFile = "140hnm6jg74fmhi6vsq2qq8agf3ar7wakwpxfkdf0zg944p41y8x"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -95041,8 +95313,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.12.3"; - sha256 = "10262cqc6ynbpvqpa3ijfacwyid4fxqxks6rm68brmqrzdqyh6wk"; + version = "0.13.0"; + sha256 = "1zbdl440xgb9s6nkqxg7fa2pc7m75w0bbndlfks4jqr1jq9f4hfh"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95075,8 +95347,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.12.3"; - sha256 = "0whmsiixv1iid1cd3faz0zib8hv4v09yclq6a7ypz4zyvjyk0szh"; + version = "0.13.0"; + sha256 = "14ckh9bshfjcinj637cmbfq6jx85ga0z98v3sqm66jw84zdqr4sy"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -96998,8 +97270,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.3.0.0"; - sha256 = "03yr8hr1aahqfm04jdn7nnfblvxpj1zgrv8c9ymgjnn6gxjvwhk7"; + version = "2.3.1.0"; + sha256 = "11gwck3ndsxslfcl9s16q0n5pgimwynp9qghxp4maf651w371kh3"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -97021,8 +97293,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.3.0.1"; - sha256 = "16vk5sjyy4knw9yss25iv501zxz2258qds3bhl1mrqa24phy3c9w"; + version = "2.3.1.0"; + sha256 = "0kn1xi7ggwdaixy2sy7ajffrplszhc57m36jmvnsz8plph1rdyim"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -97035,8 +97307,8 @@ self: { ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.2"; - sha256 = "1g4ic03aad2sc62jxspcq5zsisqmr03fs39ganzcklh86asmdb8h"; + version = "1.1.0.3"; + sha256 = "07x07h906a9qm1pd4gdk7x5cl4yz3c6xj25q8zadbjwf9smi0lh1"; libraryHaskellDepends = [ base containers effectful-core ghc ]; testHaskellDepends = [ base effectful-core ]; description = "A GHC plugin for improving disambiguation of effects"; @@ -97075,6 +97347,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-th_1_0_0_2" = callPackage + ({ mkDerivation, base, containers, effectful-core, exceptions + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "effectful-th"; + version = "1.0.0.2"; + sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + libraryHaskellDepends = [ + base containers effectful-core exceptions template-haskell + th-abstraction + ]; + testHaskellDepends = [ base effectful-core ]; + description = "Template Haskell utilities for the effectful library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effective-aspects" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -98031,7 +98321,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Dependently typed elimination functions using singletons"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "eliminators_0_9_5" = callPackage @@ -98424,29 +98713,6 @@ self: { }: mkDerivation { pname = "elm-street"; - version = "0.2.2.0"; - sha256 = "1wgf5fss6qwgc3q18k5z95658jy4g8gx1v0ys7wwbqix4jhn461s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory filepath prettyprinter text time - ]; - executableHaskellDepends = [ - base directory filepath servant servant-server text wai warp - ]; - testHaskellDepends = [ aeson base bytestring hspec ]; - doHaddock = false; - description = "Crossing the road between Haskell and Elm"; - license = lib.licenses.mpl20; - }) {}; - - "elm-street_0_2_2_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, prettyprinter, servant, servant-server, text, time, wai - , warp - }: - mkDerivation { - pname = "elm-street"; version = "0.2.2.1"; sha256 = "0hn3fxpmrwb162r8diijg0dp3rpz241nizdcbclq8friii13c3m4"; isLibrary = true; @@ -98461,7 +98727,6 @@ self: { doHaddock = false; description = "Crossing the road between Haskell and Elm"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "elm-syntax" = callPackage @@ -98556,6 +98821,31 @@ self: { mainProgram = "elm2nix"; }) {}; + "elmental" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hspec + , hspec-golden, kind-generics, kind-generics-th, neat-interpolation + , pretty-show, text + }: + mkDerivation { + pname = "elmental"; + version = "0.1.0.2"; + sha256 = "1asn28nzrns0p3jgkwaghfs9ka4g3qr02ls151gk8h8cm6mnc98m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath kind-generics neat-interpolation + text + ]; + executableHaskellDepends = [ base kind-generics-th text ]; + testHaskellDepends = [ + base containers hspec hspec-golden kind-generics-th pretty-show + text + ]; + description = "Generate Elm datatype definitions, encoders and decoders from Haskell datatypes"; + license = lib.licenses.bsd3; + mainProgram = "generate-test-app-code"; + }) {}; + "elminator" = callPackage ({ mkDerivation, aeson, base, containers, mtl, template-haskell , text @@ -99274,8 +99564,8 @@ self: { ({ mkDerivation, base, containers, HUnit, text }: mkDerivation { pname = "emojis"; - version = "0.1.3"; - sha256 = "1y0sv7hq652xzrqdqdq31v7bcvani7ilj8xqh7cih104s32cczw1"; + version = "0.1.4.1"; + sha256 = "1r8a8xjnsqbyzg96fla2s1cg6804297w6487rnrvjhqxgccxc040"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; @@ -99604,8 +99894,8 @@ self: { pname = "entropy"; version = "0.4.1.10"; sha256 = "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"; - revision = "1"; - editedCabalFile = "1c9cf98lhyvq2j5mifzkrvp26i8zg3f93vcjs86m9pxq1xh7pgc2"; + revision = "2"; + editedCabalFile = "07f8jm9cnk0b5xs6skj5ply2csjprvq1x0zgxq21bvmc3ajvxx2i"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -99978,6 +100268,8 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "env-guard" = callPackage @@ -99986,8 +100278,8 @@ self: { pname = "env-guard"; version = "0.2"; sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; - revision = "4"; - editedCabalFile = "0fax8g5n9hjaifvf20cszgb513ak9777d816cz50hlwfj114rjds"; + revision = "5"; + editedCabalFile = "0k0q8agfiqykaz5hv9q0g1xxbkkmk8n2pizv1n49kmfn3vg9rf4r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Conditionally running IO actions based on environment variables"; @@ -100118,34 +100410,37 @@ self: { "eo-phi-normalizer" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html - , blaze-markup, BNFC, Cabal, directory, doctest-parallel - , file-embed, filepath, generic-lens, happy, hspec, hspec-discover - , lens, mtl, optparse-applicative, process, QuickCheck, scientific - , string-interpolate, template-haskell, text, yaml + , blaze-markup, BNFC, bytestring, Cabal, cereal, directory + , doctest-parallel, file-embed, filepath, generic-lens, happy + , hspec, hspec-discover, lens, mtl, optparse-applicative, process + , PyF, QuickCheck, regex-compat, scientific, template-haskell, text + , with-utf8, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "0.3.1"; - sha256 = "0ap9p8ls5k692ldhkpiasnkdq0a33py8kc3i150yjcbqv5falhc3"; + version = "0.4.1"; + sha256 = "1sgag1wpl7nykq5gkkd6iak1f3nm9908cdmqr02fvn4ywrx8j1pa"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process string-interpolate ]; + setupHaskellDepends = [ base Cabal process PyF ]; libraryHaskellDepends = [ - aeson array base blaze-html blaze-markup directory file-embed - filepath generic-lens lens mtl scientific string-interpolate - template-haskell text yaml + aeson array base blaze-html blaze-markup bytestring cereal + directory file-embed filepath generic-lens lens mtl PyF + regex-compat scientific template-haskell text yaml ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - aeson aeson-pretty array base blaze-html blaze-markup directory - file-embed filepath generic-lens lens mtl optparse-applicative - scientific string-interpolate template-haskell text yaml + aeson aeson-pretty array base blaze-html blaze-markup bytestring + cereal directory file-embed filepath generic-lens lens mtl + optparse-applicative PyF regex-compat scientific template-haskell + text with-utf8 yaml ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base blaze-html blaze-markup directory doctest-parallel - file-embed filepath generic-lens hspec hspec-discover lens mtl - QuickCheck scientific string-interpolate template-haskell text yaml + aeson array base blaze-html blaze-markup bytestring cereal + directory doctest-parallel file-embed filepath generic-lens hspec + hspec-discover lens mtl PyF QuickCheck regex-compat scientific + template-haskell text with-utf8 yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; @@ -100423,23 +100718,6 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.7.0.2"; - sha256 = "18pmg7c103yprldbzh0c3wz2mbiidi14ildymsfggnxica6w05qg"; - revision = "1"; - editedCabalFile = "0qqswv42lwkv6y4hssniv4my9l9kxyvh84b2gmyqky1ijcny5y6k"; - libraryHaskellDepends = [ - base containers template-haskell th-desugar void - ]; - description = "Proof assistant for Haskell using DataKinds & PolyKinds"; - license = lib.licenses.bsd3; - }) {}; - - "equational-reasoning_0_7_0_3" = callPackage - ({ mkDerivation, base, containers, template-haskell, th-desugar - , void - }: - mkDerivation { - pname = "equational-reasoning"; version = "0.7.0.3"; sha256 = "0pr7m6afb6yi4g86pk08i27xxs9n4dszxkra6lm3icm72szygw2j"; revision = "1"; @@ -100449,7 +100727,6 @@ self: { ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "equational-reasoning-induction" = callPackage @@ -100544,8 +100821,8 @@ self: { }: mkDerivation { pname = "erebos"; - version = "0.1.3"; - sha256 = "1zlvaf33w1xc6cg6xklws510inh8lnyn5hfmqgl43hs7rhy4qj96"; + version = "0.1.4"; + sha256 = "1qrc5kycmirbwzjajv6rvlj43wnhixqa2z2lbj0hx55l28626vzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103377,7 +103654,6 @@ self: { ]; description = "@exinst@ support for @aeson@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-base" = callPackage @@ -103398,7 +103674,6 @@ self: { ]; description = "@exinst@ support for @base@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-bytes" = callPackage @@ -103419,7 +103694,6 @@ self: { ]; description = "@exinst@ support for @bytes@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-cereal" = callPackage @@ -103440,7 +103714,6 @@ self: { ]; description = "@exinst@ support for @cereal@ package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exinst-deepseq" = callPackage @@ -103488,7 +103761,6 @@ self: { ]; description = "Dependent pairs and their instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "exist" = callPackage @@ -103620,6 +103892,28 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "exon_1_7_0_0" = callPackage + ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base + , parsec, tasty, tasty-hedgehog, template-haskell + }: + mkDerivation { + pname = "exon"; + version = "1.7.0.0"; + sha256 = "1i45lxdp6g94cxcx64jipxdpvza2qpz5m3z2h499xwljgyzyj3vy"; + revision = "1"; + editedCabalFile = "1b7vdc8fdck4rfpg046gakry9kwxwmz9d9zwg8racfpw5qls6y27"; + libraryHaskellDepends = [ + base ghc incipit-base parsec template-haskell + ]; + testHaskellDepends = [ + base hedgehog incipit-base tasty tasty-hedgehog template-haskell + ]; + benchmarkHaskellDepends = [ base criterion incipit-base ]; + description = "Customizable quasiquote interpolation"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "exotic-list-monads" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , QuickCheck @@ -104205,8 +104499,8 @@ self: { pname = "extended-reals"; version = "0.2.4.0"; sha256 = "19df7zlm8kisihmnpg3ni5qg4p0vkilsny0ngch0b8b0pr56cb0c"; - revision = "2"; - editedCabalFile = "1v4vcrf66bapldw5jswkp4jb1v1qlr5cx2mgjnxb8mszir7s6p1f"; + revision = "3"; + editedCabalFile = "0wy0k20rcsz9cbgf35lzjva98csdcv67si3vh24w5jwsdqkxlmk4"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -104418,8 +104712,8 @@ self: { pname = "extensions"; version = "0.1.0.2"; sha256 = "1ra1qfrsc3icv6lgm06pgrhv77shwb8r7ci2whgnj3hs692ld7gd"; - revision = "3"; - editedCabalFile = "0ajnch6ykri1xl091yh48m8hf572d2i1aw34r5z9s9rk6bj7xxi4"; + revision = "5"; + editedCabalFile = "04plmhvz94p8dhy5qfykv5p2z9g25mqjrmcdyz6fj3x2p9pfrscd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105095,20 +105389,21 @@ self: { "faktory" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base , bytestring, crypton-connection, cryptonite, errors, hspec - , markdown-unlit, megaparsec, memory, mtl, network, random - , safe-exceptions, scanner, semigroups, text, time, unix - , unordered-containers + , markdown-unlit, megaparsec, memory, microlens, mtl, network + , random, resource-pool, safe-exceptions, scanner, semigroups, text + , time, unix, unliftio, unordered-containers }: mkDerivation { pname = "faktory"; - version = "1.1.2.7"; - sha256 = "057rrfrfxa5xsv9pqy3jsx5gzrg0lwcx50w0hlwvkgpzlxnfch30"; + version = "1.1.3.0"; + sha256 = "02csx7s9d6aa41blrlk4c580f5cy3psrsmc2yr86q7pxfb25mh5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring crypton-connection cryptonite - errors megaparsec memory mtl network random safe-exceptions scanner - semigroups text time unix unordered-containers + errors megaparsec memory microlens mtl network random resource-pool + safe-exceptions scanner semigroups text time unix unliftio + unordered-containers ]; executableHaskellDepends = [ aeson base safe-exceptions ]; testHaskellDepends = [ @@ -105184,8 +105479,8 @@ self: { pname = "falsify"; version = "0.2.0"; sha256 = "1fhj70q6kfd98892gxfy3mc8wxxyr80g4rzapaici4zd3zczz2fd"; - revision = "2"; - editedCabalFile = "1cr3lx1i89jb9sx4pqlgnb03gdav28hhn0i7prv63kjyzjn10p82"; + revision = "3"; + editedCabalFile = "0wpdv7xjf2q8wk3zql5y73ly4mky14m9rc4ql4g82x7biabnm7xg"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers data-default mtl optics-core optparse-applicative selective sop-core splitmix @@ -105361,26 +105656,6 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.2"; - sha256 = "1pdg8jc8qalwz0rrbdb0rdgq5d00j8s3bldnbdkgwc6iqagvwnsp"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath stm - text unix-compat unix-time - ]; - testHaskellDepends = [ async base bytestring directory hspec ]; - testToolDepends = [ hspec-discover ]; - description = "A fast logging system"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "fast-logger_3_2_3" = callPackage - ({ mkDerivation, array, async, auto-update, base, bytestring - , directory, easy-file, filepath, hspec, hspec-discover, stm, text - , unix-compat, unix-time - }: - mkDerivation { - pname = "fast-logger"; version = "3.2.3"; sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; libraryHaskellDepends = [ @@ -105391,7 +105666,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -106521,19 +106795,20 @@ self: { "fedora-repoquery" = callPackage ({ mkDerivation, base, bodhi, bytestring, cached-json-file - , directory, extra, filepath, http-client, http-directory - , regex-compat, simple-cmd, simple-cmd-args, text, time + , directory, extra, filepath, Glob, http-client, http-directory + , regex-compat, safe, simple-cmd, simple-cmd-args, time, utility-ht + , xdg-basedir }: mkDerivation { pname = "fedora-repoquery"; - version = "0.3.2"; - sha256 = "16qlplbxw3ipxgahvkn40i9mbpsmaprnjf42xmww6hiyp5iliwrv"; + version = "0.5"; + sha256 = "0xwc0rl4rk8kwsgzvia38767pl7yl6nvkpgl3s2n5grfl8ixj2hl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bodhi bytestring cached-json-file directory extra filepath - http-client http-directory regex-compat simple-cmd simple-cmd-args - text time + Glob http-client http-directory regex-compat safe simple-cmd + simple-cmd-args time utility-ht xdg-basedir ]; testHaskellDepends = [ base simple-cmd ]; description = "Fedora repoquery tool"; @@ -107466,6 +107741,25 @@ self: { broken = true; }) {}; + "fields-and-cases" = callPackage + ({ mkDerivation, base, lima, process, regex-compat, relude + , string-conversions, tasty, tasty-hunit + }: + mkDerivation { + pname = "fields-and-cases"; + version = "0.1.0.0"; + sha256 = "1d43xg9qss83h1sghy0ki8rfwcq05c00fqks45m2gfvsfx36qxmf"; + libraryHaskellDepends = [ base relude string-conversions ]; + testHaskellDepends = [ + base lima process regex-compat relude string-conversions tasty + tasty-hunit + ]; + description = "Codegen Haskell types to other languages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fields-json" = callPackage ({ mkDerivation, base, base64-bytestring, containers, json, mtl , utf8-string @@ -107575,6 +107869,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-embed-lzma_0_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, lzma + , template-haskell, text, transformers + }: + mkDerivation { + pname = "file-embed-lzma"; + version = "0.1"; + sha256 = "0la1nc21bkja1b8nsbhrvzpfn78nz87mjkrfixfhz2hfb57v4igy"; + libraryHaskellDepends = [ + base bytestring directory filepath lzma template-haskell text + transformers + ]; + testHaskellDepends = [ base bytestring ]; + description = "Use Template Haskell to embed (LZMA compressed) data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-embed-poly" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hspec, template-haskell @@ -107601,8 +107913,8 @@ self: { }: mkDerivation { pname = "file-io"; - version = "0.1.1"; - sha256 = "1xqmd342x7ywc000g6dcr3gj9smcgancrrx7qc4faml2yh5sh842"; + version = "0.1.2"; + sha256 = "0yimw53z6j8jb38jhkyjfzziccxvlpd74x6kkn83zkqy120y6rds"; libraryHaskellDepends = [ base bytestring deepseq filepath unix ]; testHaskellDepends = [ base bytestring filepath tasty tasty-hunit temporary @@ -107794,24 +108106,22 @@ self: { broken = true; }) {}; - "filepath_1_5_2_0" = callPackage + "filepath_1_5_3_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions - , generic-deriving, generic-random, os-string, QuickCheck + , generic-deriving, generic-random, os-string , quickcheck-classes-base, tasty, tasty-bench, tasty-quickcheck , template-haskell }: mkDerivation { pname = "filepath"; - version = "1.5.2.0"; - sha256 = "19vq749100f1nfjn9cpw99wx392x6rf439ly5lm965w5zas6sq6j"; - revision = "1"; - editedCabalFile = "16j1jjkf1rlyqwndpv6kphyc5s3ffqmh155f8j6xrvd7rd1sixwa"; + version = "1.5.3.0"; + sha256 = "0nhsjfbm31rxsx4hbx8wh9ir3845j7pcjhgb1rz7rpjkzr2fq1yq"; libraryHaskellDepends = [ base bytestring deepseq exceptions os-string template-haskell ]; testHaskellDepends = [ base bytestring deepseq generic-deriving generic-random os-string - QuickCheck quickcheck-classes-base tasty tasty-quickcheck + quickcheck-classes-base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base bytestring deepseq os-string tasty-bench @@ -108112,6 +108422,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "fin_0_3_1" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, hashable + , inspection-testing, QuickCheck, some, tagged, universe-base + }: + mkDerivation { + pname = "fin"; + version = "0.3.1"; + sha256 = "1y98g48dr046d1v300aj10dq5mrn79yj769gcld01834xi0ng010"; + libraryHaskellDepends = [ + base boring dec deepseq hashable QuickCheck some universe-base + ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fin-int" = callPackage ({ mkDerivation, attenuation, base, data-default-class, deepseq , portray, portray-diff, QuickCheck, sint @@ -108854,8 +109181,8 @@ self: { pname = "fix-whitespace"; version = "0.1"; sha256 = "0ml8ggis3a4hdgl069864bxqqm74bs9yzbyb7imp02g2zywqsr1g"; - revision = "1"; - editedCabalFile = "1sljajray6r3dyj617rsakrf4n7y5wcppl5nf5xxacwv2q21ljhi"; + revision = "2"; + editedCabalFile = "1d9g3w4ga5mincpy4b0z8dcy4f9h1qpdgq6q4hsahdpnjqbxmy40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text transformers ]; @@ -109299,8 +109626,8 @@ self: { pname = "flac"; version = "0.2.1"; sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; - revision = "1"; - editedCabalFile = "1a2qja90bqm6zwfsi6z22zm74rb3sah37j4qlz4lx08zns92bdir"; + revision = "2"; + editedCabalFile = "1byq496k06whqxdiaa7s3f4hh8mbawm6i0a9pgkbj239y14c3qpj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -109613,6 +109940,8 @@ self: { pname = "flay"; version = "0.4"; sha256 = "1vqkjjf2bzmi489wsx23ryyplbg26q9qrzb98dz80j5b5rj3xzq1"; + revision = "1"; + editedCabalFile = "0xidxbyal19npq6j7cr92prm61m6w4mdqd8zvvli54h40xd2kg21"; libraryHaskellDepends = [ base constraints transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; description = "Work generically on your datatype without knowing its shape nor its contents"; @@ -109621,6 +109950,22 @@ self: { broken = true; }) {}; + "flay_0_5" = callPackage + ({ mkDerivation, base, constraints, tasty, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "flay"; + version = "0.5"; + sha256 = "1kab09h2zxxdl11x1j6cc3qkgpx2x5zwsx76chm4rydxr4j95d4d"; + libraryHaskellDepends = [ base constraints transformers ]; + testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; + description = "Generic programming for higher-kinded types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "flexible-defaults" = callPackage ({ mkDerivation, base, containers, template-haskell, th-extras , transformers @@ -109978,25 +110323,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; - version = "2.0.0.4"; - sha256 = "079r6cjs7wz7kxql1m45pazf0nya8xgiil3sbcqrr2csxmam23cr"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Write more understandable Haskell"; - license = lib.licenses.mit; - }) {}; - - "flow_2_0_0_5" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "flow"; version = "2.0.0.5"; sha256 = "1g2fg0mdw0i2c91x3vgdzwhasmk1an5x5w5wy8dpv3hvc2van3jk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "flow-er" = callPackage @@ -111179,8 +111511,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "12"; - editedCabalFile = "0rpr0j150584h4l8mn3ziq4r055w0n24sxai20b3iqhkrd10vmk1"; + revision = "13"; + editedCabalFile = "07p1rlal8fjbyd4hm0p3a3cp3b67a86qdls88yl3f0xcgrnxxmkq"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -111380,8 +111712,8 @@ self: { pname = "forma"; version = "1.2.0"; sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; - revision = "2"; - editedCabalFile = "1wm2zqhdzx5qawlqm74kpfivfhp3bmlagxc63xz7vm4pr17cisyq"; + revision = "3"; + editedCabalFile = "0lh9dgi3m75078ijvc7s4c1bd1nr1l3v4w81l2455m6gydwsrrkd"; libraryHaskellDepends = [ aeson base containers mtl text ]; testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; @@ -111699,6 +112031,7 @@ self: { license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; mainProgram = "fortran-src"; + broken = true; }) {}; "fortran-src-extras" = callPackage @@ -111909,44 +112242,41 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_11_0_0" = callPackage + "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, Diff, directory, dlist + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, temporary, text - , th-env, yaml + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.11.0.0"; - sha256 = "1hs743r2saqzk4sbwqpyw8k62jhlrc914gizcw5yp0r1gpq83idr"; - revision = "2"; - editedCabalFile = "1gjmdwcm10d178bg468xzzg9b0fc4saxi2fhdc771rqaggd1rxg1"; + version = "0.14.0.0"; + sha256 = "1mnszw3lak3vmjcgp40xskjmzd526rw5rs06mnix2fahz8nkrrys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary bytestring Cabal-syntax - containers Diff directory dlist file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text yaml + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml ]; executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser + base Cabal-syntax containers directory filepath ghc-lib-parser optparse-applicative text th-env yaml ]; testHaskellDepends = [ - base Cabal-syntax containers Diff directory filepath ghc-lib-parser - hspec hspec-megaparsec path path-io pretty process QuickCheck - temporary text + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "fourmolu"; }) {}; - "fourmolu" = callPackage + "fourmolu_0_15_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover @@ -111956,8 +112286,10 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.14.0.0"; - sha256 = "1mnszw3lak3vmjcgp40xskjmzd526rw5rs06mnix2fahz8nkrrys"; + version = "0.15.0.0"; + sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; + revision = "1"; + editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111977,38 +112309,37 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "fourmolu"; }) {}; - "fourmolu_0_15_0_0" = callPackage + "fourmolu_0_16_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, deepseq, Diff, directory - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, scientific, syb - , temporary, text, th-env, yaml + , bytestring, Cabal-syntax, choice, containers, deepseq, Diff + , directory, file-embed, filepath, ghc-lib-parser, hspec + , hspec-discover, hspec-megaparsec, megaparsec, MemoTrie, mtl + , optparse-applicative, path, path-io, pretty, process, QuickCheck + , scientific, syb, temporary, terminal-size, text, th-env, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.15.0.0"; - sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; - revision = "1"; - editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; + version = "0.16.2.0"; + sha256 = "1vbqzljpqgabdcx282mh95q8kdap3pckfxzw03nhhinmh6hv31xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary bytestring Cabal-syntax - containers deepseq Diff directory file-embed filepath - ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + choice containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text ]; executableHaskellDepends = [ base Cabal-syntax containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml + optparse-applicative terminal-size text th-env yaml ]; testHaskellDepends = [ - base bytestring Cabal-syntax containers Diff directory filepath - ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io - pretty process QuickCheck temporary text yaml + base bytestring Cabal-syntax choice containers Diff directory + filepath ghc-lib-parser hspec hspec-megaparsec megaparsec path + path-io pretty process QuickCheck temporary text yaml ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -112025,6 +112356,8 @@ self: { pname = "fp-ieee"; version = "0.1.0.4"; sha256 = "1zba050nwsf2iidxklibndja5kmszc5k7jmimchszrnc821d0cqg"; + revision = "1"; + editedCabalFile = "0bryqkf0h9a102bk7albf4pd1mjgs2l2wa6jc96sqly75ddr4d06"; libraryHaskellDepends = [ base ghc-bignum integer-logarithms ]; testHaskellDepends = [ base doctest hspec hspec-core integer-logarithms QuickCheck random @@ -112394,14 +112727,12 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, annotated-exception, autodocodec - , autodocodec-openapi3, aws-xray-client-persistent - , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring + , autodocodec-openapi3, base, bcp47, Blammo, bugsnag, bytestring , case-insensitive, cassava, conduit, conduit-extra, containers , cookie, datadog, directory, doctest, dotenv, ekg-core, envparse , errors, exceptions, extra, faktory, filepath, Glob, hashable , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent - , hs-opentelemetry-instrumentation-wai - , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec + , hs-opentelemetry-instrumentation-wai, hs-opentelemetry-sdk, hspec , hspec-core, hspec-expectations-json, hspec-expectations-lifted , hspec-junit-formatter, http-client, http-conduit , http-link-header, http-types, hw-kafka-client, immortal, lens @@ -112412,22 +112743,21 @@ self: { , QuickCheck, resource-pool, resourcet, retry, safe, scientist , semigroupoids, serialise, template-haskell, text, time , transformers, transformers-base, typed-process, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod-core, yesod-test, zlib + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test, zlib }: mkDerivation { pname = "freckle-app"; - version = "1.15.4.0"; - sha256 = "0vrc34946jh37g4mbydwdj40nj6b1mlhrdq3ipn3lbjzvxapmb4d"; - libraryHaskellDepends = [ - aeson annotated-exception autodocodec autodocodec-openapi3 - aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo - bugsnag bytestring case-insensitive cassava conduit conduit-extra - containers cookie datadog directory doctest dotenv ekg-core - envparse errors exceptions extra faktory filepath Glob hashable - hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent - hs-opentelemetry-instrumentation-wai - hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec + version = "1.18.0.0"; + sha256 = "0djg319wkwrsqf27jnv5cvlbywzr26rm6036mwafn5kz5r0alwda"; + libraryHaskellDepends = [ + aeson annotated-exception autodocodec autodocodec-openapi3 base + bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit + conduit-extra containers cookie datadog directory doctest dotenv + ekg-core envparse errors exceptions extra faktory filepath Glob + hashable hs-opentelemetry-api + hs-opentelemetry-instrumentation-persistent + hs-opentelemetry-instrumentation-wai hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-conduit http-link-header http-types hw-kafka-client immortal lens memcache monad-control monad-logger @@ -112436,16 +112766,15 @@ self: { persistent-postgresql postgresql-simple primitive pureMD5 QuickCheck resource-pool resourcet retry safe scientist semigroupoids serialise template-haskell text time transformers - transformers-base typed-process unliftio unliftio-core - unordered-containers vector wai wai-extra yaml yesod-core - yesod-test + transformers-base typed-process unliftio unordered-containers + vector wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ - aeson base Blammo bugsnag bytestring cassava conduit errors hspec - hspec-expectations-json hspec-expectations-lifted http-types lens - lens-aeson memcache monad-validate mtl nonempty-containers - postgresql-simple QuickCheck text time unordered-containers vector - wai wai-extra zlib + aeson base Blammo bugsnag bytestring cassava conduit errors + hs-opentelemetry-api hspec hspec-expectations-json + hspec-expectations-lifted http-types lens lens-aeson memcache + monad-validate mtl nonempty-containers postgresql-simple QuickCheck + text time unordered-containers vector wai wai-extra zlib ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -112522,8 +112851,6 @@ self: { ]; description = "Free algebras"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "free-applicative-t" = callPackage @@ -112568,7 +112895,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "efficient data types for free categories and arrows"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "free-concurrent" = callPackage @@ -112599,6 +112925,27 @@ self: { mainProgram = "free-er-examples"; }) {}; + "free-foil" = callPackage + ({ mkDerivation, array, base, bifunctors, containers, deepseq + , doctest-parallel, template-haskell, text + }: + mkDerivation { + pname = "free-foil"; + version = "0.0.3"; + sha256 = "0gafhqwdzz8zqyfiw50w5zkyg5989hzqlcdq2lgqcqpzvhjg9x1r"; + libraryHaskellDepends = [ + array base bifunctors containers deepseq template-haskell text + ]; + testHaskellDepends = [ + array base bifunctors containers deepseq doctest-parallel + template-haskell text + ]; + description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "free-functors" = callPackage ({ mkDerivation, base, bifunctors, comonad, contravariant , derive-lifted-instances, profunctors, template-haskell @@ -113859,21 +114206,20 @@ self: { }) {}; "ftdi" = callPackage - ({ mkDerivation, async, base, base-unicode-symbols, bytestring - , generic-random, QuickCheck, random, tagged, test-framework + ({ mkDerivation, async, base, bytestring, generic-random + , QuickCheck, random, tagged, test-framework , test-framework-quickcheck2, transformers, usb, vector }: mkDerivation { pname = "ftdi"; - version = "0.3.0.2"; - sha256 = "0ybx59gs54nk5swh8c2yzcn7mxsm02qp7rwaj51y38p4yzajcw9x"; + version = "0.3.0.3"; + sha256 = "11xgscqdg1nbfr49b7dxjlzh2w8iw0dzyp4f16jlrajyxvw8fjq5"; libraryHaskellDepends = [ - async base base-unicode-symbols bytestring transformers usb vector + async base bytestring transformers usb vector ]; testHaskellDepends = [ - base base-unicode-symbols bytestring generic-random QuickCheck - random tagged test-framework test-framework-quickcheck2 - transformers usb vector + base bytestring generic-random QuickCheck random tagged + test-framework test-framework-quickcheck2 transformers usb vector ]; description = "A thin layer over USB to communicate with FTDI chips"; license = lib.licenses.bsd3; @@ -114876,6 +115222,8 @@ self: { pname = "fusion-plugin"; version = "0.2.7"; sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i"; + revision = "2"; + editedCabalFile = "1sk3rz7nwqb9608c78izj8ql3k7dsxy02j8alxsgbwb3kisa673l"; libraryHaskellDepends = [ base containers directory filepath fusion-plugin-types ghc syb time transformers @@ -114911,8 +115259,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.16"; - sha256 = "0yvn01d5mvahp26vhqil7m900didh5hqc2gaxa1wjg1bn0lz99ah"; + version = "0.25.17"; + sha256 = "05qmsg901d10v2fibh18jy5f84i8ickx5rfx00akw4kyr7myf9fk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115216,17 +115564,18 @@ self: { "fuzzyfind" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, hspec - , massiv, QuickCheck, text + , hspec-discover, massiv, QuickCheck, text }: mkDerivation { pname = "fuzzyfind"; - version = "3.0.1"; - sha256 = "191qbviavkhzaxwnansis4lsixyc0g4q196myjn72h1cmq5c68v0"; + version = "3.0.2"; + sha256 = "1993q97svag1g2ybyz02lsff97pxa1b4aw4j70jl97llwny7wz2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers massiv text ]; executableHaskellDepends = [ base criterion deepseq ]; testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; description = "Fuzzy text matching"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -115357,6 +115706,7 @@ self: { description = "FWGL GHCJS backend"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fx" = callPackage @@ -115380,6 +115730,7 @@ self: { description = "Interface to the FXPak/FXPak Pro USB interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "g-npm" = callPackage @@ -115749,6 +116100,8 @@ self: { pname = "gargoyle"; version = "0.1.2.0"; sha256 = "1jj1pgzikg2zw5zmkjn9kh45as5fh0ifi3kragizbbly8qy60nwl"; + revision = "1"; + editedCabalFile = "0ysxnkhymkfwkfjd7i0ys68qmcfqjm57bswi410rcfz61ania45x"; libraryHaskellDepends = [ base directory filelock filepath network process unix ]; @@ -115765,6 +116118,8 @@ self: { pname = "gargoyle-postgresql"; version = "0.2.0.2"; sha256 = "1l1p51wp8s52bpy6ac1zw1d1x0sk97bi9g77p43610386cq3dlpl"; + revision = "2"; + editedCabalFile = "0g1piy0dmfy3j8q2c6831pml84w3w79df16qm3ibdydagzs6p8xq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115786,8 +116141,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-connect"; - version = "0.1.0.1"; - sha256 = "0ipx0zh8j1k6w71h6zkhdf1xkjhid90q4yiy5mwypyywwwwbwjdv"; + version = "0.1.0.2"; + sha256 = "0dp9zj5fh6w336iykm07q11zfhi3pk9yq9yr2xsp386wjkqs17dq"; libraryHaskellDepends = [ base bytestring directory gargoyle gargoyle-postgresql gargoyle-postgresql-nix postgresql-simple resource-pool @@ -115805,6 +116160,8 @@ self: { pname = "gargoyle-postgresql-nix"; version = "0.3.0.1"; sha256 = "0fspvwgvs2mcg7hlivmjsw92phmxpjzjls23psvnl600nk7pnij8"; + revision = "2"; + editedCabalFile = "1c5f4bkwv4mh2fbfz90rsdiq51c2zzg6nk64byhgvl8ax74iijip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115855,12 +116212,17 @@ self: { }) {}; "gasp" = callPackage - ({ mkDerivation, base, binary, containers, mtl, QuickCheck }: + ({ mkDerivation, adjunctions, base, binary, constraints, containers + , distributive, mtl, QuickCheck + }: mkDerivation { pname = "gasp"; - version = "1.3.0.0"; - sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg"; - libraryHaskellDepends = [ base binary containers mtl QuickCheck ]; + version = "1.4.0.0"; + sha256 = "17rg4dn163is2c5llwx6575fa5cr4i85rj3nxcylji5qgvmacwws"; + libraryHaskellDepends = [ + adjunctions base binary constraints containers distributive mtl + QuickCheck + ]; description = "A framework of algebraic classes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -116464,20 +116826,20 @@ self: { mainProgram = "gemini-exports"; }) {}; - "gemini-exports_0_1_0_1" = callPackage + "gemini-exports_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, base64, bytestring, cassava, cmdargs - , containers, cryptonite, directory, hedgehog, http-client - , http-types, mtl, raw-strings-qq, req, safe-exceptions, scientific - , tasty, tasty-hedgehog, tasty-hunit, text, time, xdg-basedir, yaml + , containers, crypton, directory, hedgehog, http-client, http-types + , mtl, raw-strings-qq, req, safe-exceptions, scientific, tasty + , tasty-hedgehog, tasty-hunit, text, time, xdg-basedir, yaml }: mkDerivation { pname = "gemini-exports"; - version = "0.1.0.1"; - sha256 = "1hkbp9c79zhy5f29n5y05mf5jdyqr8fg5vi7fs1pz4hian21187m"; + version = "0.1.0.2"; + sha256 = "0q431qhhn6g41csk8dwvh6ys00sj8qkw1fk0sabcjn0848p9sd7r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64 bytestring cassava cmdargs containers cryptonite + aeson base base64 bytestring cassava cmdargs containers crypton directory http-client http-types mtl raw-strings-qq req safe-exceptions scientific text time xdg-basedir yaml ]; @@ -116499,6 +116861,8 @@ self: { pname = "gemini-router"; version = "0.1.2.0"; sha256 = "12b5zvs1npqc47jy04dbs2mqy2n7m0pn83ndz0wb4c1x1qygp7sj"; + revision = "1"; + editedCabalFile = "0wlzl52x65mg3an0phmp6a9d0dbcyv6vvvc941xfrmx2jydq8v78"; libraryHaskellDepends = [ base gemini-server HsOpenSSL network-uri transformers ]; @@ -116515,8 +116879,8 @@ self: { pname = "gemini-server"; version = "0.3.0.0"; sha256 = "0s9h0lzxz5yjvz8rzw9mx9dba21171960waaqikj2qbbja0iq3k3"; - revision = "1"; - editedCabalFile = "151ghd56sa5c95vxb7hacgmykg7y30086w84c61x5y18njnzyqw6"; + revision = "3"; + editedCabalFile = "1lg561xjfsa5q5gayipzr4ggragv2nv80i3bg1psg5n8ryijdpdm"; libraryHaskellDepends = [ base bytestring hslogger HsOpenSSL network network-run network-uri text utf8-string @@ -116536,8 +116900,8 @@ self: { pname = "gemini-textboard"; version = "0.2.0.1"; sha256 = "1yvizcxafq943q9fbz08mq2x50dw9ykdz5vy6hr6ps2g47j4wfa0"; - revision = "1"; - editedCabalFile = "0ppmyz8a03ccdp97s3c1y6zmpvd1whzdjmn30qx8jw6iky8whwjs"; + revision = "2"; + editedCabalFile = "1pl0k7skmf3yp2f8mscmfynhkis6dn6hb94qg26kxyr7jpwbcsb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116918,12 +117282,12 @@ self: { }) {}; "generic-data-functions" = callPackage - ({ mkDerivation, base, contravariant, text }: + ({ mkDerivation, base, contravariant }: mkDerivation { pname = "generic-data-functions"; - version = "0.5.1"; - sha256 = "1yw9v9s9nsz492d6v4sfi0s9nm3mq2kvxn4q9y01s7fwabdijpk1"; - libraryHaskellDepends = [ base contravariant text ]; + version = "0.6.0"; + sha256 = "1d4rl7bb7prpvisx4w4azg5rck1kz9g87svzackjfqjpnx56ma3g"; + libraryHaskellDepends = [ base contravariant ]; description = "Familiar functions lifted to generic data types"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -117094,10 +117458,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-lens-lite"; - version = "0.1"; - sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "6"; - editedCabalFile = "0db0lbdq3iqgq42bj6q5qn4az8szwjyhq93f32zmcj1n4mrpxdj9"; + version = "0.1.1"; + sha256 = "1ldc13g7l5jjgca80c2hymkbgq9pf8b5j4x3dr83kz6wq2p76q12"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -117203,10 +117565,8 @@ self: { ({ mkDerivation, base, generic-lens-lite, optics-core }: mkDerivation { pname = "generic-optics-lite"; - version = "0.1"; - sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "6"; - editedCabalFile = "17yqzcdlm3g5mc8rjjqp98ykj8rj1c46c0vcqk23pwgffpac5d25"; + version = "0.1.1"; + sha256 = "1dd2dw72fyyimnyq8bw57k7lbh0lnjipvk08dyj87h357ykjv3ql"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -117564,6 +117924,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "generics-sop-lens_0_2_1" = callPackage + ({ mkDerivation, base, generics-sop, lens }: + mkDerivation { + pname = "generics-sop-lens"; + version = "0.2.1"; + sha256 = "1961jzs5b4psxpwxick6lwp1b0q6m61665s9g36drr5lmxdcphbw"; + libraryHaskellDepends = [ base generics-sop lens ]; + description = "Lenses for types in generics-sop"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "genericserialize" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -119474,8 +119846,8 @@ self: { pname = "ghc-events"; version = "0.19.0.1"; sha256 = "1rliryx527ph1csyq8d5np1g8yfwhmsarspqnl7lp9d9nf0jkbn1"; - revision = "1"; - editedCabalFile = "09arkxfmi64nxr3r7qd0fwikp29qrl4rahf0zwwhhlqrz9n6npzv"; + revision = "2"; + editedCabalFile = "1p41rdbxh23465qqkv6h1sydgxbqwrcyi85xzlyjc2xg0m9ic15s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119659,12 +120031,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_9_0_0" = callPackage + "ghc-exactprint_1_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.9.0.0"; - sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; + version = "1.10.0.0"; + sha256 = "14jwkx0q2bidcv5ss7zmkvl41z264k7siy9fh7py27h7azb539v0"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -119853,6 +120225,8 @@ self: { pname = "ghc-internal"; version = "9.1001.0"; sha256 = "0z38v4gnyis99r3rli2g3dyg948d98lhd1ylz5irbghnvrn8myhl"; + revision = "1"; + editedCabalFile = "1rx55yc51xaarcyj8mgrdn6pmr8ri2n962h813dy5vc1pj49g8yz"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -119904,8 +120278,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.6.5.20240423"; - sha256 = "0jmi0c9pl69q8ydgmkjv4b5lxwkjiq8ys1zbl1g9rg2cv5d6w4in"; + version = "9.6.6.20240701"; + sha256 = "0041lgl11yb48694rdaplsaz3bpvhb83sr9a2ghy00ml9xrkxafh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -119989,8 +120363,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.6.5.20240423"; - sha256 = "1kr4xb0bz24w0nb1mnf71lzhx8yly8vrixcn7dy01l09j3jmps2w"; + version = "9.6.6.20240701"; + sha256 = "1cq2bs3nwqxi58mhfrvskdpikr7cgdyv4d1fblpgzqczr3pq94cc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -120629,13 +121003,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_11_0" = callPackage + "ghc-syntax-highlighter_0_0_12_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.11.0"; - sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; + version = "0.0.12.0"; + sha256 = "0q3lql4ykfha4p5s5dxgf2p9jrim1g14wl0yh6l80y28ls94b7d9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -120714,7 +121088,7 @@ self: { mainProgram = "ghc-tags"; }) {}; - "ghc-tags" = callPackage + "ghc-tags_1_8" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, deepseq, directory, filepath, ghc-lib, ghc-paths , optparse-applicative, process, stm, temporary, text, time, vector @@ -120733,6 +121107,29 @@ self: { ]; description = "Utility for generating ctags and etags with GHC API"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + mainProgram = "ghc-tags"; + }) {}; + + "ghc-tags" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, deepseq, directory, filepath, ghc-lib, ghc-paths + , optparse-applicative, process, stm, temporary, text, time, vector + , yaml + }: + mkDerivation { + pname = "ghc-tags"; + version = "1.9"; + sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring containers deepseq directory + filepath ghc-lib ghc-paths optparse-applicative process stm + temporary text time vector yaml + ]; + description = "Utility for generating ctags and etags with GHC API"; + license = lib.licenses.mpl20; mainProgram = "ghc-tags"; }) {}; @@ -120804,8 +121201,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.5"; - sha256 = "1hqhmsa2nic6lpq2d778ksi3ffy865fn72cs2f8d0dxf1di32s0b"; + version = "0.4.6"; + sha256 = "1a8zf8zbknsllmwsgid8q3p669r72iy3g4i89ngyv0hvanghdz2v"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -120847,39 +121244,28 @@ self: { ({ mkDerivation, base, bytestring, tasty-bench, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.2.8"; - sha256 = "1qmfywqjwbnmhjs2q2nndvdfhigjhq5ma86s882ffcz3rawxv5wi"; - libraryHaskellDepends = [ base bytestring text ]; - benchmarkHaskellDepends = [ base bytestring tasty-bench ]; - description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-trace-events_0_1_2_9" = callPackage - ({ mkDerivation, base, bytestring, tasty-bench, text }: - mkDerivation { - pname = "ghc-trace-events"; version = "0.1.2.9"; sha256 = "01fk87z47jf8hm7dahjnfdmg2m26gi00f64va0p8l6rnirzxz9z9"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-extra" = callPackage ({ mkDerivation, base, containers, ghc, ghc-bignum, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, tasty, tasty-hunit, transformers + , ghc-typelits-natnormalise, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.6"; - sha256 = "1f4n3s6cjxz3q04ixwi4mvxqb23vpifjlrfnzh4zif0kcf47sp70"; + version = "0.4.7"; + sha256 = "0kacdhzqv7x7f44icxfd54cbad05d9pg8bdsziy657y5m8awnf13"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra - ghc-typelits-knownnat ghc-typelits-natnormalise transformers + ghc-typelits-knownnat ghc-typelits-natnormalise template-haskell + transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty @@ -120896,8 +121282,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.10"; - sha256 = "03rg0p1grmxxzr9w0bgczavnqhvg2jivq8cafqsvqrsrmiacip8d"; + version = "0.7.12"; + sha256 = "0r2jaqa1667maskpvyx10nr33xypabp1navfh7f0rb2fmxxl3j9z"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -120916,10 +121302,11 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.9"; - sha256 = "1fn7ia00hrhi54m5bzzl0bb49lr6jbjr8crmasbh7ndplfv8zq46"; + version = "0.7.10"; + sha256 = "04q47qdlgry0as8fb441g1dhk8712nhjcmkkgvr4440grr14f4vv"; libraryHaskellDepends = [ - base containers ghc ghc-bignum ghc-tcplugins-extra transformers + base containers ghc ghc-bignum ghc-tcplugins-extra template-haskell + transformers ]; testHaskellDepends = [ base ghc-prim tasty tasty-hunit template-haskell @@ -120936,8 +121323,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.7.3.0"; - sha256 = "146xlp596ymsz1wrx2am62fy1v1gq7v6qzbx6qmj5dgxph0h4w6x"; + version = "0.7.4.0"; + sha256 = "1kas8w67hnrcqrywnqc1w0ls4varj5357nfirdr2r2f12zar6q45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121027,8 +121414,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.22.0"; - sha256 = "1c85yb7i3j5v5bspi3fakzs35cs2d966ddi5cjb1ffxkk6ca0ddf"; + version = "0.0.23.0"; + sha256 = "05vgjfsjyw9dywzx2xynjv51azxbgifgw8rhxkc1h54s8h421z2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121205,20 +121592,19 @@ self: { , cryptohash-sha1, data-default, deepseq, dependent-map , dependent-sum, Diff, directory, dlist, enummapset, exceptions , extra, filepath, fingertree, focus, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-paths, ghc-trace-events, gitrev, Glob - , haddock-library, hashable, hie-bios, hie-compat, hiedb, hls-graph - , hls-plugin-api, implicit-hie, lens, list-t, lsp, lsp-test - , lsp-types, mtl, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, random, regex-tdfa - , row-types, safe-exceptions, sorted-list, sqlite-simple, stm - , stm-containers, syb, tasty-hunit, text, text-rope, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , vector + , ghc-trace-events, gitrev, Glob, haddock-library, hashable + , hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , implicit-hie, lens, list-t, lsp, lsp-types, mtl, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, random, regex-tdfa, safe-exceptions + , sorted-list, sqlite-simple, stm, stm-containers, syb, text + , text-rope, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, vector }: mkDerivation { pname = "ghcide"; - version = "2.8.0.0"; - sha256 = "1mjqbh7dmgx9q90pqs6qyqy0mgxj9vcwn5ww6hqcw9i2p847mvgy"; + version = "2.9.0.0"; + sha256 = "18g70rjpkrvc433y2fd2wd6fgcwvxj1gy12h1ajr1dn28ys4847k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121226,20 +121612,18 @@ self: { case-insensitive co-log-core containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist enummapset exceptions extra filepath fingertree focus ghc - ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob - haddock-library hashable hie-bios hie-compat hiedb hls-graph - hls-plugin-api implicit-hie lens list-t lsp lsp-test lsp-types mtl - opentelemetry optparse-applicative parallel prettyprinter - prettyprinter-ansi-terminal random regex-tdfa row-types - safe-exceptions sorted-list sqlite-simple stm stm-containers syb - tasty-hunit text text-rope time transformers unix unliftio + ghc-boot ghc-boot-th ghc-trace-events Glob haddock-library hashable + hie-bios hie-compat hiedb hls-graph hls-plugin-api implicit-hie + lens list-t lsp lsp-types mtl opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal random + regex-tdfa safe-exceptions sorted-list sqlite-simple stm + stm-containers syb text text-rope time transformers unix unliftio unliftio-core unordered-containers vector ]; executableHaskellDepends = [ base data-default extra gitrev hls-plugin-api lsp lsp-types optparse-applicative ]; - doHaddock = false; description = "The core of an IDE"; license = lib.licenses.asl20; }) {}; @@ -121273,7 +121657,9 @@ self: { testToolDepends = [ ghcide ]; description = "An LSP client for running performance experiments on HLS"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "ghcide-bench"; + broken = true; }) {}; "ghcide-test-utils" = callPackage @@ -121338,8 +121724,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.8.0.1"; - sha256 = "1cx9jqpbr6b30qckp2zpsfk3swa58snjb79pq0l6485nvrxa9mls"; + version = "0.8.0.2"; + sha256 = "1p78m70jr1bc7c9xh316ib8ldpsk4nzjjz56sax5ygwz4513kc87"; description = "base library for GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -121383,8 +121769,10 @@ self: { }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.9.1"; - sha256 = "0fjf0l1yaml24ipdxc72fscn1f8az663yx31rwxhq6kj2p7j1jg1"; + version = "0.9.9.2"; + sha256 = "05risvf43x3rvh4ln1mi0jhkf13dpl3j2sxdn8ph5lidiwm0brf2"; + revision = "1"; + editedCabalFile = "11cvqicf9jmcmxc37i8l6vgh1vb501y2xhlqhwhcfinhj07ffs8i"; libraryHaskellDepends = [ base containers ghcjs-dom-jsaddle text transformers ]; @@ -121419,8 +121807,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-javascript"; - version = "0.9.9.1"; - sha256 = "0im7wn7bn43rhkblh0wn9angadbdvywsalfz0adr9pkwv6hvc8qs"; + version = "0.9.9.2"; + sha256 = "19011y6rnaa6mcch64gxpi1gzv6yp8ma2nxi6k6wp6myyfia57wh"; description = "DOM library using JSFFI and GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -121630,52 +122018,52 @@ self: { "ghcup" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, brick, bytestring, bz2, Cabal - , cabal-install-parsers, cabal-plan, case-insensitive, casing - , containers, cryptohash-sha256, deepseq, directory - , disk-free-space, exceptions, file-uri, filepath - , generic-arbitrary, haskus-utils-types, haskus-utils-variant - , hspec, hspec-discover, hspec-golden-aeson, libarchive - , lzma-static, megaparsec, mtl, optics, optparse-applicative - , os-release, pretty, pretty-terminal, process, QuickCheck - , quickcheck-arbitrary-adt, regex-posix, resourcet, retry, safe - , safe-exceptions, split, streamly, strict-base, tagsoup, tasty - , tasty-hunit, template-haskell, temporary, terminal-size, text - , time, transformers, unix, unix-bytestring, unliftio-core - , unordered-containers, uri-bytestring, utf8-string, vector - , versions, vty, word8, yaml-streamly, zlib + , Cabal-syntax, case-insensitive, casing, conduit, containers + , cryptohash-sha256, deepseq, directory, disk-free-space + , exceptions, file-uri, filepath, generic-arbitrary + , haskus-utils-types, haskus-utils-variant, hspec, hspec-discover + , hspec-golden-aeson, libarchive, lzma-static, megaparsec, mtl + , optics, optparse-applicative, os-release, parsec, pretty + , pretty-terminal, process, QuickCheck, quickcheck-arbitrary-adt + , regex-posix, resourcet, retry, safe, safe-exceptions, split + , strict-base, tagsoup, tasty, tasty-hunit, template-haskell + , temporary, terminal-size, text, time, transformers, unix + , unix-bytestring, unliftio-core, unordered-containers + , uri-bytestring, utf8-string, vector, versions, vty, word8, yaml + , zlib }: mkDerivation { pname = "ghcup"; - version = "0.1.22.0"; - sha256 = "073vcv2kchldfkyfr1bxc8sqd86b7knnm7sl94rjqrz6gs7rvqx7"; + version = "0.1.30.0"; + sha256 = "1q5lh1c29y2j883yqr4yf1vn4rnrl6fas0vyvgfsnmr1bhdjqcj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty async base base16-bytestring binary bytestring - bz2 Cabal cabal-install-parsers cabal-plan case-insensitive casing + aeson aeson-pretty async base base16-bytestring binary brick + bytestring bz2 Cabal Cabal-syntax case-insensitive casing conduit containers cryptohash-sha256 deepseq directory disk-free-space exceptions file-uri filepath haskus-utils-types haskus-utils-variant libarchive lzma-static megaparsec mtl optics - optparse-applicative os-release pretty pretty-terminal process - regex-posix resourcet retry safe safe-exceptions split streamly + optparse-applicative os-release parsec pretty pretty-terminal + process regex-posix resourcet retry safe safe-exceptions split strict-base tagsoup template-haskell temporary terminal-size text time transformers unix unix-bytestring unliftio-core unordered-containers uri-bytestring utf8-string vector versions vty - word8 yaml-streamly zlib + word8 yaml zlib ]; executableHaskellDepends = [ - aeson aeson-pretty async base brick bytestring - cabal-install-parsers cabal-plan containers deepseq directory - filepath haskus-utils-types haskus-utils-variant libarchive - megaparsec mtl optics optparse-applicative pretty pretty-terminal - process resourcet safe safe-exceptions tagsoup template-haskell - temporary text time transformers unix unordered-containers - uri-bytestring utf8-string vector versions vty yaml-streamly + aeson aeson-pretty async base bytestring containers deepseq + directory filepath haskus-utils-types haskus-utils-variant + libarchive megaparsec mtl optics optparse-applicative pretty + pretty-terminal process resourcet safe safe-exceptions tagsoup + template-haskell temporary text time transformers unix + unordered-containers uri-bytestring utf8-string vector versions + yaml ]; testHaskellDepends = [ - base bytestring containers directory filepath generic-arbitrary - hspec hspec-golden-aeson optparse-applicative QuickCheck - quickcheck-arbitrary-adt streamly tasty tasty-hunit + base bytestring conduit containers directory filepath + generic-arbitrary hspec hspec-golden-aeson optparse-applicative + QuickCheck quickcheck-arbitrary-adt tasty tasty-hunit template-haskell text time unix uri-bytestring versions ]; testToolDepends = [ hspec-discover ]; @@ -121764,8 +122152,8 @@ self: { }: mkDerivation { pname = "gi-adwaita"; - version = "1.0.6"; - sha256 = "0d5qswxbr8hl0mykjifgxivcbv55viva0gfw5zmgmswkp7my56q2"; + version = "1.0.7"; + sha256 = "16hqnb3a92b10svghgic65grs14mjx0idx2nc8d9lz4y41z27kbz"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -121788,8 +122176,8 @@ self: { }: mkDerivation { pname = "gi-atk"; - version = "2.0.27"; - sha256 = "1dp30c4ni78l9zdj07f4ahr9szm0wlwrbnp1my6plg909kf79i7m"; + version = "2.0.28"; + sha256 = "0dkzchgsbb7f4b4p56ni4s1vmpp7ln722djcbcp5zazqbd0s9vfd"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -121807,8 +122195,8 @@ self: { }: mkDerivation { pname = "gi-ayatana-appindicator3"; - version = "0.1.0"; - sha256 = "0ds1d21r2fhc92iznc02gnm6xfgj6hx63iz04bvvpbld6s6xislr"; + version = "0.1.1"; + sha256 = "1n6lf59l63yjj0q4q4gxnq3b6s8myxyqyhgpdjkszvpbym6mdb98"; setupHaskellDepends = [ base Cabal gi-gdk gi-gobject gi-gtk haskell-gi ]; @@ -121830,8 +122218,8 @@ self: { }: mkDerivation { pname = "gi-cairo"; - version = "1.0.29"; - sha256 = "124a7llg5sck0a25gd9381wp79kwm4rwgrbslbwp329azmf2s4d5"; + version = "1.0.30"; + sha256 = "0s0ych0fxnfaqg2q2ndfp2zj01sya0j888snd2rdbaiikxy0kvsq"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -121904,8 +122292,8 @@ self: { }: mkDerivation { pname = "gi-clutter"; - version = "1.0.5"; - sha256 = "05yavg91cfm3da3b9gf9c5yis6c6jv1zcqa6y0wdyyghlzagyix7"; + version = "1.0.6"; + sha256 = "01q4549k57xv5vin82mcysmm9gwar0a2ak0c180ndkqcddkpkq22"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-cogl gi-gio gi-glib gi-gobject gi-json gi-pango haskell-gi @@ -121929,8 +122317,8 @@ self: { }: mkDerivation { pname = "gi-cogl"; - version = "1.0.5"; - sha256 = "04ji6w2xvy6pcbqgnqm1f2wsyv1za1m7b8wyg9vnbdf4hiwl8mzl"; + version = "1.0.6"; + sha256 = "0mq6g6x1znc9b3kjkzcchmc7lr7vf77s49gwi67h3r3nqm90c5c9"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -121948,8 +122336,8 @@ self: { }: mkDerivation { pname = "gi-coglpango"; - version = "1.0.5"; - sha256 = "0zbp7s1kn5xds521wmgxmqiahccbdz0sc54rgmprs8ak2bf3d68p"; + version = "1.0.6"; + sha256 = "1hafha7qbzsq9jh8by730c0lcspdr5wwj4a4w3sg9bbm2290nb4i"; setupHaskellDepends = [ base Cabal gi-cogl gi-glib gi-gobject gi-pango gi-pangocairo haskell-gi @@ -121966,6 +122354,30 @@ self: { broken = true; }) {cogl-pango = null;}; + "gi-dazzle" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango + , haskell-gi, haskell-gi-base, haskell-gi-overloading, libdazzle + , text, transformers + }: + mkDerivation { + pname = "gi-dazzle"; + version = "1.0.2"; + sha256 = "0q2062bld81mq33b32hn2hx644sb4si36n2phs0s8xddijzxiag6"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdazzle ]; + description = "libdazzle bindings"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) libdazzle;}; + "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -121973,8 +122385,8 @@ self: { }: mkDerivation { pname = "gi-dbusmenu"; - version = "0.4.13"; - sha256 = "0n43qfva1wc58yqb0jblwhjzcbbfky09mk2lz0qx5p454c4qhnbc"; + version = "0.4.14"; + sha256 = "16pkj1sdkv5567yvbbgyfwncjs1k9wcj97n61mxk2aaqn5zasp2x"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -121994,8 +122406,8 @@ self: { }: mkDerivation { pname = "gi-dbusmenugtk3"; - version = "0.4.14"; - sha256 = "013hcd6ay172jcfvy437fqzn8s6xc9vzg478f0hf4j0b4vn0xhkp"; + version = "0.4.15"; + sha256 = "05i72iqv7x9r673d4b4q523q8py0652s79radclqg5maiy40ivfb"; setupHaskellDepends = [ base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi @@ -122018,8 +122430,8 @@ self: { }: mkDerivation { pname = "gi-freetype2"; - version = "2.0.4"; - sha256 = "02rprv85aba9hy7z0sn5n54nrzd0d5vci90p4fbhxv4yfq1gf1rv"; + version = "2.0.5"; + sha256 = "115yjlhb507wp21hcngygr0mrq4vdpnbx24gyfd5wwba9ny38a9j"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -122038,8 +122450,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.28"; - sha256 = "0crlbrwdj7myrjlnf7p3h24jl998l3i70afh54chv0cawqxqq114"; + version = "3.0.29"; + sha256 = "02bxn01znxwfrcdgxhfc8zsyz02x1rin5yz6km4q3fb9vpcrp9ak"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -122054,7 +122466,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_7" = callPackage + "gi-gdk_4_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122062,8 +122474,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.7"; - sha256 = "1ll3rl6ypcbgnfh3xxfwfswqpmbxgmk628lkkj5h8f9is2fwl067"; + version = "4.0.8"; + sha256 = "1izl25parszwm9nayn0w9zvmic9bsfcfl1jiasnj11pmzzllyryc"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -122086,8 +122498,8 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.31"; - sha256 = "1gh530l2iwi4lc7mbf5cg8wwm9bxj1iajw8zpj4xc0327g17zqn4"; + version = "2.0.32"; + sha256 = "1yxsrhxv5ndj60bv6djnhbmyh3a6ahmdkyfw5xbr3wy8hh9vc7l3"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gmodule gi-gobject haskell-gi ]; @@ -122107,8 +122519,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.15"; - sha256 = "1pr0rnj3ximb844yhz1bwljk0mywy1z8dcbi6ns25ag07gk2sflv"; + version = "3.0.16"; + sha256 = "0za3m9s3rydwqx3kn1lw69s9dcx1g9vr4mk96b3bh8l57k40lbc9"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -122122,15 +122534,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_7" = callPackage + "gi-gdkx11_4_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.7"; - sha256 = "0hym8rfa9ynihgvvk83npdd29vsbfajnsn824ybighczg73491dh"; + version = "4.0.8"; + sha256 = "0sfgym80d10nn4p91595xa89fnxvzhm1a1abdv89yw5dq4y5hih8"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -122153,8 +122565,8 @@ self: { }: mkDerivation { pname = "gi-ges"; - version = "1.0.4"; - sha256 = "1g3kc51g1imln821scx19plankk01af1c82mvyxjz09bfvc8mwv9"; + version = "1.0.5"; + sha256 = "0hmbpmwda8ijmfmgjxy9s6fvn3akz08lrzh082nv39bsba2wbgj8"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject gi-gst gi-gstpbutils gi-gstvideo haskell-gi @@ -122177,8 +122589,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.14"; - sha256 = "0zn41wapf9iq9fiyifvd0d9ykylcxfl583whadvbwd750knq9j97"; + version = "1.0.15"; + sha256 = "02xibi58zh56j3ji9pkm0nhyc4z4jvlvkpfhaqz6dymp9b4g139p"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122201,8 +122613,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.32"; - sha256 = "1cssldl96yi5r26c66b4jlyp7yirbhyi63mnijwldpa14xv0xpi8"; + version = "2.0.34"; + sha256 = "0y01d4758lx6qchwgvqzjwgj00r3fqwpwxjm80wq7gdh0nnwwaz3"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122237,8 +122649,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.28"; - sha256 = "1bgpl4mmlvq7xa3ar94wx4n1vlcj93s3q772ixp73zmy8izngnci"; + version = "1.0.29"; + sha256 = "19p3zpfpcj3z9d97jpkkr8n5wj1yhp9gry0rwp5csqdvz5h3n5i8"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122256,8 +122668,8 @@ self: { }: mkDerivation { pname = "gi-glib"; - version = "2.0.29"; - sha256 = "104xfcyi1jfjk24d4n9jk27b9gjysij1ghkpw6kz2kdpc3kdpzp0"; + version = "2.0.30"; + sha256 = "1l9lh3rkf4z6mw16g3ghrzsipbn4iv7jrqwcnv0mg12sa5y4slbp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -122275,8 +122687,8 @@ self: { }: mkDerivation { pname = "gi-gmodule"; - version = "2.0.5"; - sha256 = "1pij238dvbws1pkw44dnmwc7h1l2dlag7aa4xnvpignvghsx9m5z"; + version = "2.0.6"; + sha256 = "1q4a71fimdgrdfzpxf63fkjya2n624b2kyadrcpn17518hhagk7l"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base @@ -122294,8 +122706,8 @@ self: { }: mkDerivation { pname = "gi-gobject"; - version = "2.0.30"; - sha256 = "0ni09sxswrbd6li0q5s0qbj43b1q6w54xk3y816pi1sar44fnl2n"; + version = "2.0.31"; + sha256 = "1vhdbvcr33gi2cvf31q1zbgkd0gpgcrwnqi59ylrsw6xmblndhdh"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base @@ -122313,8 +122725,8 @@ self: { }: mkDerivation { pname = "gi-graphene"; - version = "1.0.7"; - sha256 = "1slpywv49m815qk78cz5lfpwym2dvi6qrmij4j61sb3xk034k33s"; + version = "1.0.8"; + sha256 = "189fsk72m3v7qbwyn75vradvi3y9vrbjlg95dbr65k2mm1if2n9k"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122333,8 +122745,8 @@ self: { }: mkDerivation { pname = "gi-gsk"; - version = "4.0.7"; - sha256 = "1mqfhgg1gp33aw3vyg9bpkl7b57apgrv6r3pdwjr2fysmjmi58cl"; + version = "4.0.8"; + sha256 = "0akmlbjapiqnn4lfh4z5b95w8ck2jlrp7abqahaxdcbj3d2kcpb4"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-graphene gi-pango haskell-gi @@ -122356,8 +122768,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.29"; - sha256 = "1cfyrvkgdhdpgmpxl5dg9s5slz3pqbg9gb9dp1alzjjf8n1fg39h"; + version = "1.0.30"; + sha256 = "07nkn14qsfjgv6ks2aac9zpvn6h81xk42bd2h8k6f0cv4hwjwb7k"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122375,8 +122787,8 @@ self: { }: mkDerivation { pname = "gi-gstapp"; - version = "1.0.28"; - sha256 = "1vm95fih31bn4d86rfqnp39xdiq0n4gwzc0j9dv71cdkz6fzswmb"; + version = "1.0.29"; + sha256 = "1yyvakxwd38201w2bb4in5c9y1dc03ss7a0q13wb0dzlfq0dpmal"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122398,8 +122810,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.27"; - sha256 = "0d094gzgb13dsfshwib648szq66ylw86sw0sir03q17pf4c3bjia"; + version = "1.0.28"; + sha256 = "0ximxmlm7zy8n4h7wfx0vvicvq9gfx5567dk36n3xbql2al3q426"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122419,8 +122831,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.28"; - sha256 = "0m55wv5696kqyvirm00ns0wkh2sxw06xrik54j0gg393nxn8s458"; + version = "1.0.29"; + sha256 = "00ppi41zs5acl7rxd48clzvyg3g22biwphyg4s5gw35jyr5fyplr"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst haskell-gi ]; @@ -122441,8 +122853,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.27"; - sha256 = "15vw2x296jmcmby4r9mx065ikqimy20ac0ilwbj7xdx75kmjxxic"; + version = "1.0.28"; + sha256 = "1ibcpyax0l408f4vn119b3jvkvgz6wzj6xcg0dyl60pjjh1bg2r3"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -122465,8 +122877,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.27"; - sha256 = "09mzk3q1ci4mr3bm88y9bkp7q4v3hf575d84hr579l40i1q2mkb4"; + version = "1.0.28"; + sha256 = "1rf97va4rrlkziivsmbrpgkl0049i123fizb4iz3s5863z2vpp9q"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122488,8 +122900,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.28"; - sha256 = "05pm8iyv0dxj031079w3aaws7yi560kz0iyry1pz2qsih9ps0igr"; + version = "1.0.29"; + sha256 = "07g38fn00i1z7fnzb276z892q2rig4wbw9m3x1q5dg5fc0yr2s5r"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122510,8 +122922,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.41"; - sha256 = "1xsf37wa9kxa54bwclb05vi1j6vjgx6w05aj2an5gr1wlg9aikq9"; + version = "3.0.43"; + sha256 = "14kgnyi6h8z3p3k9lis8ci0m189iacijvx88nyfsiilji53zw0yp"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -122526,7 +122938,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_8" = callPackage + "gi-gtk_4_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -122534,8 +122946,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.8"; - sha256 = "1gqyvd2d60xdbgia065dmg7sswfc20b6h97zxq7s6f7r6lphzg2r"; + version = "4.0.9"; + sha256 = "0pccbinm41shskr9l20m42mdvn2v11nylpwq2r4yz30lkpw401if"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -122623,8 +123035,8 @@ self: { }: mkDerivation { pname = "gi-gtk-layer-shell"; - version = "0.1.5"; - sha256 = "10bsb2njsfzgp7qail359hab7kza1qn2lnhdwnj7mbahacx024jq"; + version = "0.1.6"; + sha256 = "164k9r4k5fgkgahwvfyq6p1l566w31ijc1i1h95r549pkm21fi2c"; setupHaskellDepends = [ base Cabal gi-gdk gi-gtk haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdk gi-gtk haskell-gi haskell-gi-base @@ -122692,8 +123104,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.28"; - sha256 = "1047fgqj2avy34fd9y5m4ipv0vmpizw4lwnwdbrnhvs2fc89g0lh"; + version = "3.0.29"; + sha256 = "08pr49l0jp8wr282qik0sdqbpq9pcwkww2az5rqhrqawy0bjy6dq"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122710,7 +123122,7 @@ self: { broken = true; }) {inherit (pkgs) gtksourceview3;}; - "gi-gtksource_5_0_0" = callPackage + "gi-gtksource_5_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview, haskell-gi, haskell-gi-base @@ -122718,8 +123130,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "5.0.0"; - sha256 = "0yfwms2qzb994q8c48nnm0gfxz315jk0yvd45ss3p1j5idq4b5pp"; + version = "5.0.1"; + sha256 = "0s5xc3d7i2a4ysa2m5kd9qsr2g78yiqj4rfjy06n0kqsmymprvj2"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122744,8 +123156,8 @@ self: { }: mkDerivation { pname = "gi-handy"; - version = "1.0.4"; - sha256 = "0hahypvzd1h6fvlb2dh5p9wjgsmwi3j6zsn5l699d0w00yf8s5i5"; + version = "1.0.5"; + sha256 = "1a3x7w3142bj12qvfi51697ralnaqdxrlxbkjjcmhfvvdv5c4brz"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122767,8 +123179,8 @@ self: { }: mkDerivation { pname = "gi-harfbuzz"; - version = "0.0.9"; - sha256 = "17ijv0bsq1gmzjkalh2zj59hnpaaj1bdisd6b3mvzc0dzn4y2wy7"; + version = "0.0.10"; + sha256 = "1b7mmva40a3j1qm2155sy106wwrklj2p5fjwdzlkma8bnr6r2mqx"; setupHaskellDepends = [ base Cabal gi-freetype2 gi-glib gi-gobject haskell-gi ]; @@ -122788,8 +123200,8 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.7"; - sha256 = "08rd0kkkxaixi9z0ll5k94yinfflmzlwba8f9cizn0y4gqjpcqks"; + version = "1.5.8"; + sha256 = "1fp5ngdp4b4fl98qrpi9wqyndaqxca6pxqg5by6zqvz8rf43jcqd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122812,8 +123224,8 @@ self: { }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.27"; - sha256 = "14kimawwlp7ip5d34aamwsa965lvw979dqgzd6wxl9cfskacj7lq"; + version = "4.0.28"; + sha256 = "0l27v38z9v41lhw2afirf6v4di1vi7agbba198qxvwnala35zhfp"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122825,15 +123237,15 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) webkitgtk;}; - "gi-javascriptcore_6_0_3" = callPackage + "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , javascriptcoregtk, text, transformers }: mkDerivation { pname = "gi-javascriptcore"; - version = "6.0.3"; - sha256 = "09pycpf8h7zzwl0ml7zkgv15v0ia37c067f21zwzbmmqir8fnhwx"; + version = "6.0.4"; + sha256 = "095my50hg37g92f77336z56zc4axgf70fwqvabs0rysp39f1qnk0"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122853,8 +123265,8 @@ self: { }: mkDerivation { pname = "gi-json"; - version = "1.0.5"; - sha256 = "0iqv6w7af40hlr4bf8qqm2wd5ppd94978ak0mqxx5h132sn8w5kg"; + version = "1.0.6"; + sha256 = "1n212yyv1yz0l90w9as6pq6xjqxnjdg08ns8l274m3ddrpcdjhny"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122867,6 +123279,29 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) json-glib;}; + "gi-keybinder" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, keybinder, text, transformers + }: + mkDerivation { + pname = "gi-keybinder"; + version = "0.3.3"; + sha256 = "0cl0j6w75kqs50vrbf62v3vqrzylf4w2w5b6n381ic25xjv13f5p"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ keybinder ]; + description = "Libkeybinder bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) keybinder;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -122874,8 +123309,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.27"; - sha256 = "02x4qqs0cbw04v1bbidq0pv8pn7qclg0ybi8c0rcvvsyrld8rml4"; + version = "0.7.28"; + sha256 = "1sph16xhvyyfp81b2njz99crzwqas8njn6h0ma7hbi068jmnj7nq"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi ]; @@ -122895,8 +123330,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.18"; - sha256 = "0zkj48sarz1nddq18pc9k1v45cq3sgvr93yh677szrbp797qchis"; + version = "1.0.19"; + sha256 = "0gy3m1s0q70ny1xiqa4jqv4svxhg454bhx04z29vrpc2921b2kkd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122917,8 +123352,8 @@ self: { }: mkDerivation { pname = "gi-pango"; - version = "1.0.29"; - sha256 = "1v54gj8rm2kx0jgif4f8m7v99xzz7y4bw8dfkyc7fq98f8p02j9q"; + version = "1.0.30"; + sha256 = "1kp3jnnjik1caiax3j548aypn77qzi1l8r9b2zki95s2yg5rpv9p"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject gi-harfbuzz haskell-gi ]; @@ -122943,8 +123378,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.30"; - sha256 = "1sr42xj76485hjf4xzsf6kf01bbydg4b4ba4pzmn6x2wl4q739lx"; + version = "1.0.31"; + sha256 = "1kns0ywh540rwvmvw1wq3afmzlfygi59pn1zq2km693qv992vz1x"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject gi-pango haskell-gi ]; @@ -122969,8 +123404,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.29"; - sha256 = "0lznz54jkln93p43vv7n67kq2ldjky7g8ig8na4nq9nj3q8fwmj1"; + version = "0.18.30"; + sha256 = "1amw3kzyicw6c6z9gy6via54kigrgx09ivvzf0niccbvjgp7db9q"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122991,8 +123426,8 @@ self: { }: mkDerivation { pname = "gi-rsvg"; - version = "2.0.5"; - sha256 = "1w4mliz1fna8cb1qf8ivbjmbrcqlnd4wq8ncsjkhiz8ncpxxwaqj"; + version = "2.0.6"; + sha256 = "0v0184nd1q0hy8r0gvkfngrp2h512g9qglzw2van9lds6xzpwzy6"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject haskell-gi @@ -123014,8 +123449,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.17"; - sha256 = "1s5nv3q6b91fipzxmri4gc8pss9dwwm7svv26km7b99w4bd3k4qf"; + version = "0.0.18"; + sha256 = "0z4knqmhcicqnmamzibl1xwarjl7y1da0127jg7s1n7a780dgnd5"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -123028,7 +123463,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsecret;}; - "gi-soup" = callPackage + "gi-soup_2_4_28" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsoup, text, transformers @@ -123047,17 +123482,39 @@ self: { libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsoup;}; - "gi-soup_3_0_2" = callPackage + "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsoup, text, transformers }: mkDerivation { pname = "gi-soup"; - version = "3.0.2"; - sha256 = "07mwdvbw634fp3x1b7xc6ndh96w4ydx14habpy9gysk0a728sskz"; + version = "2.4.29"; + sha256 = "0l57g6pyy56yddc42w9iijjgavx1n2w42cdkk2p920y5yjjadnaj"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libsoup ]; + description = "Libsoup bindings"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) libsoup;}; + + "gi-soup_3_0_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, libsoup, text, transformers + }: + mkDerivation { + pname = "gi-soup"; + version = "3.0.3"; + sha256 = "154iw6689b9vhh9y82r3vc86lnvvzy1rvzadzsrp23c043gibg17"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -123078,8 +123535,8 @@ self: { }: mkDerivation { pname = "gi-vips"; - version = "8.0.4"; - sha256 = "0wsa81n9mpcx2yr536jaw9wnnhk3fy22z1fb3dy3d5fsl7164bdq"; + version = "8.0.5"; + sha256 = "07747sr630461d2k44yf2ns7jr6f02c5y7gjg69wcmw7g03gjhfw"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -123098,8 +123555,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.32"; - sha256 = "0sfcd2lbbn5zz8vjxklxhf1yz7r5vacjvg5qid99xfzialp9s82x"; + version = "2.91.33"; + sha256 = "0w24xl9i0mfw9jvihi8kbmz65s5g81f33l9sa2hk8cvm0w7s3x8p"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -123123,8 +123580,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "6.0.2"; - sha256 = "00js1737ck6qyz1lkizif84qyqwq7638wdgznrdn6g4yw2a4hd4k"; + version = "6.0.3"; + sha256 = "00nzd9qzbiwrv2511z0cv4wka3haxfxry89i068qh9g08ly7jzca"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123148,8 +123605,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.30"; - sha256 = "0a73wbmk3siig15cq20bnjm90vw5363ldns9kmmlprjmnar3vx3w"; + version = "4.0.31"; + sha256 = "1zfnhw3qly3jv3xlmrqnqxdxpr376hh8g66px1wfp9dpf4rb5kfm"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123173,8 +123630,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.30"; - sha256 = "027jmj0igs5dh7mdap033jxnzpwk6rsp9rhx6y52kjxgcnf97r5x"; + version = "4.0.31"; + sha256 = "0bs0fdphpncsmqpqm369ldqw3k2bhnyizblbjjb73rkcpphvimjh"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123200,8 +123657,8 @@ self: { }: mkDerivation { pname = "gi-webkitwebprocessextension"; - version = "6.0.2"; - sha256 = "0xvryk8kln1c0ka6jncfixm2ycbpnlayx6c8s5pbbcwrnhsj1afz"; + version = "6.0.3"; + sha256 = "0zmpv5vq8nnvcrb46jqq5xnrcw7rqwkh09rgzf7dhfnn6qngify4"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123226,8 +123683,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.14"; - sha256 = "13jwqssb3rmaliph73gc9c69wp2sm3k5flxbaj7ld61zzgzm4p0b"; + version = "3.0.15"; + sha256 = "0p0rb9xr6jz68pnir0qj6ci5sbkq1lysgv5zr3jzvjisw56fvqay"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi @@ -123250,8 +123707,8 @@ self: { }: mkDerivation { pname = "gi-xlib"; - version = "2.0.13"; - sha256 = "116zsfhcffhixxfb61irn1qq81nxw4ifwmamib3h7s31z2m7mgql"; + version = "2.0.14"; + sha256 = "0xzxvf88qgglmjakqsn01gi9z84mg6qw4dx16wi931zjibfmmhlg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -123457,10 +123914,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.10.0"; - sha256 = "0lwayry5f3jfz7ryabhdf6vb20qwmx48mzfnlmv70zd3fxz4jcd8"; - revision = "1"; - editedCabalFile = "1k73ppzjv7xvwi4s2q0i6ny8q8pwdz2hcbrd058m8xdb0c8kx7jr"; + version = "0.13.11.0"; + sha256 = "0lkf0vlmk8mmc4nxk885d4q7ddg2n9cgjcq3gb15k2nhcydv8din"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -123615,8 +124070,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240430"; - sha256 = "1p32fccxgk6nkp187cazc8cs0fmb92l7v0bdqipihj9wpw8xr4s0"; + version = "10.20240701"; + sha256 = "0870ryz0ss4ba6pxdq9k1x0wa9kyilak2ykzq6v87g7f8g2480ch"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -124150,8 +124605,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "4"; - editedCabalFile = "0lk7dhwgcgjxrryvag1qwnpb6ds5cmrcwj755n5f60nz4hm0hvqs"; + revision = "5"; + editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -124248,30 +124703,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "2.0.0.10"; - sha256 = "1zsp4zab202jh11aaxpg6a59dh4paaqagi446qnwd2f503430zsc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - description = "Upload files to GitHub releases"; - license = lib.licenses.mit; - mainProgram = "github-release"; - }) {}; - - "github-release_2_0_0_11" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; version = "2.0.0.11"; sha256 = "04zgg55zp5ggrisc5nkz4fjmx50cdgjayffcrf7y8gsi6wk96f81"; isLibrary = true; @@ -124283,7 +124714,6 @@ self: { executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "github-release"; }) {}; @@ -124311,6 +124741,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "github-rest_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, crypton + , http-client, http-client-tls, http-types, jose-jwt, mtl + , scientific, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , text, time, transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "github-rest"; + version = "1.2.1"; + sha256 = "1d7jiidqaz1z07gdn6gka8cmp8jdn0v21ppbivxc8718vj5pq5xf"; + libraryHaskellDepends = [ + aeson base bytestring crypton http-client http-client-tls + http-types jose-jwt mtl scientific text time transformers unliftio + unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring crypton http-types mtl tasty + tasty-golden tasty-hunit tasty-quickcheck text + ]; + description = "Query the GitHub REST API programmatically"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, cryptohash, Diff, directory @@ -124542,18 +124996,19 @@ self: { "gitlab-haskell" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring - , crypton-connection, http-client, http-conduit, http-types, mtl - , tasty, tasty-hunit, temporary, text, time, transformers - , tree-diff, unix, unordered-containers, vector + , crypton-connection, data-default-class, http-client, http-conduit + , http-types, mtl, tasty, tasty-hunit, temporary, text, time + , transformers, tree-diff, unix, unordered-containers, vector }: mkDerivation { pname = "gitlab-haskell"; - version = "1.0.0.5"; - sha256 = "0ghvf4pv1qzjyrqp94a11vgjflfhkbpyw3rnv0i8fiirilr5bxpw"; + version = "1.0.1.0"; + sha256 = "0xl9xbxfwvpzcvk9hr0549ki404r1ninrrg15nvpyj8blksgdmp8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring crypton-connection http-client http-conduit - http-types mtl temporary text time transformers unix + aeson base bytestring crypton-connection data-default-class + http-client http-conduit http-types mtl temporary text time + transformers unix ]; testHaskellDepends = [ aeson ansi-wl-pprint base bytestring tasty tasty-hunit text @@ -125167,10 +125622,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.10.0"; - sha256 = "149y33ddv8vkvak0042ismiwh6lgc706n3n3bvnmrgw67fmi57m1"; - revision = "2"; - editedCabalFile = "19zg675zvyi87415yyfyl1s7i65rz8hx8hw4scxwalcq50axj99s"; + version = "0.13.11.0"; + sha256 = "0krcpfz3ka03x1fm8rl5dfkwcdgymhbdmc1msays3glgi6j5c3mv"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -125401,6 +125854,24 @@ self: { broken = true; }) {}; + "globus" = callPackage + ({ mkDerivation, aeson, base, bytestring, effectful, http-api-data + , http-types, req, tagged, text + }: + mkDerivation { + pname = "globus"; + version = "0.1.2"; + sha256 = "19fyflk5q0a888y8b0lflc9pkmxjxv66x03na503w8k4wp8mc594"; + libraryHaskellDepends = [ + aeson base bytestring effectful http-api-data http-types req tagged + text + ]; + description = "GLOBUS Data Transfer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "glome-hs" = callPackage ({ mkDerivation, array, base, GlomeTrace, GlomeVec, GLUT, haskell98 , OpenGL, parallel, random, time @@ -125774,8 +126245,8 @@ self: { }: mkDerivation { pname = "glualint"; - version = "1.28.0"; - sha256 = "11wcp8h1fmbhccj2hyhk56lj63hskb92xmgyxl0ixv303lj7p1ni"; + version = "1.29.0"; + sha256 = "0y5zjd2d17lf9h9fgnbwc5l80hhhqh5ginxhrcyq4x3w57vg0f0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126016,21 +126487,22 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring - , text, time + ({ mkDerivation, base, bytestring, c2hs, gnome-keyring + , libgnome-keyring, text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ libgnome-keyring ]; + librarySystemDepends = [ gnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) gnome-keyring; + inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs @@ -128685,8 +129157,8 @@ self: { pname = "goldplate"; version = "0.2.1.1"; sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "5"; - editedCabalFile = "1nd5li3w3brca187j40mcx1dgd02fs5snj7pf21ib23qcznfnh1n"; + revision = "6"; + editedCabalFile = "1572x5xh8qja14qfv4whlj7zl7gwp5cyhmzdnbi44fnv4hr27l9d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130959,6 +131431,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "grfn" = callPackage + ({ mkDerivation, arithmoi, async, base, hspec, hspec-core + , monad-loops, parallel, parallel-io, primes, protolude, QuickCheck + , random, tasty, tasty-bench, text, time, unamb + }: + mkDerivation { + pname = "grfn"; + version = "1.0.0.1"; + sha256 = "1g9f2i50ap1bdcih2r1n6y32pqiv0i8cyw3zzmzvv61q97xrfwjb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + arithmoi async base monad-loops parallel parallel-io protolude + random text unamb + ]; + executableHaskellDepends = [ base time ]; + testHaskellDepends = [ + base hspec hspec-core primes QuickCheck text + ]; + benchmarkHaskellDepends = [ base tasty tasty-bench ]; + description = "Uniformly-random pre-factored numbers (Kalai)"; + license = lib.licenses.bsd3; + mainProgram = "grfn-exe"; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -131102,31 +131599,29 @@ self: { }) {}; "grisette" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, doctest - , generic-deriving, Glob, hashable, hashtables, HUnit, intern - , loch-th, mtl, parallel, prettyprinter, QuickCheck, sbv, stm - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, th-compat, transformers - , unordered-containers + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, doctest, generic-deriving, Glob, hashable, hashtables + , HUnit, intern, loch-th, mtl, parallel, prettyprinter, QuickCheck + , sbv, stm, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-abstraction, th-compat + , transformers, unordered-containers }: mkDerivation { pname = "grisette"; - version = "0.5.0.1"; - sha256 = "0wrvasr5kbz27ddwlmpxwzda4ya5phyn21hwi2ci7xgcfb0q3szh"; - revision = "2"; - editedCabalFile = "0sihj9hivxc3w3fr8yc8bp6wnphjspvm1fwgzx3iimsw26vb21cd"; + version = "0.7.0.0"; + sha256 = "143a0ghpa3y0dhy7b81f95jiixfhr0pw0fmgvijs6pfsaijw91p0"; libraryHaskellDepends = [ - array async base bytestring deepseq generic-deriving hashable - hashtables intern loch-th mtl parallel prettyprinter QuickCheck sbv - stm template-haskell text th-compat transformers - unordered-containers + array async base bytestring containers deepseq generic-deriving + hashable hashtables intern loch-th mtl parallel prettyprinter + QuickCheck sbv stm template-haskell text th-abstraction th-compat + transformers unordered-containers ]; testHaskellDepends = [ - array async base bytestring deepseq doctest generic-deriving Glob - hashable hashtables HUnit intern loch-th mtl parallel prettyprinter - QuickCheck sbv stm template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 text th-compat - transformers unordered-containers + array async base bytestring containers deepseq doctest + generic-deriving Glob hashable hashtables HUnit intern loch-th mtl + parallel prettyprinter QuickCheck sbv stm template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + th-abstraction th-compat transformers unordered-containers ]; description = "Symbolic evaluation as a library"; license = lib.licenses.bsd3; @@ -131687,6 +132182,7 @@ self: { description = "Haskell implementation of gRPC layered on shared C library"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {gpr = null; inherit (pkgs) grpc;}; "gruff" = callPackage @@ -131947,8 +132443,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.15.8"; - sha256 = "0yk1qqpf4j9j01fcrp7dnixi37l87rjdmmjk6nxsnb1i9zlhd3gn"; + version = "0.15.9"; + sha256 = "02kanwmakzniwb4ilywfkp7scdavx0kfc78g5vmap6s3k8sf42l5"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -132138,10 +132634,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.10.0"; - sha256 = "0ww53n596h39smwf1k0wfk5k0s56n8mkapa8b0q9v9d9bpllgfyw"; - revision = "1"; - editedCabalFile = "16ckrhii6pbd64mgrm4s4x7vzd800w8g6x18rvij2cfm784yz6by"; + version = "0.13.11.0"; + sha256 = "056wif0yx07i4c3kvpa6kxas6fqqymchkp9gi8f2fj8s9aaga0vd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -132295,8 +132789,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.8"; - sha256 = "01zl2w239djimhpzvrjv2kc142mnvc1qd9p2q2b9v8z6ddddi7fm"; + version = "0.15.9"; + sha256 = "0qnz9klvgkdssw43w8qi9n02i5rj1cd4varw3zrkhcqg9i9zsf43"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -132691,16 +133185,18 @@ self: { "h-raylib" = callPackage ({ mkDerivation, base, bytestring, c, containers, exceptions, lens , libGL, libX11, libXcursor, libXext, libXi, libXinerama, libXrandr - , template-haskell, text + , linear, template-haskell, text }: mkDerivation { pname = "h-raylib"; - version = "5.1.3.0"; - sha256 = "11m93r38i9ncb036rpm56qd03hcyfvgx6a1h0lynlbg8mfd4hg19"; + version = "5.5.0.0"; + sha256 = "063sjmk48nrp27qajipcc2br0nfxa6206gybdpxngbs66vz4kgc1"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers exceptions lens template-haskell text + base bytestring containers exceptions lens linear template-haskell + text ]; librarySystemDepends = [ c libGL libX11 libXcursor libXext libXi libXinerama libXrandr @@ -132782,6 +133278,25 @@ self: { broken = true; }) {}; + "h3-hs" = callPackage + ({ mkDerivation, base, h3, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "h3-hs"; + version = "0.2.0.1"; + sha256 = "1rnqvnmf4mznwpi06i58f2wjn6gbjl9vxr8g6al7jfw61qy4rnlh"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ h3 ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "A Haskell binding for H3"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) h3;}; + "h3spec" = callPackage ({ mkDerivation, base, bytestring, hspec, hspec-core, http-types , http3, network, quic, tls, unliftio @@ -132817,7 +133332,6 @@ self: { ]; description = "Control your Arduino board from Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hBDD" = callPackage @@ -133818,29 +134332,28 @@ self: { }) {}; "hackage-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, directory, filepath, http-io-streams, io-streams - , microlens, microlens-mtl, microlens-th, mtl, netrc + ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal + , containers, deepseq, directory, filepath, http-io-streams + , io-streams, microlens, microlens-mtl, microlens-th, mtl, netrc , optparse-applicative, pretty, process-extras, semigroups , stringsearch, tagsoup, tar, tasty, tasty-golden, text, time , unordered-containers, zlib }: mkDerivation { pname = "hackage-cli"; - version = "0.1.0.1"; - sha256 = "023gnhdxwn36k3pd74j5jcykqbrj7nvp131mg761h8913h9ldw1r"; - revision = "6"; - editedCabalFile = "1i65z5xqs0h9bmr8lja038s281fah0653yyg72fzlka5ingn7baz"; + version = "0.1.0.2"; + sha256 = "1q7k8fy6mqb7h4q4bm8qp0ma2nhspszkwy8d606hb66sdiw7k73k"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal containers mtl pretty ]; executableHaskellDepends = [ - aeson base bytestring Cabal containers deepseq directory filepath - http-io-streams io-streams microlens microlens-mtl microlens-th mtl - netrc optparse-applicative process-extras semigroups stringsearch - tagsoup tar text time unordered-containers zlib + aeson base base-compat bytestring Cabal containers deepseq + directory filepath http-io-streams io-streams microlens + microlens-mtl microlens-th mtl netrc optparse-applicative + process-extras semigroups stringsearch tagsoup tar text time + unordered-containers zlib ]; testHaskellDepends = [ base bytestring Cabal filepath tasty tasty-golden @@ -134051,8 +134564,8 @@ self: { pname = "hackage-security"; version = "0.6.2.6"; sha256 = "0sfvd5y9v01bjsxsrf446ldcqf56arzr94jk2zsvj49yddbn2hif"; - revision = "1"; - editedCabalFile = "05jbc1wv5njv4jdqfiq12y1cni7fa1qis1g5z03dg6jg64j0bxwg"; + revision = "3"; + editedCabalFile = "04prkqrqfdynf7l5p9zdy802gp78cizc1ljskqn8qq3yzcj3x13n"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -134508,8 +135021,8 @@ self: { pname = "haddock-library"; version = "1.11.0"; sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; - revision = "3"; - editedCabalFile = "09qdpidav1pbvnch04j00dwn5jw4zigz5v37rwfhp9aabwl51bqp"; + revision = "5"; + editedCabalFile = "1gi861bwyizq164pl2ikqr3zmklifndizlr5hn1ly0zq58ram3yi"; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base base-compat containers deepseq directory filepath hspec @@ -135103,10 +135616,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.2.0"; - sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; - revision = "6"; - editedCabalFile = "1pdasij9bz7pzfb9f3lvvixzch7ac3xhqqx5cd3wjl40annawsaw"; + version = "4.16.2.2"; + sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135319,10 +135830,10 @@ self: { }: mkDerivation { pname = "hakyll-convert"; - version = "0.3.0.4"; - sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "8"; - editedCabalFile = "1fwjxmdfq4wlwi77pmvvfydi0si8cbv4ygdrkbanl4d90scr2rn0"; + version = "0.3.0.5"; + sha256 = "0xnv0dxfajk4jl0d1a33cjpca21wnrvvm1194jxar58gqp9i0hr5"; + revision = "1"; + editedCabalFile = "168838k3w1aixhd7rq21yrdvrrsp6va4zxmmqkn0j3fhn3fm6a4r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136016,6 +136527,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "hamlog"; + broken = true; }) {}; "hamid" = callPackage @@ -137085,8 +137597,8 @@ self: { pname = "happstack-server"; version = "7.8.0.2"; sha256 = "15cp6w5xh5rv2fg9rv1fd0y938280gbcpziv7kmq78zywar56mis"; - revision = "1"; - editedCabalFile = "088n68k51jya68drknmywm60f22igrpidh2dmyj74mfp554jfhg2"; + revision = "2"; + editedCabalFile = "0fqwwy06v85ph0bw2fz4hzi6mbdz5hp4l36jh85mg54y3l6rv491"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -137114,6 +137626,8 @@ self: { pname = "happstack-server"; version = "7.9.0"; sha256 = "1chia8km9pd6ys1vgy6ybsqj48zmvhb2iqs60lmizdyhc5yxk0c6"; + revision = "1"; + editedCabalFile = "13fmnkl9rrvdskrzhjbdfm9478mwz2pdmhyds33b32v8jaml08qc"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -137813,6 +138327,17 @@ self: { mainProgram = "hascal"; }) {}; + "hascalam" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hascalam"; + version = "0.1.1.2"; + sha256 = "1vgbmlcd33vky1mf9sx6dkbh8yjp7nyr4528y6qz7xn7z1lxfyyx"; + libraryHaskellDepends = [ base ]; + description = "Haskell to and from Scalameta"; + license = lib.licenses.mit; + }) {}; + "hascar" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, binary, bytestring , conduit, containers, cryptohash, directory, exceptions, filepath @@ -138109,6 +138634,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.5.0.0"; + sha256 = "0snvrnh9q4arjwk6hdvb4zwb22sh7rlgvr9px7bnqpys3273m2z5"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath ghc-bignum ghc-prim + os-string text + ]; + testHaskellDepends = [ + base bytestring filepath ghc-prim HUnit os-string primitive + QuickCheck random tasty tasty-hunit tasty-quickcheck text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -138263,8 +138810,8 @@ self: { }: mkDerivation { pname = "hashes"; - version = "0.2.3"; - sha256 = "12j5wf6q6fzpc5wnln0b9jf5banamdj2hlsrkiid7i0b85z9vcvg"; + version = "0.3.0"; + sha256 = "007hn43jnz0pgv49if9g4z3r13q8kkla9w15ggbdrc2hksdbzf3v"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -138689,8 +139236,8 @@ self: { pname = "haskeline"; version = "0.8.2.1"; sha256 = "1zs0rlhd7lzp5g4kp7v5ca7cdwan7w4bx3jh5q2ri950svr2k1x0"; - revision = "1"; - editedCabalFile = "1vmsi909jaykpaqfssnv92lzr1n2gy34s07lsh29p75187ps6gny"; + revision = "2"; + editedCabalFile = "1fl9820nycn4wpcjsc5ylj62isd0ila8gvf5k6m92lqvb5sny2a0"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -139156,8 +139703,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.39.0"; - sha256 = "0pk578m0v8i1504g3kr8mk5pq5nrkdvj46n8k0fyivdvxc3zypx0"; + version = "0.0.40.0"; + sha256 = "1ahxvivvkv08xrgzq35rnkgs1il645m6vyblv0ja4hi0xj9c3g1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139304,6 +139851,26 @@ self: { license = lib.licenses.publicDomain; }) {}; + "haskell-ffprobe" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-expectations + , process, scientific, text + }: + mkDerivation { + pname = "haskell-ffprobe"; + version = "0.1.0.0"; + sha256 = "12cah6yyzbkd8k44h4dlhbw0jza557mcnw994hig2p8xd89vk4bz"; + libraryHaskellDepends = [ + aeson base bytestring process scientific text + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations + ]; + description = "Haskell bindings for ffprobe"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "haskell-formatter" = callPackage ({ mkDerivation, base, containers, directory, directory-tree , doctest, filemanip, filepath, haskell-src-exts, hlint @@ -139410,8 +139977,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.8"; - sha256 = "15ibhysm9q94jrbxgby4kpmm1wh1yx2f1y0wcqfz958jqza77733"; + version = "0.26.10"; + sha256 = "1njgrs1rqngw128z8dvc69l3v9bpr4apa153anmg1cjv8ji91rqm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -139428,8 +139995,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.26.4"; - sha256 = "1c5i9nwf0ldgjyqm8qir5fs66d5pkyl9ajq77rcxy5bc7r7kbyws"; + version = "0.26.6"; + sha256 = "101ksx4nfacl2k3pf75iycvyk5yrjsp5jmqj0368sk7v5ppdw669"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -139578,19 +140145,19 @@ self: { "haskell-language-server" = callPackage ({ mkDerivation, aeson, aeson-pretty, apply-refact, array, async - , base, bytestring, Cabal-syntax, containers, data-default, deepseq - , Diff, directory, dlist, enummapset, extra, filepath, floskell - , foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th + , base, binary, bytestring, Cabal-syntax, containers, data-default + , deepseq, Diff, directory, dlist, enummapset, extra, filepath + , floskell, foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th , ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex, ghcide - , ghcide-bench, githash, hashable, hie-bios, hie-compat, hiedb - , hlint, hls-graph, hls-plugin-api, hls-test-utils, hp2pretty - , implicit-hie, lens, lens-aeson, list-t, lsp, lsp-test, lsp-types - , megaparsec, mod, monoid-subclasses, mtl, network-uri - , optparse-applicative, optparse-simple, ormolu, parser-combinators - , prettyprinter, process, process-extras, QuickCheck, random - , refact, regex-applicative, regex-tdfa, retrie, row-types - , safe-exceptions, semigroupoids, shake, shake-bench, sqlite-simple - , stan, stm, stm-containers, stylish-haskell, syb, tasty + , githash, hashable, hie-bios, hie-compat, hiedb, hlint, hls-graph + , hls-plugin-api, hls-test-utils, hp2pretty, implicit-hie, lens + , lens-aeson, list-t, lsp, lsp-test, lsp-types, megaparsec, mod + , monoid-subclasses, mtl, network-uri, optparse-applicative + , optparse-simple, ormolu, parser-combinators, prettyprinter + , process, process-extras, QuickCheck, random, refact + , regex-applicative, regex-tdfa, retrie, row-types, safe-exceptions + , semigroupoids, shake, shake-bench, sqlite-simple, stan, stm + , stm-containers, stylish-haskell, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, temporary, text, text-rope, time , transformers, trial, unix, unliftio, unliftio-core @@ -139598,46 +140165,47 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.8.0.0"; - sha256 = "0nzqwm913s0d1m5irq4b65d2bl83qr916x44c9x35m7x04d78hrm"; + version = "2.9.0.0"; + sha256 = "171wn5nv42h00f2l6mcmdhf4vybmifkdk2ycz0v02vksd99h42fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty apply-refact array base bytestring Cabal-syntax - containers data-default deepseq Diff directory dlist extra filepath - floskell foldl fourmolu fuzzy ghc ghc-boot ghc-boot-th - ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide githash - hashable hie-bios hie-compat hiedb hlint hls-graph hls-plugin-api - lens lsp lsp-types megaparsec mod mtl optparse-applicative - optparse-simple ormolu parser-combinators prettyprinter process - process-extras refact regex-applicative regex-tdfa retrie row-types - safe-exceptions semigroupoids sqlite-simple stan stm stm-containers + aeson aeson-pretty apply-refact array async base binary bytestring + Cabal-syntax containers data-default deepseq Diff directory dlist + extra filepath floskell foldl fourmolu fuzzy ghc ghc-boot + ghc-boot-th ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide + githash hashable hie-bios hie-compat hiedb hlint hls-graph + hls-plugin-api hls-test-utils lens lsp lsp-test lsp-types + megaparsec mod mtl optparse-applicative optparse-simple ormolu + parser-combinators prettyprinter process process-extras refact + regex-applicative regex-tdfa retrie row-types safe-exceptions + semigroupoids shake sqlite-simple stan stm stm-containers stylish-haskell syb template-haskell temporary text text-rope time transformers trial unliftio unliftio-core unordered-containers - vector + vector yaml ]; executableHaskellDepends = [ - base containers data-default directory extra filepath ghcide - hie-bios hls-plugin-api lsp lsp-types prettyprinter text - transformers unix unliftio-core + aeson base bytestring containers data-default directory extra + filepath ghcide hie-bios hls-graph hls-plugin-api hls-test-utils + lens lsp lsp-test lsp-types optparse-applicative prettyprinter + process safe-exceptions shake tasty-hunit text transformers unix + unliftio-core ]; testHaskellDepends = [ - aeson async base bytestring Cabal-syntax containers data-default - deepseq directory enummapset extra filepath fuzzy ghcide hashable + aeson base bytestring Cabal-syntax containers data-default deepseq + directory enummapset extra filepath fuzzy ghcide hashable hls-plugin-api hls-test-utils lens list-t lsp lsp-test lsp-types monoid-subclasses mtl network-uri ormolu parser-combinators process - QuickCheck random regex-tdfa row-types shake sqlite-simple stm - stm-containers tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text text-rope transformers - unordered-containers vector + QuickCheck random regex-tdfa shake sqlite-simple stm stm-containers + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-rerun text text-rope transformers unordered-containers vector ]; testToolDepends = [ fourmolu ghcide implicit-hie ormolu ]; benchmarkHaskellDepends = [ aeson base containers data-default directory extra filepath - ghcide-bench hls-plugin-api lens lens-aeson shake shake-bench text - yaml + hls-plugin-api lens lens-aeson shake shake-bench text yaml ]; - benchmarkToolDepends = [ ghcide-bench hp2pretty ]; + benchmarkToolDepends = [ hp2pretty ]; doHaddock = false; description = "LSP server for GHC"; license = lib.licenses.asl20; @@ -140342,25 +140910,6 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.13"; - sha256 = "09f0lad023zylkxidsz0nv532h44mh0b1505rvs3ypaq2v4q20pa"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit - template-haskell - ]; - description = "Parse source to template-haskell abstract syntax"; - license = lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_14" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty - , syb, tasty, tasty-hunit, template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; version = "0.8.14"; sha256 = "0dkillxs6rzznw01v72j92r013ff6q2wrm5wfr98d24nh1fcp404"; libraryHaskellDepends = [ @@ -140372,7 +140921,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -140903,8 +141451,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3.3"; - sha256 = "06hh9lpib410spa65c2qva714v8ci07jdckhn9p38r9002ps8fp3"; + version = "1.4.1.0"; + sha256 = "1f1fgj3xs9kgn1x44izcq0pnw4v9v5nr88d3zq9z1gbik8sqm62j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141873,7 +142421,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "haskoin-node_1_1_0" = callPackage + "haskoin-node_1_1_3" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -141883,8 +142431,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "1.1.0"; - sha256 = "14sar39d3kjwv41mfwcywk9yv9vw4qx0x41dxfad9r565lhw59y2"; + version = "1.1.3"; + sha256 = "1bsbnfyk7abcgm9czcn0r2fiimiy7r6h9mxqbv464dpchgnnp9iy"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -141966,8 +142514,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.5"; - sha256 = "0p6cbvw2d6xskzm7wcgp6b2dzirnd38r64mvdp0njy2s1prlf92n"; + version = "1.5.11"; + sha256 = "0dfy2glrk6lc14m31nv5x80fkgzn3hlzyw0kw1yhpyidk5fg10vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142869,6 +143417,26 @@ self: { broken = true; }) {}; + "hasmtlib" = callPackage + ({ mkDerivation, attoparsec, base, bitvec, bytestring, containers + , data-default, dependent-map, finite-typelits, lens, mtl + , smtlib-backends, smtlib-backends-process, some, text, utf8-string + , vector-sized + }: + mkDerivation { + pname = "hasmtlib"; + version = "1.3.1"; + sha256 = "040m5n0pjjv3lsxniq8hw028jilfknjz819gj1gydzbjd3746r83"; + libraryHaskellDepends = [ + attoparsec base bitvec bytestring containers data-default + dependent-map finite-typelits lens mtl smtlib-backends + smtlib-backends-process some text utf8-string vector-sized + ]; + description = "A monad for interfacing with external SMT solvers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "haspara" = callPackage ({ mkDerivation, aeson, base, containers, data-default, doctest , exceptions, hashable, hspec, megaparsec, mtl, refined @@ -142945,22 +143513,22 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_7_0_2" = callPackage + "hasql_1_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, hspec, hspec-discover - , mtl, network-ip, postgresql-binary, postgresql-libpq, profunctors + , iproute, mtl, postgresql-binary, postgresql-libpq, profunctors , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit , tasty-quickcheck, text, text-builder, time, transformers, uuid , vector }: mkDerivation { pname = "hasql"; - version = "1.7.0.2"; - sha256 = "1cqvwkbclcwa122jj321sg5l3rs0aiyfmh99q7rd09ycfq1khk13"; + version = "1.8"; + sha256 = "0jaapi6p45iy1z62pi81h1w52icvk1lbd7nsx16wnl6h9bx10mr4"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder - contravariant dlist hashable hashtables mtl network-ip + contravariant dlist hashable hashtables iproute mtl postgresql-binary postgresql-libpq profunctors scientific text text-builder time transformers uuid vector ]; @@ -143076,14 +143644,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-dynamic-statements_0_3_1_6" = callPackage + "hasql-dynamic-statements_0_3_1_7" = callPackage ({ mkDerivation, base, bytestring, containers, hasql , hasql-implicits, ptr, rerebase, tasty, tasty-hunit }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.3.1.6"; - sha256 = "0w38g53kycz6bpd4cgj9aaciwv7gkzpxhzk1rwqn7nwrhmb1gglm"; + version = "0.3.1.7"; + sha256 = "0i5i530008miy6c2r17i11m0nklw2xj76wk5cnmb50w0i8kb8kis"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -143169,6 +143737,23 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-implicits_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hasql + , iproute, scientific, text, time, uuid, vector + }: + mkDerivation { + pname = "hasql-implicits"; + version = "0.2"; + sha256 = "1z6f95ql31k2ilphn6x69qqhighvsw3w07faaabyi2cx1xn1xj2z"; + libraryHaskellDepends = [ + aeson base bytestring containers hasql iproute scientific text time + uuid vector + ]; + description = "Implicit definitions for Hasql, such as default codecs for standard types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-interpolate" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty @@ -143191,6 +143776,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasql-interpolate_1_0_0_0" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , haskell-src-meta, hasql, iproute, megaparsec, mtl, scientific + , tasty, tasty-hunit, template-haskell, text, time, tmp-postgres + , transformers, uuid, vector + }: + mkDerivation { + pname = "hasql-interpolate"; + version = "1.0.0.0"; + sha256 = "14idydz3xi6h2b746lgdx80p3y0kv2p2c79cxsb6h2xf6gpmzd0p"; + libraryHaskellDepends = [ + aeson array base bytestring containers haskell-src-meta hasql + iproute megaparsec mtl scientific template-haskell text time + transformers uuid vector + ]; + testHaskellDepends = [ + base hasql tasty tasty-hunit template-haskell text tmp-postgres + ]; + description = "QuasiQuoter that supports expression interpolation for hasql"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-listen-notify" = callPackage ({ mkDerivation, base, bytestring, hasql, mtl, postgresql-libpq , text @@ -143199,8 +143807,8 @@ self: { pname = "hasql-listen-notify"; version = "0.1.0.1"; sha256 = "00pcbps2hdjd3i1xxsfgai81hgzc24cpj8n1iqg4xf7pd2c6cps4"; - revision = "1"; - editedCabalFile = "09007w68nvlknihp3020vyj1n9arr1l88bpmy3m032m400ww6qq0"; + revision = "2"; + editedCabalFile = "0lhn9axmzn9ps5s919yxhzl4fj35m0n1jizl8flbz2mn062z5w26"; libraryHaskellDepends = [ base bytestring hasql mtl postgresql-libpq text ]; @@ -143209,16 +143817,16 @@ self: { }) {}; "hasql-migration" = callPackage - ({ mkDerivation, base, bytestring, contravariant, cryptonite + ({ mkDerivation, base, bytestring, contravariant, crypton , directory, hasql, hasql-transaction, hspec, memory, text, time , transformers }: mkDerivation { pname = "hasql-migration"; - version = "0.3.0"; - sha256 = "0qk9cds6crdbjrn0niv6dfaj2pa3qpmwh1l96rl2hvqyq2dz148q"; + version = "0.3.1"; + sha256 = "13lmln6fwb6fvzhm0jl4ns1rx79h6n6dscd4bnxi9ixxxc345b6h"; libraryHaskellDepends = [ - base bytestring contravariant cryptonite directory hasql + base bytestring contravariant crypton directory hasql hasql-transaction memory text time ]; testHaskellDepends = [ @@ -143350,14 +143958,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_1_2_0_1" = callPackage + "hasql-pool_1_2_0_2" = callPackage ({ mkDerivation, async, base, bytestring, hasql, hspec, random , rerebase, stm, text, time, uuid }: mkDerivation { pname = "hasql-pool"; - version = "1.2.0.1"; - sha256 = "0kn5m4nx06zrwrb9ybz7hz24c73zn5lnjyvdxkvjqfhg3my5a8ch"; + version = "1.2.0.2"; + sha256 = "1myasw6zp3979bdkp642fh7b765wdbmwl2hbva9c2qlsa14agdrw"; libraryHaskellDepends = [ base bytestring hasql stm text time uuid ]; @@ -143602,8 +144210,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.21"; - sha256 = "1agllfk5zrpbccxr0wa9q81fmymfsa4alinj4hvqid1szzijsghl"; + version = "0.4.0.22"; + sha256 = "14d3nxxm8lq9vmwk66lfgv9gjkhnm7x2x30rifw9qw18wzhmhrq7"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -143631,20 +144239,19 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-transaction_1_1_1" = callPackage + "hasql-transaction_1_1_1_2" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, hasql, mtl, rerebase - , transformers + , contravariant, hasql, mtl, rerebase, transformers }: mkDerivation { pname = "hasql-transaction"; - version = "1.1.1"; - sha256 = "1fwk6ngwwpv992lbndxjbjzh7zvz3szijdcw4nnaahpf1w7iw96p"; + version = "1.1.1.2"; + sha256 = "159dd3v9cz2kz1ph770w54nr25md6fncng86mfiphrh7823vfj4w"; libraryHaskellDepends = [ - base bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers + base bytestring bytestring-tree-builder contravariant hasql mtl + transformers ]; - testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + testHaskellDepends = [ async hasql rerebase ]; description = "Composable abstraction over retryable transactions for Hasql"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -144224,8 +144831,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.4.0.0"; - sha256 = "1vah61fs047h9v0c8z6ka0lcckhcsjrjxqcck0jipcppzpg68inw"; + version = "2.5.1.0"; + sha256 = "15psynsr61ahcmmm06lcprl47l271nqw2h0kwkahs6jy00l7ymhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145415,6 +146022,38 @@ self: { broken = true; }) {}; + "hdmenu" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, bytestring-lexing + , containers, directory, double-conversion, hspec + , optparse-applicative, posix-paths, process, process-extras + , QuickCheck, text, tomland, unix, utf8-string + }: + mkDerivation { + pname = "hdmenu"; + version = "0.3.0"; + sha256 = "0n2mikqhrlsb79g2pdiryl3ynsy9vkcpg9fgrx0szqwqba1ckmqh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion optparse-applicative posix-paths process + process-extras text tomland unix utf8-string + ]; + executableHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion optparse-applicative posix-paths process + process-extras text tomland unix utf8-string + ]; + testHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion hspec optparse-applicative posix-paths process + process-extras QuickCheck text tomland unix utf8-string + ]; + description = "A small wrapper around dmenu"; + license = lib.licenses.gpl3Only; + mainProgram = "hdmenu"; + }) {}; + "hdo" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad , data-default, free, http-conduit, iproute, lens, mtl, network-uri @@ -145611,6 +146250,8 @@ self: { pname = "heap"; version = "1.0.4"; sha256 = "0ahpsfmb76728w71xn4021ad7z752n6aqqgzdpcyis9i22g4ihm4"; + revision = "1"; + editedCabalFile = "010mvg5syk0iprrin4kmqf21dmabyncmz1b65w5p05j9f4w22jfj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -145987,8 +146628,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; - revision = "5"; - editedCabalFile = "1majbvnqywyqfzm7qm7bhwmfzi3jamiz7d5ql4yvzsix8wg4rbag"; + revision = "8"; + editedCabalFile = "062nz959mb96gphk769kwym10xn4r7c7gdvibi8xjl9rmcsanq4q"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -146273,6 +146914,8 @@ self: { pname = "hedis"; version = "0.15.2"; sha256 = "0za6ybxzfba922jz5zzvyqd1yy7g7kcj5j3hjzpi2w2hwcbwa21p"; + revision = "1"; + editedCabalFile = "109ky2krl7s4pmjp3bkqhpz4vi3mmq99zqcj7mjm19vxys56wf7v"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -146304,6 +146947,17 @@ self: { broken = true; }) {}; + "hedis-effectful" = callPackage + ({ mkDerivation, base, effectful-core, hedis }: + mkDerivation { + pname = "hedis-effectful"; + version = "1.0.0.0"; + sha256 = "0l9jiyns9d6zw65cb0ragb038aw0ma1q1a87s55xz7z1367wmj0r"; + libraryHaskellDepends = [ base effectful-core hedis ]; + description = "Adaptation of the hedis library for the effectful ecosystem"; + license = lib.licenses.bsd3; + }) {}; + "hedis-envy" = callPackage ({ mkDerivation, base, envy, hedis, scientific, time }: mkDerivation { @@ -146591,8 +147245,8 @@ self: { pname = "heist"; version = "1.1.1.2"; sha256 = "1377740si611j0szp64axy0xj1fi2a6w8i9s3xij89h34m7rb3rz"; - revision = "1"; - editedCabalFile = "0glg856n9w1pf74d0kr3v10saw26z54j32mb12hd3xqh8xq34lf6"; + revision = "3"; + editedCabalFile = "0i4rpf62bf3l6w4f26m5fyqpj2qhd0ix8lvsbpkh8m8dh2cvxmx6"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -147177,12 +147831,13 @@ self: { ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, boost, bytestring, Cabal , cabal-pkg-config-version-hook, cachix, cachix-api, conduit - , conduit-extra, containers, directory, dlist, exceptions, filepath - , hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core - , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec - , hspec-discover, http-client, http-client-tls, http-conduit, HUnit - , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async - , lifted-base, monad-control, mtl, network, network-uri, nix + , conduit-extra, containers, directory, dlist, exceptions + , file-embed, filepath, hercules-ci-api, hercules-ci-api-agent + , hercules-ci-api-core, hercules-ci-cnix-expr + , hercules-ci-cnix-store, hostname, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, HUnit, inline-c + , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base + , monad-control, mtl, network, network-uri, nix , optparse-applicative, process, process-extras, profunctors , protolude, QuickCheck, safe-exceptions, scientific, servant , servant-auth-client, servant-client, servant-client-core, stm @@ -147193,15 +147848,14 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.3"; - sha256 = "1gfvlr37zzwnwnlixndwi9955c1n4yn67ffhif70d06bpjvh037k"; + version = "0.10.4"; + sha256 = "1bslpq4x0kp6k5x7jgcv8hkigp64p5gjgq6d3g60ig0pd35ribwd"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson async base binary binary-conduit bytestring conduit - containers directory dlist exceptions filepath + containers directory dlist exceptions file-embed filepath hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store katip lens lens-aeson lifted-async lifted-base monad-control mtl network network-uri process @@ -147392,9 +148046,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.6.3"; - sha256 = "1mwsdc8xdf8c9cpzkvhg6z450d4n6s1ijraznzzvkgh0zwqggddq"; - enableSeparateDataOutput = true; + version = "0.3.6.4"; + sha256 = "0l5d4mirf8843svhamq2zwga46y0a4wr1myi3g46l92spljwribc"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson base bytestring conduit containers directory exceptions @@ -147949,10 +148602,8 @@ self: { doHaddock = false; description = "Symbolic EVM Evaluator"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; - broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) libff; inherit (pkgs) secp256k1;}; @@ -148012,8 +148663,8 @@ self: { pname = "hex-text"; version = "0.1.0.9"; sha256 = "1dzv1jpjga4nsrxbwrh5nhnzv5f0mnl5i8da0blqc73vavsjhny5"; - revision = "1"; - editedCabalFile = "1r6lh44n7x6s1fk7nlqzychspi3647wsd0avraxlzqs32xslxgq1"; + revision = "2"; + editedCabalFile = "1ym53q8zpnl5vh049z4lki7l8154fbfvizrc5sf6wra5vqgvys35"; libraryHaskellDepends = [ base base16-bytestring bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring hspec text @@ -149070,14 +149721,14 @@ self: { "hgraph" = callPackage ({ mkDerivation, array, base, clock, containers, happy-dot, HUnit - , linear, mtl, random, transformers + , linear, mtl, random, say, transformers }: mkDerivation { pname = "hgraph"; - version = "1.2.0.1"; - sha256 = "0zdjnkisk1m5z8yz6r3sdprxxbikqffjx4aqw3qarafqb46kr9mv"; + version = "1.10.0.0"; + sha256 = "0689z5dy5zifpqdvhfarc96l386zfin6xgpgxkgj92dc4ps6wb9h"; libraryHaskellDepends = [ - array base containers happy-dot linear mtl random transformers + array base containers happy-dot linear mtl random say transformers ]; testHaskellDepends = [ base containers HUnit transformers ]; benchmarkHaskellDepends = [ @@ -149457,6 +150108,8 @@ self: { pname = "hie-compat"; version = "0.3.1.2"; sha256 = "0m0520z20qd3vxh047izb140jbywnhi20i9av7gf6h8f8486cs0m"; + revision = "1"; + editedCabalFile = "03yidgx0vbw5jy1193lqb9yhc97z1hbwsfa92dkndh73j1d5ia3l"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -149511,8 +150164,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.6.0.0"; - sha256 = "1yz04cy981c1gpwcp758hhy1nlmavb9yciyp0mwcjamcazpqx562"; + version = "0.6.0.1"; + sha256 = "0pvbxjhwqd7abvb5j23ynlg0rsqc09c0vq915drb52cilbs46fcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151027,8 +151680,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.7.0"; - sha256 = "15dhr9xszg64kdswywc8pd8kfawq02mcarhh4lyq21g9cynvbk6g"; + version = "0.7.2"; + sha256 = "0n3sc5v8a7df4p4p4ch13alkv877djhbqz9qk3pb9pqvyhxy3xg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151045,7 +151698,9 @@ self: { ]; description = "Haskell/Nix development build tools"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; mainProgram = "hix"; + broken = true; }) {}; "hjcase" = callPackage @@ -151362,8 +152017,8 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.4.4"; - sha256 = "03vz4f7jjklbjsmh17kljnnbpk5m5a0r1q67g1r23vhpx2dkk7vk"; + version = "0.4.6"; + sha256 = "1qhj3rfmdvc93m0zs38sw21lrnhk8vkrns0ca6dva0nsfi6fi5n9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -151528,7 +152183,7 @@ self: { ]; }) {}; - "hledger_1_33_1" = callPackage + "hledger_1_34" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -151539,10 +152194,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.33.1"; - sha256 = "14vx74c1lj4kj81p9qrdi9ln8fs15dk3xz0yy3aaq7xp979jj21f"; - revision = "1"; - editedCabalFile = "1bbh8vbc8n539manidahnkqvskg4wzmf6y00f8wxga80dm5djadl"; + version = "1.34"; + sha256 = "08ygx4aavimxzmyvb9303xds455vs72jvkbrj41nca8357118j3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151714,6 +152367,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; + revision = "1"; + editedCabalFile = "1jx773cqq676yvzibp7nzdpmas8i7ahx8j6kfc1sfipk37vz2q0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151745,8 +152400,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "3"; - editedCabalFile = "0yywynp3yrdssh2vr7jwp0izr890hfn9kjy6cl9ad8mx1qfyg771"; + revision = "4"; + editedCabalFile = "0b1dvr9kyzhm8zf60xvqf2hkad8w6m14fr2prm0fry8lq79gc515"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151818,7 +152473,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_33_1" = callPackage + "hledger-lib_1_34" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default @@ -151831,10 +152486,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.33.1"; - sha256 = "12l3c6ixmfb65c566vgrfksggrpgab11f1v658dk5gy482p994vb"; - revision = "1"; - editedCabalFile = "1wkp0lyihjqc7figv29sw37g7d6i7zwzddi8jvjqpbpcffrcj81r"; + version = "1.34"; + sha256 = "0789zyz5lbd67mphr8qq8wryni6dkf3759ah9fb7cm2wr5wwvd85"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -151940,26 +152593,27 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_33_1" = callPackage + "hledger-ui_1_34" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath - , fsnotify, hledger, hledger-lib, megaparsec, microlens + , fsnotify, githash, hledger, hledger-lib, megaparsec, microlens , microlens-platform, mtl, process, safe, split, text, text-zipper , time, transformers, unix, vector, vty, vty-crossplatform }: mkDerivation { pname = "hledger-ui"; - version = "1.33.1"; - sha256 = "1x05jdm6aargcnghvmdayzacigc8is5ra8xpnava499kwqk5x66i"; + version = "1.34"; + sha256 = "0w80bl6m98hsjzdpj5vjd768qs32vf8vdqzg6srh2z3pl36pjiki"; revision = "1"; - editedCabalFile = "0q29ix824in8mwdr6mg13b7hrzpv55mkrfwm5r84jsv1mxlbslvp"; + editedCabalFile = "09ipwnyswhgx3jg9fp5b22qwk8xph9h80806l73s4rzk9h6nhh7x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal async base brick cmdargs containers data-default - directory doclayout extra filepath fsnotify hledger hledger-lib - megaparsec microlens microlens-platform mtl process safe split text - text-zipper time transformers unix vector vty vty-crossplatform + directory doclayout extra filepath fsnotify githash hledger + hledger-lib megaparsec microlens microlens-platform mtl process + safe split text text-zipper time transformers unix vector vty + vty-crossplatform ]; executableHaskellDepends = [ base ]; description = "Terminal interface for the hledger accounting system"; @@ -152026,34 +152680,32 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_33_1" = callPackage + "hledger-web_1_34" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory - , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client - , http-conduit, http-types, megaparsec, mtl, network, safe - , shakespeare, template-haskell, text, time, transformers + , extra, filepath, githash, hjsmin, hledger, hledger-lib, hspec + , http-client, http-conduit, http-types, megaparsec, mtl, network + , safe, shakespeare, template-haskell, text, time, transformers , unix-compat, unordered-containers, utf8-string, wai, wai-cors , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core , yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "1.33.1"; - sha256 = "1f5xk0s93n2r8ar0l3hxfxxvi5gbb2sn1fhlg8mvkjbh93krywqr"; - revision = "1"; - editedCabalFile = "040sls51agm49s2p9wdpq5vly3d210dib87q312dlk6238p7hap5"; + version = "1.34"; + sha256 = "1h39gjpdddnyryig4713pq9ipixzavr0mb7wlmzr5sbzqmnshbds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64 blaze-html blaze-markup bytestring case-insensitive clientsession cmdargs conduit conduit-extra - containers data-default Decimal directory extra filepath hjsmin - hledger hledger-lib hspec http-client http-conduit http-types - megaparsec mtl network safe shakespeare template-haskell text time - transformers unix-compat unordered-containers utf8-string wai - wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static yesod-test + containers data-default Decimal directory extra filepath githash + hjsmin hledger hledger-lib hspec http-client http-conduit + http-types megaparsec mtl network safe shakespeare template-haskell + text time transformers unix-compat unordered-containers utf8-string + wai wai-cors wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static yesod-test ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -152794,8 +153446,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.8.0.0"; - sha256 = "0s8igxwbg7r0yjz6975vz7zw4yj9ik8733p0n7zcyvcv87ankxkd"; + version = "2.9.0.0"; + sha256 = "19ifqsw6bfqy969icbgyl46ss178wjn37dfhrh6ch3k6pa3lz73l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -152921,29 +153573,29 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, co-log-core, containers, criterion - , data-default, deepseq, dependent-map, dependent-sum, Diff, dlist - , extra, filepath, ghc, hashable, hls-graph, hw-fingertree, lens - , lens-aeson, lsp, lsp-types, megaparsec, mtl, opentelemetry - , optparse-applicative, prettyprinter, random, random-fu - , regex-tdfa, row-types, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, co-log-core, containers + , criterion, data-default, deepseq, dependent-map, dependent-sum + , Diff, dlist, extra, filepath, ghc, hashable, hls-graph + , hw-fingertree, lens, lens-aeson, lsp, lsp-types, megaparsec, mtl + , opentelemetry, optparse-applicative, prettyprinter, random + , random-fu, regex-tdfa, stm, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, time, transformers, unix + , unliftio, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "2.8.0.0"; - sha256 = "0s5jywzafd1dyhya4n80w1i7si4br7wmxwp6q3f11f787qqbv5xs"; + version = "2.9.0.0"; + sha256 = "0s0yd66cbazifxqqsyw05rdwc88kbx9q434ihlzgw72mkn0pvcm0"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph hw-fingertree lens lens-aeson lsp megaparsec mtl opentelemetry - optparse-applicative prettyprinter regex-tdfa row-types stm text - time transformers unix unliftio unordered-containers + optparse-applicative prettyprinter regex-tdfa stm text time + transformers unix unliftio unordered-containers ]; testHaskellDepends = [ - base containers data-default lens lsp-types tasty tasty-hunit - tasty-quickcheck tasty-rerun text + aeson base bytestring containers data-default lens lsp-types tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ base criterion deepseq lsp-types random random-fu @@ -153231,19 +153883,19 @@ self: { "hls-test-utils" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, extra, filepath, ghcide, hls-plugin-api - , lens, lsp-test, lsp-types, row-types, safe-exceptions, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun - , temporary, text + , lens, lsp, lsp-test, lsp-types, neat-interpolation + , safe-exceptions, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-rerun, temporary, text, text-rope }: mkDerivation { pname = "hls-test-utils"; - version = "2.8.0.0"; - sha256 = "1fk6n88g9z4yihvimzwi0bnmysr77qv3zdlcpr62lczl8pvm89d2"; + version = "2.9.0.0"; + sha256 = "0xj7hfpa6yl4v0ysbd7abkpax5y4hj0pfhzb40wp0qp5x6prsgw7"; libraryHaskellDepends = [ aeson async base bytestring containers data-default directory extra - filepath ghcide hls-plugin-api lens lsp-test lsp-types row-types - safe-exceptions tasty tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text + filepath ghcide hls-plugin-api lens lsp lsp-test lsp-types + neat-interpolation safe-exceptions tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-rerun temporary text text-rope ]; description = "Utilities used in the tests of Haskell Language Server"; license = lib.licenses.asl20; @@ -154307,7 +154959,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_13_1" = callPackage + "hoauth2_2_14_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, crypton, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -154315,8 +154967,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.13.1"; - sha256 = "0m6bn52j2425km0h6mx8zbmc3rbwdj0ar08jy9m96v5hwzdfch4i"; + version = "2.14.0"; + sha256 = "1gbdb01iinhcfc91iw2ld4lpvmpcvy6d9r1zl5a58jg16z5v6j8k"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers crypton data-default exceptions http-conduit http-types memory microlens text @@ -154337,8 +154989,8 @@ self: { }: mkDerivation { pname = "hoauth2-demo"; - version = "1.11.0"; - sha256 = "12vxm1kfdbhvsagmqslr4wph9ji49gcakkvcqdx84d5y6ywd05wh"; + version = "1.12.0"; + sha256 = "03nsjqpaz3b5809rhjc1bqjm84w8srfcbn6ncj42w6g74hb3lmab"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -154362,8 +155014,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers"; - version = "0.7.1"; - sha256 = "0222kkbnw4fpzyr0f3pls19bnlgs89yal3ffw85x6qdrg2lqk006"; + version = "0.8.0"; + sha256 = "11y4lbp81spa7wky834l7i0fkqq3b529zn7divz5x9ar0jnnpnaj"; libraryHaskellDepends = [ aeson base bytestring containers crypton hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl text time transformers @@ -154384,8 +155036,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.7.0"; - sha256 = "02gdx3ry1f61czc37r84z1qz25ybvgm6p88li03iyl87ihajymw4"; + version = "0.8.0"; + sha256 = "1b9sjwirkjwl3w54y9pq4i07xp3spsm7zxknf9xilw4jgg9mmncz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154406,8 +155058,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.7.0"; - sha256 = "1jv87hlz22jvyq5z2ax3jc4g3if0ap1j8g4hxxc62skx1d7jp99x"; + version = "0.8.0"; + sha256 = "0w7fa1gyslng19sxk3xnvy1bvy0r2gannypvlv9hi86hinwx525j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155658,8 +156310,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.8.0"; - sha256 = "122caz296w8sfc0ma4zigssha8vbr8abgj9ajsr83jh9k68jy3d9"; + version = "0.9.0"; + sha256 = "0fxj2w762zdl3lzknpglmlwm3dgxsaw8vrljm73fb3gcscj9flbc"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -155674,8 +156326,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.8.0"; - sha256 = "0vkf5ajmdy7h88vfz2aq5zzq4mrnl4wi0dqn0rzzbr3rjpip42j6"; + version = "0.9.0"; + sha256 = "16pa8w05fa11xl7cv3gz36j5xk8rxsi341a1wgm513m0ghqxyaqw"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -155692,8 +156344,8 @@ self: { }: mkDerivation { pname = "hoppy-runtime"; - version = "0.8.0"; - sha256 = "123mn1sfwy01jyb803r4rhdqpdafmbkyip149ga1pvlaj272mlqy"; + version = "0.9.0"; + sha256 = "0ndabz5yb98d7xpjsgsvqvvaslvsg3pcmd1ms9n93lsx4xv4xkpx"; libraryHaskellDepends = [ base Cabal containers directory filepath hoppy-generator ]; @@ -155706,8 +156358,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.8.0"; - sha256 = "0ysbnhabnrr0jb8f9a06fqqxv2sy7ahj92jhw2bifnvjffk1pnqd"; + version = "0.9.0"; + sha256 = "1vgpdkmy2pzfj2gl10pdc45i80d73vgi5mhcd82if1rgc4zvqjas"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -156117,6 +156769,8 @@ self: { pname = "hourglass"; version = "0.2.12"; sha256 = "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4"; + revision = "1"; + editedCabalFile = "0yc9k9lrx6z5r52mk3hra4v74ksk590d89lrj934bj1hrnv6ri45"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time @@ -156298,7 +156952,7 @@ self: { mainProgram = "hp2pretty"; }) {}; - "hpack" = callPackage + "hpack_0_36_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -156336,6 +156990,86 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + }) {}; + + "hpack" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, crypton, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, mtl, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.36.1"; + sha256 = "1n02wkkhgqwh7im33b2158h9ha0yglzmqv05fd0igmm4mfly05db"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery mtl pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + mainProgram = "hpack"; + }) {}; + + "hpack_0_37_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, crypton, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, mtl, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.37.0"; + sha256 = "0wrc3h93gxs7mkl6pdshyg1slayivglxzw2f0hkmzyyfbqip6x54"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery mtl pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "hpack"; }) {}; @@ -156650,14 +157384,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_6_0_0" = callPackage + "hpc-codecov_0_6_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-golden, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.6.0.0"; - sha256 = "1if8nmqv6pcv92ww8ncaxkvaawdr9shmsdsnr9xvzfmhqjq83q7w"; + version = "0.6.2.0"; + sha256 = "193aqvdqh730wa362l617vs8dwsan5f631477akkz4mmighf6zv6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157099,8 +157833,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.6.2"; - sha256 = "118758mwqwf22i5y7iawqqwibyljfn5cxlx6hjbz1xgxcvchvm65"; + version = "0.6.3"; + sha256 = "0x7qiwmh5aqix0an24qm9z1580v6c8q59mq7i6nzchm0bk7nj3py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158608,6 +159342,7 @@ self: { description = "A library for Passbook pass creation & signing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "hs-popen" = callPackage @@ -160282,6 +161017,89 @@ self: { broken = true; }) {}; + "hsec-core" = callPackage + ({ mkDerivation, base, Cabal-syntax, cvss, osv, pandoc-types, safe + , tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "hsec-core"; + version = "0.1.0.0"; + sha256 = "0yf6vdv1v3r52i92pcjh7jpnxwxlax9vpchy0f2ixs0ddgsk6v83"; + libraryHaskellDepends = [ + base Cabal-syntax cvss osv pandoc-types safe text time + ]; + testHaskellDepends = [ base cvss tasty tasty-hunit text ]; + description = "Core package representing Haskell advisories"; + license = lib.licenses.bsd3; + }) {}; + + "hsec-sync" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, extra, feed + , filepath, hsec-core, http-client, lens, optparse-applicative + , process, tasty, tasty-hunit, temporary, text, time, transformers + , wreq + }: + mkDerivation { + pname = "hsec-sync"; + version = "0.1.0.0"; + sha256 = "0svk3rvsf6svhy2vqr5bpxxgngjmxb9zxwj9ljx4n56yq2gvqdp9"; + revision = "1"; + editedCabalFile = "1xk4f5yh720d16gxark20cbdywg9jrlrhd20x153a74p2gka44rm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory extra feed filepath hsec-core http-client lens + process text time transformers wreq + ]; + executableHaskellDepends = [ + aeson base bytestring filepath optparse-applicative text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary text + time + ]; + description = "Synchronize with the Haskell security advisory database"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsec-sync"; + broken = true; + }) {}; + + "hsec-tools" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , Cabal-syntax, commonmark, commonmark-pandoc, containers, cvss + , directory, extra, feed, filepath, hsec-core, lucid, mtl + , optparse-applicative, osv, pandoc-types, parsec, pathwalk + , pretty-simple, process, safe, tasty, tasty-golden, tasty-hunit + , text, time, toml-parser, validation-selective + }: + mkDerivation { + pname = "hsec-tools"; + version = "0.1.0.0"; + sha256 = "1q48ygbw463jm77cv3sznbncr496rqzqrablj02s1vdwihkv3h86"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base Cabal-syntax commonmark commonmark-pandoc containers + cvss directory extra feed filepath hsec-core lucid mtl osv + pandoc-types parsec pathwalk process safe text time toml-parser + validation-selective + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal-syntax filepath hsec-core + optparse-applicative text validation-selective + ]; + testHaskellDepends = [ + aeson-pretty base Cabal-syntax cvss directory hsec-core + pretty-simple tasty tasty-golden tasty-hunit text time + ]; + description = "Tools for working with the Haskell security advisory database"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hsec-tools"; + broken = true; + }) {}; + "hsemail" = callPackage ({ mkDerivation, base, hspec, parsec, time, time-compat }: mkDerivation { @@ -160315,8 +161133,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.3.1"; - sha256 = "0vcrh15p479x7yl4npr85wqalgkzs76h4smqwlsrp9m4w4lgaskz"; + version = "0.1.3.2"; + sha256 = "19qkaavyankx5lmrf03n108d7hyfj7ls1hkxcgdp7jnf7wrwkpdq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160886,8 +161704,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "2.3.1"; - sha256 = "1wh6lih9x555vb6mdw8z8968kd88hw9mbxqq4cyqnk6rjl95vjdz"; + version = "2.3.1.1"; + sha256 = "09a5xbl8ib79vln01naw9cd5g100arfx5nm41n0xbk272cjf7cgg"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector @@ -160930,8 +161748,8 @@ self: { }: mkDerivation { pname = "hslua-cli"; - version = "1.4.2"; - sha256 = "0hj6j673qcv8ffiza263b0b3r5br6ak0nl61g40km7jxmf293n7v"; + version = "1.4.3"; + sha256 = "1sn8mc18lqn8c0pm7rms623p49vpmmhbp07bh561x6q96fgjcwzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161014,8 +161832,8 @@ self: { }: mkDerivation { pname = "hslua-module-doclayout"; - version = "1.1.1"; - sha256 = "051rvq7x8cnby0fv14i9qy0j1d46rkmwbx5b09nqgb51i03wsivf"; + version = "1.1.1.2"; + sha256 = "1bgs6p20maqdwmqjv8nqsmlk63sjhb54icqs7d1kxsk8k9hh65qg"; libraryHaskellDepends = [ base doclayout hslua text ]; testHaskellDepends = [ base doclayout hslua tasty tasty-hunit tasty-lua text @@ -161050,8 +161868,8 @@ self: { }: mkDerivation { pname = "hslua-module-system"; - version = "1.1.1"; - sha256 = "0adjxcyxb8xc98jj2r6xhbswqkqvs4c40sn4m9gl0bkjhh0nk57q"; + version = "1.1.2"; + sha256 = "1pi1yp5ch83b74diimbrq09gd9wq8cjpxwjzv9jvchf2xrz8winl"; libraryHaskellDepends = [ base directory exceptions hslua-core hslua-marshalling hslua-packaging temporary text @@ -161585,8 +162403,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.11.8"; - sha256 = "1w0ryyr9h1f87jgz56yl09x3yvd9zm2w1bj70k5p6pzdyz984cjr"; + version = "2.11.9"; + sha256 = "16rh30v2mx01yi72k8kiwmwgnv98xv59d9n6ap8jpyn7p96nmsir"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -161600,8 +162418,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.8"; - sha256 = "02hhmxgd4vz5jakp3nd6cwslh8qmqnlg6j3fq7my8lbdim95wnf6"; + version = "2.11.9"; + sha256 = "1hzv4q63yd60kypnil3hmsf8v92ig2ankafhavd0jf5hgdjd2wnk"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -161706,8 +162524,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.8"; - sha256 = "18zaiac5s830q01hq9ai67z5sk0ilvhz471vxabraif3rznrsmla"; + version = "2.11.9"; + sha256 = "0qzzwyx71741v53qd9pah5bqq8md3mj0l6ykaw3d4816c2np5wdi"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -161774,8 +162592,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.11.8"; - sha256 = "0s81mjb7an628c0gr3g74navnxzfahdl92zixdgys2is5rbd6yqf"; + version = "2.11.9"; + sha256 = "054l0k6rn7n1mm3ivhvv00zmqdkdnrp91h5l2wy6sbibrvrl8rhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -161890,6 +162708,8 @@ self: { pname = "hspec-expectations-pretty-diff"; version = "0.7.2.6"; sha256 = "0wksgvdj50yc3p4bg3wmacf2w75v7p8nlq1g33z5amrwllig6m49"; + revision = "1"; + editedCabalFile = "161n217lg9r8sw3gd654ri7dr2h27hkvcbpjbf38sl44j3zha17d"; libraryHaskellDepends = [ ansi-terminal base Diff hscolour HUnit nicify-lib text unicode-show ]; @@ -162031,21 +162851,23 @@ self: { }) {}; "hspec-junit-formatter" = callPackage - ({ mkDerivation, base, conduit, containers, directory, exceptions - , filepath, hspec, hspec-core, iso8601-time, markdown-unlit - , temporary, text, time, xml-conduit, xml-types + ({ mkDerivation, array, base, conduit, containers, directory + , exceptions, filepath, hspec, hspec-api, hspec-core, hspec-golden + , iso8601-time, markdown-unlit, regex-base, regex-tdfa, temporary + , text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.2"; - sha256 = "1gzgfisji7w4gsixlchlrg5ylkmdqq2mk5sc0jdwqxz865kjq01g"; + version = "1.1.2.1"; + sha256 = "1ydgm3c24jn2zz7vypicr7f0wxba20yj15m27ink3pk7610sd9bp"; libraryHaskellDepends = [ - base conduit containers directory exceptions filepath hspec-core - iso8601-time text time xml-conduit xml-types + array base conduit containers directory exceptions filepath + hspec-api hspec-core iso8601-time regex-base regex-tdfa text time + xml-conduit xml-types ]; testHaskellDepends = [ - base containers filepath hspec markdown-unlit temporary text - xml-conduit + base containers filepath hspec hspec-golden markdown-unlit + temporary text xml-conduit ]; testToolDepends = [ markdown-unlit ]; description = "A JUnit XML runner/formatter for hspec"; @@ -162143,8 +162965,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.8"; - sha256 = "0diwxrp6rkf0pchfnfhc5xdbhv9arbbmpgl8hyw5afbfmqjsd4kv"; + version = "2.11.9"; + sha256 = "09cl2dknj548zzmdfx1pyd27jywgcr4000hf1rscn85b4r2riymm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162534,6 +163356,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-yesod" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie + , exceptions, hspec, hspec-core, html-conduit, http-types, HUnit + , memory, mtl, network, pretty-show, text, time, transformers + , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form, yesod-test + }: + mkDerivation { + pname = "hspec-yesod"; + version = "0.1.0"; + sha256 = "1ixra4fdfrihlnigqs63xwyrl7ab4kwl7klmhv6xfvprs798g4mb"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie exceptions hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + yesod-test + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form yesod-test + ]; + description = "A variation of yesod-test that follows hspec idioms more closely"; + license = lib.licenses.mit; + }) {}; + "hspec2" = callPackage ({ mkDerivation, base, hspec, hspec-discover }: mkDerivation { @@ -162600,8 +163450,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.5.2.0"; - sha256 = "05fkyvb9h5hnv44nkk7ykhmhcajfc393rmn2a7dzqqgam44wpydl"; + version = "0.5.4.0"; + sha256 = "01y4jgbhvis0aa2imc1is62zcgwkqysz2v8vvld0y5c92j0f3y6s"; libraryHaskellDepends = [ base containers extra hashable matrix numeric-prelude text unordered-containers @@ -163896,7 +164746,6 @@ self: { libraryHaskellDepends = [ attoparsec base html-parse text ]; description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.slotThe ]; }) {}; @@ -164268,7 +165117,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http-api-data_0_6" = callPackage + "http-api-data_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, cookie, hashable , hspec, hspec-discover, http-types, HUnit, QuickCheck , quickcheck-instances, tagged, text, text-iso8601, time-compat @@ -164276,10 +165125,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.6"; - sha256 = "0ihkvjhm1rfgfnr2s5kzsmmqbnxgmyaxi0gqzqs4lxyhvy14743l"; - revision = "1"; - editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv"; + version = "0.6.1"; + sha256 = "1kz3qjjazl61q7iad6q67zdsm2gynsjdfcn34rzmybjhq27wylas"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -164946,6 +165793,8 @@ self: { pname = "http-io-streams"; version = "0.1.7.0"; sha256 = "14jn78jby18h0jnmpx523nq3wnpr4l65mn746rzmq6z49p513wmg"; + revision = "1"; + editedCabalFile = "0fmpilsyw805v0s6m0cgx4j47f88difadqwmz5xl7akqzbv66ap5"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -165282,8 +166131,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.6.0.2"; - sha256 = "13ln90didwh4r0jb77i05csmimrl9p1mv71c7ygz9bi3zk8mvl7l"; + version = "0.6.1.0"; + sha256 = "0ijdcdd7025i4752mcqs6pd2wklv0df407v1yndl67k15phksp6c"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive conduit conduit-extra containers http-client http-types network resourcet @@ -165327,8 +166176,8 @@ self: { }: mkDerivation { pname = "http-semantics"; - version = "0.0.0"; - sha256 = "04wi14c0hy2dpzazv6v49100dc4r16rzkii14625xkijcgjlcx7w"; + version = "0.1.2"; + sha256 = "1xrlglwsjpyhpxkxchx3kgysm39a8c7bddvps0n71ax75px2laq9"; libraryHaskellDepends = [ array base bytestring case-insensitive http-types network network-byte-order time-manager utf8-string @@ -165558,7 +166407,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_2_1" = callPackage + "http2_5_2_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -165569,8 +166418,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "5.2.1"; - sha256 = "0qgyykw866m06d8br6ppwwq3dxzm028gssjq402qfs46axxkxzdf"; + version = "5.2.6"; + sha256 = "0xpyhwf1iqkyzgi4g2549cc2yb5lgjv6xgs0xdambwhcdcg1j6h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165610,6 +166459,7 @@ self: { testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "http2-client-exe" = callPackage @@ -165714,8 +166564,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.2.11"; - sha256 = "1vi55fk0n168j42n83mdiifqksh7d2fq3pyg3fq06b7bj1597khm"; + version = "0.4.0"; + sha256 = "04q1i804dv1hrssy83y8i9ndwngphbqm2fnfy6x7mwpk9spfh944"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165738,8 +166588,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.11"; - sha256 = "1z3hqalylraxmx18h82gljpbaslzd8mz2ndv8g15mhfac6jjz4rd"; + version = "0.0.14"; + sha256 = "0ipvl28n0ibb7pspx963nf5fbzwy0kblirkdm8srqlk7ll9jmpy9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167395,7 +168245,6 @@ self: { testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; description = "Avro support for Kafka infrastructure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hw-kafka-client" = callPackage @@ -167573,25 +168422,29 @@ self: { }) {}; "hw-polysemy" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, contravariant - , Diff, directory, filepath, generic-lens, ghc-prim, lens, network - , polysemy, polysemy-log, polysemy-plugin, polysemy-time, process - , resourcet, stm, tasty, tasty-discover, tasty-hedgehog, temporary - , text, time, unliftio, yaml + ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base + , bytestring, contravariant, Diff, directory, exceptions, filepath + , generic-lens, ghc-prim, http-conduit, lens, mtl, network + , polysemy, polysemy-log, polysemy-plugin, polysemy-time + , prettyprinter, process, resourcet, stm, tasty, tasty-discover + , tasty-hedgehog, temporary, testcontainers, text, time + , transformers, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.4.2"; - sha256 = "1czisgq8yv8gmr9ixs72y7yfajs95333698blfnj2ipngcmkrh09"; + version = "0.2.12.0"; + sha256 = "0xcmk4n276rmwipkxm3bil7a8lz1r08sbm25224nvchp38gzasrj"; libraryHaskellDepends = [ - aeson async base bytestring contravariant Diff directory filepath - generic-lens ghc-prim lens network polysemy polysemy-log - polysemy-plugin polysemy-time process resourcet stm temporary text - time unliftio yaml + aeson aeson-pretty async base bytestring contravariant Diff + directory exceptions filepath generic-lens ghc-prim http-conduit + lens mtl network polysemy polysemy-log polysemy-plugin + polysemy-time prettyprinter process resourcet stm temporary + testcontainers text time transformers unliftio yaml ]; testHaskellDepends = [ - base filepath polysemy polysemy-log polysemy-plugin tasty - tasty-hedgehog text + amazonka-s3 base filepath generic-lens lens polysemy polysemy-log + polysemy-plugin tasty tasty-discover tasty-hedgehog testcontainers + text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; @@ -169006,32 +169859,40 @@ self: { }) {}; "hyperbole" = callPackage - ({ mkDerivation, base, bytestring, casing, containers, effectful - , file-embed, http-api-data, http-types, network - , string-conversions, string-interpolate, text, wai - , wai-middleware-static, wai-websockets, warp, web-view, websockets + ({ mkDerivation, base, bytestring, casing, containers, cookie + , effectful, file-embed, http-api-data, http-types, network + , string-conversions, string-interpolate, sydtest, sydtest-discover + , text, wai, wai-middleware-static, wai-websockets, warp, web-view + , websockets }: mkDerivation { pname = "hyperbole"; - version = "0.2.0"; - sha256 = "04b9mgcd06dh8v1ki06dbgx9ak070p5h5pb5njyg99s8cykdip5r"; + version = "0.3.6"; + sha256 = "0s3hsr6yhsqxayl22bafgrgan2jrjyg2027qj35gvxr20z1vsg12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring casing containers effectful file-embed + base bytestring casing containers cookie effectful file-embed http-api-data http-types network string-conversions string-interpolate text wai wai-websockets warp web-view websockets ]; executableHaskellDepends = [ - base bytestring casing containers effectful file-embed + base bytestring casing containers cookie effectful file-embed http-api-data http-types network string-conversions string-interpolate text wai wai-middleware-static wai-websockets warp web-view websockets ]; - description = "Web Framework inspired by HTMX"; + testHaskellDepends = [ + base bytestring casing containers cookie effectful file-embed + http-api-data http-types network string-conversions + string-interpolate sydtest text wai wai-websockets warp web-view + websockets + ]; + testToolDepends = [ sydtest-discover ]; + description = "Interactive HTML apps using type-safe serverside Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "example"; + mainProgram = "examples"; }) {}; "hyperdrive" = callPackage @@ -169136,8 +169997,8 @@ self: { pname = "hyperloglog"; version = "0.4.6"; sha256 = "0zwg4dhgasa9sx7pbjjjb9kz2bnhb3r2daij2b572cszv65l91nv"; - revision = "4"; - editedCabalFile = "0bw7bj4kq7nsmzsmiwngg32zhjfpcy1zmzpslp9h0i1m12hxh4c9"; + revision = "5"; + editedCabalFile = "1acq3rhj3x019ckvvhpl4vg8islr53il9ngxd5p5k1is90hcyx97"; libraryHaskellDepends = [ approximate base binary bits bytes bytestring cereal cereal-vector comonad cpu deepseq distributive hashable lens reflection @@ -170732,6 +171593,7 @@ self: { description = "IPython standard widgets for IHaskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ihp-hsx" = callPackage @@ -170749,6 +171611,7 @@ self: { ]; description = "JSX-like but for Haskell"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "ihs" = callPackage @@ -171711,8 +172574,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.9.0.1"; - sha256 = "0zalzp5p59cqz3zky1y0xvw5g44z386z5smffmzhx1gjk6v0b3pk"; + version = "0.10.0.0"; + sha256 = "0464gn50ayfd61n2xzcdrg36vmzls3j6bi2w7113iqzbl8q8gz6j"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -172191,23 +173054,11 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "indexed-traversable"; - version = "0.1.3"; - sha256 = "1nak3bq3yzai8b38mflmpsbirx8d6v29zcj9m193m3ppnrgr4chx"; - libraryHaskellDepends = [ array base containers transformers ]; - description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable_0_1_4" = callPackage - ({ mkDerivation, array, base, containers, transformers }: - mkDerivation { - pname = "indexed-traversable"; version = "0.1.4"; sha256 = "08ivs1shxnvw5fzklvg7yh4xy0nnh3gsglm059fa5m9svyphkgjq"; libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indexed-traversable-instances" = callPackage @@ -172217,30 +173068,6 @@ self: { }: mkDerivation { pname = "indexed-traversable-instances"; - version = "0.1.1.2"; - sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; - revision = "2"; - editedCabalFile = "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"; - libraryHaskellDepends = [ - base indexed-traversable OneTuple tagged unordered-containers - vector - ]; - testHaskellDepends = [ - base containers indexed-traversable OneTuple QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable-instances_0_1_2" = callPackage - ({ mkDerivation, base, containers, indexed-traversable, OneTuple - , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "indexed-traversable-instances"; version = "0.1.2"; sha256 = "1hf75x729c3348yvgxk0pjab2mmwi0xxcw3h2yb6c78lp8pvcarw"; libraryHaskellDepends = [ @@ -172254,7 +173081,6 @@ self: { ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indextype" = callPackage @@ -172662,6 +173488,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Inflections library for Haskell"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "inflist" = callPackage @@ -172687,8 +173514,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.9.3.1"; - sha256 = "1ywjwiggs00hb83bakdi6liwvra6rb24gw3i4x0anh9iq6l02l68"; + version = "1.9.3.2"; + sha256 = "0n78k1zds9bg57bic8hawwcdyyrkxqwk62sbl8vlqp1qf1a8p6sa"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -173149,6 +173976,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "insert-ordered-containers_0_2_6" = callPackage + ({ mkDerivation, aeson, base, base-compat, deepseq, hashable + , indexed-traversable, lens, optics-core, optics-extra, QuickCheck + , semigroupoids, tasty, tasty-quickcheck, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "insert-ordered-containers"; + version = "0.2.6"; + sha256 = "17y4s31v6l1330i8ga2phf28myh5h3i889w2wll0hjkf2x5yalpg"; + libraryHaskellDepends = [ + aeson base deepseq hashable indexed-traversable lens optics-core + optics-extra semigroupoids text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat hashable lens QuickCheck semigroupoids tasty + tasty-quickcheck text unordered-containers + ]; + description = "Associative containers retaining insertion order for traversals"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "inserts" = callPackage ({ mkDerivation, attoparsec, base, bytestring, dlist }: mkDerivation { @@ -173188,6 +174038,8 @@ self: { pname = "inspection-testing"; version = "0.5.0.3"; sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; + revision = "2"; + editedCabalFile = "01qs82sldkjvyjkdf2r96g4n480d2dwrncrlzl6k49b4py9hfdll"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -173487,8 +174339,8 @@ self: { pname = "int-cast"; version = "0.2.0.0"; sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0"; - revision = "6"; - editedCabalFile = "11yvshlvp4ma279h9d4s1sdhlng4abar85crwkjsbjlvhfhlc3xw"; + revision = "7"; + editedCabalFile = "0z1bffrx787f2697a6gfkmbxkj3ymgs88kid9ckcla08n11zw2ql"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -173989,8 +174841,8 @@ self: { pname = "intern"; version = "0.9.5"; sha256 = "0jsylr86vlwn7pqzpkbja84br6i2r7d4a1vgqb3zcl92n306wzln"; - revision = "1"; - editedCabalFile = "0vhn9sxi0fbkh0f9340vlckpbdflsp9j02as5hxs7yh5vvnp9sz4"; + revision = "2"; + editedCabalFile = "11a759fhyh5f4kn9jdz7jqlyjr7bf0hyxda961yrsyyv88fmzqs5"; libraryHaskellDepends = [ array base bytestring hashable text unordered-containers ]; @@ -174780,6 +175632,8 @@ self: { pname = "io-classes-mtl"; version = "0.1.2.0"; sha256 = "06lcz96rja31hk3229zxz9ip45c2xqr563kv66jc2f9zyjy7z8s7"; + revision = "1"; + editedCabalFile = "055spdxxq97dg60pbdz3ldc7zzdb8b0cf3frpagbz98cvx5mxfsf"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -175334,19 +176188,20 @@ self: { "iproute" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers - , doctest, hspec, network, QuickCheck, safe + , hspec, hspec-discover, network, QuickCheck, safe }: mkDerivation { pname = "iproute"; - version = "1.7.12"; - sha256 = "0qvb4d7nw8f6j4s09cnpn6z1rdwcwknwklfrhsgivg7wg4aisxgi"; + version = "1.7.14"; + sha256 = "0kvbddh7h5fg5makk0j9hx7wa8si6xmq3rg10w2bv3rwwnsbgw4k"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; testHaskellDepends = [ - appar base byteorder bytestring containers doctest hspec network - QuickCheck safe + appar base byteorder bytestring containers hspec network QuickCheck + safe ]; + testToolDepends = [ hspec-discover ]; description = "IP Routing Table"; license = lib.licenses.bsd3; }) {}; @@ -175941,6 +176796,8 @@ self: { pname = "iso-deriving"; version = "0.0.8"; sha256 = "1w9fvnyanzmxs7yab9qhf3k9qy1lik7y5y5gzfv3jrxzwm0hivbi"; + revision = "1"; + editedCabalFile = "1psk0w6y8vcy1kgzvasffzkdd412ky7svwslaycj0r8y47mghw7a"; libraryHaskellDepends = [ base mtl profunctors ]; testHaskellDepends = [ base mtl ]; description = "Deriving via arbitrary isomorphisms"; @@ -175995,8 +176852,8 @@ self: { }: mkDerivation { pname = "iso8601-duration"; - version = "0.1.1.0"; - sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl"; + version = "0.1.2.0"; + sha256 = "1hzzcgc1k3dn4l5yxzqq9d62n2hfkrcg0ag14dly7ak3gx9l8l3n"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-lexing time ]; @@ -177021,24 +177878,22 @@ self: { "jacinda" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, deepseq, directory, filepath, happy, microlens - , microlens-mtl, mtl, optparse-applicative, prettyprinter - , recursion, regex-rure, silently, split, tasty, tasty-hunit, text - , transformers, vector + , criterion, deepseq, directory, filepath, happy, lazy-csv + , microlens, microlens-mtl, mtl, optparse-applicative + , prettyprinter, regex-rure, silently, split, tasty, tasty-hunit + , text, transformers, vector }: mkDerivation { pname = "jacinda"; - version = "3.0.2.0"; - sha256 = "0b18681ggx6syfix318j1wlycz3fm9g4r6p1vgqgfgxgv8kmyw9w"; - revision = "2"; - editedCabalFile = "12dnkgsf44wfcizdyd5z2l4hh4wg97cd816l909r9q70z2hszqpp"; + version = "3.1.1.1"; + sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath - microlens microlens-mtl mtl prettyprinter recursion regex-rure - split text transformers vector + lazy-csv microlens microlens-mtl mtl prettyprinter regex-rure split + text transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base optparse-applicative text ]; @@ -177104,22 +177959,23 @@ self: { "jackpolynomials" = callPackage ({ mkDerivation, array, base, combinat, containers, extra, hspray - , hypergeomatrix, ilist, lens, miniterion, numeric-prelude, tasty - , tasty-hunit, unordered-containers + , hypergeomatrix, ilist, lens, matrix, miniterion, numeric-prelude + , tasty, tasty-hunit, unordered-containers, vector }: mkDerivation { pname = "jackpolynomials"; - version = "1.4.1.0"; - sha256 = "153y4p18a5bz803il9v7nacsqki4mw1szw0pdx5qk9jyh9vnalkb"; + version = "1.4.7.0"; + sha256 = "00hblzl2yayxqaygf2rk3k94kawk1rs80707sc6h9317ghpa6x9g"; libraryHaskellDepends = [ - array base combinat containers extra hspray ilist lens - numeric-prelude unordered-containers + array base combinat containers extra hspray ilist lens matrix + numeric-prelude unordered-containers vector ]; testHaskellDepends = [ - base combinat containers hspray hypergeomatrix tasty tasty-hunit + base combinat containers hspray hypergeomatrix matrix + numeric-prelude tasty tasty-hunit unordered-containers ]; benchmarkHaskellDepends = [ base hspray miniterion ]; - description = "Jack, zonal, Schur and skew Schur polynomials"; + description = "Jack, zonal, Schur, and other symmetric polynomials"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -178066,6 +178922,25 @@ self: { broken = true; }) {inherit (pkgs) jdk;}; + "job" = callPackage + ({ mkDerivation, async, base, containers, hashable, mmzk-typeid + , random, resourcet, resourcet-extra, safe-exceptions, stm, time + , transformers + }: + mkDerivation { + pname = "job"; + version = "0.1.1"; + sha256 = "1zvsi7j9fv1wb6jam2gpzyh4ry2fbii5fdqfk2wdj8i266ggh27l"; + libraryHaskellDepends = [ + async base containers hashable mmzk-typeid resourcet + resourcet-extra safe-exceptions stm time transformers + ]; + testHaskellDepends = [ base random resourcet time ]; + description = "Job queue"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -178611,8 +179486,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.9.0"; - sha256 = "0vpd76wicdvybbvrj1v28mxkyagrisijfl0821wkv35k0lls4m9a"; + version = "0.9.9.2"; + sha256 = "0xifxq1mfx1wxcsy23h9lsq8qpnccrzq6v9qk7zfnj43ljfv9mav"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -178630,8 +179505,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.9.0"; - sha256 = "0i2abhhfcg9dy767hx9h6si83syhxpnk7cgihadh2l3l7p4ykbgr"; + version = "0.9.9.2"; + sha256 = "1g34xam06kyvdr3dfmwrc0ybysj4kd2cyip0348kpf72yvbn5caf"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -178646,8 +179521,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.9.1"; - sha256 = "0gpr98p6wsj32vp029mdliclkkk5rf2bg6mv1jbkncskrvn40aqg"; + version = "0.9.9.2"; + sha256 = "0f2c95hagrabyb8s5bdyn1x6sbg5dzvzp23qhmyygi9cgp89nmf4"; libraryHaskellDepends = [ base base-compat exceptions jsaddle lens text transformers ]; @@ -178684,8 +179559,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.9.0"; - sha256 = "0kl296fw3f1fis4fzq9i4q23r0lgxil9bil2alfwnkv6yixj0mhs"; + version = "0.9.9.2"; + sha256 = "0pcswpx37i5gl70n75dlmqb57asya0ikjwyigklv6974yy9ryc9q"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -179104,25 +179979,6 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.11"; - sha256 = "0i8xandvxrh6almz70vkj8hln77j4mnbndy7izqknhzmbxk7ns4q"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = lib.licenses.mit; - }) {}; - - "json-feed_2_0_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; version = "2.0.0.12"; sha256 = "16rkzj280f735va17zl7lrp8yr1b8avjk9gqfa67pk31zn08yicc"; libraryHaskellDepends = [ @@ -179131,7 +179987,6 @@ self: { testHaskellDepends = [ base bytestring filepath hspec ]; description = "JSON Feed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-fu" = callPackage @@ -179528,8 +180383,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.4.0.0"; - sha256 = "07484bh8f9cnv60h5g0h1mgpic105cwq9v3m4pww57m8wg28a0sk"; + version = "0.5.0.0"; + sha256 = "1jdr9l8jvy4r11z6qxpicyafs48z792qkl24r20hddggq0kiac8z"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -179549,8 +180404,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.1"; - sha256 = "0gqlkb3zbkb46lf2bqa65ikj231qyi7kq59hys6vv3y13w3yq2ck"; + version = "0.4.0.2"; + sha256 = "1l49x5bzqra0s2xpf8azbq07kkj9zkqj0qya83bgyg1wrsnv0ivl"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; @@ -179562,22 +180417,23 @@ self: { "json-spec-elm-servant" = callPackage ({ mkDerivation, aeson, base, binary, bound, bytestring, containers - , cookie, directory, elm-syntax, hspec, http-types, json-spec - , json-spec-elm, mtl, prettyprinter, process, servant, text, time - , unordered-containers, uuid + , cookie, directory, elm-syntax, filepath, hspec, http-types + , json-spec, json-spec-elm, mtl, prettyprinter, process, servant + , text, time, unordered-containers, uuid }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.0.1"; - sha256 = "0smg0sx4mybfqycz99xpax3ia5qiwa17p14k87xmp793m6yyj2iq"; + version = "0.4.1.0"; + sha256 = "1l4gx5s8knf1f2s22qn4p8gnr8hbgys1b1pbcsmg0dvsac785871"; libraryHaskellDepends = [ - base bound containers elm-syntax http-types json-spec json-spec-elm - mtl servant text + base bound containers directory elm-syntax filepath http-types + json-spec json-spec-elm mtl prettyprinter process servant text + unordered-containers ]; testHaskellDepends = [ - aeson base binary bytestring containers cookie directory elm-syntax - hspec json-spec prettyprinter process servant text time - unordered-containers uuid + aeson base binary bound bytestring containers cookie directory + elm-syntax filepath hspec http-types json-spec json-spec-elm mtl + prettyprinter process servant text time unordered-containers uuid ]; description = "Generated elm code for servant APIs"; license = lib.licenses.mit; @@ -179590,8 +180446,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.3.0.0"; - sha256 = "1wpf1lzpljczcxq0ml6yikh2xiysd1c5nl9zbscy3bsdcw1vwbgf"; + version = "0.3.1.0"; + sha256 = "0zypr3lxyqaywml7bkkvp00x4a6l4r8wggsplafvcvlanyz7b23i"; libraryHaskellDepends = [ aeson base insert-ordered-containers json-spec lens openapi3 text ]; @@ -181457,27 +182313,6 @@ self: { }: mkDerivation { pname = "katip-wai"; - version = "0.1.2.3"; - sha256 = "1b6rz18jcpxjhckpkknhj760np7xlml10hyfnk891agpgmlsii15"; - libraryHaskellDepends = [ - aeson base bytestring clock http-types katip network text uuid wai - ]; - testHaskellDepends = [ - aeson async base bytestring containers hspec http-client http-types - katip stm text uuid wai warp - ]; - testToolDepends = [ hspec-discover ]; - description = "WAI middleware for logging request and response info through katip"; - license = lib.licenses.bsd3; - }) {}; - - "katip-wai_0_1_2_4" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, clock, containers - , hspec, hspec-discover, http-client, http-types, katip, network - , stm, text, uuid, wai, warp - }: - mkDerivation { - pname = "katip-wai"; version = "0.1.2.4"; sha256 = "0vpjqdr4x68ffjzlwj5f7vhslkwqybj95ynvj8ap9fhq0nhmmp3q"; libraryHaskellDepends = [ @@ -181490,7 +182325,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "WAI middleware for logging request and response info through katip"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katt" = callPackage @@ -181740,15 +182574,18 @@ self: { }) {}; "kdt" = callPackage - ({ mkDerivation, base, criterion, deepseq, deepseq-generics, heap - , mersenne-random-pure64, MonadRandom, QuickCheck + ({ mkDerivation, base, containers, criterion, deepseq + , deepseq-generics, heap, mersenne-random-pure64, MonadRandom + , QuickCheck }: mkDerivation { pname = "kdt"; - version = "0.2.5"; - sha256 = "0sb4vmljkvw4hx3fi7xxyc6wc8vmnpgaj38m3jlbyv22qjp1qf3a"; + version = "0.2.6"; + sha256 = "055chna3q37986mds4f4gdp8ydnw7vviikrmihnf1q4savq14iv1"; libraryHaskellDepends = [ base deepseq deepseq-generics heap ]; - testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ]; + testHaskellDepends = [ + base containers deepseq deepseq-generics QuickCheck + ]; benchmarkHaskellDepends = [ base criterion deepseq deepseq-generics heap mersenne-random-pure64 MonadRandom QuickCheck @@ -182331,8 +183168,8 @@ self: { }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.2.1"; - sha256 = "06w9a69h6qawddyj4i8k69f8a3p5gnc4hz3irrp0yiyfaqrkbcpa"; + version = "0.1.3.0"; + sha256 = "07l35z43524gsp65nc7ipg93hdz1ssfd8mm3ifw7qpgc829vp9vl"; libraryHaskellDepends = [ base binary bytestring dear-imgui GLFW-b keid-core resourcet rio rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator @@ -182375,8 +183212,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.13"; - sha256 = "0r2kskw5hpl9pkfl4r8c2p5wkzhy922rl8l7fla017iw3h1v6y8s"; + version = "0.2.0.14"; + sha256 = "056pvzywdwgya6i43i05kq81r0f91y6cxa0lmx825dzkfm7x7851"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -182490,6 +183327,47 @@ self: { mainProgram = "keter"; }) {}; + "keter_2_1_7" = callPackage + ({ mkDerivation, aeson, array, async, attoparsec, base + , blaze-builder, bytestring, case-insensitive, conduit + , conduit-extra, containers, directory, fast-logger, filepath + , fsnotify, http-client, http-conduit, http-reverse-proxy + , http-types, HUnit, indexed-traversable, lens, lifted-base + , monad-logger, mtl, network, optparse-applicative, process, random + , regex-tdfa, stm, tar, tasty, tasty-hunit, template-haskell, text + , time, tls, tls-session-manager, transformers, unix, unix-compat + , unliftio-core, unordered-containers, vector, wai, wai-app-static + , wai-extra, warp, warp-tls, wreq, yaml, zlib + }: + mkDerivation { + pname = "keter"; + version = "2.1.7"; + sha256 = "16chqiyqp3cjyf9ci6zkbgngynf0q6jrkw6nzjc6m6s20sr07j1r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async attoparsec base blaze-builder bytestring + case-insensitive conduit conduit-extra containers directory + fast-logger filepath fsnotify http-client http-conduit + http-reverse-proxy http-types indexed-traversable lifted-base + monad-logger mtl network optparse-applicative process random + regex-tdfa stm tar template-haskell text time tls + tls-session-manager transformers unix unix-compat unliftio-core + unordered-containers vector wai wai-app-static wai-extra warp + warp-tls yaml zlib + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit http-client http-conduit http-types HUnit + lens monad-logger mtl stm tasty tasty-hunit transformers unix wai + warp wreq + ]; + description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "keter"; + }) {}; + "keuringsdienst" = callPackage ({ mkDerivation, aeson, base, containers, HUnit, text }: mkDerivation { @@ -182738,8 +183616,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; - revision = "5"; - editedCabalFile = "0qp6xvqjw4k98g3di4pnv7hvlhgfcab28nm3pdi48c1gk14qv1kf"; + revision = "6"; + editedCabalFile = "0iyv24rlsjph2kkvf8x3rraysrcadqik4csav5ci46qh4zbahsvc"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -182778,6 +183656,7 @@ self: { license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "keysafe"; + broken = true; }) {}; "keystore" = callPackage @@ -182908,6 +183787,8 @@ self: { pname = "ki-unlifted"; version = "1.0.0.2"; sha256 = "11b4jm161znazwf2pn3qdn4dbz1g5a12dvhm03ddx6lrha7yv1xv"; + revision = "1"; + editedCabalFile = "16rpz48mp17gnadxikfr4mma6fqlcw8qh2v61lxkxz8aap51xhh1"; libraryHaskellDepends = [ base ki unliftio-core ]; description = "A lightweight structured concurrency library"; license = lib.licenses.bsd3; @@ -183161,8 +184042,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "7"; - editedCabalFile = "0pdxv8cjv5zkby152xyxbm1kzvy7bl3f4gni4z3ksd96kijaqixq"; + revision = "8"; + editedCabalFile = "0cvk155zdcyvzjdckymx1algrqakzgsmfy7rnrrgcq45gsrr97my"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -183284,6 +184165,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; + badPlatforms = lib.platforms.darwin; mainProgram = "kmonad"; maintainers = [ lib.maintainers.slotThe ]; }) {}; @@ -183321,7 +184203,6 @@ self: { ]; description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "knead-arithmetic" = callPackage @@ -183336,6 +184217,7 @@ self: { description = "Linear algebra and interpolation using LLVM JIT"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "knit" = callPackage @@ -184028,7 +184910,6 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "kyotocabinet" = callPackage @@ -184216,25 +185097,12 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "2.0.0.7"; - sha256 = "08i4hg2m6d1s6fbgpjnd010ahgfa2d9i5m42pnnd2cr2rkan5f13"; - libraryHaskellDepends = [ base servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = lib.licenses.mit; - }) {}; - - "lackey_2_0_0_8" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; version = "2.0.0.8"; sha256 = "1lqvy29zcqmmv7bvrprriip5537j73j8zfbwl505a9b17ym97sr7"; libraryHaskellDepends = [ base servant-foreign text ]; testHaskellDepends = [ base hspec servant text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lacroix" = callPackage @@ -185411,7 +186279,6 @@ self: { ]; description = "Language definition and parser for AVRO files"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "language-bash" = callPackage @@ -185529,10 +186396,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.13.0.1"; - sha256 = "0ik16ng210fa0l93bgiwpw9m1krcw23530fvv5agl9j1b71qaxm0"; - revision = "1"; - editedCabalFile = "0skpnzjdrfadd1b835q5ic7pvl0znx1mkyxkimy99zm474rn3dzj"; + version = "0.13.0.2"; + sha256 = "1d7s5yy7984n7x1pxmw2qjh9skay2rvaz4vyy085q8mklb05x6sy"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -185671,8 +186536,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.3.0"; - sha256 = "18idkxx2mh62qfymqwbfmzf3k0zvx3wgijk73iqpfbw43wqn99ls"; + version = "1.4.3.1"; + sha256 = "03fj2ddrim37kcqbixjdypawn6v4i4vy3qjrcqy78amymvc9br2m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185698,7 +186563,9 @@ self: { doHaddock = false; description = "A language for generative literature"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "emd"; + broken = true; }) {}; "language-docker_11_0_0" = callPackage @@ -185931,8 +186798,8 @@ self: { pname = "language-gemini"; version = "0.1.0.1"; sha256 = "1vnl280ld0wazffzx19an5d6gybx4396z57idcfvdvzkap97qbh9"; - revision = "1"; - editedCabalFile = "0a3ah5y4nadgdy7jhaa8yswm0hcwq8mzvy25nr1z02garkx8382f"; + revision = "2"; + editedCabalFile = "0z1i9i3w6ymlhaa4r8fs6iks94rwx25zwwrk1gkyczhv1ah1vaqi"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hedgehog hspec hspec-hedgehog text ]; description = "Datatypes and parsing/printing functions to represent the Gemini markup language"; @@ -186791,37 +187658,6 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms - , comfort-array, comfort-array-shape, comfort-blas, data-ref - , deepseq, doctest-exitcode-stdio, guarded-allocation, hyper - , lapack-ffi, lazyio, monoid-transformer, netlib-ffi, non-empty - , QuickCheck, quickcheck-transformer, random, semigroups, Stream - , tagged, text, tfp, transformers, unique-logic-tf, utility-ht - }: - mkDerivation { - pname = "lapack"; - version = "0.5.1.1"; - sha256 = "1fcg43anw1ig861f20p7654gf8g4i2yb2rnld3q22gyi6s5bmi75"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blas-ffi blaze-html boxes comfort-array comfort-array-shape - comfort-blas deepseq guarded-allocation hyper lapack-ffi lazyio - netlib-ffi non-empty semigroups Stream tagged text tfp transformers - utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms comfort-array comfort-array-shape data-ref - doctest-exitcode-stdio monoid-transformer netlib-ffi non-empty - QuickCheck quickcheck-transformer random semigroups tfp - transformers unique-logic-tf utility-ht - ]; - description = "Numerical Linear Algebra using LAPACK"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "lapack_0_5_2" = callPackage - ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms , comfort-array, comfort-array-shape, comfort-blas, containers , data-ref, deepseq, doctest-exitcode-stdio, guarded-allocation , hyper, lapack-ffi, lazyio, monoid-transformer, netlib-ffi @@ -186849,7 +187685,6 @@ self: { ]; description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -186956,10 +187791,8 @@ self: { }: mkDerivation { pname = "large-anon"; - version = "0.3.0"; - sha256 = "07jy3q9x1h49c6zmad2x2s9id4lldklgd133m67l3sfh61qz72vv"; - revision = "1"; - editedCabalFile = "0jyyrlicgs0l4rg4vji8r68hm3iai3x4lmnl0ckr5f525y4yf3g1"; + version = "0.3.1"; + sha256 = "10wvhvmsknxmmg6rbalhp429849xp4q672ynj2kg4lz7qx45w87f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186976,7 +187809,6 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; @@ -186987,10 +187819,8 @@ self: { }: mkDerivation { pname = "large-generics"; - version = "0.2.1"; - sha256 = "0av3j1a1400fsvdmmfji358nknf54n7592fvlilm4kahm4grjl1z"; - revision = "1"; - editedCabalFile = "0j2dmwf0ccggs25npzrrvz6zpachdbywn2crdlyl1dim3m6psrrh"; + version = "0.2.2"; + sha256 = "1mvlyhna4s0997pzfkbhgg3v4l5fqj7rpx5nqjpgy7af5zp2mdgn"; libraryHaskellDepends = [ aeson base deepseq generics-sop primitive sop-core ]; @@ -187043,10 +187873,8 @@ self: { }: mkDerivation { pname = "large-records"; - version = "0.4"; - sha256 = "0g09ly8fck613lbs3g2w1slqrxp6fvvrn7i232w5g7nafgsdalfy"; - revision = "1"; - editedCabalFile = "0wcw9rnp2mkchq2xccsyiqqncxq09lj0nyk661a8xpggflsjbhwb"; + version = "0.4.1"; + sha256 = "0z0k8r4im1rzykwgk8wgyy8zv1wcb06fmikgir09bxhymg0fzpw8"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell @@ -187059,9 +187887,7 @@ self: { ]; description = "Efficient compilation for large records, linear in the size of the record"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; - broken = true; }) {}; "largeword" = callPackage @@ -187327,32 +188153,6 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , integer-logarithms, QuickCheck, quickcheck-instances, tagged - , tasty, tasty-quickcheck, transformers, universe-base - , universe-reverse-instances, unordered-containers - }: - mkDerivation { - pname = "lattices"; - version = "2.2"; - sha256 = "1hwm290bzmiv83hms5lkmgsx64lflr1jp49mz61gg4xnw2sp9v7y"; - revision = "1"; - editedCabalFile = "1q7kl6lxk47lchbmgx15690akggdshvjjhdvmwzfj3hqgwgzjjyi"; - libraryHaskellDepends = [ - base base-compat containers deepseq hashable integer-logarithms - QuickCheck tagged transformers universe-base - universe-reverse-instances unordered-containers - ]; - testHaskellDepends = [ - base base-compat containers QuickCheck quickcheck-instances tasty - tasty-quickcheck transformers universe-base - universe-reverse-instances unordered-containers - ]; - description = "Fine-grained library for constructing and manipulating lattices"; - license = lib.licenses.bsd3; - }) {}; - - "lattices_2_2_1" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances, tagged , tasty, tasty-quickcheck, transformers, universe-base @@ -187374,7 +188174,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "launchdarkly-server-sdk" = callPackage @@ -187618,19 +188417,19 @@ self: { }) {}; "layers-game" = callPackage - ({ mkDerivation, base, cmdargs, composition, data-lens, Gamgine - , GLFW-b, ListZipper, mtl, OpenGLRaw, pretty-show + ({ mkDerivation, base, cmdargs, composition, data-lens-light + , Gamgine, GLFW-b, ListZipper, mtl, OpenGLRaw, pretty-show }: mkDerivation { pname = "layers-game"; - version = "0.7.0"; - sha256 = "1v55940lpp9p67nnnqslzz175cbzs7sfdyinxws9dhwmjvpm4ix8"; + version = "0.8.0"; + sha256 = "17chcw2m3xrn2wmls5k9m2mkdwjqbqphsipbgihskbsq6jmplyc9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl - OpenGLRaw pretty-show + base cmdargs composition data-lens-light Gamgine GLFW-b ListZipper + mtl OpenGLRaw pretty-show ]; description = "A prototypical 2d platform game"; license = lib.licenses.bsd3; @@ -188051,21 +188850,20 @@ self: { "ldap-client" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , connection, containers, fail, hspec, network, process, semigroups - , stm, text + , containers, crypton-connection, fail, hspec, network, process + , semigroups, stm, text }: mkDerivation { pname = "ldap-client"; - version = "0.4.2"; - sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; + version = "0.4.3"; + sha256 = "15cid7mnfn6ykh4vhhqbs652sng12430ccdabf6kcc0236ghicrd"; libraryHaskellDepends = [ - asn1-encoding asn1-types async base bytestring connection - containers fail network semigroups stm text + asn1-encoding asn1-types async base bytestring containers + crypton-connection fail network semigroups stm text ]; testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ldap-client-og" = callPackage @@ -188774,8 +189572,8 @@ self: { pname = "lens"; version = "5.3.2"; sha256 = "1629gyy38l48ifhlwxlbjbrzahphcqgmad5sz2qlr2z2cq3bq4zz"; - revision = "1"; - editedCabalFile = "0xpmk9cd73frn5hb4g6h62rkrjxs091hmxajimn61cnnbg85ckb4"; + revision = "2"; + editedCabalFile = "110jzs8ga4sr3l12khlf1vjhxy2mccn3p9d5qwbr4y7vazllk3np"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -189766,8 +190564,8 @@ self: { ({ mkDerivation, base, deepseq, hashable, tasty, tasty-hunit }: mkDerivation { pname = "libBF"; - version = "0.6.7"; - sha256 = "0kdazhqxn3wr6mi20qwlkn6n5vl9sviij0p141svs77zpc3cxk09"; + version = "0.6.8"; + sha256 = "02lfs9l5qx0xgcy997c31kkmldy26442ahbwiaap9ri85w9j306r"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A binding to the libBF library"; @@ -190018,14 +190816,14 @@ self: { broken = true; }) {}; - "libiserv_9_6_3" = callPackage + "libiserv_9_6_6" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghci, unix }: mkDerivation { pname = "libiserv"; - version = "9.6.3"; - sha256 = "1gq5gppahw443smf04fr6jjjsc7znpkzg2kq4gdmn1vzdxjh1z25"; + version = "9.6.6"; + sha256 = "1wjbmxxsxf4v27ahfx7vicx64n4fp3q2gln58a1c7w43nwqrpnzv"; libraryHaskellDepends = [ base binary bytestring containers deepseq ghci unix ]; @@ -190272,8 +191070,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.10.0.0"; - sha256 = "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh"; + version = "0.10.0.1"; + sha256 = "0ca3ispg92aj49fjzg5ykv7ggvdzb8lsvrh8rfh6fbnivqyzqn56"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network safe-exceptions text time utf8-string @@ -190591,6 +191389,37 @@ self: { broken = true; }) {libressl = null; libtls = null;}; + "libriscv" = callPackage + ({ mkDerivation, array, base, bv, bytestring, containers + , exceptions, extra, file-embed, filepath, freer-simple, melf + , optparse-applicative, parameterized-utils, tasty, tasty-hunit + , template-haskell, transformers, yaml + }: + mkDerivation { + pname = "libriscv"; + version = "0.1.0.0"; + sha256 = "00m4ad1h5qh3mmha6g0j65zni3xlhiqrmgy793cksh08ldims6bp"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bv bytestring containers exceptions extra file-embed + filepath freer-simple melf optparse-applicative parameterized-utils + template-haskell transformers yaml + ]; + executableHaskellDepends = [ + base bv freer-simple optparse-applicative + ]; + testHaskellDepends = [ + array base bv bytestring tasty tasty-hunit + ]; + doHaddock = false; + description = "A versatile, flexible and executable formal model for the RISC-V architecture"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "riscv-tiny"; + }) {}; + "libroman" = callPackage ({ mkDerivation, base, hspec, QuickCheck, split }: mkDerivation { @@ -190661,6 +191490,18 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; + "libssh" = callPackage + ({ mkDerivation, base, bytestring, libssh }: + mkDerivation { + pname = "libssh"; + version = "0.1.0.0"; + sha256 = "17i6yqa9705wv91q3y2li3zaan1kc71c9nmfgmz1k0zhq172z36n"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libssh ]; + description = "libssh bindings"; + license = lib.licenses.mit; + }) {inherit (pkgs) libssh;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -191726,6 +192567,8 @@ self: { pname = "linear"; version = "1.23"; sha256 = "13w6j1wnq40821nwrly7zl4qdsnih19f3p9fnmka42mblmin2lld"; + revision = "1"; + editedCabalFile = "1pal83jxjdci49i7fmqyykg3aplijmg8yva673v3rr5pns1a7cfi"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -191867,8 +192710,8 @@ self: { pname = "linear-generics"; version = "0.2.3"; sha256 = "0093ywl8s8k92b50li28gcmqc616f6l7jkv7vslkvqzn42yrvbq2"; - revision = "1"; - editedCabalFile = "1ky9dhc0bjymw12wpjcv12drbfz7955f1nchgcs3l0ghv8vyvy3x"; + revision = "2"; + editedCabalFile = "0qicg4wh00zph3dih63rkx97fbda4kdyp78xnra0589ry9axbxry"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -193171,25 +194014,10 @@ self: { }: mkDerivation { pname = "list-shuffle"; - version = "1.0.0"; - sha256 = "03qvms9z3jrcz1lswb6kzyk8bw9gafmkz5yil7vi3jirhxxq7491"; - libraryHaskellDepends = [ base primitive random ]; - testHaskellDepends = [ base hedgehog random ]; - benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; - description = "List shuffling and sampling"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "list-shuffle_1_0_0_1" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, primitive, random - , tasty-bench - }: - mkDerivation { - pname = "list-shuffle"; version = "1.0.0.1"; sha256 = "1qcgkkhwnbrl729va8zgv5k6b4lpfy15bbkqnnx0nqz0d91xiqcr"; + revision = "1"; + editedCabalFile = "0hp8s6lc59f3f75cfvd1a9xs1wrischkhahylv4a7qd9xnzrh7ba"; libraryHaskellDepends = [ base primitive random ]; testHaskellDepends = [ base hedgehog random ]; benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; @@ -193332,26 +194160,12 @@ self: { ({ mkDerivation, base, doctest, mmorph, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.1.0"; - sha256 = "061a2cnlv335ski627zrdfk8nd110wpiawclq5nwa3sx0l92xsrx"; - libraryHaskellDepends = [ base mmorph mtl ]; - testHaskellDepends = [ base doctest ]; - description = "List monad transformer"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "list-transformer_1_1_1" = callPackage - ({ mkDerivation, base, doctest, mmorph, mtl }: - mkDerivation { - pname = "list-transformer"; version = "1.1.1"; sha256 = "172dmmw2hbmgzym2fdllwdnk5kcwrw8ljks6azpyzz99ppzk6gr0"; libraryHaskellDepends = [ base mmorph mtl ]; testHaskellDepends = [ base doctest ]; description = "List monad transformer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -193594,8 +194408,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "7"; - editedCabalFile = "0w03xl8i6j47li8cp0issjf6k2n5kwkhp461pp5spsw0hkb4gl3i"; + revision = "8"; + editedCabalFile = "0wg9kshyn0s8f65pchyl69i97qdk39lr8fzp9c4zb7d2lv1cgn8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193894,7 +194708,6 @@ self: { ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-extension" = callPackage @@ -193914,6 +194727,7 @@ self: { description = "Processor specific intrinsics for the llvm interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "llvm-extra" = callPackage @@ -193940,7 +194754,6 @@ self: { doHaddock = false; description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-ffi" = callPackage @@ -194264,8 +195077,6 @@ self: { doHaddock = false; description = "Bindings to the LLVM compiler toolkit using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "llvm-tools" = callPackage @@ -194659,18 +195470,18 @@ self: { }) {}; "locators" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptonite, hspec + ({ mkDerivation, base, bytestring, containers, crypton, hspec , HUnit, memory, QuickCheck }: mkDerivation { pname = "locators"; - version = "0.3.0.3"; - sha256 = "1rjlgjm41mxflq4b7y7cl86mlkdlh5lgxsm40lmy1lwfcx7l2fmq"; + version = "0.3.0.5"; + sha256 = "1mjg7kq43z70cvg42axz26p4b3pk0jg7d78m1nlr0plj1mmx013l"; libraryHaskellDepends = [ - base bytestring containers cryptonite memory + base bytestring containers crypton memory ]; testHaskellDepends = [ - base bytestring containers cryptonite hspec HUnit QuickCheck + base bytestring containers crypton hspec HUnit QuickCheck ]; description = "Human exchangable identifiers and locators"; license = lib.licenses.mit; @@ -194831,8 +195642,8 @@ self: { pname = "log-domain"; version = "0.13.2"; sha256 = "0i4fx9k8cwjvmj0pgfnbici1b68zmif1jmmqxplpjqy32ksnyifa"; - revision = "3"; - editedCabalFile = "0sw686ym4m03glrgyka4m6amvv1iai6cd9f043jnr607phkdjd0k"; + revision = "4"; + editedCabalFile = "1wavnqnay11b49swan3gb2wg5fvl6dqzgkma7vrvr94hyjzjxycn"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable semigroupoids semigroups vector @@ -195156,6 +195967,8 @@ self: { pname = "logging-effect"; version = "1.4.0"; sha256 = "0ff794800pn4gxdig85nr2svajph01rdg3sm0vjpfa71q67wlq0q"; + revision = "1"; + editedCabalFile = "0yjlwlc4rybygpbksclid3wskp5ng8gwwwrh8frq6vl08d1rwmf7"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -196433,7 +197246,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "lsp" = callPackage + "lsp_2_4_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , filepath, hashable, hspec, hspec-discover, lens, lens-aeson @@ -196460,30 +197273,28 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; - "lsp_2_6_0_0" = callPackage + "lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , extra, filepath, hashable, hspec, hspec-discover, lens - , lens-aeson, lsp-types, mtl, prettyprinter, random, sorted-list - , stm, text, text-rope, transformers, unliftio, unliftio-core - , unordered-containers, uuid + , lens-aeson, lsp-types, mtl, prettyprinter, sorted-list, stm, text + , text-rope, transformers, unliftio, unliftio-core + , unordered-containers }: mkDerivation { pname = "lsp"; - version = "2.6.0.0"; - sha256 = "1wimb5y1757l8k1kinlv1y43n7kmjzdh18gayarfm32dsmllahi5"; - revision = "1"; - editedCabalFile = "1p9lvb18m69jdz99d8bn59h2dn3gwalnf4j0sf7j1p2cj9yv8srm"; + version = "2.7.0.0"; + sha256 = "1vxyl3p4b4nskl4icvw5087683lbr5zjj64wwmckw3l2hgvqwr6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring co-log-core containers data-default directory exceptions extra filepath hashable lens - lens-aeson lsp-types mtl prettyprinter random sorted-list stm text + lens-aeson lsp-types mtl prettyprinter sorted-list stm text text-rope transformers unliftio unliftio-core unordered-containers - uuid ]; testHaskellDepends = [ base containers hspec sorted-list text text-rope @@ -196492,7 +197303,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-client" = callPackage @@ -196527,46 +197337,12 @@ self: { , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob , hspec, lens, lens-aeson, lsp, lsp-types, mtl, parser-combinators - , process, row-types, some, text, time, transformers, unix - , unliftio - }: - mkDerivation { - pname = "lsp-test"; - version = "0.17.0.0"; - sha256 = "1jjzqp7dbvaxysfa765zlcmb8h973242fb7a6b17cab3bjc12laq"; - revision = "1"; - editedCabalFile = "07090b7n5a02s1npzmwn6yfk4jnxwi98j1hqflcihni48ylx3b4g"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring co-log-core - conduit conduit-parse containers data-default Diff directory - exceptions extra filepath Glob lens lens-aeson lsp lsp-types mtl - parser-combinators process row-types some text time transformers - unix - ]; - testHaskellDepends = [ - aeson base co-log-core containers data-default directory extra - filepath hspec lens lsp mtl parser-combinators process text - unliftio - ]; - testToolDepends = [ lsp ]; - benchmarkHaskellDepends = [ base extra lsp process ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - }) {}; - - "lsp-test_0_17_0_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, co-log-core, conduit, conduit-parse, containers - , data-default, Diff, directory, exceptions, extra, filepath, Glob - , hspec, lens, lens-aeson, lsp, lsp-types, mtl, parser-combinators , process, some, text, time, transformers, unix, unliftio }: mkDerivation { pname = "lsp-test"; - version = "0.17.0.2"; - sha256 = "1nyqv66rqs316dx1yl1n3ydcxl1lkdvxri8chgvw88c67p84ss45"; - revision = "1"; - editedCabalFile = "04pr949939z5wpi5ir4pjks8zx1r99pgrb4f7wxqpm1g0l25vzgx"; + version = "0.17.1.0"; + sha256 = "1yirmmb4nich63mgxhs51ib5gbp42qi6dmycl38rw4x7lclf82nx"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring co-log-core conduit conduit-parse containers data-default Diff directory @@ -196582,7 +197358,6 @@ self: { benchmarkHaskellDepends = [ base extra lsp process ]; description = "Functional test framework for LSP servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-types_2_0_2_0" = callPackage @@ -196622,7 +197397,7 @@ self: { mainProgram = "generator"; }) {}; - "lsp-types" = callPackage + "lsp-types_2_1_1_0" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath , generic-arbitrary, hashable, hspec, hspec-discover @@ -196655,23 +197430,22 @@ self: { doHaddock = false; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "generator"; }) {}; - "lsp-types_2_2_0_0" = callPackage + "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath - , generic-arbitrary, hashable, hspec, hspec-discover + , generic-arbitrary, hashable, hspec, hspec-discover, hspec-golden , indexed-traversable, indexed-traversable-instances, lens, mod , mtl, network-uri, prettyprinter, QuickCheck, quickcheck-instances , regex, row-types, safe, some, template-haskell, text, witherable }: mkDerivation { pname = "lsp-types"; - version = "2.2.0.0"; - sha256 = "0h3mdnilhk6mg4vnhmnynq18vhj9kfbw5k9bsqa7mrgr8rjsy7jy"; - revision = "1"; - editedCabalFile = "05rz0q5w8ijac7ciia06lcdim6lycq3y5ni5kl7fbjhp39z9l11g"; + version = "2.3.0.0"; + sha256 = "1w5yrcya1yhdg0f4j4yiy0a1lx2ivyjabzkm814ncgs8g99pb8vs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196686,14 +197460,13 @@ self: { witherable ]; testHaskellDepends = [ - aeson base filepath hspec lens network-uri QuickCheck - quickcheck-instances text + aeson base filepath hspec hspec-golden lens network-uri + prettyprinter QuickCheck quickcheck-instances text ]; testToolDepends = [ hspec-discover ]; doHaddock = false; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "generator"; }) {}; @@ -197121,8 +197894,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.7.1.1"; - sha256 = "16yijfnbm58cw8b2bfx10xnn55z96xjdhjd488a76ypcfl2qzfrd"; + version = "0.7.2.0"; + sha256 = "166a6sfwsgmppi8d07xbfrazschfb01qa1nml8vnn5vvj8sxv1z8"; libraryHaskellDepends = [ base blaze-builder lucid text transformers ]; @@ -197287,6 +198060,24 @@ self: { license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; + "lukko_0_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, filepath, singleton-bool + , tasty, tasty-expected-failure, tasty-hunit, temporary + }: + mkDerivation { + pname = "lukko"; + version = "0.1.2"; + sha256 = "0vcqds8ihpjw6zv5rxdzzykh05wayx376wvz77s63d15ls56zn3j"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + async base bytestring filepath singleton-bool tasty + tasty-expected-failure tasty-hunit temporary + ]; + description = "File locking"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + "lumberjack" = callPackage ({ mkDerivation, base, contravariant, exceptions, mtl , prettyprinter, prettyprinter-ansi-terminal, text, time @@ -197688,19 +198479,17 @@ self: { }) {}; "lzma" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, xz + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, xz }: mkDerivation { pname = "lzma"; - version = "0.0.1.0"; - sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; - revision = "1"; - editedCabalFile = "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"; + version = "0.0.1.1"; + sha256 = "1wfwxa927607kfqy9qs8lxm11gngl3ikwwwm0d7i3km2j612g9c0"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ xz ]; testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; @@ -198667,10 +199456,8 @@ self: { ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { pname = "mainland-pretty"; - version = "0.7.1"; - sha256 = "19z2769rik6kwvsil2if2bfq2v59jmwv74jy3fy4q3q3zy4239p1"; - revision = "3"; - editedCabalFile = "0wspwmy0wi1fcyw8czgkr03iyq73gg4i0x6ckjbhxq7qb3r62q8v"; + version = "0.7.1.1"; + sha256 = "02ywrfpcmjnl0gwvhkf89d461l12j14w7nn26kh55rlcvidxvhpb"; libraryHaskellDepends = [ base containers srcloc text transformers ]; @@ -199530,8 +200317,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "8"; - editedCabalFile = "0cqpj3cdygj1dpinz182kaa6zid22wb34x6kiv8kyx40px9n8wx5"; + revision = "9"; + editedCabalFile = "0xzb8pjljfyjbhilfi8sv13i87w5a2yzyn6piw3kgf86f6j6349i"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -199568,34 +200355,6 @@ self: { }: mkDerivation { pname = "mappings"; - version = "0.3.0.0"; - sha256 = "0ljjai9b46d6gsd1w99daincnvs0ckbx81z3y2z1sljn7nay88np"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cond containers formatting indexed-traversable partialord - ]; - executableHaskellDepends = [ - base cond containers formatting indexed-traversable partialord - ]; - testHaskellDepends = [ - base cond containers formatting hspec indexed-traversable - partialord - ]; - testToolDepends = [ hspec-discover ]; - description = "Types which represent functions k -> v"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "view"; - broken = true; - }) {}; - - "mappings_0_3_1_0" = callPackage - ({ mkDerivation, base, cond, containers, formatting, hspec - , hspec-discover, indexed-traversable, partialord - }: - mkDerivation { - pname = "mappings"; version = "0.3.1.0"; sha256 = "1yf6qvsipjfq8s9z9lk7q29m3dkpa5kgvjpkm4wap5vawp2rzqyd"; isLibrary = true; @@ -200325,6 +201084,8 @@ self: { pname = "massiv-test"; version = "1.0.0.0"; sha256 = "1hd9y2n038ja3wz317ah0k84dz30cnmzx0nms9hkr5inf62gbd3n"; + revision = "1"; + editedCabalFile = "10r3k0d6awqrsflwjypw0rq18ahhhakajv63k84h0345kzqb2c5p"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -200339,6 +201100,33 @@ self: { maintainers = [ lib.maintainers.sheepforce ]; }) {}; + "massiv-test_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, hspec, hspec-discover + , massiv, mwc-random, primitive, QuickCheck + , quickcheck-classes-base, scheduler, unliftio, vector + }: + mkDerivation { + pname = "massiv-test"; + version = "1.1.0.0"; + sha256 = "0xwsh95w0r4b6bnvmmlp42jbc8d2114b2b6wiawp35b42cjlniyq"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck quickcheck-classes-base scheduler unliftio + vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq hspec massiv + mwc-random primitive QuickCheck quickcheck-classes-base scheduler + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sheepforce ]; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -200380,6 +201168,24 @@ self: { mainProgram = "mastermind"; }) {}; + "matcha" = callPackage + ({ mkDerivation, base, http-api-data, http-types, text, wai }: + mkDerivation { + pname = "matcha"; + version = "0.0.0.1"; + sha256 = "15s031ks4ih6ic2mvhx8dfcnkg0x3yaz347gyxbbrywjkn0826sv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base http-api-data http-types text wai ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A micro web framework based on pattern matching"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "matcha-exe"; + broken = true; + }) {}; + "matchable" = callPackage ({ mkDerivation, base, containers, hashable, hspec, tagged , unordered-containers, vector @@ -200388,6 +201194,8 @@ self: { pname = "matchable"; version = "0.1.2.1"; sha256 = "0vpjqw9hkx8ck1x56fbjmhhgmdmxzjbxiqdq1i3kqsh8p67dnshq"; + revision = "1"; + editedCabalFile = "0gawa35cnb7qv7fgjpxn1x8ljzx93blw9bnfmpzazlij61cw6lq4"; libraryHaskellDepends = [ base containers hashable tagged unordered-containers vector ]; @@ -203492,10 +204300,8 @@ self: { }: mkDerivation { pname = "microaeson"; - version = "0.1.0.1"; - sha256 = "0rx5gm7apazc0sm65v687ab5106ximka9khizxq1lbckd2x0cq3q"; - revision = "9"; - editedCabalFile = "0w43nprqacq6vx645263x7sirnv4jkw985gyynhxfldyp3yw895h"; + version = "0.1.0.2"; + sha256 = "025vnzs4j2nmkin5x8h5hbrj25spamqppg68wfqlnbrr1519lxfz"; libraryHaskellDepends = [ array base bytestring containers deepseq fail text ]; @@ -204646,8 +205452,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mini"; - version = "1.3.0.1"; - sha256 = "1f17mf4v2dv19wv1kzff3kql6yhn452vpjk8i1sd91rkznq28yr0"; + version = "1.4.0.0"; + sha256 = "0l94dfs2i18yvxi8insl5627wdpm523bygkbc5rg8c38gzrqja6q"; libraryHaskellDepends = [ base ]; description = "Minimal essentials"; license = lib.licenses.mit; @@ -204875,6 +205681,7 @@ self: { ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "minions" = callPackage @@ -205001,12 +205808,12 @@ self: { ({ mkDerivation, base, deepseq, directory, tasty, tasty-hunit }: mkDerivation { pname = "miniterion"; - version = "0.1.1.0"; - sha256 = "0byjlkmi6hr5wpqfbcmqyz7yzcs5nw7gc3x3878a32f9jz92a8jr"; + version = "0.1.1.1"; + sha256 = "1gz00kydz4zdmd0cvfjk1s68mvcmrcdp7h6y4vhp2whqcaiyyppl"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base directory tasty tasty-hunit ]; benchmarkHaskellDepends = [ base ]; - description = "Simple and lightweight benchmark utilities"; + description = "Simple and lightweight benchmarking utilities"; license = lib.licenses.mit; }) {}; @@ -205333,8 +206140,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.8.1.0"; - sha256 = "1l9984zzfb6dkrid342p6y0v36xx0jki54mlhq3w7j4x4ppjxj0k"; + version = "1.8.4.0"; + sha256 = "0z0q0pxkihdhjpm516xxdy3igbx23pfpn7jnjbvf2v054vjq2rmg"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -205687,10 +206494,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.7.6"; - sha256 = "1zahgky724s0x89c9jp4fa6m0kzh461sc2lcpwaw61hqgamaay4c"; - revision = "2"; - editedCabalFile = "0jmnizdwnsmf67y7dh68anvi0sjik4nazs0mjvxv78r2ld3fghg8"; + version = "0.0.8.0"; + sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -205705,6 +206510,7 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "mmark-cli" = callPackage @@ -205746,6 +206552,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "mmorph_1_1_3" = callPackage @@ -206085,8 +206892,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.6.0.1"; - sha256 = "0dcwa97whwwk267cvbmvixya465v7hyc45i0s1jvgxqjhmpy3p6d"; + version = "0.7.0.0"; + sha256 = "139wn08imnasz40v8hlcjm4fmkxwq9lr0xbcl1kqnxqph8yfmmwa"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -206095,7 +206902,7 @@ self: { aeson array base binary bytestring containers entropy hashable hspec random text time uuid uuid-types ]; - description = "A TypeID implementation for Haskell"; + description = "A TypeID and UUIDv7 implementation for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -206323,8 +207130,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; - revision = "1"; - editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"; + revision = "2"; + editedCabalFile = "1wr2c7rymb3xbs9vzkhk7xz2msh74riqx2clyfm78wpfbdzga0xa"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged template-haskell text @@ -206888,8 +207695,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.3.0.1"; - sha256 = "1dlafvvf087l9afdyvwl9zhza9ycccgd30jgd2230ak30hwbvgmk"; + version = "1.3.0.2"; + sha256 = "0w25h6dal72p9y2wn639095g6h78a0sv2p7qbvxsf4rybdwd7j65"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206979,24 +207786,6 @@ self: { }: mkDerivation { pname = "monad-chronicle"; - version = "1.0.1"; - sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; - revision = "3"; - editedCabalFile = "1piiyqm671grd7kwn9l1ks92sdr62kbf8jxq9w05d72s3m050ygi"; - libraryHaskellDepends = [ - base data-default-class mtl semigroupoids these transformers - transformers-compat - ]; - description = "These as a transformer, ChronicleT"; - license = lib.licenses.bsd3; - }) {}; - - "monad-chronicle_1_0_2" = callPackage - ({ mkDerivation, base, data-default-class, mtl, semigroupoids - , these, transformers, transformers-compat - }: - mkDerivation { - pname = "monad-chronicle"; version = "1.0.2"; sha256 = "1mmp2r75b3j9l0rvxjvl1znlr7x4d8baj6ykffdsbnf9v59h0dcx"; libraryHaskellDepends = [ @@ -207005,7 +207794,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monad-classes" = callPackage @@ -207640,8 +208428,8 @@ self: { }: mkDerivation { pname = "monad-metrics"; - version = "0.2.2.1"; - sha256 = "1fknfailm2cwl8r96pxxbid3chvmaq3g98yb6l4pnr8mcqyyz7k6"; + version = "0.2.2.2"; + sha256 = "1w065hrd4r6as763anliig0dd3qdrn50gz5ld8iz3fc744qyc356"; libraryHaskellDepends = [ base clock ekg-core exceptions hashable microlens mtl text transformers unordered-containers @@ -207934,6 +208722,29 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "monad-schedule_0_2" = callPackage + ({ mkDerivation, base, free, generic-arbitrary, HUnit, operational + , QuickCheck, stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, time-domain, transformers + }: + mkDerivation { + pname = "monad-schedule"; + version = "0.2"; + sha256 = "1cwypy31hn49afq7dr8ahvw687j97xyjg8l8g30ss379g3fm3y2k"; + libraryHaskellDepends = [ + base free operational stm time-domain transformers + ]; + testHaskellDepends = [ + base free generic-arbitrary HUnit operational QuickCheck stm + test-framework test-framework-hunit test-framework-quickcheck2 time + time-domain transformers + ]; + description = "A new, simple, composable concurrency abstraction"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "monad-skeleton" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208363,8 +209174,8 @@ self: { }: mkDerivation { pname = "monadic-bang"; - version = "0.2.1.0"; - sha256 = "1kridaswa219y6gchfg50q0chm8gngk7clyjxnpz3hhls2v45pj6"; + version = "0.2.2.1"; + sha256 = "1map2ywq3inzqki6fkw8f5frx85cic1c06ccyy3p0laahlz8i1z8"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; @@ -208995,27 +209806,6 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.5"; - sha256 = "17i07i5z4jhk7w35123hkikrl81v7vnp4qd8plci90vfix53z5aa"; - libraryHaskellDepends = [ - base bytestring commutative-semigroups containers primes text - vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_2_5_1" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, primes, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; version = "1.2.5.1"; sha256 = "0xrbsk4cd8gncw8s0wdg02pmds8wxf237qkbncr73wfwbidshl15"; libraryHaskellDepends = [ @@ -209028,7 +209818,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -209049,10 +209838,8 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.6.4.0"; - sha256 = "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"; - revision = "2"; - editedCabalFile = "0k0pi43km8v25rz61zqfw958djbxrrjb1a2idkpj92klbjsr49dd"; + version = "0.6.5.0"; + sha256 = "008icgq7704pk301s6224k24iy3n60h0jvkkqgq61fi2fbbdy5r7"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -209338,21 +210125,21 @@ self: { }) {}; "months" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, deepseq - , hashable, intervals, QuickCheck, text, time-compat + ({ mkDerivation, aeson, attoparsec, base, deepseq, hashable + , intervals, QuickCheck, text, time-compat }: mkDerivation { pname = "months"; - version = "0.2"; - sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "9"; - editedCabalFile = "0911yfyf0z7zzpc0my8rsg2p38dz07w7mkhc3b909ydyh04wzxvp"; + version = "0.2.1"; + sha256 = "18ysiyj5vqp96nvrkaa1k58ci6l08x03lkiq6cmi5vyg4gw734ig"; libraryHaskellDepends = [ - aeson attoparsec base base-compat deepseq hashable intervals - QuickCheck text time-compat + aeson attoparsec base deepseq hashable intervals QuickCheck text + time-compat ]; description = "MonthName"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "monus" = callPackage @@ -209739,8 +210526,8 @@ self: { }) {}; "morpheus-graphql" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , morpheus-graphql-app, morpheus-graphql-code-gen + ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring + , containers, morpheus-graphql-app, morpheus-graphql-code-gen , morpheus-graphql-core, morpheus-graphql-server , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl , relude, tasty, tasty-hunit, template-haskell, text, transformers @@ -209748,21 +210535,22 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.27.3"; - sha256 = "04qah7565dzq7v4q43zjz8778pdn5jwnway5rvz4kkibcrscfagn"; + version = "0.28.1"; + sha256 = "0i4ax49plhms3rxb4b8p5w97r01i8baqjjnkzg0if0xsvsp1hs3s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server mtl relude template-haskell text - transformers unordered-containers vector + aeson attoparsec-aeson base bytestring containers + morpheus-graphql-app morpheus-graphql-code-gen + morpheus-graphql-core morpheus-graphql-server mtl relude + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server morpheus-graphql-subscriptions - morpheus-graphql-tests mtl relude tasty tasty-hunit - template-haskell text transformers unordered-containers vector + aeson attoparsec-aeson base bytestring containers + morpheus-graphql-app morpheus-graphql-code-gen + morpheus-graphql-core morpheus-graphql-server + morpheus-graphql-subscriptions morpheus-graphql-tests mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers vector ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; @@ -209796,6 +210584,35 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_28_1" = callPackage + ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring + , containers, directory, hashable, megaparsec + , morpheus-graphql-core, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.28.1"; + sha256 = "1fdxz6fny43nrb2cfd57br61v0kc9ijl039p8951xbv3b2c8fjrh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec-aeson base bytestring containers hashable + megaparsec morpheus-graphql-core mtl relude scientific + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec-aeson base bytestring containers directory + hashable megaparsec morpheus-graphql-core morpheus-graphql-tests + mtl relude scientific tasty tasty-hunit template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -209850,6 +210667,38 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, modern-uri, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , prettyprinter, relude, req, tasty, tasty-hunit, template-haskell + , text, transformers, unliftio-core, unordered-containers + , websockets, wuss + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.28.1"; + sha256 = "18kifpxqbnvbw4842d1v1wgfsjic0w91rc2ly02kgj302a2lhgp0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req + template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req tasty + tasty-hunit template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-code-gen" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, filepath , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils @@ -209859,8 +210708,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.27.3"; - sha256 = "1rmxcr17xjx99aam048a4sqlwlnxjk41hx8fnb363ljid74vrcrb"; + version = "0.28.1"; + sha256 = "0nlqhfb5h6rhkg7f85cz8q6jskijqf1ddqic5hcfd5d8myfh6xkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209900,6 +210749,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "morpheus-graphql-code-gen-utils_0_28_1" = callPackage + ({ mkDerivation, base, bytestring, containers + , morpheus-graphql-core, mtl, prettyprinter, relude + , template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen-utils"; + version = "0.28.1"; + sha256 = "0ficavdkml1cbw9rkdgljpgcfsx819116djc86fbdhxglaz1afpd"; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core mtl prettyprinter + relude template-haskell text unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-tests, mtl, relude @@ -209926,6 +210793,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.28.1"; + sha256 = "0z47wcqhpm2mz0v5168s9pd03f40as1kl8mnyvzp29c15wf2qmay"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-server" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , morpheus-graphql-app, morpheus-graphql-core @@ -209953,6 +210847,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-server_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , morpheus-graphql-app, morpheus-graphql-core + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-server"; + version = "0.28.1"; + sha256 = "1pghahv73d8cjqmxi7xndlq8g68f0ap5gn3yk9ww25zjp8vwwsgw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed morpheus-graphql-app + morpheus-graphql-core morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app , morpheus-graphql-core, mtl, relude, text, transformers @@ -209971,6 +210893,25 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app + , morpheus-graphql-core, mtl, relude, text, transformers + , unliftio-core, unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.28.1"; + sha256 = "10bvy586a0ldyfld2xhzprsrgd7rdvcwpcnbg460l0hqmzgpkcr2"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers @@ -209987,6 +210928,23 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-tests_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.28.1"; + sha256 = "161qazf4g7plkx68rnf56sjzrdx5j9k31kdwpynmpb117ylvvrmf"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -210178,7 +211136,6 @@ self: { ]; description = "General purpose migrations library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "moto-postgresql" = callPackage @@ -210195,7 +211152,6 @@ self: { ]; description = "PostgreSQL-based migrations registry for moto"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "motor" = callPackage @@ -210371,8 +211327,8 @@ self: { }: mkDerivation { pname = "mpd-current-json"; - version = "1.2.0.0"; - sha256 = "0ih0x53mwgpk87mznhhwhjhgznl6ap8i5skb9lmsfpnpmy27xh7s"; + version = "1.3.2.0"; + sha256 = "04kwmfjc28y2j0wfgcf9m7qfh7vwa2cvzfsy2hpplyg5ji2ds11a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base libmpd ]; @@ -211302,10 +212258,10 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mt19937"; - version = "0.1.0"; - sha256 = "1gmw70an5qa37kq876z1y1nhj2c9zb48i2pn2z8dcc54ixc5ap4x"; + version = "0.1.1"; + sha256 = "0idy3im1f78df71v7mbz1jdllgswi89cwk12hbp80ph6v3c1syj7"; libraryHaskellDepends = [ base vector ]; - description = "Efficient MT19937 (standard 32-bit Mersenne Twister PRNG) implementation in pure Haskell"; + description = "Standard 32-bit Mersenne Twister PRNG, in pure Haskell"; license = lib.licenses.mit; }) {}; @@ -212340,8 +213296,8 @@ self: { pname = "multipart"; version = "0.2.1"; sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"; - revision = "1"; - editedCabalFile = "03gaapwnvn843hpm5qwdci9df1wf383msd42p8w9ghilpfjj4qy9"; + revision = "2"; + editedCabalFile = "0nansxxrd6153bwwm825iarsxqgyhx924spvx5rrd2i1spp0972m"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "Parsers for the HTTP multipart format"; license = lib.licenses.bsd3; @@ -213480,29 +214436,27 @@ self: { }) {}; "mwc-random" = callPackage - ({ mkDerivation, base, bytestring, doctest, gauge, math-functions - , mersenne-random, primitive, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, time, vector + ({ mkDerivation, base, bytestring, doctest, math-functions + , mersenne-random, mtl, primitive, QuickCheck, random, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, time, vector }: mkDerivation { pname = "mwc-random"; - version = "0.15.0.2"; - sha256 = "0ny2mw4am24d6ykrm8rbcjnrq6p2cjmzjb4m6qfk54wfdxflvmim"; - revision = "1"; - editedCabalFile = "15q5pax8708shpmmf2ql6ximsidzmfsrqkf4ix3dljz65jvhz7hh"; + version = "0.15.1.0"; + sha256 = "1j72qd2v1645x6z1inkswzpmq6prm2k7w0xzz7gc0k85cnyzjaq3"; libraryHaskellDepends = [ base math-functions primitive random time vector ]; testHaskellDepends = [ - base bytestring doctest primitive QuickCheck random tasty - tasty-hunit tasty-quickcheck vector + base bytestring doctest math-functions mtl primitive QuickCheck + random tasty tasty-hunit tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - base gauge mersenne-random random vector + base mersenne-random random tasty tasty-bench vector ]; doCheck = false; description = "Fast, high quality pseudo random number generation"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; }) {}; "mwc-random-accelerate" = callPackage @@ -213895,8 +214849,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "1.1.4"; - sha256 = "1cqrn04p83pc7qjsk4vl8vfjw7z64r00dcki0rvq7si8dd7fslab"; + version = "1.1.5"; + sha256 = "06q07wahvghbalx9dm6dqmrmljlqjzqs46fbmmlp2f2ijz36m024"; libraryHaskellDepends = [ base binary blaze-textual bytestring bytestring-lexing crypton crypton-x509 crypton-x509-store crypton-x509-system @@ -214981,8 +215935,8 @@ self: { }: mkDerivation { pname = "national-australia-bank"; - version = "0.0.8"; - sha256 = "1z4bdd8xwxivb4n07jxgk905r8vk1zhg9ik6k3rqqd5rlc0xa0di"; + version = "0.0.11"; + sha256 = "1bhnzsbxcl6mrcka9vibclria5650hnsrlyj21yfbww55klg6nh8"; libraryHaskellDepends = [ base bytestring containers digit directory filepath lens mtl parsec sv time transformers utf8-string validation @@ -216125,24 +217079,6 @@ self: { }) {}; "netlib-ffi" = callPackage - ({ mkDerivation, base, guarded-allocation, storable-complex - , transformers - }: - mkDerivation { - pname = "netlib-ffi"; - version = "0.1.1"; - sha256 = "0irf5gc9kw3pjb339nrzylr1ldz8fhgmpkji26dm3w18vkwic411"; - revision = "1"; - editedCabalFile = "0q5psp0gi0il6yz99sxmq7x3m7axwzh2qbimcvqbw623zbzgycyg"; - libraryHaskellDepends = [ - base guarded-allocation storable-complex transformers - ]; - description = "Helper modules for FFI to BLAS and LAPACK"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "netlib-ffi_0_1_2" = callPackage ({ mkDerivation, base, deepseq, guarded-allocation , storable-complex, transformers }: @@ -216155,7 +217091,6 @@ self: { ]; description = "Helper modules for FFI to BLAS and LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -216245,10 +217180,8 @@ self: { }: mkDerivation { pname = "netrc"; - version = "0.2.0.0"; - sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "13"; - editedCabalFile = "01c405f31al4qv6fq3apx1p5s4szzkla2nhmwwzpf6lvl5rz8y8h"; + version = "0.2.0.1"; + sha256 = "0scp0y4l5cmj8jkf64rjd0sw51nv8ndk43fg6fwkij37z7pcy42l"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -216524,14 +217457,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_2_0_0" = callPackage + "network_3_2_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.2.0.0"; - sha256 = "1jmrkjxjypm3j0d3rzm3xm87nnwnd7c3s6l7aqxdjdy49ms9cmn4"; + version = "3.2.1.0"; + sha256 = "00fjgg9zj5nhw1ra8kqaaa3cxzkf0lxnzcfdqvagxx7fdvbwdw4h"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -216642,8 +217575,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "1.0.0.0"; - sha256 = "00h1qwnk2clybf06d172pjmf87qb7jwsdn2l1a08hszq1pxyb9ch"; + version = "1.0.0.1"; + sha256 = "0mnyl7rsy30n21kn8h6v1lz73figc1d7b6bljvcas63izymjy8wq"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -216713,8 +217646,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; - revision = "5"; - editedCabalFile = "00j8p4z1ymzh99lgy8lld0slc850xr6wfafj97bb1crvn0xgfzg2"; + revision = "6"; + editedCabalFile = "173jmmqfmqwv6am1yk127ixbdqzng9sjj45v9f9g3cvf3kw6fy6c"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; license = lib.licenses.bsd3; @@ -216804,15 +217737,16 @@ self: { }: mkDerivation { pname = "network-conduit-tls"; - version = "1.4.0"; - sha256 = "16addjifgsvyjsapl3a6nfkcab5znffxyy5lifrmkn9r69s7l5f5"; + version = "1.4.0.1"; + sha256 = "0lbf16f0nm080wmk6ak356jjpdxs1kqasakyfgrx32qkwm41003r"; libraryHaskellDepends = [ base bytestring conduit conduit-extra crypton-connection data-default-class network streaming-commons tls transformers unliftio-core ]; testHaskellDepends = [ - base bytestring conduit conduit-extra crypton-connection HUnit mtl + base bytestring conduit conduit-extra crypton-connection + data-default-class HUnit mtl ]; description = "Create TLS-aware network code with conduits"; license = lib.licenses.mit; @@ -216845,14 +217779,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network-control_0_1_0" = callPackage + "network-control_0_1_1" = callPackage ({ mkDerivation, base, hspec, hspec-discover, pretty-simple , psqueues, QuickCheck, text, unix-time }: mkDerivation { pname = "network-control"; - version = "0.1.0"; - sha256 = "0bvkjid0nqhc15f5nn4za6xwvcc5x8hxfbwky0m2zqdyzwd9bmlp"; + version = "0.1.1"; + sha256 = "1bmfvv7fsf3n65silhwpy7xwy86b358zvflxqj641fysnadxj85f"; libraryHaskellDepends = [ base psqueues unix-time ]; testHaskellDepends = [ base hspec pretty-simple QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -217258,6 +218192,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-run_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, network, time-manager }: + mkDerivation { + pname = "network-run"; + version = "0.4.0"; + sha256 = "07ndlpmsbzhd8sfk8rv1xm543g7v111rilysb9fl0llgzas8hra8"; + libraryHaskellDepends = [ base bytestring network time-manager ]; + description = "Simple network runner library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-server" = callPackage ({ mkDerivation, base, network, unix }: mkDerivation { @@ -217436,6 +218382,8 @@ self: { pname = "network-transport"; version = "0.5.7"; sha256 = "163n3dl56vrmw4pdq66lb80ybjh58lqr85j69hpqwr24c46gjqk7"; + revision = "1"; + editedCabalFile = "1z9k8i5j01ajhashmy1kkwq6bqcwvi48j6d3n57i4bglfdz8s31z"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -217506,8 +218454,8 @@ self: { }: mkDerivation { pname = "network-transport-tcp"; - version = "0.8.3"; - sha256 = "06n6yxcd1alc3zgid29qmljg34mncax0yw6krxalq95pm8lia8j0"; + version = "0.8.4"; + sha256 = "141l1i8knh0b8wspq0zf2530z89bziiv13zw2s36drxg6inq6rcl"; libraryHaskellDepends = [ async base bytestring containers data-accessor network network-transport uuid @@ -218267,8 +219215,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.10"; - sha256 = "15hd1hknhkcpg8x8h7fb6azcgazyxbxggsxrqm441a80yvphq81s"; + version = "1.7.10.1"; + sha256 = "1gzyygw3l434s7kb5iqj6maxrwrnlx5fw1jiir14zdq6p3vafnp8"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -218341,15 +219289,15 @@ self: { }) {}; "ngx-export-tools" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, ngx-export, safe + ({ mkDerivation, aeson, base, binary, bytestring, ngx-export , template-haskell }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.4"; - sha256 = "12qryvxkz8mjbpyrvmp7k3jh0zdf6f92a09jdhca8c2x7qdi3xn8"; + version = "1.2.4.1"; + sha256 = "120jk2d2yip9vd4r0s9b7z7ykh67i921svspn2kc7v5vwx95xn3w"; libraryHaskellDepends = [ - aeson base binary bytestring ngx-export safe template-haskell + aeson base binary bytestring ngx-export template-haskell ]; description = "Extra tools for Nginx Haskell module"; license = lib.licenses.bsd3; @@ -218878,8 +219826,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.7.0.0"; - sha256 = "03qh3691242n0yza6mk66d2l3gmhipfh1pk04qb4fzm9mhb472ps"; + version = "0.7.0.1"; + sha256 = "1b6wl253ffzs81w65is76cgijp47pg7mmyc83kjgc08irz98hi0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220166,7 +221114,9 @@ self: { ]; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "notifications-tray-icon"; + broken = true; }) {}; "notmuch" = callPackage @@ -221969,6 +222919,7 @@ self: { description = "Communicate to OBD interfaces over ELM327"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "obdd" = callPackage @@ -222449,10 +223400,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.7"; - sha256 = "1nywxada76zqzraadwbmz3v6dpwbd997393ksrprci5n6myrakng"; - revision = "1"; - editedCabalFile = "1fxg13qd5rniidin08yjywgfk8dvwfc3y5n582z3x0x86b2ifxy6"; + version = "1.0.8"; + sha256 = "1bimn9jq8nw152jgb4la1cczz6c9ij8hf2xjg59z6inq4ssgyjl9"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -222498,8 +223447,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.3.0"; - sha256 = "07a64p1b0yzx3wmxycifimjqvnfx9gpk6n3wl6rzgncl1fgf89h0"; + version = "1.4.0"; + sha256 = "096p2xx99d00p0qnrclnwdb4dq5wp1i2idz7wj1g7ccz3h26rm2z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -222521,8 +223470,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.3.0"; - sha256 = "0p3cwyrrjm56x3a8myfp1wlm7xy2j1d06y80arij8cl5cki95kwy"; + version = "1.4.0"; + sha256 = "03bbdqq69jqxfdaihykxxds4vcfvc6bydwkyz8zsanvsi5ifwza5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring filepath IfElse mtl ogma-extra @@ -222544,8 +223493,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.3.0"; - sha256 = "1pvnqcgi00v93jkzqxg770y2n0zbq53b0shi783apz9cjxm5a329"; + version = "1.4.0"; + sha256 = "1lg9xph8hsb9jfxvyka6hqb9n9ijw4da29girjf6y16cf7ras3j0"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -222562,8 +223511,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.3.0"; - sha256 = "0g1z3yh4x9p0iinc39ip1nm9s4d21nwc7gzss81vvc5f2m8hdqbg"; + version = "1.4.0"; + sha256 = "0bvsm9d65akrv67n9l9j0j0b6bpxddhj2fgzp4jrjw07dcqsfwpi"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222581,8 +223530,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.3.0"; - sha256 = "18zv608mb3ifs14m3lmsc644cc2qhj9f0gjxgc85m2wq82blsxpb"; + version = "1.4.0"; + sha256 = "1n2i2zxcci5ys0z00h28ndqyl7ay0i200y5krxnarwy5b28xcjnf"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222598,8 +223547,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.3.0"; - sha256 = "1d9grndx0774rz64x7g8hi9bz80ddayclzianyql0jzyw61ps70s"; + version = "1.4.0"; + sha256 = "16ybs7c1404c1hsmrimqs9lx0m5d24kvqjd99ljmk4vw4hb686if"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -222653,8 +223602,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.3.0"; - sha256 = "04w0fayj6hbqciw4fqn481gwlj34sq3r9i09zcqh2m455mybalyc"; + version = "1.4.0"; + sha256 = "0xrdnbsdm2a06r3n7i19bb9dcgssgb9fcly5c7rx7p4744lli3as"; libraryHaskellDepends = [ aeson base bytestring jsonpath megaparsec ogma-spec text ]; @@ -222670,8 +223619,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.3.0"; - sha256 = "06hb9gxqg81gw5sqzsi966fk9yxhv9q7pclnwhjlaaya3jav3xx2"; + version = "1.4.0"; + sha256 = "1f2afvxdjgkgdc64w0f455fb4r9w43nbsjjm4q2s4lhqhrf7qqa9"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222687,8 +223636,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.3.0"; - sha256 = "01vph8dwqf0sw2bn3frik3s2jwnpap1nlkpl8jnk91q2xjc4zhfs"; + version = "1.4.0"; + sha256 = "01lgymsrvkh75jjssxbn5wzw3d51fpc27ngf6pfmrkbd7fx39287"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; @@ -222712,6 +223661,28 @@ self: { broken = true; }) {}; + "ohhecs" = callPackage + ({ mkDerivation, assert-failure, base, byte-order, containers + , ghc-prim, hashable, intern, lens, ordered-containers + , template-haskell, text, th-abstraction, unordered-containers + , vector-th-unbox, witherable, xml-conduit, xml-picklers, xml-types + }: + mkDerivation { + pname = "ohhecs"; + version = "0.0.2"; + sha256 = "1qca5d2va6xvagq1c2p3rg067i2m8yg0a2kqclac0fmv9651npqp"; + libraryHaskellDepends = [ + assert-failure base byte-order containers ghc-prim hashable intern + lens ordered-containers template-haskell text th-abstraction + unordered-containers vector-th-unbox witherable xml-conduit + xml-picklers xml-types + ]; + description = "An Entity-Component-Systems engine core"; + license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ohloh-hs" = callPackage ({ mkDerivation, base, cmdargs, data-lens, hxt, hxt-curl , pretty-show, QuickCheck, test-framework @@ -222939,8 +223910,8 @@ self: { }: mkDerivation { pname = "om-fail"; - version = "0.1.0.2"; - sha256 = "0wv102jpyi69xij2rwzrz5pdlc7pxad0wqsf0zfj15sfl1cnwya6"; + version = "0.1.0.4"; + sha256 = "0nf4hdx8a2invk0wjq3ryk8l5psl8jjkixskadmk8zd8r06mf3ky"; libraryHaskellDepends = [ base monad-logger safe-exceptions transformers ]; @@ -222978,8 +223949,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.0.7"; - sha256 = "0lmca3l4pbhkrxfqwhvw4x6ds6bxml70agi73f5q509iwi3997ni"; + version = "0.3.1.0"; + sha256 = "1whs8v3m4ldxlw7as3jnw9snk3jx0biqkid2rr63c0kkxazlxjpp"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -223587,39 +224558,10 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.3.0"; - sha256 = "1zq2d8rb1zwrvg0civh2a6r01nv1v2ini9rykf63px00srs98p67"; - revision = "1"; - editedCabalFile = "1wd2jgvrlbnma5z3zxa709svcm06clhx8gh9gs1jxscdd6lr6sh7"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_10_3_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; version = "0.10.3.1"; sha256 = "1cv9p6kpb5i4x9bc8ak9vyfvhnqmycf8gbhaf4f6xb6rzwvllvd9"; + revision = "1"; + editedCabalFile = "192hpyb8a0vs7w4l0rq2j2ahqjip5m85w2ic63pn5sskmqcpaxb3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -223635,7 +224577,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -224068,8 +225009,8 @@ self: { pname = "openapi3"; version = "3.2.4"; sha256 = "182bl4z9npcci85771adg7iar1377b5clgzs6wya04j79d391jyv"; - revision = "1"; - editedCabalFile = "08ikd506fxz3pllg5w8lx9yn9qfqlx9il9xwzz7s17yxn5k3xmnk"; + revision = "2"; + editedCabalFile = "1y7is2q6jfq1k35swnw9yv2h122pd5f6zchxl8zah0laafkm03vq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -224136,31 +225077,33 @@ self: { }) {}; "opencascade-hs" = callPackage - ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKernel, TKFillet - , TKG2d, TKG3d, TKGeomBase, TKLCAF, TKMath, TKMesh, TKOffset - , TKPrim, TKRWMesh, TKService, TKShHealing, TKStd, TKSTEP, TKSTL - , TKTopAlgo, TKV3d, TKXCAF, TKXSBase + ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKDEGLTF, TKDEOBJ + , TKDESTEP, TKDESTL, TKernel, TKFillet, TKG2d, TKG3d, TKGeomBase + , TKLCAF, TKMath, TKMesh, TKOffset, TKPrim, TKRWMesh, TKService + , TKShHealing, TKStd, TKTopAlgo, TKV3d, TKXCAF, TKXSBase }: mkDerivation { pname = "opencascade-hs"; - version = "0.2.2.0"; - sha256 = "0h50q77p60dpngm1bxwk8i5lvw05idcsl2jgsv6kq14jpsc65ajq"; + version = "0.3.0.0"; + sha256 = "0bkyjrr2jn4032sg5xm4h93v74w7d6z15gsv7xdazq27va4j52x0"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ - TKBO TKBRep TKernel TKFillet TKG2d TKG3d TKGeomBase TKLCAF TKMath - TKMesh TKOffset TKPrim TKRWMesh TKService TKShHealing TKStd TKSTEP - TKSTL TKTopAlgo TKV3d TKXCAF TKXSBase + TKBO TKBRep TKDEGLTF TKDEOBJ TKDESTEP TKDESTL TKernel TKFillet + TKG2d TKG3d TKGeomBase TKLCAF TKMath TKMesh TKOffset TKPrim + TKRWMesh TKService TKShHealing TKStd TKTopAlgo TKV3d TKXCAF + TKXSBase ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {TKBO = null; TKBRep = null; TKFillet = null; TKG2d = null; + }) {TKBO = null; TKBRep = null; TKDEGLTF = null; TKDEOBJ = null; + TKDESTEP = null; TKDESTL = null; TKFillet = null; TKG2d = null; TKG3d = null; TKGeomBase = null; TKLCAF = null; TKMath = null; TKMesh = null; TKOffset = null; TKPrim = null; TKRWMesh = null; - TKSTEP = null; TKSTL = null; TKService = null; TKShHealing = null; - TKStd = null; TKTopAlgo = null; TKV3d = null; TKXCAF = null; - TKXSBase = null; TKernel = null;}; + TKService = null; TKShHealing = null; TKStd = null; + TKTopAlgo = null; TKV3d = null; TKXCAF = null; TKXSBase = null; + TKernel = null;}; "opencc" = callPackage ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers @@ -224640,8 +225583,8 @@ self: { pname = "openssl-streams"; version = "1.2.3.0"; sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; - revision = "2"; - editedCabalFile = "0xxbx82ksjnphi7vl93ymm3wp8kib5svqcnd6xamqmywrny08qfq"; + revision = "3"; + editedCabalFile = "1vizl9yajkbd59rrnfb38xwq7hfj36avbv6vwqnkhbvz3qaj3dwg"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -224751,16 +225694,17 @@ self: { "opentelemetry-plugin" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , hs-opentelemetry-api, hs-opentelemetry-propagator-w3c - , hs-opentelemetry-sdk, mwc-random, text, unordered-containers + , hs-opentelemetry-sdk, mwc-random, stm, stm-containers, text + , transformers, unordered-containers }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.0.0"; - sha256 = "10j37spgz06xa7n16bbqx9zwhh9yc7avbhmwlvhraikpcjfmz7j9"; + version = "1.1.0"; + sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api - hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random - text unordered-containers + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm + stm-containers text transformers unordered-containers ]; description = "GHC plugin for open telemetry"; license = lib.licenses.bsd3; @@ -225263,6 +226207,8 @@ self: { pname = "oplang"; version = "0.5.0.0"; sha256 = "0psk8jyxdhx2spzrx6k3hka7pyb2mhhsdwwk1g4bzgd3hmxnhh5l"; + revision = "1"; + editedCabalFile = "043mxfr8yjhqzagaydyx0l9q326zpjfzji1l4k6vfdv745ibnd68"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225336,6 +226282,57 @@ self: { broken = true; }) {}; + "opt-env-conf" = callPackage + ({ mkDerivation, aeson, autodocodec, autodocodec-schema + , autodocodec-yaml, base, containers, hashable, mtl, path, path-io + , safe-coloured-text, safe-coloured-text-layout + , safe-coloured-text-terminfo, selective, text, validity + , validity-containers + }: + mkDerivation { + pname = "opt-env-conf"; + version = "0.0.0.0"; + sha256 = "18w3z2q92zphx3wri5cjv2jr0icjnv6jy4mwx4zjkdgkrmsywwz4"; + libraryHaskellDepends = [ + aeson autodocodec autodocodec-schema autodocodec-yaml base + containers hashable mtl path path-io safe-coloured-text + safe-coloured-text-layout safe-coloured-text-terminfo selective + text validity validity-containers + ]; + description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values"; + license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + + "opt-env-conf-test" = callPackage + ({ mkDerivation, aeson, base, containers, genvalidity + , genvalidity-aeson, genvalidity-containers, genvalidity-sydtest + , genvalidity-text, mtl, opt-env-conf, path, pretty-show + , QuickCheck, safe-coloured-text, sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "opt-env-conf-test"; + version = "0.0.0.0"; + sha256 = "1wax19kv3slnnk9zibjsjq4nb3qjcgfznhbs1hv1kf8309a8hzvl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base genvalidity genvalidity-containers opt-env-conf + safe-coloured-text sydtest text + ]; + executableHaskellDepends = [ base opt-env-conf text ]; + testHaskellDepends = [ + aeson base containers genvalidity-aeson genvalidity-sydtest + genvalidity-text mtl opt-env-conf path pretty-show QuickCheck + safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + description = "A testing companion package for opt-env-conf"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "opt-env-conf-example"; + }) {}; + "optics" = callPackage ({ mkDerivation, array, base, bytestring, containers , indexed-profunctors, inspection-testing, lens, mtl, optics-core @@ -225872,7 +226869,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; @@ -226041,17 +227037,6 @@ self: { }) {}; "ordered-containers" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "ordered-containers"; - version = "0.2.3"; - sha256 = "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"; - libraryHaskellDepends = [ base containers ]; - description = "Set- and Map-like types that remember the order elements were inserted"; - license = lib.licenses.bsd3; - }) {}; - - "ordered-containers_0_2_4" = callPackage ({ mkDerivation, base, containers, hashable }: mkDerivation { pname = "ordered-containers"; @@ -226060,7 +227045,6 @@ self: { libraryHaskellDepends = [ base containers hashable ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ordering-duplicates" = callPackage @@ -226504,6 +227488,40 @@ self: { mainProgram = "ormolu"; }) {}; + "ormolu_0_7_7_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, choice, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, QuickCheck, syb, temporary, text, th-env + }: + mkDerivation { + pname = "ormolu"; + version = "0.7.7.0"; + sha256 = "1069j7cldvqqazmfrpfc6wy816227c5vz7fbq860yfb5h9ycv5ns"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax choice + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env + ]; + testHaskellDepends = [ + base Cabal-syntax choice containers directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + QuickCheck temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -226638,8 +227656,8 @@ self: { }: mkDerivation { pname = "os-string"; - version = "2.0.2.2"; - sha256 = "0715lza6wr1gbsvv6a5xkcag38msqms4m6g8bkj5wz90axv0vk1z"; + version = "2.0.6"; + sha256 = "12piw87ypyajhcb45lkrb8nwwg7rrb919dspzifnnrv6zkawgz12"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -226802,6 +227820,19 @@ self: { mainProgram = "ostree-pin"; }) {}; + "osv" = callPackage + ({ mkDerivation, aeson, base, cvss, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "osv"; + version = "0.1.0.0"; + sha256 = "11w2x76ifx4sf6z5gz116pky4w4qv3l8nj2z57x61802l9ckrlqd"; + libraryHaskellDepends = [ aeson base cvss text time ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Open Source Vulnerability format"; + license = lib.licenses.bsd3; + }) {}; + "osx-ar" = callPackage ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { @@ -227218,8 +228249,8 @@ self: { pname = "package-version"; version = "0.3"; sha256 = "01d0345qs5c02gmh3ccsl0xbmiqwcbdpzlqgx2pwj6iv9vvjrf5l"; - revision = "3"; - editedCabalFile = "1cdrarcrf4rdzjvilr0nwwbavwmkv0kc3wq0qhca55710j4kxk5d"; + revision = "4"; + editedCabalFile = "08pjfpib8g8ci9d9p3461bg37k64f0360cx35v4i8lqj8ny69xvh"; libraryHaskellDepends = [ base bytestring deepseq prettyprinter safe-exceptions template-haskell text @@ -227505,18 +228536,19 @@ self: { "pact-time" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal, clock - , Decimal, deepseq, microlens, mtl, tasty, tasty-hunit, text - , vector, vector-space + , data-dword, Decimal, deepseq, microlens, mtl, tasty, tasty-hunit + , text, vector }: mkDerivation { pname = "pact-time"; - version = "0.2.0.2"; - sha256 = "0vkrz5mk2gwxx46x9mjx2b0wkkd88xylg52pf3bhbyp08z6g00p5"; + version = "0.3.0.1"; + sha256 = "1zb70hw0dwa7dsbrb8w4bzhmimv5x8ng31jwhb3fw3cmdcay47sp"; libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal clock Decimal deepseq - microlens mtl text vector vector-space + aeson attoparsec base bytestring cereal clock data-dword Decimal + deepseq microlens mtl text vector ]; testHaskellDepends = [ base tasty tasty-hunit ]; + doHaddock = false; description = "Time Library for Pact"; license = lib.licenses.bsd3; }) {}; @@ -227969,7 +229001,7 @@ self: { ]; }) {}; - "pandoc_3_2" = callPackage + "pandoc_3_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -227988,8 +229020,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.2"; - sha256 = "1630lmia6pwm1c8kb7h0j65vcs65yxkv9j8d7ys9iiazcmrpv1hp"; + version = "3.2.1"; + sha256 = "0mld92y5bmlmqw00d92jy9pqjfr6na7k1pj63f88a8hhaapfg6hj"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -228111,16 +229143,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_2" = callPackage + "pandoc-cli_3_2_1" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.2"; - sha256 = "03nibp6m9nv91h9f6kvj73w7qhbz74qva787zlk7p3m8ayldjwa5"; - revision = "1"; - editedCabalFile = "0f3jyg9ln69ggi4shmny5rqqxpyl5w1gmri11iy4z5a1y1v7nr2l"; + version = "3.2.1"; + sha256 = "1pl4shb3jxbg9xbr2m7ilj3hc3lky6cbgi0h3iqqajb7jrqg8hrw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228501,7 +229531,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_2_1_5" = callPackage + "pandoc-lua-engine_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers , data-default, directory, doclayout, doctemplates, exceptions , filepath, hslua, hslua-module-doclayout, hslua-module-path @@ -228512,10 +229542,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.2.1.5"; - sha256 = "0d2l14889rlac4022j0xzyz2nn17mr84mjd48apz93y2k7r4mcn5"; - revision = "1"; - editedCabalFile = "1fzv8386ra3xsg9d2nzazz5s3crsl8l3p4vhn6vc3js3dzf49hnp"; + version = "0.3"; + sha256 = "0gip84gd5pz8y00jcizy41gdrk11nh5fw4l3wa54fjlzq5279y6p"; libraryHaskellDepends = [ aeson base bytestring citeproc containers data-default doclayout doctemplates exceptions hslua hslua-module-doclayout @@ -228539,8 +229567,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.2.7"; - sha256 = "1n25xpjaf5fcs275xm64qzsfqy7k5hq5vjblxvighzv2n3yxd27n"; + version = "0.2.7.1"; + sha256 = "1yg1hv2xaw2yr036xc6bp2dd0dr4kw1g6ss9a8ahxs8kd670myxw"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hslua hslua-list hslua-marshalling pandoc-types safe text @@ -228988,10 +230016,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.10.0"; - sha256 = "0qdk18vj07qivyyd0limjprni77q2xvydx748lsxsrw2ws8hb1ax"; - revision = "2"; - editedCabalFile = "064bpj5mmxc31snkfysb9c52v1695kxyqbj617m933mgjrw13q91"; + version = "0.13.11.0"; + sha256 = "1c18sh5g3xl4362llqmhcy66ry4328v6pxp1mmdgqgk499aznbs9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -229175,6 +230201,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; + revision = "1"; + editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229872,6 +230900,8 @@ self: { pname = "parameterized-utils"; version = "2.1.8.0"; sha256 = "026lrdnw5rjvny380rmrzpwhmcfgp551whbk0mnx2y2q6ij0sjfm"; + revision = "1"; + editedCabalFile = "0c253mwkk7a58frhavl9nzwlmps4kzvi5a5hsdv6mbsaqq5vq7vw"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables indexed-traversable lens mtl profunctors @@ -230080,6 +231110,8 @@ self: { pname = "park-bench"; version = "0.1.1.0"; sha256 = "15vbhljsnqjm3hjqxlzifvkbcysmwz3fqw2hmdlwkzsyncz4p6j9"; + revision = "1"; + editedCabalFile = "1ngbvkrxnx7g1p321gzh6w23q0k1akf7gg71qxa6asrra4a86b54"; libraryHaskellDepends = [ array base bytestring ghc-prim text ]; description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback"; license = lib.licenses.bsd3; @@ -230576,8 +231608,8 @@ self: { }: mkDerivation { pname = "parser-unbiased-choice-monad-embedding"; - version = "0.0.0.4"; - sha256 = "1gp44c30xj37kym32j7vkl103ks0arb13xjrsar1zmlzzafa9fhz"; + version = "0.0.1.0"; + sha256 = "1q7bxrhqflg79b2r04vkgb02m2n4p071qi7ia4jb6qvpy5vg0z6w"; libraryHaskellDepends = [ base containers Earley srcloc ]; testHaskellDepends = [ base doctest lexer-applicative regex-applicative @@ -230865,6 +231897,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "partial-isomorphisms_0_2_4_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "partial-isomorphisms"; + version = "0.2.4.0"; + sha256 = "0f4lm8f3k76dxanarw1qvdl5b769jvqj9cr6bb7l3f151sabqkv4"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Partial isomorphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "partial-lens" = callPackage ({ mkDerivation, base, comonad-transformers, data-lens , transformers @@ -231109,6 +232153,8 @@ self: { pname = "password"; version = "3.0.4.0"; sha256 = "0dn1qvf25kf5rwifp615wcqm8lh566knvw5mjhr4s8gwsymjdpsk"; + revision = "1"; + editedCabalFile = "0dsc1c97kvqrwyvgaxr88c8r07slbb899pf71m7mwlmiqlz9vhli"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -231339,8 +232385,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "2"; - editedCabalFile = "098xpd9x8cm6w4b8azg4cl039whyh3mjimvhqmazhcn4hp4y4rr4"; + revision = "3"; + editedCabalFile = "1y3fv802jvnrc08qpmh4vvk2h83lbdkv12g6rckhcl4ppgrzc5lz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231490,28 +232536,6 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.8.1"; - sha256 = "1phaxzff8n4jfksdakbzxadh8m07h5ifscwyjz4h5568rlv7zlws"; - revision = "1"; - editedCabalFile = "092gf9fk6f2h5apv2lgqww49gbqjljz70nz6yp7c1l6rhkmcnxaz"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions filepath hspec path transformers - unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = lib.licenses.bsd3; - }) {}; - - "path-io_1_8_2" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; version = "1.8.2"; sha256 = "1a4s4fc2rbzri1cb27gzlm0v24k5g2975smvqg2j4d4h6xmpzbfd"; libraryHaskellDepends = [ @@ -231521,7 +232545,6 @@ self: { testHaskellDepends = [ base exceptions hspec path unix-compat ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "path-like" = callPackage @@ -231732,27 +232755,6 @@ self: { }: mkDerivation { pname = "patrol"; - version = "1.0.0.7"; - sha256 = "139zkmwclm2yigb6081b6zgiqirv9jwcxshx3kigf00vy4wb32z6"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions - http-client http-types network-uri text time uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions hspec - http-client http-types network-uri text time uuid - ]; - description = "Sentry SDK"; - license = lib.licenses.mit; - }) {}; - - "patrol_1_0_0_8" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, exceptions, hspec, http-client, http-types - , network-uri, text, time, uuid - }: - mkDerivation { - pname = "patrol"; version = "1.0.0.8"; sha256 = "0117g6am2g4057apz5xl2jya929bg7sbk4v7mqkllijph6sjycp2"; libraryHaskellDepends = [ @@ -231765,7 +232767,6 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "patronscraper" = callPackage @@ -232233,6 +233234,7 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "A regexp (regex) library on top of pcre-light you can actually use"; license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "pcre-less" = callPackage @@ -232430,27 +233432,6 @@ self: { }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.1.1"; - sha256 = "0bdcakhmazxim5npqkb13lh0b65p1xqv2a05c61zv0g64n1d6k5f"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring containers io-streams - pdf-toolbox-core scientific text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring containers hspec io-streams - pdf-toolbox-core - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-content_0_1_2" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , containers, hspec, io-streams, pdf-toolbox-core, scientific, text - , vector - }: - mkDerivation { - pname = "pdf-toolbox-content"; version = "0.1.2"; sha256 = "1pxzn6ja0k29qb1sr000ksyscjilf8clk3li94i26z1kgxjqf05s"; libraryHaskellDepends = [ @@ -232463,7 +233444,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -232474,33 +233454,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.1.1"; - sha256 = "1d5bk7qbcgz99xa61xi17z0hgr3w2by3d5mr2vgd0hpcdi5ygskz"; - revision = "1"; - editedCabalFile = "1h5nh360zaql29lw3mcykip7bvnnjjcxmpaaz3s842a227m9wflz"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 - containers crypto-api cryptohash hashable io-streams scientific - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hspec io-streams unordered-containers - vector - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-core_0_1_2" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , cipher-aes, cipher-rc4, containers, crypto-api, cryptohash - , hashable, hspec, io-streams, scientific, unordered-containers - , vector - }: - mkDerivation { - pname = "pdf-toolbox-core"; - version = "0.1.2"; - sha256 = "0i1078lj7q0xm52bnxnhhi8wdgnbwh029423g6hm9mj815lq825n"; + version = "0.1.3"; + sha256 = "1pvwilidzg9mb95g6bl0dlaygxq1yjxay6n5a907wxga54kj29w3"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 containers crypto-api cryptohash hashable io-streams scientific @@ -232512,7 +233467,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-document" = callPackage @@ -232522,29 +233476,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.1.2"; - sha256 = "172vxsv541hsdkk08rsr21rwdrcxwmf4pwjmgsq2rjwj4ba4723y"; - libraryHaskellDepends = [ - base bytestring containers io-streams pdf-toolbox-content - pdf-toolbox-core text unordered-containers vector - ]; - testHaskellDepends = [ - base directory hspec io-streams pdf-toolbox-core - unordered-containers - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-document_0_1_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hspec - , io-streams, pdf-toolbox-content, pdf-toolbox-core, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pdf-toolbox-document"; - version = "0.1.3"; - sha256 = "1yywab2xzp69k59636b63akb6nc4g9ql58qj11wkrdsvwvcv9lbb"; + version = "0.1.4"; + sha256 = "1lnh6mafrld72wbsgvar4q2i3qlp3c32ipqab2d1bhm18kg8lvzy"; libraryHaskellDepends = [ base bytestring containers io-streams pdf-toolbox-content pdf-toolbox-core text unordered-containers vector @@ -232555,7 +233488,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -232670,9 +233602,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Extracts text from PDF using poppler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "pdftotext.hs"; - broken = true; + maintainers = [ lib.maintainers.mpscholten ]; }) {poppler-cpp = null;}; "pdynload" = callPackage @@ -233270,10 +234201,8 @@ self: { }: mkDerivation { pname = "perfect-vector-shuffle"; - version = "0.1.1.1"; - sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "5"; - editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; + version = "0.1.1.2"; + sha256 = "0xc75pf21jbc0q49vcr82p50gbfhqfhxq2z96mr3p42grhs0rwr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233904,6 +234833,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-ip" = callPackage + ({ mkDerivation, attoparsec, base, ip, persistent, text }: + mkDerivation { + pname = "persistent-ip"; + version = "0.6.0"; + sha256 = "0g7vwz8xrnycaw9z9inifyrcyj2jjx3pxs358lnm1rhv6zbb5may"; + libraryHaskellDepends = [ attoparsec base ip persistent text ]; + description = "Code for using the ip package with yesod"; + license = lib.licenses.bsd3; + }) {}; + "persistent-iproute" = callPackage ({ mkDerivation, aeson, aeson-iproute, base, bytestring , http-api-data, iproute, path-pieces, persistent, text @@ -236486,8 +237426,8 @@ self: { }: mkDerivation { pname = "pinch"; - version = "0.5.1.0"; - sha256 = "0p90hq8qk8x11ak2im7pv44agw4dcx9dqzby1ip0pl8mmmfdrpdx"; + version = "0.5.2.0"; + sha256 = "1f20lgfqqa5jz6bg2nxgmvpq3wa1kf8gk4a471a7ndvpacw17m8v"; libraryHaskellDepends = [ array base bytestring cereal containers deepseq ghc-prim hashable network semigroups text unordered-containers vector @@ -236643,8 +237583,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.1.0"; - sha256 = "1a2ajm4g3ii4cz6wz6w1rcgpaaznxjv6qwjxy84jsq6s5krczkb0"; + version = "0.1.2.0"; + sha256 = "1wgjiqfv56iaqzv6brp0c8ni13zvn8sgx6iifm5zzlq3p20q62cm"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; @@ -236792,8 +237732,6 @@ self: { ]; description = "Encode and decode JSON streams using Aeson and Pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "pipes-async" = callPackage @@ -239259,8 +240197,8 @@ self: { pname = "pointed"; version = "5.0.4"; sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; - revision = "2"; - editedCabalFile = "1ik9mdz5gdkw5bzj1ymsh8c6kihrl07j1imh1k5rwylnq1pmvlmc"; + revision = "3"; + editedCabalFile = "070yfc5b8rww0zyvpf7jfd0k30p53wdr8mdn289afmfjk1p69kx6"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -239951,10 +240889,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.3"; - sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; - revision = "1"; - editedCabalFile = "0a4m860wgk2wx55x93xia9dx29bj27f1dkvcz1q7b0jgjyvffc58"; + version = "1.9.2.0"; + sha256 = "1qwy6a59jdlzc2y7f422yvlwvd9spsgbbpm2r7jcasgxiwq3fkr0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -240046,8 +240982,8 @@ self: { }: mkDerivation { pname = "polysemy-blockfrost"; - version = "0.1.1.0"; - sha256 = "0vix900hxi9rns556l2nk0hmmbcshac8b028m9pxk9ybax2w3bqq"; + version = "0.1.4.0"; + sha256 = "0l4qna29fv8z2mh9aywp30mmlpw73hn40gwkzhpv8hjdlppvlri1"; libraryHaskellDepends = [ base blockfrost-api blockfrost-client polysemy polysemy-plugin text ]; @@ -240084,8 +241020,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.6.0.2"; - sha256 = "1d53m5i0v1g5c66wvy8ji7gmw0vzz9qh57hf0wx44kk45myva4ad"; + version = "0.7.0.0"; + sha256 = "1x91x960zzpwlscx7mkxfqq5jvd01gkzn66zdza1z0jjrbvkda34"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; @@ -240098,22 +241034,21 @@ self: { }) {}; "polysemy-conc" = callPackage - ({ mkDerivation, async, base, containers, hedgehog, incipit-core - , polysemy, polysemy-plugin, polysemy-resume, polysemy-test - , polysemy-time, stm, stm-chans, tasty, tasty-hedgehog, time - , torsor, unagi-chan, unix + ({ mkDerivation, async, base, hedgehog, incipit-core, polysemy + , polysemy-plugin, polysemy-resume, polysemy-test, polysemy-time + , stm, stm-chans, tasty, tasty-hedgehog, time, torsor, unagi-chan }: mkDerivation { pname = "polysemy-conc"; - version = "0.13.0.1"; - sha256 = "15blkrrh27wadi746qn590agsp0xqrxd6cnvzr9wkfkvv9hcizvj"; + version = "0.14.1.0"; + sha256 = "19m7hnx6f53dzkvj8gkbdds9qs1zfrbzy34iznigksmzyhhsjim4"; libraryHaskellDepends = [ - async base containers incipit-core polysemy polysemy-resume - polysemy-time stm stm-chans torsor unagi-chan unix + async base incipit-core polysemy polysemy-resume polysemy-time stm + stm-chans torsor unagi-chan ]; testHaskellDepends = [ async base hedgehog incipit-core polysemy polysemy-plugin - polysemy-test polysemy-time stm tasty tasty-hedgehog time unix + polysemy-test polysemy-time tasty tasty-hedgehog time torsor ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; @@ -240316,8 +241251,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.10.0.1"; - sha256 = "0wm7qzwaqyhrmwpxvshi5168sbzyb8vya1fmi58jz3plmyz9drws"; + version = "0.11.0.0"; + sha256 = "03vbnvbpz3cn88mp2sgdxn2w63ciz26g6y948wszd21srrcix62i"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -240363,8 +241298,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.10.0.1"; - sha256 = "1srydqn5snp8lqdvwixkh956isl58172syvk2k020knwji5qgw9z"; + version = "0.11.0.0"; + sha256 = "00wsqawnclvqw9mi8yh9i607kjgg8vr8rz7fvrzjmdn13xrpy301"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -240519,24 +241454,25 @@ self: { }) {}; "polysemy-process" = callPackage - ({ mkDerivation, base, incipit-core, path, path-io, polysemy - , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test - , polysemy-time, posix-pty, process, stm-chans, tasty - , tasty-expected-failure, typed-process, unix + ({ mkDerivation, async, base, hedgehog, incipit-core, path, path-io + , polysemy, polysemy-conc, polysemy-plugin, polysemy-resume + , polysemy-test, polysemy-time, posix-pty, process, stm-chans + , tasty, tasty-expected-failure, tasty-hedgehog, typed-process + , unix }: mkDerivation { pname = "polysemy-process"; - version = "0.13.0.1"; - sha256 = "05n7k3jlssa448ixmxc9fmyb1szwfs9pcmvfg2ya40f2p5p8blkx"; + version = "0.14.1.0"; + sha256 = "15jg25chgy92q4k1xl3ndyn3mzc8gkh305zgihzci2lapn55q6cz"; libraryHaskellDepends = [ - base incipit-core path path-io polysemy polysemy-conc + async base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans typed-process unix ]; testHaskellDepends = [ - base incipit-core polysemy polysemy-conc polysemy-plugin - polysemy-resume polysemy-test polysemy-time tasty - tasty-expected-failure typed-process + async base hedgehog incipit-core polysemy polysemy-conc + polysemy-plugin polysemy-resume polysemy-test polysemy-time tasty + tasty-expected-failure tasty-hedgehog typed-process unix ]; description = "Polysemy effects for system processes"; license = "BSD-2-Clause-Patent"; @@ -240591,8 +241527,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.8.0.1"; - sha256 = "03qw5aivq39vjg88liz57pgw6frr68kx2lb8bfqxyjsf4anzg8nq"; + version = "0.9.0.0"; + sha256 = "1qzpj01pnzi8fapjjrvifkn7v8mw76xz3vfnd9yisxn2xpvgm85h"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; @@ -240659,8 +241595,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.9.0.0"; - sha256 = "09aysv1l95q3mx70n0bcnsanrvlynlnz2zl2zg6v2a8vdhnkw7s7"; + version = "0.10.0.0"; + sha256 = "037bjfl0my8hbhmv5nhlv8bmhxdyk16ql9n5bzw03aqkm7pc7p6k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty @@ -240681,8 +241617,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.6.0.2"; - sha256 = "1zg0xyhp7zn9hl76zag097cpdzs38iap3zkc3bpy5amkkbw05kax"; + version = "0.7.0.0"; + sha256 = "0yjv0dz6l1a81jl7x6z4sff22qx68cf2vy0fld8v66wppfrpq199"; libraryHaskellDepends = [ aeson base incipit-core template-haskell time torsor ]; @@ -241007,8 +241943,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.6.8"; - sha256 = "1mylrcnpcwrj9zgfy6plydqyvl34s6xwzsrj6sf7xgxy1zqg0px7"; + version = "0.5.7.0"; + sha256 = "0v1dvps1rz1mkxanx9wnhjqkyzk9qg9b40zcgy2ckz3wyc8362mj"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api cryptohash cryptohash-cryptoapi @@ -241048,8 +241984,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.9"; - sha256 = "1pbwbhymdfqcpmpgcx1473fqaygr9mchlpqhr4i7hqbvhndwvqnl"; + version = "0.1.0.10"; + sha256 = "132b3vr9y9q3xclclaa9n57y66qrh77ajpfz3vnx0r4p2yl2xy38"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -242106,6 +243042,32 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_14" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, criterion, iproute + , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase + , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.14"; + sha256 = "01cyka7jiyx9lna6d6zwvfy71l30fzvrl440ly54m2l08vfwiq3n"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers iproute scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson iproute postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -242237,6 +243199,8 @@ self: { pname = "postgresql-libpq"; version = "0.10.1.0"; sha256 = "1w49zp3izxi3s4mq71i93i4s08kwcv1j0j6m5cfpxcp5s4h12pwq"; + revision = "1"; + editedCabalFile = "1d7hvi969ksdzg4fzyy448k354h4jl3k2i3fv8nb6c4y1bzysiba"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -243275,8 +244239,8 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.4.2"; - sha256 = "1pf57anqc7f90p6rhnlz78asm0xpj1wgh0642zb7g98pyxr1qx7g"; + version = "0.4.4"; + sha256 = "0vg2s1afrjj25wrw7ss0ni12ildqdwp9zr83a2gg4mkb02p3sk2z"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq hashable servant servant-client servant-client-core text @@ -246540,8 +247504,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "0.9.9"; - sha256 = "07d3jr66gk48l4cmy2acigi61zwxn1pa6gg09lxazi5c8ii6zhzf"; + version = "1.0.1"; + sha256 = "10axznbfm6z4nph9wsadiqpsg94a88pky1p0pl24d0ykgpv2j4i2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246565,10 +247529,10 @@ self: { hashable haskeline http-api-data http-conduit http-types HUnit list-t megaparsec modern-uri MonadRandom mtl network optparse-applicative parallel parser-combinators path-pieces - prettyprinter random scientific scotty semigroups stm - stm-containers template-haskell temporary text time transformers - unordered-containers uuid vector wai wai-websockets warp warp-tls - websockets winery + prettyprinter random recursion-schemes scientific scotty semigroups + stm stm-containers template-haskell temporary text time + transformers unordered-containers uuid vector wai wai-websockets + warp warp-tls websockets winery ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -246576,9 +247540,10 @@ self: { data-interval deepseq deepseq-generics directory filepath gnuplot hashable haskeline http-conduit http-types HUnit list-t megaparsec modern-uri MonadRandom mtl network optparse-applicative parallel - parser-combinators prettyprinter random scientific semigroups stm - stm-containers temporary text time transformers - unordered-containers uuid vector wai warp websockets winery + parser-combinators prettyprinter random recursion-schemes + scientific semigroups stm stm-containers temporary text time + transformers unordered-containers uuid vector wai warp websockets + winery ]; benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -247041,13 +248006,14 @@ self: { }) {}; "propeller" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "propeller"; - version = "0.1.0.0"; - sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x"; - libraryHaskellDepends = [ base ]; - description = "A Simple Propagator Library"; + version = "0.2.0.0"; + sha256 = "19mx2y5ba8jzgjn8g0basdpwpy4sv8y90m6cjy4z353wfyspjxxs"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers ]; + description = "A Propagator Library"; license = lib.licenses.bsd3; }) {}; @@ -247530,7 +248496,6 @@ self: { ]; description = "A higher-level API to the proto3-wire library"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.alexfmpe ]; }) {}; @@ -247543,8 +248508,8 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.4.2"; - sha256 = "0ly8nc5z6ri1bj5l8h0r23kwsjr0m7nrwbyzxscp5q4880rqx492"; + version = "1.4.3"; + sha256 = "0gsb0qzxpgpy64jmx2fsbb7cjzixpfsqb2zjws62kg89sgkid8vz"; libraryHaskellDepends = [ base bytestring cereal containers deepseq hashable parameterized primitive QuickCheck safe template-haskell text text-short @@ -247734,15 +248699,15 @@ self: { }) {}; "protocol-radius" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, cryptonite + ({ mkDerivation, base, bytestring, cereal, containers, crypton , dlist, memory, template-haskell, text, transformers }: mkDerivation { pname = "protocol-radius"; - version = "0.0.1.1"; - sha256 = "0cd1qr5c2s25136lljqj2xfl8anrrc6m1yf8dpscjil2y4r27629"; + version = "0.0.1.2"; + sha256 = "08r6qls5nbgmi5kpyr4vc9hmrgc1gqpja7x4f76nffip60riy03n"; libraryHaskellDepends = [ - base bytestring cereal containers cryptonite dlist memory + base bytestring cereal containers crypton dlist memory template-haskell text transformers ]; description = "parser and printer for radius protocol packet"; @@ -248004,6 +248969,7 @@ self: { description = "Language support for the PureScript programming language"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pseudo-boolean" = callPackage @@ -248909,7 +249875,6 @@ self: { executableHaskellDepends = [ base ]; description = "Nix backend for PureScript. Transpile PureScript code to Nix."; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "purenix"; }) {}; @@ -249000,9 +249965,7 @@ self: { doCheck = false; description = "PureScript Programming Language Compiler"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "purs"; - broken = true; }) {}; "purescript-ast" = callPackage @@ -249135,6 +250098,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "purs-tsd-gen"; + broken = true; }) {}; "pursuit-client" = callPackage @@ -249235,8 +250199,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.4.0.0"; - sha256 = "0b5si5c6mhs4a9845qjl0svlgwb7vc0mzr9br20027f44l49dpzl"; + version = "0.4.0.2"; + sha256 = "07clkpwysni1m06jjvpgx9fkxflymnkyldkvhdw0qwmy14pk89aw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249252,6 +250216,7 @@ self: { description = "Send push notifications to mobile iOS devices"; license = lib.licenses.bsd3; mainProgram = "sendapn"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "push-notify-ccs" = callPackage @@ -250712,8 +251677,8 @@ self: { pname = "queues"; version = "1.0.0"; sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr"; - revision = "1"; - editedCabalFile = "1bjjbpx4zm3rkkrpd7sh7ji65g84a6vi34skxkg18zhqcyj3d7wv"; + revision = "3"; + editedCabalFile = "1w18xd6dsh4sl0xsc87v78ra4ja6fbaliy73sfyd432cgchiyfbh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hedgehog ]; benchmarkHaskellDepends = [ base containers tasty-bench ]; @@ -250730,6 +251695,8 @@ self: { pname = "quibble-core"; version = "0.1.0.1"; sha256 = "108cqh3xzl73ijh7fg91cyw0lpn2svm13l8nn922ab9401jy9x8c"; + revision = "1"; + editedCabalFile = "0kfb3714jq791riywhh0nbixzjj7nkpl2y0w8c1cy5hhx2q1jigy"; libraryHaskellDepends = [ base bytestring containers mono-traversable optics-core text text-conversions time uuid @@ -250753,10 +251720,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.20"; - sha256 = "0zzpdb07xrgx3bcvnfmn778yamk6q86lqmj1ir1h3g82gcknzfxm"; - revision = "1"; - editedCabalFile = "0nnl78qiczrsqzjhfvwc89m6v1kyvaysph5v1m9bi37ainvy8222"; + version = "0.1.26"; + sha256 = "0j7dhbscspj48sz9aj4gzq51c5h0wx6q6qh5lxxib49ghry76aqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250986,28 +251951,6 @@ self: { "quickcheck-groups" = callPackage ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show - , QuickCheck, quickcheck-classes, quickcheck-instances - , semigroupoids - }: - mkDerivation { - pname = "quickcheck-groups"; - version = "0.0.1.2"; - sha256 = "0pv1j93g4cmfsh4yijrcc7qgrkggk92jmhl1qjj83yzszm4fb80p"; - libraryHaskellDepends = [ - base groups pretty-show QuickCheck quickcheck-classes - quickcheck-instances semigroupoids - ]; - testHaskellDepends = [ - base groups hspec QuickCheck quickcheck-classes - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Testing group class instances with QuickCheck"; - license = lib.licenses.asl20; - }) {}; - - "quickcheck-groups_0_0_1_3" = callPackage - ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show , QuickCheck, quickcheck-classes, semigroupoids }: mkDerivation { @@ -251024,7 +251967,6 @@ self: { doHaddock = false; description = "Testing group class instances with QuickCheck"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-higherorder" = callPackage @@ -251080,6 +252022,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.31"; sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; + revision = "1"; + editedCabalFile = "1l92l30ghks35wr4im54h44ipw8ddwh3jsinl5snmy2jgv3jaz89"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -251115,6 +252059,8 @@ self: { pname = "quickcheck-lockstep"; version = "0.5.0"; sha256 = "0ap8qgv33a6rwvvplmmf2hh68hk257l0maznkvlmi7cds6z90bk4"; + revision = "1"; + editedCabalFile = "19iqirk5k92l8k04clppvv84i0z9kfvbffk0jwvljs4jn35qx5mq"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -251135,31 +252081,6 @@ self: { }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.3.0.3"; - sha256 = "0z7i93f9r6f0c8xvyja8v4gwm4ydhymir9lzncails53v2aw1g71"; - libraryHaskellDepends = [ - base containers monoid-subclasses pretty-show QuickCheck - quickcheck-classes quickcheck-instances semigroupoids - ]; - testHaskellDepends = [ - base bytestring commutative-semigroups containers hspec - monoid-subclasses QuickCheck quickcheck-classes - quickcheck-instances text vector - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Testing monoid subclass instances with QuickCheck"; - license = lib.licenses.asl20; - }) {}; - - "quickcheck-monoid-subclasses_0_3_0_4" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, hspec, hspec-discover, monoid-subclasses, pretty-show - , QuickCheck, quickcheck-classes, quickcheck-instances - , semigroupoids, text, vector - }: - mkDerivation { - pname = "quickcheck-monoid-subclasses"; version = "0.3.0.4"; sha256 = "1ndyk2l8m5g7vx5q5kmkawv3v8s5yydfg7snr203188zamskcq85"; libraryHaskellDepends = [ @@ -251175,7 +252096,6 @@ self: { doHaddock = false; description = "Testing monoid subclass instances with QuickCheck"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-poly" = callPackage @@ -251394,27 +252314,27 @@ self: { broken = true; }) {}; - "quickcheck-state-machine_0_9_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, base, base-compat - , bifunctors, bytestring, containers, directory, doctest - , exceptions, filelock, filepath, generics-sop, graphviz, hashable - , hashtables, http-client, MemoTrie, monad-logger, mtl, network - , persistent, persistent-postgresql, persistent-sqlite - , postgresql-simple, pretty, pretty-show, process, QuickCheck - , quickcheck-instances, random, resource-pool, resourcet - , servant-client, servant-server, sop-core, split, stm, strict - , string-conversions, tasty, tasty-hunit, tasty-quickcheck, text - , time, unliftio, unliftio-core, vector, warp + "quickcheck-state-machine_0_10_0" = callPackage + ({ mkDerivation, array, base, base-compat, bifunctors, bytestring + , containers, directory, doctest, exceptions, filelock, filepath + , generics-sop, graphviz, hashable, hashtables, http-client + , MemoTrie, monad-logger, mtl, network, persistent + , persistent-postgresql, persistent-sqlite, postgresql-simple + , pretty, pretty-show, prettyprinter, prettyprinter-ansi-terminal + , process, QuickCheck, quickcheck-instances, random, resource-pool + , resourcet, servant-client, servant-server, sop-core, split, stm + , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck + , text, time, unliftio, unliftio-core, vector, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.9.0"; - sha256 = "1b0zsnrr57wymc203rnmidyy5czvcfip5x9jn8vk3m581yl2ljfs"; + version = "0.10.0"; + sha256 = "09xm7lc24ps4il2x5gbl01643zp5j26ps6r2jxw05n8859flp4lq"; libraryHaskellDepends = [ - ansi-wl-pprint base base-compat bytestring containers directory - exceptions filepath generics-sop graphviz MemoTrie mtl pretty - pretty-show QuickCheck random sop-core split text time unliftio - vector + base base-compat bytestring containers directory exceptions + filepath generics-sop graphviz MemoTrie mtl pretty pretty-show + prettyprinter prettyprinter-ansi-terminal QuickCheck random + sop-core split text time unliftio vector ]; testHaskellDepends = [ array base bifunctors bytestring containers directory doctest @@ -252249,8 +253169,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.9"; - sha256 = "11xacqd1xcbpb34h04ch7zz1bsal90zk4h6fvgqb7a8fj094ci2v"; + version = "0.3.10"; + sha256 = "08gpnkb1nj11rhqybgcfcnglf9h271r1hpgsqv9ljzzyc0d67bkp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -252675,30 +253595,49 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "ral_0_2_2" = callPackage + ({ mkDerivation, adjunctions, base, bin, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable, QuickCheck + , semigroupoids, vector + }: + mkDerivation { + pname = "ral"; + version = "0.2.2"; + sha256 = "1c301l9mcq86wkgb4x8vhjrzb0nmv75dsixg5bgmwqp8rbh0xis6"; + libraryHaskellDepends = [ + adjunctions base bin boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Random access lists"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ral-lens" = callPackage ({ mkDerivation, base, bin, fin, lens, ral }: mkDerivation { pname = "ral-lens"; - version = "0.2"; - sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; - revision = "4"; - editedCabalFile = "03wb2rwsh3qwb91iv8ydpbpk74ixfw3krw67dwh4l29057c4p31g"; + version = "0.2.1"; + sha256 = "04i3mq49y3swvzyzhjzjgalwwbgn29vjwkqda7b8hs33wxaza7d6"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ral-optics" = callPackage ({ mkDerivation, base, bin, fin, optics-core, ral }: mkDerivation { pname = "ral-optics"; - version = "0.2"; - sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; - revision = "4"; - editedCabalFile = "17vp96nsgf74b275547mgbwyc858lffy53fggs8nf1b8637mnjvs"; + version = "0.2.1"; + sha256 = "117nwsw8h167fi1x416xifa4pq9ihvasj9144cdg4mmk2ly9br2n"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ralist" = callPackage @@ -252756,25 +253695,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; - version = "2.0.0.7"; - sha256 = "03yvjnyij98c1lmak3511zn1rfczwnjaal0vrqq3lq5j89ysvyrf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Determine how intervals relate to each other"; - license = lib.licenses.mit; - }) {}; - - "rampart_2_0_0_8" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "rampart"; version = "2.0.0.8"; sha256 = "1sdagiz1075kvad525f3q72krn7hvhkrbq1j4dwca4i4p77jdi17"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ramus" = callPackage @@ -253258,6 +254184,23 @@ self: { license = lib.licenses.mit; }) {}; + "range-set-list_0_1_4" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "range-set-list"; + version = "0.1.4"; + sha256 = "1w5kvqi66wg13m6ibzkjkn1gf725msr6ks4nfm5chhk30ad4lvj1"; + libraryHaskellDepends = [ base containers deepseq hashable ]; + testHaskellDepends = [ + base containers deepseq hashable tasty tasty-quickcheck + ]; + description = "Memory efficient sets with ranges of elements"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "range-space" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, time, vector-space @@ -253381,28 +254324,6 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.3"; - sha256 = "1smcplhgh1xmgdp4i5d7sbmvm80s05z5p1vhyywsq4x2hpz20a7g"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base data-functor-logistic distributive template-haskell - transformers - ]; - testHaskellDepends = [ - base data-functor-logistic distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = lib.licenses.bsd3; - }) {}; - - "rank2classes_1_5_3_1" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, data-functor-logistic - , distributive, doctest, markdown-unlit, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; version = "1.5.3.1"; sha256 = "1gbcc6damm3wix4g7lk046cf0qsmy8i06mz54id5gw6qccbicnsh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -253416,7 +254337,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rapid" = callPackage @@ -253725,27 +254645,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.11"; - sha256 = "1v396lxy4xm5ydsxd7c0hpzglysarzp4s872pdiygbfyz0hayhbg"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = lib.licenses.mit; - }) {}; - - "ratel_2_0_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, uuid - }: - mkDerivation { - pname = "ratel"; version = "2.0.0.12"; sha256 = "015riig033fm3pmgm90j2rlynyk5vnd3d9z6izh63ab76kppyh6s"; libraryHaskellDepends = [ @@ -253755,7 +254654,6 @@ self: { testHaskellDepends = [ base filepath hspec ]; description = "Notify Honeybadger about exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -253764,21 +254662,6 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "2.0.0.6"; - sha256 = "01i4k821s10216flhcbcvv7jb1rzn6cqacj10j578l4761h0acz6"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "ratel-wai_2_0_0_7" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; version = "2.0.0.7"; sha256 = "02a6jv5hri6y26idgfxpnyhfjsgiwc1ssks3pn7vcqlahampqa5i"; libraryHaskellDepends = [ @@ -253786,7 +254669,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratelimiter" = callPackage @@ -253975,6 +254857,7 @@ self: { ]; description = "Haskell client for Sentry logging service"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "raven-haskell-scotty" = callPackage @@ -255139,8 +256022,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.2"; - sha256 = "0vkdkyrlmja0aa8h4q04p3rlzvcd0lb4pr07f191dbnd7siwk9dw"; + version = "0.1.0.3"; + sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -255313,6 +256196,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_21_1" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.21.1"; + sha256 = "16i15df3z4qq54jy576z7r146s84awjksa9rb87yk8ldrqx7p5n5"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -255629,8 +256534,8 @@ self: { }: mkDerivation { pname = "recover-rtti"; - version = "0.4.3"; - sha256 = "044qrvq4js03w916d9imyjbq4x0dwwm68d56l0fjsjzzvzin76v7"; + version = "0.5.0"; + sha256 = "17jx201m9x14d624agxx96wkscmlppilmdsjwnh9p930504f66mp"; libraryHaskellDepends = [ aeson base bytestring containers ghc-heap ghc-prim mtl primitive sop-core stm text unordered-containers vector @@ -255661,10 +256566,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.2.2.5"; - sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; - revision = "1"; - editedCabalFile = "0rz78i40nsk3jywkdssqhla8vpbyhrdd95js5ncxwc0p6s5xp4h9"; + version = "5.2.3"; + sha256 = "020fk7s4dzim3957h8447mi3jp95k25zrac86dcaavldxjy88kiv"; libraryHaskellDepends = [ base comonad containers data-fix free template-haskell th-abstraction transformers @@ -256110,8 +257013,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "6"; - editedCabalFile = "02l86v7s9z8by8ym770q2c0wsi2vsic7kvsdqwzxba8krz52kc1b"; + revision = "7"; + editedCabalFile = "0s16blgjra4alwayamivbba1swgr47nic3mns9zj8gqlyv1s5ah8"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -256285,6 +257188,20 @@ self: { license = lib.licenses.mit; }) {}; + "reference-counting" = callPackage + ({ mkDerivation, atomic-counter, base, containers, linear-base }: + mkDerivation { + pname = "reference-counting"; + version = "0.1.0.0"; + sha256 = "1q0nnm4x1nw6hzymzaxg6rvsd9nwqnmxwrwmwphfa37lz4mcn2lr"; + libraryHaskellDepends = [ + atomic-counter base containers linear-base + ]; + testHaskellDepends = [ base linear-base ]; + description = "A reference counting library to alias linear resources"; + license = lib.licenses.bsd3; + }) {}; + "references" = callPackage ({ mkDerivation, array, base, containers, directory, either , filepath, HUnit, instance-control, lens, mtl, template-haskell @@ -257255,8 +258172,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.5.2.0"; - sha256 = "0aszgik0iir6f0n9zzak7w8s7cpc6sh77f5nbkgdyqswscnsfacq"; + version = "0.5.2.1"; + sha256 = "1hfvs6igpavzr6cd4mc7asxj2iwhcjzi7mc4fbfwnq1jmll9xp37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259009,8 +259926,8 @@ self: { pname = "relude"; version = "1.2.1.0"; sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; - revision = "2"; - editedCabalFile = "1vplhnkcgsxfnmg145chxclzqdgaqr9cc5687sgd9qbbisqz7gm1"; + revision = "3"; + editedCabalFile = "1y4qgr64d02cqn46l8cqqwmzkkbd3v2w040b41z5inagbwbr50r8"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -259899,6 +260816,8 @@ self: { pname = "req"; version = "3.13.2"; sha256 = "1pmhfn4rq4n5r2jmml8bj287iaipfl576s0csl4yaf31j0ll1gjv"; + revision = "4"; + editedCabalFile = "1zgxl5w68pplz3s9m9q7jjrcyijyzqlb7xgx1j7pqs57lyr9hsxd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -259919,6 +260838,40 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "req_3_13_3" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, containers, crypton-connection + , data-default-class, exceptions, hspec, hspec-core, hspec-discover + , http-api-data, http-client, http-client-tls, http-types + , modern-uri, monad-control, mtl, QuickCheck, retry + , template-haskell, text, time, transformers, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "req"; + version = "3.13.3"; + sha256 = "162hqajwdnkpl0hylkzf33jxh68nyq1bnsyp3wi6h394phrgniy3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive containers crypton-connection data-default-class + exceptions http-api-data http-client http-client-tls http-types + modern-uri monad-control mtl retry template-haskell text + transformers transformers-base unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-api-data http-client http-types modern-uri + QuickCheck retry template-haskell text time + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , hspec-discover, http-client, req, temporary, weigh @@ -260122,14 +261075,26 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_21_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.21.1"; + sha256 = "09m3jlv6vapf41zm79kznamm0833wwmirn6hgvlnb27j4s5dy4fc"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show }: mkDerivation { pname = "rerefined"; - version = "0.4.0"; - sha256 = "1x7k3s45k9g7g62y5spg52m64fjqxa4bh6dy6d71p6fa2qyhxf2b"; + version = "0.5.1"; + sha256 = "0n775yxclxpnw0nf6g0ai6pdmckvw5v8rw03fss51mq1y9xw8dcg"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show @@ -260261,27 +261226,6 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {}; - "resolv_0_1_2_0" = callPackage - ({ mkDerivation, base, base16-bytestring, binary, bytestring - , containers, directory, filepath, tasty, tasty-hunit - }: - mkDerivation { - pname = "resolv"; - version = "0.1.2.0"; - sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; - revision = "6"; - editedCabalFile = "1qhl69hrvdby2wmk1ip0mr3ghq57zqk1n06qp768bbpdanrfvxx1"; - libraryHaskellDepends = [ - base base16-bytestring binary bytestring containers - ]; - testHaskellDepends = [ - base bytestring directory filepath tasty tasty-hunit - ]; - description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; - license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "resolv" = callPackage ({ mkDerivation, base, base16-bytestring, binary, bytestring , containers, directory, filepath, tasty, tasty-hunit @@ -261632,8 +262576,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "1.3"; - sha256 = "0n6pa29sxkr1vchyayr8sq8akc5jpr8kbn9l2dr9k24y9x55m8jr"; + version = "1.4.0.1"; + sha256 = "1878fwyvghm0k9ayba88abyf7ca9abgzc03290ldkzwbn2kg5gwg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ automaton base containers deepseq free mmorph monad-schedule @@ -261651,26 +262595,24 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; - broken = true; }) {}; "rhine-bayes" = callPackage - ({ mkDerivation, base, dunai, log-domain, mmorph, monad-bayes + ({ mkDerivation, automaton, base, log-domain, mmorph, monad-bayes , rhine, rhine-gloss, time, transformers }: mkDerivation { pname = "rhine-bayes"; - version = "1.2"; - sha256 = "0zffcvhx2bh1wcbizbjvy1gpcn4l8yjzppi54dcl9zxkpdbap5hb"; + version = "1.4.0.1"; + sha256 = "1qkk7sn4zgvm817iii1g930w593wwpcm2anrpml29zj9wznllbj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dunai log-domain monad-bayes rhine transformers + automaton base log-domain mmorph monad-bayes rhine transformers ]; executableHaskellDepends = [ - base dunai log-domain mmorph monad-bayes rhine rhine-gloss time + automaton base log-domain mmorph monad-bayes rhine rhine-gloss time transformers ]; description = "monad-bayes backend for Rhine"; @@ -261685,8 +262627,8 @@ self: { }: mkDerivation { pname = "rhine-gloss"; - version = "1.3"; - sha256 = "1x21mjaiy4adfph7wk85xh3fv037zvfgzmh8ng2bima4i1brn11h"; + version = "1.4.0.1"; + sha256 = "02yrmkl1zl3kys0jzkgz23ah8jwqilbkpijsh4fk8cv16ar9nmgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261695,7 +262637,6 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "rhine-gloss-gears"; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -261706,8 +262647,8 @@ self: { }: mkDerivation { pname = "rhine-terminal"; - version = "1.3"; - sha256 = "0jafqyg7ipfhnxwk4k9q6r3w72amrx9ir0w4r3mfzjq1bxgclzxr"; + version = "1.4.0.1"; + sha256 = "1rzs3mcq489kky55m0cljflqcaw53mzrg0ysnf4snpi41vmp3gh6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261719,7 +262660,6 @@ self: { ]; description = "Terminal backend for Rhine"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "rhine-terminal-simple"; }) {}; @@ -262046,17 +262986,17 @@ self: { "richenv" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover - , QuickCheck, quickcheck-instances, text, unordered-containers - , yaml + , HsYAML, HsYAML-aeson, QuickCheck, quickcheck-instances, text + , unordered-containers }: mkDerivation { pname = "richenv"; - version = "0.1.0.1"; - sha256 = "0jpj1xgwgw8lvah2jkmhvwiyx47n57bvayn5msyhqvrjsbdk90yk"; + version = "0.1.0.2"; + sha256 = "0yxl6cnhg7n29f93mj4a5wkp1v1i2y38824n2bg8b64ik1hlg876"; libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck quickcheck-instances text - unordered-containers yaml + aeson base bytestring hspec HsYAML HsYAML-aeson QuickCheck + quickcheck-instances text unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Rich environment variable setup for Haskell"; @@ -262938,26 +263878,6 @@ self: { }: mkDerivation { pname = "roc-id"; - version = "0.2.0.2"; - sha256 = "1sx66ixilvfzwnic16balzfdynpc891b3lj8gsyp9xd6z059pa61"; - libraryHaskellDepends = [ - base MonadRandom Only text vector-sized - ]; - testHaskellDepends = [ - base hspec MonadRandom Only QuickCheck text vector-sized - ]; - description = "Implementation of the ROC (Taiwan) National ID standard"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "roc-id_0_2_0_3" = callPackage - ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text - , vector-sized - }: - mkDerivation { - pname = "roc-id"; version = "0.2.0.3"; sha256 = "1alniidc069v24gamc4ch058pfqs97hz5mmsgjhidz8j1294pii5"; libraryHaskellDepends = [ @@ -263769,6 +264689,8 @@ self: { pname = "rounded-hw"; version = "0.4.0"; sha256 = "1844qb2nsv25ix41jkrcr0n08wa4zsnrn7wpxxavnabi4j7mf8yz"; + revision = "1"; + editedCabalFile = "1h2cxi47xmpmq5bdfd6jq3pag6sg7rqw3qw6577smjzrpydb67l5"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base deepseq fp-ieee primitive tagged vector @@ -264315,6 +265237,8 @@ self: { pname = "rss"; version = "3000.2.0.8"; sha256 = "03bvyld0kbsmwj23hivdwq7qsd8qldfs2w4z4rq31xlsbksw8bnn"; + revision = "1"; + editedCabalFile = "195hm7q59ndrcisri7mnwmllryivmn715x9l17cjk5ri4v10a8xf"; libraryHaskellDepends = [ base HaXml network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = lib.licenses.publicDomain; @@ -265110,14 +266034,14 @@ self: { license = lib.licenses.mit; }) {}; - "safe-coloured-text_0_3_0_1" = callPackage + "safe-coloured-text_0_3_0_2" = callPackage ({ mkDerivation, base, bytestring, text, validity , validity-bytestring, validity-text }: mkDerivation { pname = "safe-coloured-text"; - version = "0.3.0.1"; - sha256 = "1m0a8ffwbrj13bxzv6zsa5la6711xd94fxpbixwv1jb8r43zhbf6"; + version = "0.3.0.2"; + sha256 = "08chz2sc0zv29if71gsfq5vrkfcx60ydn6x8p42sxckv29x4k5f6"; libraryHaskellDepends = [ base bytestring text validity validity-bytestring validity-text ]; @@ -265189,14 +266113,14 @@ self: { broken = true; }) {}; - "safe-coloured-text-layout_0_1_0_0" = callPackage + "safe-coloured-text-layout_0_2_0_0" = callPackage ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest , sydtest-discover, text, validity }: mkDerivation { pname = "safe-coloured-text-layout"; - version = "0.1.0.0"; - sha256 = "1d964dh6fa1b5ldrndl9pc0169fm4y5m1lxv28an3y13dd6z6mrc"; + version = "0.2.0.0"; + sha256 = "0hhmhbm7zw45nxqy24k8za30k4z0wr2hclgh3kzn72sdb0cq5jir"; libraryHaskellDepends = [ base safe-coloured-text text validity ]; testHaskellDepends = [ base bytestring safe-coloured-text sydtest text @@ -265240,12 +266164,12 @@ self: { license = lib.licenses.mit; }) {}; - "safe-coloured-text-terminfo_0_2_0_0" = callPackage + "safe-coloured-text-terminfo_0_3_0_0" = callPackage ({ mkDerivation, base, safe-coloured-text, terminfo }: mkDerivation { pname = "safe-coloured-text-terminfo"; - version = "0.2.0.0"; - sha256 = "0lnqkhihkklyi1da2lvv41h9z5lg60b03zx1c856s07aghm2iwfj"; + version = "0.3.0.0"; + sha256 = "0l17xzwxrmvjcc5k1a6l9fgf2lqwdyvxpw9r0qy48by24jx8kp32"; libraryHaskellDepends = [ base safe-coloured-text terminfo ]; description = "Safely output coloured text"; license = lib.licenses.mit; @@ -265412,8 +266336,8 @@ self: { pname = "safe-json"; version = "1.2.0.1"; sha256 = "1y03smd9fjxqfs5q2zi8138k3aafwx691327xavsa2b7q27bvi5b"; - revision = "1"; - editedCabalFile = "1f2fax632djf5vq502ms7qj5jagfw8lz7f0vg53acj9qsnx8pkhp"; + revision = "2"; + editedCabalFile = "045q097n08h06zq4jv2ccfqdm3dpcz8gs5yp1hryh7lpf304h33p"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -265641,8 +266565,10 @@ self: { ({ mkDerivation, base, template-haskell, th-abstraction }: mkDerivation { pname = "safe-wild-cards"; - version = "1.0.0.1"; - sha256 = "0kvr91ygb6wjr27scmvjazcbvv2y2kvs0mp8pjqv570wwsi593cy"; + version = "1.0.0.2"; + sha256 = "1b249139ymylvyxzkn0nk7hqgcmxz89mbgs5zc6f7l17gd7iqvap"; + revision = "1"; + editedCabalFile = "0v52sndb7d27w7ad20rfi26qn1fmc0rm5jygxh4zyiwrckrj0nkc"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base ]; description = "Use RecordWildCards safely"; @@ -266050,25 +266976,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; - version = "2.0.0.4"; - sha256 = "1csk70mgawp7298x787xk4sshh7xm71vrc703vjwy3mv3i0sg94x"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Semantic version numbers and constraints"; - license = lib.licenses.mit; - }) {}; - - "salve_2_0_0_5" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "salve"; version = "2.0.0.5"; sha256 = "1n86a61rn5mmxi4whfwxv3ydn47h4537swqgwbg5adys9hwk7pqp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "salvia" = callPackage @@ -266626,6 +267539,8 @@ self: { pname = "sasha"; version = "0.2"; sha256 = "1z99hdbn94ngfinijgsd5x4lllwpyxc8jkf67lk0f6p12jfq7qv0"; + revision = "1"; + editedCabalFile = "0k3c54jajid7ggrm87xa0fvh11zjmhy2qn6lply1nykjhip9q1qn"; libraryHaskellDepends = [ base bytestring containers lattices QuickCheck template-haskell th-letrec wide-word word8set @@ -266987,7 +267902,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_0_0" = callPackage + "sbp_6_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -266996,8 +267911,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.0.0"; - sha256 = "0g6s3ga93y2khs8mvjrqk3v7wzgfjg9y2g6clz0ng57129n579lp"; + version = "6.0.1"; + sha256 = "12q23hdj8xddq9kq73nqf50qwdazqlv6xrb0dyxs5xg3kvlpccwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267154,8 +268069,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.8.2"; - sha256 = "1i1v8jhb2ms41ij1hj5bx9bhn8ig9rl45jn493i61ykv7md3i2m5"; + version = "9.10.1"; + sha256 = "0rdz2a6y23m2h9dcxg4bxl3sqd0q81gd6krflcjhgbhjrbqkjwcx"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -267546,8 +268461,8 @@ self: { }: mkDerivation { pname = "scc"; - version = "0.8.3.1"; - sha256 = "1l89lq20khi3fysbvfxjzchbdw9civz1kj85fyjf8wcm3s3cq34l"; + version = "0.8.4"; + sha256 = "017swv1mvwq05c8fvbqsnbr9xikga4sp9ngmzckggvpbqx5vxd3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268041,6 +268956,8 @@ self: { pname = "scientific"; version = "0.3.8.0"; sha256 = "1kqqf8hyffrkqp6cgjxgxm9nc18ql7jj5rjjirqxf9mam2y47cqk"; + revision = "1"; + editedCabalFile = "1khkf5yl0mlmsia8lvkki6z8da0dwq77w1i5xvnd47qzmgkf4j11"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -268285,8 +269202,8 @@ self: { pname = "scotty"; version = "0.22"; sha256 = "075qnj3s1ddq337qcbrgwsc12rgjm1g5p755iaf67k824p0rifff"; - revision = "1"; - editedCabalFile = "1xx6rq7w2zzim2s8q1gj1z7amgd0jsn3l3rv0pdnh0z5cxw5ydhj"; + revision = "2"; + editedCabalFile = "1m3qvb5q6yigw6ijxnp6h66rmyqg54619hb240s7cqc9qjrrkixk"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive cookie data-default-class exceptions http-types monad-control mtl network @@ -270140,8 +271057,8 @@ self: { pname = "semaphore-compat"; version = "1.0.0"; sha256 = "1qnrdqayrdazmsflh37p1igd25nh1cfgn4k1v3jwwb0w0amnyvhw"; - revision = "2"; - editedCabalFile = "17abqbz6swzwilbfiv6rr6p8j81w4x9hr5vmx5pa6284liv61xx8"; + revision = "3"; + editedCabalFile = "0m8qiy2kkw2w7c0jxii0l513457s1y9zvl6p1c4yzf3jxy623r9d"; libraryHaskellDepends = [ base exceptions unix ]; description = "Cross-platform abstraction for system semaphores"; license = lib.licenses.bsd3; @@ -270204,26 +271121,6 @@ self: { }: mkDerivation { pname = "semialign"; - version = "1.3"; - sha256 = "0v657hpbngbwygpmqz47dw7nwn5cbilf0khjdka8sjjqkwql73k2"; - revision = "1"; - editedCabalFile = "08sjh4vpkjc4mibrb34kn6rim7cbnsm57h383ycm5c6nl5ffzsbv"; - libraryHaskellDepends = [ - base containers hashable indexed-traversable - indexed-traversable-instances semigroupoids tagged these - transformers unordered-containers vector - ]; - description = "Align and Zip type-classes from the common Semialign ancestor"; - license = lib.licenses.bsd3; - }) {}; - - "semialign_1_3_1" = callPackage - ({ mkDerivation, base, containers, hashable, indexed-traversable - , indexed-traversable-instances, semigroupoids, tagged, these - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "semialign"; version = "1.3.1"; sha256 = "1xwx1icyggjbjflgn75bsqw34dmpsd15qqmz13ljxv7zak17ps36"; libraryHaskellDepends = [ @@ -270233,7 +271130,6 @@ self: { ]; description = "Align and Zip type-classes from the common Semialign ancestor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "semialign-extras" = callPackage @@ -270324,6 +271220,8 @@ self: { pname = "semigroupoids"; version = "6.0.1"; sha256 = "07yc5759y4njlb2f7s2yy3ji9akp7xw03w7nybaga514hqq20lqx"; + revision = "1"; + editedCabalFile = "0kiz5zx2i955hn3yi51fa193kbdjkpdxrpsb6dl7674lbzv94n7n"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -270469,8 +271367,8 @@ self: { pname = "semirings"; version = "0.6"; sha256 = "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr"; - revision = "1"; - editedCabalFile = "1c06yhfa053sv3rfz0d72a33l5qb0xmj1b3hy2z7pzxrcay6g1yc"; + revision = "2"; + editedCabalFile = "1km8k2j0b7ym1c6gp8m4rx5y1vh8n27ff1w4l2g6865z0fg1d56l"; libraryHaskellDepends = [ base base-compat-batteries containers hashable unordered-containers ]; @@ -270478,6 +271376,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "semirings_0_7" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "semirings"; + version = "0.7"; + sha256 = "1rjxzs1ypgn50nkniln5bbjkxfphs48y0jvf8b3y4v8r4bi0mj4g"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + description = "two monoids as one, in holy haskimony"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text @@ -270518,8 +271431,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.11.5"; - sha256 = "0b0rzry82yyy96kb9aywlggna721bhzvx8af5s6say6ssm7hwsad"; + version = "0.7.11.6"; + sha256 = "07927m3d1v3w28yhiad6gfkkrbm31c1f9zz98yx5hbi4qspxvri9"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -270912,6 +271825,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "seqn" = callPackage + ({ mkDerivation, base, deepseq, indexed-traversable, primitive + , QuickCheck, quickcheck-classes-base, samsort, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "seqn"; + version = "0.1.1.0"; + sha256 = "0fwkb58qjcn3d8llvll461w9jkign2gfpsyv5lmvnvkpbjb7j5pi"; + libraryHaskellDepends = [ + base deepseq indexed-traversable primitive samsort transformers + ]; + testHaskellDepends = [ + base indexed-traversable QuickCheck quickcheck-classes-base tasty + tasty-quickcheck transformers + ]; + description = "Sequences and measured sequences"; + license = lib.licenses.bsd3; + }) {}; + "sequence" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, transformers @@ -271008,6 +271941,22 @@ self: { broken = true; }) {}; + "sequitur" = callPackage + ({ mkDerivation, base, containers, hashable, hashtables, hspec + , primitive, QuickCheck + }: + mkDerivation { + pname = "sequitur"; + version = "0.1.0.0"; + sha256 = "0j1v4q7jm2bdjhmbpyiw9hmawl09xwf2lrls5fwm35ahngpxcpr5"; + libraryHaskellDepends = [ + base containers hashable hashtables primitive + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "Grammar-based compression algorithms SEQUITUR"; + license = lib.licenses.bsd3; + }) {}; + "sequor" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, mtl , nlp-scores, pretty, split, text, vector @@ -271058,6 +272007,8 @@ self: { pname = "serdoc-core"; version = "0.1.0.0"; sha256 = "0m5sarripwgi9pda5bs2zb65mgvsy72zb4g9ld2bxxrb094hlbg5"; + revision = "1"; + editedCabalFile = "0h17lvgafzp9dqv5ydmd8akanm1wyafbxbd08y0nl82djmzadv14"; libraryHaskellDepends = [ base bytestring containers mtl tasty tasty-quickcheck template-haskell text th-abstraction time @@ -271135,8 +272086,8 @@ self: { pname = "serialise"; version = "0.2.6.1"; sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; - revision = "2"; - editedCabalFile = "1y21m10vx4k75x0im5448pl5mhl772hz1hfk47ryb3whz1l6d9vf"; + revision = "3"; + editedCabalFile = "0msmv6shqxpfl8vz46mw4vj398h1fvjgrfv0s4dcsmfql44m1zz3"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -271203,8 +272154,6 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "serokell-util" = callPackage @@ -271348,6 +272297,26 @@ self: { mainProgram = "image-conversion"; }) {}; + "servant-activeresource" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, servant + , servant-server, template-haskell, text + }: + mkDerivation { + pname = "servant-activeresource"; + version = "0.1.0.0"; + sha256 = "0dcip0vbry344pv8za5ldxr9g71vyb63ks3jdpjc7z4vixp5rbsp"; + libraryHaskellDepends = [ + aeson base bytestring containers servant servant-server + template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring containers servant servant-server + template-haskell text + ]; + description = "Servant endpoints compatible with Rails's ActiveResources"; + license = lib.licenses.bsd3; + }) {}; + "servant-aeson-generics-typescript" = callPackage ({ mkDerivation, aeson, aeson-generics-typescript, async, base , bytestring, conduit, containers, directory, filepath, hspec @@ -273051,8 +274020,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; - revision = "6"; - editedCabalFile = "03sx2hc8kds5yx62zivhc0nj3hd0g0clcrdbccbx1hfnr7bs8ddx"; + revision = "7"; + editedCabalFile = "148mx2hi46l5mdlgikfgilwl3lrvbhqd651qxiky58nr32m07gk0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -274053,6 +275022,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_3_5_5_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.5.5.0.1"; + sha256 = "0s0krm17addizhjm8033an4nnz27v9n03431gd5v86i5db879q24"; + libraryHaskellDepends = [ + aeson base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core text + ]; + description = "Servant swagger ui"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-swagger-ui-core" = callPackage ({ mkDerivation, aeson, base, blaze-markup, bytestring, http-media , servant, servant-blaze, servant-server, text, transformers @@ -274062,8 +275048,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.5"; sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd"; - revision = "10"; - editedCabalFile = "0f5k3103mm9rp00grw89if7iwkpzvxqbbbdpm09zhh1s8chhnqll"; + revision = "11"; + editedCabalFile = "03wabrz068mf4vddlv8mvgvgijp7vqn7i85bqzr7aw7bx6kmkkv1"; libraryHaskellDepends = [ aeson base blaze-markup bytestring http-media servant servant-blaze servant-server text transformers transformers-compat wai-app-static @@ -274880,10 +275866,8 @@ self: { }: mkDerivation { pname = "set-cover"; - version = "0.1.1"; - sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; - revision = "3"; - editedCabalFile = "1xx2ibsqqc8kiwh8b82lgj5xigrdk8cnvqz6l57bfwn9jlrh82yg"; + version = "0.1.1.1"; + sha256 = "14j4ml7kglk667idd3qgsdkkzr8iikrj6jcr80wpnlk6wpi2cpnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275451,8 +276435,8 @@ self: { }: mkDerivation { pname = "sha-validation"; - version = "0.1.0.0"; - sha256 = "190z2sgbbnq4p91j1xlc8bnnspz68r1m17vvzxpcifh2ji42al0v"; + version = "0.1.0.1"; + sha256 = "19sfz8rcb2jjp8zcb7gj9ylvb7a0nz70zr3fssmp0imlahr4q2kg"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring directory filepath template-haskell text vector @@ -276167,6 +277151,17 @@ self: { license = lib.licenses.mit; }) {}; + "shamochu" = callPackage + ({ mkDerivation, base, containers, vector }: + mkDerivation { + pname = "shamochu"; + version = "0.1.0.0"; + sha256 = "0k5sn1jmwk2a1c3xj83lr4pjf1b40kk10gs9x0addywbrfbjwh2p"; + libraryHaskellDepends = [ base containers vector ]; + description = "“Shuffle and merge overlapping chunks” lossless compression"; + license = lib.licenses.bsd3; + }) {}; + "shana" = callPackage ({ mkDerivation, base, directory, regex-posix }: mkDerivation { @@ -278538,12 +279533,14 @@ self: { }) {}; "simple-prompt" = callPackage - ({ mkDerivation, base, exceptions, extra, haskeline, time }: + ({ mkDerivation, base, exceptions, extra, haskeline, safe, time }: mkDerivation { pname = "simple-prompt"; - version = "0.2.2"; - sha256 = "1m8q7jqmdsz3nmsb86i9wy94pxypz172ragx9qfy2v5v0pmc8mww"; - libraryHaskellDepends = [ base exceptions extra haskeline time ]; + version = "0.2.3"; + sha256 = "1ijnfrb6jxrwaj9fnva6mj55a998ld5nwqaxk1x23z57b5wnkacc"; + libraryHaskellDepends = [ + base exceptions extra haskeline safe time + ]; description = "Simple commandline text prompt functions"; license = lib.licenses.bsd3; }) {}; @@ -279239,6 +280236,17 @@ self: { broken = true; }) {}; + "singleraeh" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleraeh"; + version = "0.4.0"; + sha256 = "1ajb4s4b3qqaaylzaipby6c3vgvj7p99ycrvcl6wv3pvq32q4z6s"; + libraryHaskellDepends = [ base ]; + description = "raehik's singletons"; + license = lib.licenses.mit; + }) {}; + "singlethongs" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -279257,10 +280265,8 @@ self: { ({ mkDerivation, base, boring, dec, deepseq, some }: mkDerivation { pname = "singleton-bool"; - version = "0.1.7"; - sha256 = "16xj7d3qnd8nhk66kxm5c145l1060m9yz2yc9y47wsf3hriijb8w"; - revision = "1"; - editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c"; + version = "0.1.8"; + sha256 = "0wql2gdy93f62ghv93xcqjm6ajs5glyz8si605wrll9vp79g66r6"; libraryHaskellDepends = [ base boring dec deepseq some ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -279290,7 +280296,6 @@ self: { libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "singleton-typelits" = callPackage @@ -279338,8 +280343,29 @@ self: { ]; description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; + }) {}; + + "singletons-base_3_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, deepseq, directory + , filepath, pretty, process, singletons, singletons-th, tasty + , tasty-golden, template-haskell, text, th-desugar, turtle + }: + mkDerivation { + pname = "singletons-base"; + version = "3.3"; + sha256 = "1h879yy50g6pldnshjh3syvw8qvqzkm8vxsrj237fk76n56x0iq8"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base pretty singletons singletons-th template-haskell text + th-desugar + ]; + testHaskellDepends = [ + base bytestring deepseq filepath process tasty tasty-golden text + turtle + ]; + description = "A promoted and singled version of the base library"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-base_3_4" = callPackage @@ -279363,7 +280389,6 @@ self: { description = "A promoted and singled version of the base library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "singletons-presburger" = callPackage @@ -279372,8 +280397,8 @@ self: { }: mkDerivation { pname = "singletons-presburger"; - version = "0.7.3.0"; - sha256 = "00dbagcga3pkbss4asa383vabb42yprv29fp6sqq5drkw6pja32v"; + version = "0.7.4.0"; + sha256 = "1c58ckqnhqsmshdc9fmjd5y0x63i3q1jajj8v9cacybhi8krl0sq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279382,7 +280407,6 @@ self: { ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "singletons-th" = callPackage @@ -279401,6 +280425,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons-th_3_3" = callPackage + ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons + , syb, template-haskell, th-desugar, th-orphans, transformers + }: + mkDerivation { + pname = "singletons-th"; + version = "3.3"; + sha256 = "131v6gfx43mwxaqxx4m1lkyb1cxybwpd02m91r83i1phkxmla2qv"; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl singletons syb template-haskell + th-desugar th-orphans transformers + ]; + description = "A framework for generating singleton types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-th_3_4" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers @@ -279687,6 +280728,8 @@ self: { pname = "size-based"; version = "0.1.3.2"; sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; + revision = "1"; + editedCabalFile = "1h4ig2pqw5spg5mdgwd73q4banvk3kyk7q76pkhy8n0mnwpa51ck"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -279704,8 +280747,8 @@ self: { }: mkDerivation { pname = "sized"; - version = "1.1.0.1"; - sha256 = "0ncgzl6qif9zs78d4hp7vmghv99mx3vvydn3ls37k1fvqqpwz2z9"; + version = "1.1.0.2"; + sha256 = "0644x908zr74bj98apbyr6368lmr9vya7hh6iyykswi6afh7967l"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens @@ -279837,18 +280880,18 @@ self: { }) {}; "sizes" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, deepseq, dlist, lens - , parallel-io, regex-posix, system-fileio, system-filepath, text + ({ mkDerivation, base, cmdargs, deepseq, dlist, lens, parallel-io + , regex-pcre, semigroups, system-fileio, system-filepath, text , unix }: mkDerivation { pname = "sizes"; - version = "2.3.2"; - sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg"; + version = "2.4.0"; + sha256 = "1s888f14pnvm71sxpn7bgr5a5zijmf0g3px5bmy36q10rjylwp6b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cmdargs deepseq dlist lens parallel-io regex-posix + base cmdargs deepseq dlist lens parallel-io regex-pcre semigroups system-fileio system-filepath text unix ]; description = "Recursively show space (size and i-nodes) used in subdirectories"; @@ -280024,8 +281067,8 @@ self: { pname = "skew-list"; version = "0.1"; sha256 = "1j0rc1s3mpf933wl4fifik62d68hx1py8g8wwxz69ynfhjhf9fa2"; - revision = "2"; - editedCabalFile = "1khmbbfd6f531vmlngcqramazayc2sqvm3j9xwmz1zjxscmvwhsg"; + revision = "3"; + editedCabalFile = "1d44sp9hcf5p72f6km47q5hy2v0xw7slrcbkb6dkvh4mv5cga8iw"; libraryHaskellDepends = [ base deepseq hashable indexed-traversable QuickCheck strict ]; @@ -280149,8 +281192,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.14.1.2"; - sha256 = "12zdnbn22dwchd6zslxf0hyvf2jn0wnyr51q5mr00436pchp93qp"; + version = "0.14.2"; + sha256 = "1xbjmxpcqhnfjhma3bq539y3a3jnry75qrfw7d113gvrwsx39njl"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -280176,8 +281219,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.14.1.2"; - sha256 = "13y1jliy330byvpq8gvqm6xk2nqilxyc6kcsvwbm25gvv8xzqcp5"; + version = "0.14.2"; + sha256 = "0ja6pjkz49p9r6h0lajf2nfq55sbmda57n1v7jbw1xzh3fcdvqrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280335,6 +281378,38 @@ self: { broken = true; }) {ghc-binary = null;}; + "slab" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, blaze-svg + , bytestring, containers, directory, filepath, fsnotify, Glob + , hspec, http-types, lens, megaparsec, optparse-applicative + , parser-combinators, pretty-simple, prettyprinter, process + , protolude, QuickCheck, servant, servant-blaze, servant-server + , stm, tasty, tasty-silver, text, transformers, vector, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "slab"; + version = "0.0.2.0"; + sha256 = "1sh604c1zwfa5myhl85wzx7bzq0xrc785bcj4lqnqi1qiad2wbgp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup blaze-svg bytestring containers + directory filepath fsnotify Glob http-types megaparsec + optparse-applicative parser-combinators pretty-simple prettyprinter + process protolude servant servant-blaze servant-server stm text + transformers vector wai wai-app-static warp + ]; + executableHaskellDepends = [ base optparse-applicative protolude ]; + testHaskellDepends = [ + base filepath Glob hspec lens optparse-applicative pretty-simple + process protolude QuickCheck tasty tasty-silver text + ]; + description = "A programmable markup language to generate HTML"; + license = lib.licenses.bsd2; + mainProgram = "slab"; + }) {}; + "slack" = callPackage ({ mkDerivation, aeson, base, containers, either, http-conduit, mtl , old-locale, text, time, transformers @@ -280817,8 +281892,8 @@ self: { }: mkDerivation { pname = "slugify"; - version = "0.1.0.1"; - sha256 = "1h5lbp33hd10lr2d5cplac7515aphyd56jyj3wlzw5pg3sih8qvv"; + version = "0.1.0.2"; + sha256 = "1188b76jk05ri3qgiz7g1zxn82sqv7dixxqzh2cx5kl8crk78ivn"; libraryHaskellDepends = [ base text unicode-transforms ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -281493,10 +282568,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "smtlib-backends"; - version = "0.3"; - sha256 = "13pyic8zq0dv7w529pciw0zfpzx63mrf3bq5nillsswbk0czv0qw"; - revision = "2"; - editedCabalFile = "1g2pfmdmqkf3agxnzirgpp9sibjz5m89pjnx7f1i98znk6nswix9"; + version = "0.4"; + sha256 = "16n2ig71wjqp1ziplwrq3639fqn582ymx5g9ls7f814ddjgc70xg"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -281510,8 +282583,8 @@ self: { pname = "smtlib-backends-process"; version = "0.3"; sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; - revision = "2"; - editedCabalFile = "09hszx3ba4d5x11sdv8fagb0nkg1m0q32wc264x5x0pnsv9k3wfa"; + revision = "3"; + editedCabalFile = "1kc9643lrpz8yxcnda54kb2cakxcmbdaxszkhadjmz7in7xv1xi6"; libraryHaskellDepends = [ base bytestring process smtlib-backends ]; @@ -281531,8 +282604,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; - revision = "1"; - editedCabalFile = "0imbf9cgp1imqqj5iryg7k2my4690rwixhl4j3s3a6w54n0zs0sd"; + revision = "2"; + editedCabalFile = "1c7xag17kfvzlz7w8sd9f8nwj3znmfbwlp0049byr9nlmv1nq7lr"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -281546,6 +282619,8 @@ self: { pname = "smtlib-backends-z3"; version = "0.3.1"; sha256 = "1mgjlfhqcbqc84a87g6bp0i9pnmpz87b7w43x200mwx1k877zddy"; + revision = "1"; + editedCabalFile = "18rj2yj3w4cqdirycxavfhwhaalg8v4qjacs25iy3c1qmm3jwrvb"; libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ @@ -281645,20 +282720,23 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, crypton-connection, cryptonite, filepath, memory - , mime-mail, network, network-bsd, text + , bytestring, crypton, crypton-connection, data-default-class + , filepath, memory, mime-mail, network, network-bsd, text }: mkDerivation { pname = "smtp-mail"; - version = "0.4.0.0"; - sha256 = "0j95vvk2hh1vp4lv59gppfnpavy3mlz4bzlr6l29glz53lmc8bn5"; + version = "0.4.0.2"; + sha256 = "09w7076f5ybx83b15fbzm90b1wyb2mqizd1cxk7yh4qfw6gwljga"; + revision = "1"; + editedCabalFile = "0zb0s241h4z9hd1ndw63ha370l75z114dfmcw4qn1fpsy9ajnzss"; libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring bytestring - crypton-connection cryptonite filepath memory mime-mail network - network-bsd text + array base base16-bytestring base64-bytestring bytestring crypton + crypton-connection data-default-class filepath memory mime-mail + network network-bsd text ]; description = "Simple email sending via SMTP"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "smtp-mail-ng" = callPackage @@ -281864,8 +282942,8 @@ self: { pname = "snap"; version = "1.1.3.3"; sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; - revision = "1"; - editedCabalFile = "06f9xcj6s7ci01v5gkrd1qhrhnnpwijiac83m6nhjpsisx1d11g3"; + revision = "3"; + editedCabalFile = "1nzkb0jq359lpwz4a1ldx1fh8xs735wfwf2z6qq0z7y0c4zxb9da"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base bytestring cereal clientsession configurator containers directory directory-tree @@ -281992,8 +283070,8 @@ self: { pname = "snap-core"; version = "1.0.5.1"; sha256 = "00h5xijkjvnhcgxpw3vmkpf5nwfpknqflvxgig6gvsy4wahc2157"; - revision = "5"; - editedCabalFile = "02szs3kljcfzg9kvnv6m8mykrm5big6ki4a7hzian5bb2jpjw4f1"; + revision = "6"; + editedCabalFile = "0sc559ahr96y0xzahxj25rrr6mhq3d12ljj42rwvnpnfyaynqbqc"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -282199,8 +283277,8 @@ self: { pname = "snap-server"; version = "1.1.2.1"; sha256 = "0znadz0av6k31s8d175904d2kajxayl38sva3dqh5ckdfkymfx54"; - revision = "4"; - editedCabalFile = "02h1gdhd4wi57145s3jjnrghszzry624q55kjry0d54mmxrzgsh1"; + revision = "5"; + editedCabalFile = "0hpbnxbyfsngnx816i92hccimbsc1zx7smajjzaz58647cxkgm1y"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -283169,6 +284247,8 @@ self: { pname = "snappy-c"; version = "0.1.1"; sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; + revision = "1"; + editedCabalFile = "1jcsfn3i7qj21n8vpznjs1g9yways15cr3wf4762alq9ghfal4xi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285548,6 +286628,30 @@ self: { broken = true; }) {}; + "spirv-enum" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "spirv-enum"; + version = "0.1.0.0"; + sha256 = "0sr39lxh4jrzinins8i0lv0y715sc11grp2yq47sa1jpzvaf246v"; + libraryHaskellDepends = [ base ]; + description = "SPIR-V enumerations generated from Khronos JSON"; + license = lib.licenses.bsd3; + }) {}; + + "spirv-headers" = callPackage + ({ mkDerivation, aeson, base, containers, text }: + mkDerivation { + pname = "spirv-headers"; + version = "0.1.0.0"; + sha256 = "06z8x3iqwslfasvdmp9nm391wngx5iwn7znyna24x595xxg3yvjh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base containers text ]; + description = "Types and generator for SPIR-V JSON spec"; + license = lib.licenses.bsd3; + }) {}; + "spirv-reflect-ffi" = callPackage ({ mkDerivation, base, bytestring, c2hs, spirv-reflect-types, text , vector @@ -285675,8 +286779,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.2.1"; - sha256 = "04887k7ys72gkjkw0l1w3sqxwydk20gvfpl0qfwkrx8xp705710l"; + version = "2.0.0.5"; + sha256 = "0gpyqnxvz6xmm9iiq1164c0qwcjvmin07mkdrb90smcyi5s886j2"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = lib.licenses.isc; @@ -287180,8 +288284,8 @@ self: { pname = "stache"; version = "2.3.4"; sha256 = "0kgiyxws2kir8q8zrqkzmk103y7hl6nksxl70f6fy8m9fqkjga51"; - revision = "1"; - editedCabalFile = "16hg9ry7vkyv218913nn0pdhjk4hzn4a4r15pm2g28mms0bh4lx5"; + revision = "2"; + editedCabalFile = "107iijpd6jzdnbxd8pm2kyj57645h1ax1ynzb3dfsq0akhnmsgx6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -287304,20 +288408,20 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_1" = callPackage + "stack-all_0_6_3" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd - , simple-cmd-args, text + , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.1"; - sha256 = "0k5gvvl9vh7znscf5b4d3bpsr1mhz58pmh7ny1fdm9p08n3i8dlz"; + version = "0.6.3"; + sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base cached-json-file config-ini directory extra filepath - http-query process simple-cmd simple-cmd-args text + http-query process simple-cmd simple-cmd-args text yaml ]; description = "CLI tool for building over Stackage major versions"; license = lib.licenses.bsd3; @@ -288237,8 +289341,8 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.1.2.1"; - sha256 = "1v1f2a1j7dfi9yxkcm6q9jh4bv9yh2yndj7k5dj2fa889pgq134r"; + version = "0.1.3.0"; + sha256 = "1ah330fmhhqwd603gn3r30d838xig9ipk15is6f1334rdw92893i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288541,8 +289645,8 @@ self: { pname = "statestack"; version = "0.3.1.1"; sha256 = "1747qzaj3xqc90fj4ddch3ra5kj52rfd1dn7a8c6fkdk68q76mfd"; - revision = "2"; - editedCabalFile = "1k60fkszxxyya6amqyjkz5dsxri3c07kgdr6mb1hw4b3dnvq6gwa"; + revision = "3"; + editedCabalFile = "0v43wd19i2pj8f4skxvxjap1rs0jxfwjicpyd9vgdfqji6jaj7a7"; libraryHaskellDepends = [ base mtl transformers ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; @@ -288960,8 +290064,8 @@ self: { }: mkDerivation { pname = "statsd-rupp"; - version = "0.4.0.4"; - sha256 = "1y1c7ln8fany6inshxkmz6dz2g9wpcrrijkgqgfabhvg8nqqgi9w"; + version = "0.5.0.0"; + sha256 = "0clvpmg50p0f1ny9zz5q1niad1ahnkv0dqyphkyrc2snxh896avp"; libraryHaskellDepends = [ base bytestring network unliftio unordered-containers vector ]; @@ -289322,10 +290426,10 @@ self: { ({ mkDerivation, base, containers, deepseq, QuickCheck }: mkDerivation { pname = "step-function"; - version = "0.2.0.1"; - sha256 = "0hpzbjgjgsrx6q7sjk2dz40i2lggx8wraqlf58ibbv3y1yvb2q6a"; - revision = "2"; - editedCabalFile = "034mk1k23qs8d9y1iyxnpxn0zcq0yy6z7jy9lp3l4vin6gmpz0vk"; + version = "0.2.1"; + sha256 = "1izshxrfhidvdhmnyrnqx2lqv2qjpisjdrxa687yywswcd4nlf9g"; + revision = "1"; + editedCabalFile = "1xh4slrjyrbzp5fzrx65bld6y8h8rmqrrb36xprs7c2kq08c6wwv"; libraryHaskellDepends = [ base containers deepseq QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; description = "Staircase functions or piecewise constant functions"; @@ -290960,6 +292064,8 @@ self: { pname = "streamly"; version = "0.10.1"; sha256 = "1iyvrhjlvfww5jmwdfx58pr5xi9jzv5h22g0nvnhgnrnxhm86sxn"; + revision = "3"; + editedCabalFile = "1g4jv5gq9bn9mb97zqh2g27l77i1ik8qznzv2lc217kylhmnm2gh"; libraryHaskellDepends = [ atomic-primops base containers deepseq directory exceptions hashable heaps lockfree-queue monad-control mtl network @@ -291361,6 +292467,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict_0_5_1" = callPackage + ({ mkDerivation, assoc, base, binary, bytestring, deepseq, ghc-prim + , hashable, text, these, transformers + }: + mkDerivation { + pname = "strict"; + version = "0.5.1"; + sha256 = "12rgzrxb1dz5qb1sqmwdyiyhxbpa5rrzlyr293ki4qx8qa094wbp"; + libraryHaskellDepends = [ + assoc base binary bytestring deepseq ghc-prim hashable text these + transformers + ]; + description = "Strict data types and String IO"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-base" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -291391,6 +292514,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict-base-types_0_8_1" = callPackage + ({ mkDerivation, aeson, base, quickcheck-instances, strict + , strict-lens + }: + mkDerivation { + pname = "strict-base-types"; + version = "0.8.1"; + sha256 = "0dazvs9pwjqrhwggkxh6g73n5y6jz99lpgbnmq39ka4jnc6m8km1"; + libraryHaskellDepends = [ + aeson base quickcheck-instances strict strict-lens + ]; + description = "Strict variants of the types provided in base"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-concurrency" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -291415,8 +292554,8 @@ self: { pname = "strict-containers"; version = "0.2"; sha256 = "128aw17c2m3rh2v23c2vdgk7f7rk11plwkzq2carrm1x5nvhrki7"; - revision = "1"; - editedCabalFile = "0imlmrqsc3v341dvs5r9r6cynvn2szfy1a1ldxfs3axjzyszvsqv"; + revision = "2"; + editedCabalFile = "1gkb90gsx8ls5c86jjxs1c01r09lkv9jxzx6g0c0rc1n45n6w5ph"; libraryHaskellDepends = [ array base binary containers deepseq hashable indexed-traversable primitive strict template-haskell unordered-containers vector @@ -291439,6 +292578,8 @@ self: { pname = "strict-containers-lens"; version = "0.2"; sha256 = "08m4brq8sbdi44cw3klakaw3dax3y9x94kxniv8w6dyqmf5as38w"; + revision = "1"; + editedCabalFile = "1z92vzi2phvrqjn23hdqzpwdj1jwsj26723l2aby7vymyg70xsvk"; libraryHaskellDepends = [ base hashable lens strict-containers ]; description = "Strict containers - Lens instances"; license = lib.licenses.bsd3; @@ -291453,6 +292594,8 @@ self: { pname = "strict-containers-serialise"; version = "0.2"; sha256 = "10y0pcvxidq39z284ffac4sl6yg6cq00x1mmdnwcbaxiq8xhm3hk"; + revision = "1"; + editedCabalFile = "09lkaahyzf9xq86z8pv05w4zmv4qq94lar2jdc6vnf8y5szc4idy"; libraryHaskellDepends = [ base cborg hashable serialise strict-containers ]; @@ -291547,21 +292690,19 @@ self: { license = lib.licenses.bsd3; }) {}; - "strict-list" = callPackage - ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids - , tasty, tasty-quickcheck - }: + "strict-lens_0_4_1" = callPackage + ({ mkDerivation, base, lens, strict }: mkDerivation { - pname = "strict-list"; - version = "0.1.7.4"; - sha256 = "0jncppjyzg64d5qxban713z9mxzdky9zlldnnw029l7d1y3yv3x1"; - libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; - testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; - description = "Strict linked list"; - license = lib.licenses.mit; + pname = "strict-lens"; + version = "0.4.1"; + sha256 = "044rqqwcn1zr6ypci04xddgvlyf9fl0p78rwn9dpk7vmpvcmkb0b"; + libraryHaskellDepends = [ base lens strict ]; + description = "Lenses for types in strict package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "strict-list_0_1_7_5" = callPackage + "strict-list" = callPackage ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids , tasty, tasty-quickcheck }: @@ -291573,7 +292714,6 @@ self: { testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; description = "Strict linked list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strict-mvar" = callPackage @@ -291596,13 +292736,13 @@ self: { ({ mkDerivation, base, optics-core, strict }: mkDerivation { pname = "strict-optics"; - version = "0.4.0.1"; - sha256 = "1x4p2fksljd9xfy4mxdz5pxcskxz2qg2ma28d6y4j2v4728r0x8a"; - revision = "2"; - editedCabalFile = "01099gz0bf64kkx429f1nmsbfnyqwpp5nbj2bbmmckv40r8w7yw4"; + version = "0.4.1"; + sha256 = "0mszg553zl44247ahwaf50548qcsd5xwg6lpnxsnfjjanc6g2x5f"; libraryHaskellDepends = [ base optics-core strict ]; description = "Optics for types in strict package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strict-stm" = callPackage @@ -291620,25 +292760,12 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.5.3"; - sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_5_4" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; version = "0.1.5.4"; sha256 = "1znx5lmi7lgn4jzkr73lsc2xac0ypl65bx0pa1hxrc4c74ilysbk"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -291740,8 +292867,8 @@ self: { ({ mkDerivation, base, bytestring, tagged, text }: mkDerivation { pname = "string-class"; - version = "0.1.7.1"; - sha256 = "0hbh4ccd3zlwnkczgvfg76h537gxs1rcci0p689i5v833n67zygy"; + version = "0.1.7.2"; + sha256 = "0wi9kkvwf3j77i3z81ijc16pjrn3jwjr6fs8hk78qwf9bklwg3jl"; libraryHaskellDepends = [ base bytestring tagged text ]; description = "String class library"; license = lib.licenses.bsd3; @@ -291855,10 +292982,8 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.3.3.0"; - sha256 = "1m4m9ivi29q90fvrinigqwz4qmnxnbi895l1gmsrp7j0bmwjxhrb"; - revision = "1"; - editedCabalFile = "1xys5lmy4xj9z2yj3lnhcv43wi4yqgchkbkd0adr8m6snfpabbcl"; + version = "0.3.4.0"; + sha256 = "13hb3spabggr6gsn9xhwpwldjvpl2l7z4lgssis82c40n108b0w8"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -291971,6 +293096,7 @@ self: { description = "A library for generating random string from a regular experession"; license = lib.licenses.bsd3; mainProgram = "hstrrand"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "string-similarity" = callPackage @@ -292120,8 +293246,8 @@ self: { pname = "stringsearch"; version = "0.3.6.6"; sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9"; - revision = "1"; - editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378"; + revision = "2"; + editedCabalFile = "01w6m4fxxccm9xh63648y6fs50y7l727sjrpda5b21k0jh1vnwnd"; libraryHaskellDepends = [ array base bytestring containers ]; description = "Fast searching, splitting and replacing of ByteStrings"; license = lib.licenses.bsd3; @@ -292197,6 +293323,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "stripe-core" = callPackage @@ -292349,6 +293476,7 @@ self: { ]; description = "Verification of Stripe webhook signatures"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "stripe-tests" = callPackage @@ -292423,23 +293551,6 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.11"; - sha256 = "1ddqkyqxbls5slg6gkj7rpvxac104q9haqpc7agggnglznrsc9p5"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - description = "A client for the Strava V3 API"; - license = lib.licenses.mit; - }) {}; - - "strive_6_0_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; version = "6.0.0.12"; sha256 = "1376pkfkzm3pvhl1k8kqls20vj00zfhyhriccwlzvw918h4f73nc"; libraryHaskellDepends = [ @@ -292448,7 +293559,6 @@ self: { ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strong-path" = callPackage @@ -292508,20 +293618,20 @@ self: { }) {}; "strongweak" = callPackage - ({ mkDerivation, base, either, generic-random, hspec - , hspec-discover, QuickCheck, quickcheck-instances, rerefined, text + ({ mkDerivation, base, generic-random, hspec, hspec-discover + , QuickCheck, quickcheck-instances, rerefined, text , text-builder-linear, vector, vector-sized }: mkDerivation { pname = "strongweak"; - version = "0.7.0"; - sha256 = "0gy6y2dlk2zy7dizyccjb77wf8dzyjx5qi1rxg7xajagpm5nxpzw"; + version = "0.8.0"; + sha256 = "1nws2lkbjfr11jx5ns8qmmik63n158n4abdb1bgmkzkby8621f08"; libraryHaskellDepends = [ - base either rerefined text text-builder-linear vector vector-sized + base rerefined text text-builder-linear vector vector-sized ]; testHaskellDepends = [ - base either generic-random hspec QuickCheck quickcheck-instances - rerefined text text-builder-linear vector vector-sized + base generic-random hspec QuickCheck quickcheck-instances rerefined + text text-builder-linear vector vector-sized ]; testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; @@ -293110,8 +294220,8 @@ self: { }: mkDerivation { pname = "subcategories"; - version = "0.2.1.0"; - sha256 = "18bvpib34nc60s7hkg1c6ypyn26k90gwdsydcrld65a29ddf615a"; + version = "0.2.1.1"; + sha256 = "14n1f28wbk0jczig211jj4181ljnczy18hy5pi1y1c6pmbj9mxci"; libraryHaskellDepends = [ base containers data-default foldl hashable mono-traversable pointed primitive reflection semialign template-haskell text these @@ -293621,6 +294731,7 @@ self: { description = "A Haskell interface to SUMP-compatible logic analyzers"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sundown" = callPackage @@ -294242,8 +295353,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; - revision = "8"; - editedCabalFile = "0h6bymf2him9shr8sfhw4h61ysp7hkzk0y1jwyv13d5l84yzi52g"; + revision = "9"; + editedCabalFile = "0ca6bgv5xrk6pz12j35jv1gbp06z6kk7fs7nc1bwjjxy6c6x4vm5"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -294272,8 +295383,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "3.8.3"; - sha256 = "0483mpcinsq06jahk58811r8l4bk6ajp6hilvs0sgc0543p4jj6i"; + version = "3.9"; + sha256 = "1iyj0g9plzvih50j9sx41dpksj4avllr9csf8sp577zrq334r1l1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -294737,8 +295848,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.10.8.0"; - sha256 = "14kjclrdfymrb5ad4s0g4k8b7zrazjppgc5rgm5wa3b4wc13x18z"; + version = "0.10.9.0"; + sha256 = "0d74b2mf1wwc0zvyv7kxsxhphybg0s9fjin4046dhgzddzagmwys"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -295778,10 +296889,8 @@ self: { ({ mkDerivation, base, containers, deepseq }: mkDerivation { pname = "symbol"; - version = "0.2.4"; - sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h"; - revision = "2"; - editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1"; + version = "0.2.4.1"; + sha256 = "1lk5ymzv914m66dc98pz7vym4c4q54fbw5qsw5g1fb1x22s7gxmy"; libraryHaskellDepends = [ base containers deepseq ]; description = "A 'Symbol' type for fast symbol comparison"; license = lib.licenses.bsd3; @@ -295931,13 +297040,19 @@ self: { }) {}; "symparsec" = callPackage - ({ mkDerivation, base, defun-core, type-spec }: + ({ mkDerivation, base, defun-core, singleraeh, type-level-show + , type-spec + }: mkDerivation { pname = "symparsec"; - version = "0.4.0"; - sha256 = "0ap3j2163vqpr27rij8ld3m6jyd7jnbndx8s7ix6xzjyhdijmkjw"; - libraryHaskellDepends = [ base defun-core ]; - testHaskellDepends = [ base defun-core type-spec ]; + version = "1.1.1"; + sha256 = "0v22lqpb61788s3vpvd9pcdf5cyrz09myzykz3mfi6xfd2dsjby3"; + libraryHaskellDepends = [ + base defun-core singleraeh type-level-show + ]; + testHaskellDepends = [ + base defun-core singleraeh type-level-show type-spec + ]; description = "Type level string parser combinators"; license = lib.licenses.mit; }) {}; @@ -296429,6 +297544,7 @@ self: { description = "Efficient signal processing using runtime compilation"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "synthesizer-midi" = callPackage @@ -296867,6 +297983,22 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "systemd_2_4_0" = callPackage + ({ mkDerivation, base, bytestring, network, transformers, unix }: + mkDerivation { + pname = "systemd"; + version = "2.4.0"; + sha256 = "031aa9js27c3g4i0mxxndi7y01xa2qisb0cs9xq94gjib1j3z7hd"; + libraryHaskellDepends = [ + base bytestring network transformers unix + ]; + testHaskellDepends = [ base network unix ]; + description = "Systemd facilities (Socket activation, Notify)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "systemd-api" = callPackage ({ mkDerivation, base, posix-api, systemd }: mkDerivation { @@ -296939,6 +298071,28 @@ self: { mainProgram = "systemstats"; }) {}; + "systranything" = callPackage + ({ mkDerivation, aeson, base, bytestring, extra + , gi-ayatana-appindicator3, gi-gdk, gi-glib, gi-gobject, gi-gtk + , optparse-applicative, text, typed-process, unliftio, yaml + }: + mkDerivation { + pname = "systranything"; + version = "0.1.0.0"; + sha256 = "1p6y9hvkn12n1dwnkwij2qjjdvhzqwq9sxqmlzrkclbmkmivcanj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring extra gi-ayatana-appindicator3 gi-gdk gi-glib + gi-gobject gi-gtk optparse-applicative text typed-process unliftio + yaml + ]; + description = "Let you put anything in the system tray"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "systranything"; + }) {}; + "syz" = callPackage ({ mkDerivation, base, syb }: mkDerivation { @@ -298351,15 +299505,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "tar_0_6_2_0" = callPackage + "tar_0_6_3_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, file-embed, filepath, os-string, QuickCheck, tasty , tasty-bench, tasty-quickcheck, temporary, time, transformers }: mkDerivation { pname = "tar"; - version = "0.6.2.0"; - sha256 = "160rxxaxq7aiz9zca7hxa5abllzqmb77rzp9hmzgxmlynn11xih8"; + version = "0.6.3.0"; + sha256 = "05387za01dssa2nhgqcsshwpxakfk4djad39dm0j99f8xq7ndfsh"; + revision = "1"; + editedCabalFile = "12pxf0427a51gw4n652vzfjc1scj4x5m4c778cs9bs4vk7cm3wg9"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath os-string time transformers @@ -298720,16 +299876,16 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "tasty_1_5" = callPackage + "tasty_1_5_1" = callPackage ({ mkDerivation, ansi-terminal, base, containers , optparse-applicative, stm, tagged, transformers, unix }: mkDerivation { pname = "tasty"; - version = "1.5"; - sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; - revision = "2"; - editedCabalFile = "0jr6a6klg08x9pqmap3h3ys5dhda0w92ysbnsvvi81vrzxzz98wd"; + version = "1.5.1"; + sha256 = "1pb14rp2y87nbgwy3pkyhm69ly53knnnahidrihdd1nd378svpl9"; + revision = "1"; + editedCabalFile = "1qvv4kl3c841sc3g14sdlzds0j8n0i7spj8y45gqksbyq4h3daqz"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -298789,34 +299945,6 @@ self: { }: mkDerivation { pname = "tasty-autocollect"; - version = "0.4.2"; - sha256 = "021yrrw53k8bppqpqqiny0gwbphhwq76g08m3d2ycfn57f9hxnbs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath ghc tasty - tasty-expected-failure template-haskell text transformers - ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ - base bytestring containers directory explainable-predicates - filepath tasty tasty-golden tasty-hunit tasty-quickcheck temporary - text typed-process - ]; - description = "Autocollection of tasty tests"; - license = lib.licenses.bsd3; - mainProgram = "tasty-autocollect"; - }) {}; - - "tasty-autocollect_0_4_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , explainable-predicates, filepath, ghc, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, transformers - , typed-process - }: - mkDerivation { - pname = "tasty-autocollect"; version = "0.4.3"; sha256 = "0pidvmxkyddx3kdyhhx335cn8hyi66y4n2xvpdk5sg1zg2w29ggl"; isLibrary = true; @@ -298833,7 +299961,6 @@ self: { ]; description = "Autocollection of tasty tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "tasty-autocollect"; }) {}; @@ -298877,6 +300004,19 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_4" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.4"; + sha256 = "1qkvdp1djbvb2b7yxckpfaygdgsh71h340mbvprm0r6dim3q1742"; + libraryHaskellDepends = [ base containers deepseq ghc-prim tasty ]; + benchmarkHaskellDepends = [ base ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-bench-fit" = callPackage ({ mkDerivation, base, containers, deepseq, infinite-list , regression-simple, tasty, tasty-bench, tasty-expected-failure @@ -298886,8 +300026,29 @@ self: { pname = "tasty-bench-fit"; version = "0.1"; sha256 = "0dn8zfiwrpw8f3q5lnb7n3rp5sazrfxbcfk3cffh7s55mgb74rbk"; - revision = "2"; - editedCabalFile = "1b779czhl7qh8ajagp13lvwrgmnbpvwyndn0rf0qmxq1bp6l2yj0"; + revision = "3"; + editedCabalFile = "1izd6ipx80cp1xjbb1rwdx6s7kxlsiwck3p1b8zb66mdmfbwaxvm"; + libraryHaskellDepends = [ + base containers deepseq infinite-list regression-simple tasty + tasty-bench + ]; + testHaskellDepends = [ + base containers tasty tasty-bench tasty-expected-failure + tasty-quickcheck + ]; + description = "Determine time complexity of a given function"; + license = lib.licenses.mit; + }) {}; + + "tasty-bench-fit_0_1_1" = callPackage + ({ mkDerivation, base, containers, deepseq, infinite-list + , regression-simple, tasty, tasty-bench, tasty-expected-failure + , tasty-quickcheck + }: + mkDerivation { + pname = "tasty-bench-fit"; + version = "0.1.1"; + sha256 = "1x1f2r3p5jsl4f8ss21mdszwl5mi7xfshql8578ff2q8nf9ah9iv"; libraryHaskellDepends = [ base containers deepseq infinite-list regression-simple tasty tasty-bench @@ -298898,6 +300059,7 @@ self: { ]; description = "Determine time complexity of a given function"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "tasty-checklist" = callPackage @@ -299092,8 +300254,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "3"; - editedCabalFile = "1ij1h7kdbg4bd93fl9991b39xn1rkawshsh3hgbz3j2inmnljx2w"; + revision = "4"; + editedCabalFile = "1qibqxwh3f0c2n7fcj2dni12mhixfwbywli6qrqii6wi7n325gd9"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -299167,8 +300329,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.4"; sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"; - revision = "4"; - editedCabalFile = "1i2wq9cir6l861g51g9rya8s37629ljbbrrh37vk76mv85lb38vj"; + revision = "5"; + editedCabalFile = "0ikiij332dfrj9qmln3az2ihghklk614vjjdq3z851m5gv32y0pa"; libraryHaskellDepends = [ base hspec hspec-api hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -299232,8 +300394,8 @@ self: { ({ mkDerivation, base, call-stack, tasty }: mkDerivation { pname = "tasty-hunit"; - version = "0.10.1"; - sha256 = "10r05j6cl5clxzi2y2gxg9y4izxpa17l6hwb7f4lrc2qs8xl5sww"; + version = "0.10.2"; + sha256 = "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"; libraryHaskellDepends = [ base call-stack tasty ]; description = "HUnit support for the Tasty test framework"; license = lib.licenses.mit; @@ -299544,20 +300706,20 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-quickcheck_0_10_3" = callPackage + "tasty-quickcheck_0_11" = callPackage ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck , random, tagged, tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.10.3"; - sha256 = "02lw6gk83b6wc9dwd3shin58zqy9isgx4zh7z0whs0wkzwzkpyyg"; - revision = "2"; - editedCabalFile = "0j2g1cngc5xk190jsm2k7kh25y1afmbr37abi09wvlyq8ja4n59r"; + version = "0.11"; + sha256 = "07liq4wjz7wad8xwgwb5x9ijl8626cfd9f5gb37mjqc23ab268lx"; libraryHaskellDepends = [ base optparse-applicative QuickCheck random tagged tasty ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + testHaskellDepends = [ + base pcre-light QuickCheck tasty tasty-hunit + ]; description = "QuickCheck support for the Tasty test framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299676,7 +300838,6 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-tap" = callPackage @@ -300036,23 +301197,19 @@ self: { }) {}; "tdigest" = callPackage - ({ mkDerivation, base, base-compat, binary, deepseq, reducers - , semigroups, tasty, tasty-quickcheck, transformers, vector - , vector-algorithms + ({ mkDerivation, base, binary, deepseq, reducers, semigroups, tasty + , tasty-quickcheck, transformers, vector, vector-algorithms }: mkDerivation { pname = "tdigest"; - version = "0.3"; - sha256 = "02jdi827kxa8bn6gacdncmnggjw5f8wjf2i4idgf88kz564yd9bb"; - revision = "1"; - editedCabalFile = "1pcm1gdn28syhq6gws3ss15dldnvyvy4l2mqbqmp46gv3hzqnw6b"; + version = "0.3.1"; + sha256 = "1v3j0041hjhvnwr77r1i1flvl9b1n8z0d2g83b63fr97kyl2fc8r"; libraryHaskellDepends = [ - base base-compat binary deepseq reducers transformers vector - vector-algorithms + base binary deepseq reducers transformers vector vector-algorithms ]; testHaskellDepends = [ - base base-compat binary deepseq semigroups tasty tasty-quickcheck - vector vector-algorithms + base binary deepseq semigroups tasty tasty-quickcheck vector + vector-algorithms ]; description = "On-line accumulation of rank-based statistics"; license = lib.licenses.bsd3; @@ -300299,6 +301456,8 @@ self: { pname = "teeth"; version = "0.2.0.2"; sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c"; + revision = "1"; + editedCabalFile = "0g8z22ppi6p6cm11a444kr7dfk60fbxs8lbar9ssw7lfbd8738h9"; libraryHaskellDepends = [ base ]; description = "Dental data types"; license = lib.licenses.mit; @@ -300421,8 +301580,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.0"; - sha256 = "0kzn0zhnq4g3l85jbdfz420449aamv5kah3qdk05ysmx2msd4s66"; + version = "7.4"; + sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -300445,8 +301604,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.13"; - sha256 = "0gf272hhfavx5lki7dlxcn760gjk613md391nvmxnmnvyhs6g5rz"; + version = "0.14.1"; + sha256 = "0v025wkhjnxjqzisj3x1gfv1qk9c17j2czdf0iv5fsxdkz2vc949"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -300854,26 +302013,27 @@ self: { "templatise" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, directory , exceptions, extra, filepath, hspec, http-client, http-conduit - , mtl, network-uri, optparse-applicative, parsec, process, tasty - , tasty-golden, tasty-hspec, temporary, text, time + , MissingH, monad-logger, mtl, network-uri, optparse-applicative + , parsec, process, regex-tdfa, tasty, tasty-golden, tasty-hspec + , temporary, text, time }: mkDerivation { pname = "templatise"; - version = "0.1.2.0"; - sha256 = "0plgfhvdhs8bwyldcc84scmaw7cw1rva7m3rxx14jn3dhc2k65qj"; + version = "0.1.5.0"; + sha256 = "092vbmng2jpcb2vc9bqg2gm132zrvi3b9qh7lfw6d1as9qf8f43v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal-syntax exceptions extra filepath http-client - http-conduit mtl network-uri optparse-applicative parsec process - text time + http-conduit monad-logger mtl network-uri optparse-applicative + parsec process regex-tdfa text time ]; - executableHaskellDepends = [ base filepath optparse-applicative ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - base bytestring Cabal-syntax directory filepath hspec mtl - network-uri optparse-applicative process tasty tasty-golden - tasty-hspec temporary text time + base bytestring Cabal-syntax directory filepath hspec MissingH + monad-logger mtl network-uri optparse-applicative process tasty + tasty-golden tasty-hspec temporary text time ]; doHaddock = false; description = "You can use template.hs to create a new Haskell GitHub repository."; @@ -301435,6 +302595,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "tensort" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle + , time + }: + mkDerivation { + pname = "tensort"; + version = "0.2.0.3"; + sha256 = "0qkm7iy00z13drs1f3fd3zl6cc45c7s2k8pn6ya7pmpji424dwiw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl random random-shuffle ]; + executableHaskellDepends = [ base time ]; + testHaskellDepends = [ base mtl QuickCheck ]; + description = "Tunable sorting for responsive robustness and beyond!"; + license = lib.licenses.mit; + mainProgram = "tensort"; + }) {}; + "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -301459,6 +302637,8 @@ self: { pname = "termbox"; version = "2.0.0.1"; sha256 = "0kynby25arx6hcq64cklw9qhw87qxy6vrz9z40d7k7j817gkzccq"; + revision = "1"; + editedCabalFile = "049mnzqwdsxa9ninv38nbbmwfh092wgp055nq4fkl97g1wkmd0w7"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; @@ -301470,8 +302650,8 @@ self: { pname = "termbox-banana"; version = "2.0.0"; sha256 = "1izf90r6idfspi06q3vwjipawpdcz5ag5qw3l45khn7js520rapn"; - revision = "1"; - editedCabalFile = "0yk0kj4hn6gv89vs04n95fbf6hyf05dvhxmfjj7c5235ppnxjd07"; + revision = "2"; + editedCabalFile = "19xpkxjz8ay0wzy0nszfswvkyl5m2hchg7w05izcjkwl8skm0sjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base reactive-banana termbox ]; @@ -301503,6 +302683,8 @@ self: { pname = "termbox-bindings-c"; version = "0.1.0.1"; sha256 = "1rq695y6491f0nydgm64r6v2l8mkpvzgcrb2gxfdy6g0bwarimxw"; + revision = "1"; + editedCabalFile = "01n2013v0il3g1mm6lqjl01c0yqhpvsr86v7jcqpbj32rvkrg68v"; libraryHaskellDepends = [ base ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -301514,6 +302696,8 @@ self: { pname = "termbox-bindings-hs"; version = "1.0.0"; sha256 = "1j90pjqrngyygwwwk9zh2ah4sfdz9sv6222k21lmrql60md85g8i"; + revision = "1"; + editedCabalFile = "0qhmbx42njzbb7awvh7wgsgj52yxbcq8lrpj9dr8qpqzwprpnj2i"; libraryHaskellDepends = [ base termbox-bindings-c ]; description = "termbox bindings"; license = lib.licenses.bsd3; @@ -301525,6 +302709,8 @@ self: { pname = "termbox-tea"; version = "1.0.0"; sha256 = "0wya0fkjialv7hs6iw230x5ryx79s12pwig28mwrvgzvxmgm383a"; + revision = "1"; + editedCabalFile = "0zdpssg28lg5vwi61r2bp8c6p9b1phsxr8qz5gycg1yddd01n961"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki termbox ]; @@ -301884,8 +303070,8 @@ self: { }: mkDerivation { pname = "test-certs"; - version = "0.1.0.3"; - sha256 = "0ayvf1by5hp7xxn78j6d2ajiiz3f6gngjvijps8dgibwcawjvc79"; + version = "0.1.1.1"; + sha256 = "032v48ljhhynvib7b47pzndrvrlm640y318jg8d5lifzrplwmb6p"; libraryHaskellDepends = [ base bytestring filepath HsOpenSSL temporary text time ]; @@ -301926,8 +303112,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "11"; - editedCabalFile = "1p0a12cf6h2wfhrym8zl1iv0isg5mxs3ydzp770q6ahkm4lqsfz6"; + revision = "12"; + editedCabalFile = "16g2xbsmyjal05xka6ib0vca8bjnspsin4aph1xjgqvnma6jv9lz"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -302040,8 +303226,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; - revision = "3"; - editedCabalFile = "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh"; + revision = "4"; + editedCabalFile = "18wslbbbzhp4i31k3blayfx84kb0f7b0b8pf1cx4v054y8nd2a0s"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -302880,8 +304066,8 @@ self: { }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.4.2"; - sha256 = "0q0wv1b1v5c54yabqd89h5a6rsx9q9k8scmrxgi2d2m94dggzz9n"; + version = "0.3.4.4"; + sha256 = "13n6dp385xhm7f533lr4nivhgwai2pdslz7b3ywq7m0dv249p6l9"; libraryHaskellDepends = [ base bytestring deferred-folds isomorphism-class QuickCheck quickcheck-instances split text time transformers @@ -302896,14 +304082,16 @@ self: { }) {}; "text-builder-linear" = callPackage - ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench - , tasty-quickcheck, text + ({ mkDerivation, base, bytestring, ghc-bignum, quote-quot, tasty + , tasty-bench, tasty-quickcheck, text }: mkDerivation { pname = "text-builder-linear"; - version = "0.1.2"; - sha256 = "0ymx978kxqjcgrza82l29g8hp5qwx0miscmkwd04qcvq3iz8ikxa"; - libraryHaskellDepends = [ base bytestring quote-quot text ]; + version = "0.1.3"; + sha256 = "1nw2gazirrkylrfvnfyyqc4kw9s0cazya44phgiypv0m8nzvpjs9"; + libraryHaskellDepends = [ + base bytestring ghc-bignum quote-quot text + ]; testHaskellDepends = [ base tasty tasty-quickcheck text ]; benchmarkHaskellDepends = [ base bytestring tasty tasty-bench text @@ -303153,32 +304341,6 @@ self: { }: mkDerivation { pname = "text-iso8601"; - version = "0.1"; - sha256 = "1kszvadfl2ihmyd1chd6am6qkdvd9zwa5q1954yz3waiz537m3pm"; - revision = "1"; - editedCabalFile = "0xlz7g29bihgn22h1p2rdlvgggi6g1zdsag01lydnld71i8g51mc"; - libraryHaskellDepends = [ - base integer-conversion text time time-compat - ]; - testHaskellDepends = [ - base QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text time-compat - ]; - benchmarkHaskellDepends = [ - attoparsec attoparsec-iso8601 base tasty-bench text time-compat - ]; - description = "Converting time to and from ISO 8601 text"; - license = lib.licenses.bsd3; - }) {}; - - "text-iso8601_0_1_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base - , integer-conversion, QuickCheck, quickcheck-instances, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, time - , time-compat - }: - mkDerivation { - pname = "text-iso8601"; version = "0.1.1"; sha256 = "00l2m3xj39mrz7lbmbnir4k9jbn3jm3xa2q6zkh0zr7arsvx5slx"; libraryHaskellDepends = [ @@ -303193,7 +304355,6 @@ self: { ]; description = "Converting time to and from ISO 8601 text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-json-qq" = callPackage @@ -303342,8 +304503,8 @@ self: { pname = "text-metrics"; version = "0.3.2"; sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; - revision = "3"; - editedCabalFile = "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"; + revision = "4"; + editedCabalFile = "1blvnlylfs5s91q4n48la7pcl2sz5gajmjdx9jagcml5nmsnirqq"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -303575,8 +304736,8 @@ self: { pname = "text-short"; version = "0.1.6"; sha256 = "1avfamw6sig6r5zpm2hbas373qbrdszi4q33gds9ihvxil9ylww1"; - revision = "1"; - editedCabalFile = "0ir38dm5n8a398lbn0alk9g03cncnxjlqx9jg0qp0dhckgrrqwm6"; + revision = "2"; + editedCabalFile = "1r0bjj1h05bqf2g6plcq5sz5rzvq4s99xj1dmgnlfq0vqwadqlsr"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -304169,6 +305330,8 @@ self: { pname = "th-deepstrict"; version = "0.1.1.0"; sha256 = "0y0wlgzsm44sbwbchg4pqyb0s398aqjmd1awgd019bp29gzkd1hp"; + revision = "1"; + editedCabalFile = "0fip82wksknywr9wqmwsyf7847j5abhsqpbhbv8l9hlfhz6889d9"; libraryHaskellDepends = [ base containers mtl template-haskell th-abstraction th-orphans ]; @@ -304205,6 +305368,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-desugar_1_16" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl + , ordered-containers, syb, template-haskell, th-abstraction + , th-orphans, transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.16"; + sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; + revision = "1"; + editedCabalFile = "18qjikbyjzbhickq11hrn5ill89jdfdzbdx3q2s3630k4g8g2qzi"; + libraryHaskellDepends = [ + base containers ghc-prim mtl ordered-containers syb + template-haskell th-abstraction th-orphans transformers-compat + ]; + testHaskellDepends = [ + base containers ghc-prim hspec HUnit mtl syb template-haskell + th-abstraction th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-desugar_1_17" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction @@ -304439,6 +305626,8 @@ self: { pname = "th-letrec"; version = "0.1.1"; sha256 = "0z4zh9lnp60nih7dwy697jbnk19f1h3ypazw23jbf0z93f7d90b6"; + revision = "1"; + editedCabalFile = "1zghhmlqzz5lfq8zbbxnbyl9naf9ixjpawi6l00z2b31l0wspfsr"; libraryHaskellDepends = [ base codet containers some template-haskell transformers ]; @@ -304903,75 +306092,33 @@ self: { ({ mkDerivation, assoc, base, binary, deepseq, hashable }: mkDerivation { pname = "these"; - version = "1.2"; - sha256 = "1f6lmjmy3yl1d2ycfsfk7q4sd0m3zrrap2plc11pd47pnxs73vd8"; - revision = "1"; - editedCabalFile = "0vpcgbyrykzzyycwda8k6dcjvjcncrwlish4gkw2i80wi7v247h1"; - libraryHaskellDepends = [ assoc base binary deepseq hashable ]; - description = "An either-or-both data type"; - license = lib.licenses.bsd3; - }) {}; - - "these_1_2_1" = callPackage - ({ mkDerivation, assoc, base, binary, deepseq, hashable }: - mkDerivation { - pname = "these"; version = "1.2.1"; sha256 = "1pp44amwvpl0m762zahg632prlxx0ca2r10n3a0bznjy6qrxkmhp"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-lens" = callPackage ({ mkDerivation, base, lens, these }: mkDerivation { pname = "these-lens"; - version = "1.0.1.3"; - sha256 = "1pka56z7nrwapiqihp1d7jcindv9m6njy693561q4km2m3rhs5dq"; - revision = "1"; - editedCabalFile = "0gchaa8b7gynryhm9ddkblbs3mivy6aqlj0digwv271c0qzx9bjg"; - libraryHaskellDepends = [ base lens these ]; - description = "Lenses for These"; - license = lib.licenses.bsd3; - }) {}; - - "these-lens_1_0_2" = callPackage - ({ mkDerivation, base, lens, these }: - mkDerivation { - pname = "these-lens"; version = "1.0.2"; sha256 = "159dp25rbhcnmpxvvabjl8s9df9mvqi30p81vrmh7kgg86xa050y"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-optics" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { pname = "these-optics"; - version = "1.0.1.2"; - sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; - revision = "3"; - editedCabalFile = "0srsap1s1vi96xbw9vzpk14jyxajqlpmwn1bw190qjqnilxkqg48"; - libraryHaskellDepends = [ base optics-core these ]; - description = "Optics for These"; - license = lib.licenses.bsd3; - }) {}; - - "these-optics_1_0_2" = callPackage - ({ mkDerivation, base, optics-core, these }: - mkDerivation { - pname = "these-optics"; version = "1.0.2"; sha256 = "0a63xfqj841i7pwdjzg067ixs0lj9ngwfjps6yyk5gyqqmhirqsv"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-skinny" = callPackage @@ -305351,6 +306498,8 @@ self: { pname = "threepenny-gui"; version = "0.9.4.1"; sha256 = "199jpgzmjlraspazaq9crv1zl92xmi8k2fif5kvznzpjvl4b1k1k"; + revision = "1"; + editedCabalFile = "1y0kc86hry2n2d5xrgly5y2zax52q4jjgl7j0984znqdmqk6b8jb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -305827,6 +306976,7 @@ self: { description = "Serial support for tidal"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tidal-vis" = callPackage @@ -306078,6 +307228,8 @@ self: { pname = "time-compat"; version = "1.9.7"; sha256 = "1k0xcd73wx4l6wsj3c2ksdxch9c4kdbg0v8qmxik4v033nibx3y9"; + revision = "2"; + editedCabalFile = "03xjd6jcdnj1fn6zj6x9hlplnlviz88birkrnqvgzbpsyrdg3gzh"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -306094,8 +307246,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "time-domain"; - version = "0.1.0.4"; - sha256 = "0ldknnh15xmjk08v8f24is0j7fib810hf2bssjfbz8h7r0h2prir"; + version = "0.1.0.5"; + sha256 = "0lrzhbmv18ab4388p8v959jf9v2i8wamniganm0z7bx3x95jx9v7"; libraryHaskellDepends = [ base time ]; description = "A library for time domains and durations"; license = lib.licenses.mit; @@ -306585,8 +307737,8 @@ self: { pname = "timeline"; version = "0.1.0.0"; sha256 = "0ya56j51vgg380yylpakfgr5srv20ybiyy7yhfyxz21sdgz7f168"; - revision = "5"; - editedCabalFile = "07dfsj2p0qzq4r5zzljj70jhrd3y9i3wk8kb66bafbxkbjy0ggam"; + revision = "6"; + editedCabalFile = "0wn1mvgqh4b9yrgbcmz6yks51bsidj40irb6j1w3am20k7mdb6rq"; libraryHaskellDepends = [ base containers hedgehog indexed-traversable semigroupoids template-haskell text th-compat time @@ -306732,29 +307884,15 @@ self: { }: mkDerivation { pname = "timer-wheel"; - version = "1.0.0"; - sha256 = "1fl2incjl0zsrhk6kzhv1g9wzmsvyambak4z75fw3b5s306hw763"; - libraryHaskellDepends = [ atomic-primops base ki primitive ]; - testHaskellDepends = [ base ki random ]; - benchmarkHaskellDepends = [ base ki random tasty-bench ]; - description = "A timer wheel"; - license = lib.licenses.bsd3; - }) {}; - - "timer-wheel_1_0_0_1" = callPackage - ({ mkDerivation, atomic-primops, base, ki, primitive, random - , tasty-bench - }: - mkDerivation { - pname = "timer-wheel"; version = "1.0.0.1"; sha256 = "0sshn0i25f4bdb6wj6xg4shkq5ylpiq4803wp6ra1qvyg9kbx5za"; + revision = "1"; + editedCabalFile = "0sg380qy6d0a3s2hmvyj7ii5788vxvk589vdga1vhl5x6a102v4a"; libraryHaskellDepends = [ atomic-primops base ki primitive ]; testHaskellDepends = [ base ki random ]; benchmarkHaskellDepends = [ base ki random tasty-bench ]; description = "A timer wheel"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "timerep" = callPackage @@ -306898,8 +308036,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "timestats"; - version = "0.1.3"; - sha256 = "11qif48pc5fisighqw5c7iq9asbfzpnx2w6wxasw0gfpwmphcwyf"; + version = "0.2.0"; + sha256 = "085jbizsxn7hxn8i8621gbyss924qzysc56c81lg13xng7s8b3f3"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base text ]; description = "A library for profiling time in Haskell applications"; @@ -307110,6 +308248,7 @@ self: { description = "TinyMesh - communicating with auto-meshing sensor network"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tinyXml" = callPackage @@ -307139,6 +308278,18 @@ self: { broken = true; }) {}; + "tinyapp" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tinyapp"; + version = "0.1.0.2"; + sha256 = "1xsh0fv5zmcpgcm5xq3xap5fx9y1v8z14pdqa9xsy7v509g4c8l1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Library to build tiny apps in Haskell"; + license = lib.licenses.mit; + }) {}; + "tinyfiledialogs" = callPackage ({ mkDerivation, base, c2hs, text }: mkDerivation { @@ -307640,7 +308791,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls_2_0_5" = callPackage + "tls_2_0_6" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -307649,10 +308800,38 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.0.5"; - sha256 = "1qgwgbhp19a28ibb73h1ahkrwsjnv3hndfj3bsp9fb1s4856vn6z"; - revision = "1"; - editedCabalFile = "0717sfkj6jzpnp0r5013m3z6s25fnnrcd07lfdlpzxhs5fdjnk36"; + version = "2.0.6"; + sha256 = "07cznhk0jf2ffkpmq3q9iz9r4zcls8rkh32s3qqwaahp8lnvmsm3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base base16-bytestring bytestring + cereal crypton crypton-x509 crypton-x509-store + crypton-x509-validation data-default-class memory mtl network + serialise transformers unix-time + ]; + testHaskellDepends = [ + asn1-types async base bytestring crypton crypton-x509 + crypton-x509-validation data-default-class hourglass hspec + QuickCheck serialise + ]; + testToolDepends = [ hspec-discover ]; + description = "TLS protocol native implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "tls_2_1_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base + , base16-bytestring, bytestring, cereal, crypton, crypton-x509 + , crypton-x509-store, crypton-x509-validation, data-default-class + , hourglass, hspec, hspec-discover, memory, mtl, network + , QuickCheck, serialise, transformers, unix-time + }: + mkDerivation { + pname = "tls"; + version = "2.1.0"; + sha256 = "1i84j49gb1dgyqf4rwdrnjp47rynmyavh05dkijbj82qdcxjmb6v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307721,6 +308900,8 @@ self: { pname = "tls-session-manager"; version = "0.0.4"; sha256 = "134kb5nz668f4xrr5g98g7fc1bwb3ri6q433a1i6asjkniwpy85s"; + revision = "1"; + editedCabalFile = "1pg11vlx2hjy3qf73x8wd8jfabm94mng09gny2zn5jv9z3amw8l1"; libraryHaskellDepends = [ auto-update base basement bytestring clock memory psqueues tls ]; @@ -307728,16 +308909,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls-session-manager_0_0_5" = callPackage + "tls-session-manager_0_0_6" = callPackage ({ mkDerivation, auto-update, base, basement, bytestring, clock , crypto-token, memory, psqueues, serialise, tls }: mkDerivation { pname = "tls-session-manager"; - version = "0.0.5"; - sha256 = "0zfls8ckskip43vrjvvqafv0c9wb5a6j507j2fjjczb0gm9gdq5m"; - revision = "2"; - editedCabalFile = "1qlm2y0zjcf3dsqnv0pi730bmbl4nqk3r0a826fydpaphv1xgh6v"; + version = "0.0.6"; + sha256 = "019b8d54nmmrqxf6nw4si0cym7hjmd2safq848hzihimgjp41caz"; libraryHaskellDepends = [ auto-update base basement bytestring clock crypto-token memory psqueues serialise tls @@ -307870,7 +309049,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_7_0_0" = callPackage + "tmp-proc_0_7_1_0" = callPackage ({ mkDerivation, async, base, bytestring, crypton-connection , crypton-x509-system, data-default, directory, filepath, fmt , hspec, http-client, http-client-tls, http-types, mtl, mustache @@ -307879,8 +309058,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.7.0.0"; - sha256 = "1vfaid9x5mcnn2r1h7a788rxrgds631adwzhmhn6fqzivysmqk6g"; + version = "0.7.1.0"; + sha256 = "0l7grkyl0n1h6nbhfi8ivn3wxdkjzhhwfnbxrlbvf2pbiidgj6bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -307979,14 +309158,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc-rabbitmq_0_7_0_0" = callPackage + "tmp-proc-rabbitmq_0_7_0_1" = callPackage ({ mkDerivation, amqp, base, bytestring, hspec, hspec-tmp-proc , text, tmp-proc }: mkDerivation { pname = "tmp-proc-rabbitmq"; - version = "0.7.0.0"; - sha256 = "1jb47zgisv2zh397hbf81gkhc5f7qla5yhah778p02cnjnxlxqdc"; + version = "0.7.0.1"; + sha256 = "1jxymiffs8822rxh4fcpiblnd9k40s53p7sx3ny1nf9a3qvh82nf"; libraryHaskellDepends = [ amqp base bytestring text tmp-proc ]; testHaskellDepends = [ amqp base bytestring hspec hspec-tmp-proc text tmp-proc @@ -308552,17 +309731,15 @@ self: { license = lib.licenses.isc; }) {}; - "toml-parser_2_0_0_0" = callPackage + "toml-parser_2_0_1_0" = callPackage ({ mkDerivation, alex, array, base, containers, happy, hspec , hspec-discover, markdown-unlit, prettyprinter, template-haskell , text, time, transformers }: mkDerivation { pname = "toml-parser"; - version = "2.0.0.0"; - sha256 = "1nvrmlgmdvm7p16fywds4wnpyavyq7sk0p3zlqy9dci33qb3kzc7"; - revision = "2"; - editedCabalFile = "027xradr3xivfb68nljplrj6qr8kr32k0ifdl8bwki442rkbhfqv"; + version = "2.0.1.0"; + sha256 = "1qcpcrcalds3a2gdx83iynpj3hvkg6hbyza8al0f7jdsg9r6sdh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308644,20 +309821,18 @@ self: { "tomland" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec - , megaparsec, mtl, parser-combinators, text, time, transformers + , megaparsec, mtl, parser-combinators, text, time , unordered-containers, validation-selective }: mkDerivation { pname = "tomland"; - version = "1.3.3.2"; - sha256 = "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm"; - revision = "5"; - editedCabalFile = "1y42r0wkzjnjinld9jh01gjxs9mw8qv200nq4dj6prp5d2rbgdd3"; + version = "1.3.3.3"; + sha256 = "1asnz773mrbg8fkfabq5w24v63sgqljspc4p4nmf4dm6abm2p6d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers + parser-combinators text time unordered-containers validation-selective ]; testHaskellDepends = [ @@ -308991,17 +310166,13 @@ self: { }) {}; "topaz" = callPackage - ({ mkDerivation, aeson, base, binary, hashable, quantification - , vector - }: + ({ mkDerivation, base, binary, hashable, quantification, vector }: mkDerivation { pname = "topaz"; - version = "0.7.0"; - sha256 = "18l900v86m4dil4bvr6wcwqinbzls85fqz5bc5vvqhkx8vgglm7j"; - revision = "1"; - editedCabalFile = "0cpcngy2qc7bxxr8m01v0kyq4nx2jvb2p69dfzkjn0m3hcw58fig"; + version = "0.8.0.1"; + sha256 = "0dmv98miak251gps6cbpnax49rm3dq250g45kx45g6g54hx0dc3m"; libraryHaskellDepends = [ - aeson base binary hashable quantification vector + base binary hashable quantification vector ]; description = "Extensible records library"; license = lib.licenses.bsd3; @@ -309012,8 +310183,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.7.0"; - sha256 = "1jrqna3lxjxsiqxb6ybwm7kl59r3948lqhqb8l5xv9v5r38vzr6d"; + version = "1.0.8.0"; + sha256 = "0cqa5dwsc95hvixbxfmjqrp1lrjfzcgx01z3mkm062ybb4smk5k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -309046,18 +310217,12 @@ self: { }) {}; "topograph" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , vector - }: + ({ mkDerivation, base, base-orphans, containers, vector }: mkDerivation { pname = "topograph"; - version = "1.0.0.2"; - sha256 = "08fpwaf6341gaf7niwss08zlfyf8nvfrc4343zlkhscb19l4b7ni"; - revision = "2"; - editedCabalFile = "1l98l1rky1y9npckf40d3dizy27xh4byqkfz419n1d6ks8fi15w6"; - libraryHaskellDepends = [ - base base-compat base-orphans containers vector - ]; + version = "1.0.1"; + sha256 = "02nywgf9k20lx75cq8y3kpqv4q7zzpkvszyxnzml2x1b1ybb1blm"; + libraryHaskellDepends = [ base base-orphans containers vector ]; description = "Directed acyclic graphs"; license = lib.licenses.bsd3; }) {}; @@ -310574,6 +311739,35 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_3_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , bytestring, containers, criterion, deepseq, Diff, hashable + , parsec, parsers, pretty, primitive, QuickCheck, scientific + , semialign, strict, tagged, tasty, tasty-golden, tasty-quickcheck + , text, these, time, trifecta, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.3.1"; + sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base bytestring containers + deepseq hashable parsec parsers pretty primitive QuickCheck + scientific semialign strict tagged text these time + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base parsec primitive QuickCheck + tagged tasty tasty-golden tasty-quickcheck trifecta + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -311099,8 +312293,8 @@ self: { pname = "trie-simple"; version = "0.4.2"; sha256 = "1ai4fn35312z6ydwadi0rxscglwqawjrzq6p1i2kpbf7vmflznjg"; - revision = "4"; - editedCabalFile = "1f4mc1jvn5nz7mgwlip7lhfkbnba6hpa4vwkbw52bp0qx063b9y5"; + revision = "5"; + editedCabalFile = "1cz6rpa07098p2y03jarydvg6jvjnm148x82jg4q3slfp3cbsyqb"; libraryHaskellDepends = [ base containers deepseq hashable indexed-traversable matchable mtl semialign these witherable @@ -311157,6 +312351,8 @@ self: { pname = "trifecta"; version = "2.1.4"; sha256 = "0a4wvj3g27xmkck150ci6wfp8lqbdlrqgi9q8y3k0cqsvfpl5n6l"; + revision = "1"; + editedCabalFile = "0l11slzf5f0lvd8lqimn6jlyshwy0v47369cmwagnsh1nfrnfrnk"; libraryHaskellDepends = [ ansi-terminal array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq fingertree ghc-prim @@ -312225,8 +313421,8 @@ self: { pname = "turtle"; version = "1.6.2"; sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; - revision = "2"; - editedCabalFile = "14jnb2vyq0nx4cp4c97xflzg7z9xw1avg2d27c1d1cnqg28pd4an"; + revision = "3"; + editedCabalFile = "19i3n3hd2a0rkdz1ikwdgwhg4ds5pcfah25vgk0jnmwf71h0qwbm"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -313533,12 +314729,12 @@ self: { }) {}; "type-level-show" = callPackage - ({ mkDerivation, base, defun-core }: + ({ mkDerivation, base, defun-core, singleraeh }: mkDerivation { pname = "type-level-show"; - version = "0.1.1"; - sha256 = "150k54mf15pj2jghhvr76y9yvljn4q25vrg3zwmvbn93gd1zhy20"; - libraryHaskellDepends = [ base defun-core ]; + version = "0.3.0"; + sha256 = "09yxl90lzrscpb7wwaq3bchhf6qq0hj1pnxzkynkalcpdbac2d1m"; + libraryHaskellDepends = [ base defun-core singleraeh ]; description = "Utilities for writing Show-like type families"; license = lib.licenses.mit; }) {}; @@ -313594,6 +314790,8 @@ self: { pname = "type-natural"; version = "1.3.0.1"; sha256 = "0n07bcz5hi4l2a2lvgqkns4b158nsw10f1m7ij1vagwwvzsl0msf"; + revision = "1"; + editedCabalFile = "037mnys2dmkff7m52wqmr0x0sc2s9ld4iid00rf0482d7gz72wlm"; libraryHaskellDepends = [ base constraints equational-reasoning ghc ghc-typelits-knownnat ghc-typelits-natnormalise ghc-typelits-presburger @@ -314301,14 +315499,12 @@ self: { }: mkDerivation { pname = "typelet"; - version = "0.1.3"; - sha256 = "03igpnkrb5kxkjhlab8w6fpnbjv6xzc7mv8rczs1y8w3d7biz3r0"; + version = "0.1.4"; + sha256 = "0f5ycxi0pa2p5pfil5hlfrz01r5rk5km21fqdab7mna19bp5w9z4"; libraryHaskellDepends = [ base containers ghc ghc-tcplugin-api ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typelevel" = callPackage @@ -314458,6 +315654,7 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "types-compat" = callPackage @@ -314488,24 +315685,22 @@ self: { "typesafe-precure" = callPackage ({ mkDerivation, aeson, aeson-pretty, autoexporter, base - , bytestring, dlist, hspec, hspec-discover, monad-skeleton - , template-haskell, text, th-data-compat, th-strict-compat + , bytestring, dlist, hspec, hspec-discover, template-haskell, text + , th-data-compat, th-strict-compat, transformers }: mkDerivation { pname = "typesafe-precure"; - version = "0.10.1.2"; - sha256 = "0gn9i4p8idvl3av06il1j14x8dp9lxmb2cpdzqkwp4gsss9hfl73"; + version = "0.11.0.1"; + sha256 = "15zyjckgyk30v2753pfrvnvqhfdrpv39mc7vbfv66igcg7r9scm1"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist - monad-skeleton template-haskell text th-data-compat - th-strict-compat + template-haskell text th-data-compat th-strict-compat transformers ]; libraryToolDepends = [ autoexporter ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "typescript-docs" = callPackage @@ -314709,7 +315904,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "typst_0_5_0_3" = callPackage + "typst_0_5_0_4" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cassava , containers, directory, filepath, mtl, ordered-containers, parsec , pretty, pretty-show, regex-tdfa, scientific, tasty, tasty-golden @@ -314717,8 +315912,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.5.0.3"; - sha256 = "0g290vpw9yqi888a2pcw87gc6nbh41x0gp2l6g5hmrg509x1yhg3"; + version = "0.5.0.4"; + sha256 = "1073pjq2vd5a6y8wg0nagxw9m0aa472nmig08kknzk4mbadcarg7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -316051,6 +317246,8 @@ self: { pname = "unicode-collation"; version = "0.1.3.6"; sha256 = "0c1s1n4cqhjibiv05h5qfl4cg4h11ny4jay0gqnqg36z9kb66hfn"; + revision = "1"; + editedCabalFile = "01s776d2bifbvpy0mvpbc7yf748j5j2x4hf2fz6bzxm1rrlzrxmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -316074,8 +317271,8 @@ self: { pname = "unicode-data"; version = "0.4.0.1"; sha256 = "1030n3h11hk1rbq0fdbpry3aclz6yz8bki2abjvbwh0rh2kdx99p"; - revision = "2"; - editedCabalFile = "1v7kswa3606k3j8y7y7rigxabgypx23m3wv2hbnqs75s15g7ip2y"; + revision = "3"; + editedCabalFile = "0n7iwvha6pr2v6np0a6rw7ral3r7mjlhmydljlknv5mhq0kx4l7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -316085,43 +317282,63 @@ self: { license = lib.licenses.asl20; }) {}; - "unicode-data-names" = callPackage - ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty - , tasty-bench, unicode-data - }: + "unicode-data_0_6_0" = callPackage + ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench }: mkDerivation { - pname = "unicode-data-names"; - version = "0.2.0"; - sha256 = "0i28rp5g6wmnga6i95a6cq3dhkjg3v477xwycbcl38dfwdj3iy2c"; + pname = "unicode-data"; + version = "0.6.0"; + sha256 = "0iwr096kwvjmx32a2drzz5hlam5sy0ca2m15ih33r8imhlb371xj"; revision = "1"; - editedCabalFile = "1pxpg1mkv9yq26h9xcvxa6wza14y65g3j73gvs2nfmg4byksfdml"; - isLibrary = true; - isExecutable = true; + editedCabalFile = "0ijgkzh73x1fhjwr0zv9bg69s5ff95gdxv9acd4kpwa8nd9nvzsn"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec unicode-data ]; - testToolDepends = [ hspec-discover ]; + testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; - description = "Unicode characters names and aliases"; + description = "Access Unicode Character Database (UCD)"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; - "unicode-data-scripts" = callPackage + "unicode-data-names" = callPackage ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench , unicode-data }: mkDerivation { - pname = "unicode-data-scripts"; - version = "0.2.0.1"; - sha256 = "0kpa2g59w9yiyl3adak7k0g9wnkwzv97c82x7bsrqvk23bdljxc0"; - revision = "1"; - editedCabalFile = "1f6kz6kwv9v087bzjss29qaid03vig6njnsa1w46p93dn2xscvsm"; + pname = "unicode-data-names"; + version = "0.4.0"; + sha256 = "041vkwzxk2fiq3icxkp9rrvvi2z4w7fjdh75cx8nsg8g573g1q05"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec unicode-data ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench unicode-data ]; + description = "Unicode characters names and aliases"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "unicode-data-parser" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "unicode-data-parser"; + version = "0.3.0.2"; + sha256 = "1zz5n9x4pn1whyam0kkbsml8iawk1savzp7xc7idvripdm61dd31"; + libraryHaskellDepends = [ base bytestring ]; + description = "Parsers for Unicode Character Database (UCD) files"; + license = lib.licenses.bsd3; + }) {}; + + "unicode-data-scripts" = callPackage + ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench }: + mkDerivation { + pname = "unicode-data-scripts"; + version = "0.4.0"; + sha256 = "04v87r7hqvkyzdsrjiap1brxdaqvsk5vpg2m7jd6i630ag0lvvzy"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; description = "Unicode characters scripts"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -316129,18 +317346,15 @@ self: { }) {}; "unicode-data-security" = callPackage - ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty - , tasty-bench, unicode-data + ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench + , unicode-data }: mkDerivation { pname = "unicode-data-security"; - version = "0.2.0"; - sha256 = "10x58l62i7bj9kmnchp1rggln40sfbsyw4pxlzbk8dmhkh5zmdlx"; - revision = "1"; - editedCabalFile = "0mbsz5ynisjclzprvqvwd8q6l7kmv31qc2nkpbix05ipcrm0p4qg"; + version = "0.4.0"; + sha256 = "0awmdzv6d619c0lpk0jwnr0dh1sa2f8jr1h0ab3ysjp7gq969qfq"; libraryHaskellDepends = [ base unicode-data ]; testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; description = "Unicode security mechanisms database"; license = lib.licenses.asl20; @@ -316252,8 +317466,8 @@ self: { pname = "unicode-transforms"; version = "0.4.0.1"; sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j"; - revision = "4"; - editedCabalFile = "16d6l9ybs2wdwxdf3xfs25pzkkf3svflsn6ncvg86yky4x50zg29"; + revision = "6"; + editedCabalFile = "0lal09irlmna5b69bhf28749ny93flyb28hfhs7299fxi7ad3cgz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -317060,7 +318274,6 @@ self: { ]; description = "A domain-specific type system for dimensional analysis"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "units-attoparsec" = callPackage @@ -317089,7 +318302,6 @@ self: { libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "units-parser" = callPackage @@ -317509,6 +318721,8 @@ self: { pname = "unix-bytestring"; version = "0.4.0.1"; sha256 = "013if0qmbm491hjc4ha455whw3gwxwpws351cjhpalz8a6yh479j"; + revision = "1"; + editedCabalFile = "00qlidmxjap1y6m51m06m7xnmid3yrs8iki1rqmwp2pjx0lfwsxd"; libraryHaskellDepends = [ base bytestring ]; description = "Unix/Posix-specific functions for ByteStrings"; license = lib.licenses.bsd3; @@ -317520,8 +318734,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.1"; - sha256 = "0gz30f4g3gyjz60jbcg072ms67pwdn4by6wvdkg63hjshgl0cj60"; + version = "0.7.2"; + sha256 = "02v9lr7i7m3nrd8wkg2psdm41i7vc0mzaqks89ds05lv9qsjqf2q"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -317658,8 +318872,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.12"; - sha256 = "1qlpmwd43kaybbq7vaa1wnbay575qwj4r7xynafixa6bwnc759ah"; + version = "0.4.15"; + sha256 = "0rkjjwbw4s1k13f0syy409yiqj7v9x8ghi209j3lxkh1xq9caq17"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring hspec old-locale old-time QuickCheck @@ -317715,8 +318929,8 @@ self: { }: mkDerivation { pname = "unleash-client-haskell"; - version = "0.6.0"; - sha256 = "1vl31yvcqrsq1j56hqi34qf280ibhv9rk9sfddkiw43qi58gs0v4"; + version = "0.7.0"; + sha256 = "00dnfqci4adgadhmx9wikgk26z70skhqva9iij034v8fgqg480p4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -317724,7 +318938,7 @@ self: { servant-client text time unleash-client-haskell-core ]; executableHaskellDepends = [ - base mtl servant-client text unleash-client-haskell-core unliftio + base mtl servant-client text unliftio ]; description = "Unleash feature toggle client"; license = lib.licenses.mit; @@ -317739,8 +318953,8 @@ self: { }: mkDerivation { pname = "unleash-client-haskell-core"; - version = "0.10.0"; - sha256 = "0biki24hxvnvzd3zrvlb5f30nwlzzshm0sbajd2q55wpx98008fc"; + version = "0.11.0"; + sha256 = "1n60lycxbl933c5pmf8194ccliblgfklamqx164bfxhfww3armfr"; libraryHaskellDepends = [ aeson base containers murmur3 random text text-show time versions ]; @@ -317839,8 +319053,8 @@ self: { pname = "unliftio-core"; version = "0.2.1.0"; sha256 = "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"; - revision = "3"; - editedCabalFile = "1ph6pfz8rj697wg0p8df6l4slj9708l8q951vpxpn3qfn8rhd018"; + revision = "4"; + editedCabalFile = "0ah7x2k1p5d43iwr2xr12z5fk5jdxb9l7jjd73cr0lwbhmpp78pn"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -317903,6 +319117,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "unliftio-servant-server" = callPackage + ({ mkDerivation, base, mtl, servant, servant-server, unliftio }: + mkDerivation { + pname = "unliftio-servant-server"; + version = "0.1.0.0"; + sha256 = "1lpvkzpi9yl4h42nvvwacd7mg1ky45n64dzrjs12lbv2c0m8i3pp"; + revision = "1"; + editedCabalFile = "0ddhn9x6m0r0pd63hrxgzfj535i9ikmwjkjiysghhhzfvd1p82k3"; + libraryHaskellDepends = [ + base mtl servant servant-server unliftio + ]; + description = "Use MonadUnliftIO on servant APIs"; + license = lib.licenses.bsd3; + }) {}; + "unliftio-streams" = callPackage ({ mkDerivation, base, bytestring, io-streams, text, unliftio-core }: @@ -319212,8 +320441,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.7"; - sha256 = "12ijma954vss6a2nicq17q5pz3l7qjgh1f6s8lcrrxcf8vc10m1c"; + version = "0.1.3.8"; + sha256 = "1cwjz221ij395z9nsi71dl9gsgp9cmz0x65b7v7f21qziw54vwqq"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -319558,8 +320787,8 @@ self: { }: mkDerivation { pname = "utility-ht"; - version = "0.0.17.1"; - sha256 = "02pcjyi50jrxssirc8mf2mc17jqbr2a5w2vxiisfqwpwz2h4ivvb"; + version = "0.0.17.2"; + sha256 = "0b1pn25pdhsaigi2qbih13fagcaskbrsr2pmhk5gh63djn0w13ha"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest-exitcode-stdio doctest-lib QuickCheck @@ -319575,12 +320804,12 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.5.1"; - sha256 = "1k46h256vdzwqbg7g44la8k41rlwwa4xjpzl1506zr3dsxvjgab2"; + version = "0.0.7.0"; + sha256 = "1jy44jnqfd2h1aq2bqi6yq8yn34i1kl2jvl12fjbv4h29skvmvpg"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; - description = "A gRPC interface for UTxO Blockchains"; + description = "Generated code for a gRPC interface for UTxO Blockchains"; license = lib.licenses.asl20; }) {}; @@ -319622,8 +320851,8 @@ self: { }: mkDerivation { pname = "utxorpc-server"; - version = "0.0.2.0"; - sha256 = "1sbbyhf4av2vrqnz2g7gzm0q28bchw2jqnyqr42az7jddki9r93l"; + version = "0.0.3.0"; + sha256 = "0a56c871ypq0rfjl8lc5xxzx0vqggx74anxkbymvrad7h0bhsjyz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -319833,8 +321062,8 @@ self: { }: mkDerivation { pname = "uuagc-cabal"; - version = "1.3.0.0"; - sha256 = "18374y3cmhny6gdd6inx5xgnqx3424h4xfcnlzdfcia423bjw90h"; + version = "1.3.1.0"; + sha256 = "1xq7hxa8lk0b251vd3vqvyj7kz66qwn3hww49f14yx9rn4bz8vr9"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; @@ -319896,6 +321125,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "uuid_1_3_16" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, time, uuid-types + }: + mkDerivation { + pname = "uuid"; + version = "1.3.16"; + sha256 = "1xhdf8zw2n2h4c0f8xf76c2gsjvldz34zgc4sn6wqpzcnk7pjihs"; + revision = "1"; + editedCabalFile = "1sbr491gywd2862060j71r1gj1wfh8v9jgzcljx5wkbwjr7lwc8f"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 cryptohash-sha1 entropy + network-info random text time uuid-types + ]; + testHaskellDepends = [ + base bytestring QuickCheck random tasty tasty-hunit + tasty-quickcheck + ]; + description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uuid-aeson" = callPackage ({ mkDerivation, aeson, base, text, uuid }: mkDerivation { @@ -320018,6 +321271,8 @@ self: { pname = "uuid-types"; version = "1.0.6"; sha256 = "0zimp0v7hx073rcb4y9l463jfg4y3yqxdbmw975d6vrx919xj3by"; + revision = "1"; + editedCabalFile = "19jmxffgqp10s4rwxdsrbk65wm8iqi3b8byhbkl8p41n1m848mjr"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random template-haskell text @@ -320965,8 +322220,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "6"; - editedCabalFile = "10l6j8hdfraxfnzqq0l01y546q7rqgv95bci71gfs7lm15vnw2d3"; + revision = "7"; + editedCabalFile = "0jbbjmh3h9pkj1mfafysny20ynfl58ifchizn13dkqvclpkr770h"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -321269,30 +322524,51 @@ self: { license = lib.licenses.bsd3; }) {}; + "vec_0_5_1" = callPackage + ({ mkDerivation, adjunctions, base, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable + , inspection-testing, QuickCheck, semigroupoids, tagged + , transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.5.1"; + sha256 = "0rswq31fjsqzzq88b920hz0j8v0rdjhb04v4fr10cdqbnxaqglb0"; + libraryHaskellDepends = [ + adjunctions base boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids transformers + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vec-lens" = callPackage ({ mkDerivation, base, fin, lens, vec }: mkDerivation { pname = "vec-lens"; - version = "0.4"; - sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; - revision = "4"; - editedCabalFile = "1mh9wswfvcxw7656qqpggykndcpc5jsc5i0wxrnlzyg0ijh22qcs"; + version = "0.4.1"; + sha256 = "1llppbk2qdkymgy66w5dl2w7x3r70mf5rqzp6ppllvzhjm7fg9vw"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "vec-optics" = callPackage ({ mkDerivation, base, fin, optics-core, vec }: mkDerivation { pname = "vec-optics"; - version = "0.4"; - sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; - revision = "4"; - editedCabalFile = "0szgvkhqnn2igjzvm86fbiqpybfjwl5n2dscr614bda6yhqlvk00"; + version = "0.4.1"; + sha256 = "1s0q34r54bsj43lzzzg9wcssc2lcgqgvx556xzdkyhs69rcc3r11"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "vect" = callPackage @@ -321375,10 +322651,10 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.9.0.1"; - sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "3"; - editedCabalFile = "1fixldpkbw3yqj27vh5c8wb6vw8djdjprfjgs1rkvqdrq2j02ar2"; + version = "0.9.0.2"; + sha256 = "0fi5gahk5spqy9jz6alvhp3sligyq9n1ib1w3mw48jbkp060vvl2"; + revision = "1"; + editedCabalFile = "11vfdv6d1dhcb6bkl4x0z22bni9gsl1qrq3r0wb4bj9ncb7nfqk3"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -322008,8 +323284,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.4.0.0"; - sha256 = "0sjwgcvymyl74hgfc93l6nj5422d044dkj02mlzvrcfdqhicz96d"; + version = "0.4.0.1"; + sha256 = "17sfx8jn8kd6r2ik3iad3zzrpxr7qp4h8aka0jag78h0cpnapz3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -322339,8 +323615,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "6.0.6"; - sha256 = "0w73gcg2yyrx5b6msynmpa05q2q1n4qaa59n0l21glz28k7lzyma"; + version = "6.0.7"; + sha256 = "1gn2xjgsgvjh0sav16kjmldviy1fbib6jlfd25c879a2a631b5p0"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators template-haskell text @@ -323658,8 +324934,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.26.1"; - sha256 = "0cfy3zgszbf56hw086fgprd45yh5hidrmbhsa07smy1r3rhynlda"; + version = "3.26.2"; + sha256 = "1y0yrcc2z43s98gyics9v56j0nkh6xk8knmqwslndsznzma6ga0c"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -324120,37 +325396,6 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.14"; - sha256 = "1db4iz6ls98n2y08fcb53gip0kf2sagvk1a82xzl25nf14dza12p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory - fast-logger http-types HUnit iproute network resourcet - streaming-commons text time transformers unix vault wai wai-logger - warp word8 - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie directory fast-logger - hspec http-types HUnit iproute resourcet temporary text time wai - warp word8 zlib - ]; - testToolDepends = [ hspec-discover ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-extra_3_1_15" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, directory, fast-logger, hspec, hspec-discover - , http-types, HUnit, iproute, network, resourcet, streaming-commons - , temporary, text, time, transformers, unix, vault, wai, wai-logger - , warp, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; version = "3.1.15"; sha256 = "0n786h3ck3ik9s3p1wmfgy47j9hdzwkgjmcmjhjgyxrvsvnzn6mx"; isLibrary = true; @@ -324170,7 +325415,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -324273,8 +325517,8 @@ self: { ({ mkDerivation, base, bytestring, fcgi, wai, wai-extra }: mkDerivation { pname = "wai-handler-fastcgi"; - version = "3.0.0.2"; - sha256 = "1pvkykviql5qp8jvgy5d9abc8vkakmbw0bgmnsg53rna1zfvlmdm"; + version = "3.0.0.3"; + sha256 = "15z9zmlm8svak0gqcw4p0yx1q4dr7wqsn24a2zfzacihfi47pkva"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; librarySystemDepends = [ fcgi ]; description = "Wai handler to fastcgi"; @@ -324293,8 +325537,8 @@ self: { pname = "wai-handler-hal"; version = "0.4.0.0"; sha256 = "1qdw8ml3b0zgb09zrv37xp83yqw9v95nm22iw4ysdlampidz8s6d"; - revision = "1"; - editedCabalFile = "0klabj62v4qs7rac9vwvn1pqji7i0xhj1lza6zi49lkhsdn29020"; + revision = "2"; + editedCabalFile = "0way2hcy49prr6sl7rga62yswm1gzvfdg6ksq8m19rxnhfw9lw0l"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-media http-types network text unordered-containers vault wai @@ -324317,6 +325561,8 @@ self: { pname = "wai-handler-launch"; version = "3.0.3.1"; sha256 = "1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m"; + revision = "1"; + editedCabalFile = "1jp1lngryrg4v84q4q6c5g7h93kasdk3bgp4x0miivvx8s8iibs6"; libraryHaskellDepends = [ async base bytestring http-types process streaming-commons transformers wai warp @@ -324361,6 +325607,8 @@ self: { pname = "wai-handler-webkit"; version = "3.0.0.3"; sha256 = "10sr9xgd95ncwczbmchaf2qjyadqchm566r3zhqc3bwgsydrsq08"; + revision = "1"; + editedCabalFile = "073p8nar10pv1p1k7ryjv38404wdmhzpv3llql034r6bhdplc5gr"; libraryHaskellDepends = [ base wai warp ]; libraryPkgconfigDepends = [ QtWebKit ]; description = "Turn WAI applications into standalone GUIs using QtWebkit"; @@ -325082,8 +326330,8 @@ self: { }: mkDerivation { pname = "wai-middleware-prometheus"; - version = "1.0.0.1"; - sha256 = "1657zar254550skn3hx7y1g06aww2pjls5i4frw6ci4sxy3nynxp"; + version = "1.0.1.0"; + sha256 = "0c96zzkpfyfas9x9h8zlkba9qpdf6bjrkp0px80rw4bjr6vvn32i"; libraryHaskellDepends = [ base bytestring clock data-default http-types prometheus-client text wai @@ -325556,6 +326804,35 @@ self: { broken = true; }) {}; + "wai-saml2_0_6" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, c14n, containers, crypton, crypton-x509 + , crypton-x509-store, data-default-class, filepath, http-types, mtl + , network-uri, pretty-show, tasty, tasty-golden, text, time, vault + , wai, wai-extra, xml-conduit, zlib + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.6"; + sha256 = "0lxyh93f0581r5b1wzrxrv4binz4df2vxndbmnfnmp6hql61ayx3"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring c14n containers + crypton crypton-x509 crypton-x509-store data-default-class + http-types mtl network-uri text time vault wai wai-extra + xml-conduit zlib + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring c14n containers + crypton crypton-x509 crypton-x509-store data-default-class filepath + http-types mtl network-uri pretty-show tasty tasty-golden text time + vault wai wai-extra xml-conduit zlib + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-secure-cookies" = callPackage ({ mkDerivation, base, bytestring, crypton, hspec, hspec-discover , hspec-expectations, hspec-wai, http-types, memory, random, split @@ -326267,8 +327544,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.4.5"; - sha256 = "0j4m5idjg7fa8snc46lhf5gwwdgq004pjmqzfcb78pf1px1y0gwy"; + version = "3.4.6"; + sha256 = "0m5k2n7sdyb1g1r6ddwv2k75jgrhxwcgn3dbj42d1kjwvpiq03j8"; libraryHaskellDepends = [ base bytestring data-default-class network recv streaming-commons tls tls-session-manager unliftio wai warp @@ -326406,8 +327683,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.2.2.0"; - sha256 = "1il6s1mg9k9dhqcwj49a88p0z9zbwi65b2lvsg199rn6klv1jn36"; + version = "0.3.0.0"; + sha256 = "0xm85jz1l4mqm1bikmkr95jxn2nl7h57m3jcvrq7mynyfmkznfs8"; libraryHaskellDepends = [ base filepath lattices lens linear opencascade-hs primitive resourcet @@ -326423,8 +327700,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.2.2.0"; - sha256 = "0gy9iza13l03h381sm4riccjpn3zbpgy60d6fqhbj5rw1qisad2x"; + version = "0.3.0.0"; + sha256 = "0jca25rkdshagqi4incdxajxyk8vy0pqa0wdr3kjk2djpikm26g4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -326463,6 +327740,8 @@ self: { pname = "wave"; version = "0.2.1"; sha256 = "1b8qm9jl453z9pklmqcz13f2abl69ab0j31151gz77l4dgxnnqzl"; + revision = "1"; + editedCabalFile = "1j6ycd1v6c5khkmybzss2vbfm93n28dh1ah8sipqqpd94yqwvdiz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ @@ -326855,8 +328134,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.15"; - sha256 = "1kmyhyc3c9b2k0678q8yhd52x51jz153i8180a16ig05w6clc4xx"; + version = "0.27.16"; + sha256 = "1643hr3fblf8m41961swkxch784max6xn49x0a0pnrxkv5y8brnq"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -326872,8 +328151,8 @@ self: { ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.4.4"; - sha256 = "0sbw93flmhbwdg1lag5jm7qi8nh5fy4k3anxijzf1472y6kqncrp"; + version = "0.28.4.5"; + sha256 = "1jgpmm6s1n87p005ib9pjlc9b9xc3gn85ir6qhaak2s94l3nylrk"; libraryHaskellDepends = [ base boomerang mtl parsec text web-routes ]; @@ -326886,8 +328165,8 @@ self: { ({ mkDerivation, base, parsec, text, web-routes }: mkDerivation { pname = "web-routes-generics"; - version = "0.1.0.1"; - sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy"; + version = "0.1.0.2"; + sha256 = "1ld1kqs8qf6550p0n8vw5l676xj18sb78dzpgr74fcqjc6cbnc3v"; libraryHaskellDepends = [ base parsec text web-routes ]; description = "portable, type-safe URL routing"; license = lib.licenses.bsd3; @@ -326967,8 +328246,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.8.1"; - sha256 = "0sv8ya7s70zlfr9qhavpb9i0q3l5arcarsxgb20w6cbghfj67kh5"; + version = "0.22.8.2"; + sha256 = "11ps9cn5qz46w0i69znqb03fc6ljrwrn9y1cq0j1dsy7rjkqhgxm"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -327028,33 +328307,26 @@ self: { }) {}; "web-view" = callPackage - ({ mkDerivation, base, bytestring, casing, containers, effectful - , file-embed, http-types, string-interpolate, sydtest - , sydtest-discover, text, wai, warp + ({ mkDerivation, base, bytestring, casing, containers + , effectful-core, file-embed, http-types, string-interpolate + , sydtest, sydtest-discover, text }: mkDerivation { pname = "web-view"; - version = "0.3.1"; - sha256 = "1c27zmyx4n66gj1nlwnllk2c4vzmcb9xqjgadca12zql1vk69fv8"; - isLibrary = true; - isExecutable = true; + version = "0.4.0"; + sha256 = "1dy9qpscj1r6g35n11qyk7fd4nkhbxp0ism8cqhgm2gwmhc2yn56"; libraryHaskellDepends = [ - base bytestring casing containers effectful file-embed - string-interpolate text - ]; - executableHaskellDepends = [ - base bytestring casing containers effectful file-embed http-types - string-interpolate text wai warp + base bytestring casing containers effectful-core file-embed + http-types string-interpolate text ]; testHaskellDepends = [ - base bytestring casing containers effectful file-embed - string-interpolate sydtest text + base bytestring casing containers effectful-core file-embed + http-types string-interpolate sydtest text ]; testToolDepends = [ sydtest-discover ]; description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "example"; broken = true; }) {}; @@ -327550,6 +328822,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "webdriver-wrapper" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, directory, extra + , filepath, http-conduit, http-types, process, process-extras + , retry, string-interpolate, tar, text, unix, unordered-containers + , vector, webdriver, zip-archive, zlib + }: + mkDerivation { + pname = "webdriver-wrapper"; + version = "0.2.0.0"; + sha256 = "0dirnaxab9ddaa5jbqn0bhqlmh8x311vmq0il8xh0r3df5cvmgcg"; + libraryHaskellDepends = [ + aeson async base bytestring directory extra filepath http-conduit + http-types process process-extras retry string-interpolate tar text + unix unordered-containers vector webdriver zip-archive zlib + ]; + description = "Wrapper around the webdriver package that automatically manages Selenium"; + license = lib.licenses.bsd3; + }) {}; + "webex-teams-api" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, hspec-discover @@ -327661,8 +328952,8 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.2.0"; - sha256 = "03qp9x4f1hkv6swlrwp6kay104alapqqn5wvswykw6ji1wja0wj2"; + version = "1.3.0"; + sha256 = "1d16dvb76rjnpbapzp2m8g04wijyh6xzi8pcf03ymbll78x438w6"; libraryHaskellDepends = [ arrows base binary bytestring case-insensitive cookie http-api-data http-media http-types jose network tagged template-haskell text wai @@ -327674,15 +328965,16 @@ self: { "webgear-openapi" = callPackage ({ mkDerivation, arrows, base, http-media, http-types - , insert-ordered-containers, lens, openapi3, text, webgear-core + , insert-ordered-containers, lens, mtl, openapi3, text + , webgear-core }: mkDerivation { pname = "webgear-openapi"; - version = "1.2.0"; - sha256 = "0ym3jvkww6qf5nkrhb7wqp8maw6d03yc6835wp8wva8cj5cf9hy1"; + version = "1.3.0"; + sha256 = "1278dkhrckz9m8qjmqjfc2bxgnq4wsmrnyjkf24ci5lvxvrz3y9f"; libraryHaskellDepends = [ arrows base http-media http-types insert-ordered-containers lens - openapi3 text webgear-core + mtl openapi3 text webgear-core ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; @@ -327697,8 +328989,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.2.0"; - sha256 = "1pc46dcx3jndc1jaf1bbbhs1z20hvspkiq86y3b60i2vpcbdhwn0"; + version = "1.3.0"; + sha256 = "1s3iwzkb29g2zlkszarm27mlcwbszjwmmdzrb5ciqgz3l8pijyrx"; libraryHaskellDepends = [ aeson arrows base base64-bytestring binary bytestring cookie http-api-data http-media http-types jose monad-time mtl resourcet @@ -327715,15 +329007,16 @@ self: { "webgear-swagger" = callPackage ({ mkDerivation, arrows, base, http-types - , insert-ordered-containers, lens, swagger2, text, webgear-core + , insert-ordered-containers, lens, mtl, swagger2, text + , webgear-core }: mkDerivation { pname = "webgear-swagger"; - version = "1.2.0"; - sha256 = "1l1cgixhh8b7myypbr9anv6zbckh9x4h3a5lrwv7znh616n9440a"; + version = "1.3.0"; + sha256 = "1p10wn5jgfyqcysa14sx6lmirc4irl1nls5mblav50yr9a5ilipc"; libraryHaskellDepends = [ - arrows base http-types insert-ordered-containers lens swagger2 text - webgear-core + arrows base http-types insert-ordered-containers lens mtl swagger2 + text webgear-core ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; @@ -327735,8 +329028,8 @@ self: { }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.2.0"; - sha256 = "1a40blmnwx1xia8r6dhk710mabxnqf31cqh0rhjzjlwsv96rsk9a"; + version = "1.3.0"; + sha256 = "1vz7ycl2kppiwqp23z2dg6binc3azb8p5r17hir00zr4i8jhl88m"; libraryHaskellDepends = [ base bytestring file-embed http-types text wai-app-static webgear-core @@ -327827,8 +329120,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.4.5"; - sha256 = "05vsizj1nk6wdsgh4qn11hd0w7jsrr130bx6a33k5dk0gmam2ap9"; + version = "0.14.4.6"; + sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -328701,12 +329994,12 @@ self: { }) {}; "wherefrom-compat" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc-heap, tasty, tasty-hunit }: mkDerivation { pname = "wherefrom-compat"; - version = "0.1.1.0"; - sha256 = "14vzbm6skahqas3qflrw368d6llbq59fcxm31s9wj7fbmb239v3d"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0sy2kyp0sz0vkirlxvyc1s5szhx1f6a8zn0sysl2vbgk0yis3b0d"; + libraryHaskellDepends = [ base ghc-heap ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A compatibility layer for GHC's 'wherefrom' function"; license = lib.licenses.bsd2; @@ -328850,6 +330143,8 @@ self: { pname = "wide-word"; version = "0.1.6.0"; sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; + revision = "2"; + editedCabalFile = "0d21qdyx80yac09j31sy1xndwx5by257hy2cyx8www795dl5inh4"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -329298,25 +330593,6 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.2.1.0"; - sha256 = "0kwg2qdjl3hfg3y7qi8lqsnrvfc80w1mkkwi4ikay8mzkp61snb3"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_2_1_1" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; version = "1.2.1.1"; sha256 = "0zllz1wg2jpldjnyjkswrshs3agr8bbqnb6agv4avfgvffpj0rw1"; libraryHaskellDepends = [ @@ -329327,7 +330603,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -329388,6 +330663,8 @@ self: { pname = "with-utf8"; version = "1.1.0.0"; sha256 = "01p1pxshm3kjawy6sx8j1jw0sqg5dwbp2cy6wd04qmccr3vx1f54"; + revision = "1"; + editedCabalFile = "1j2f0cj47qa733ly6a3m3zs8y3978q6qr86sy3j46wki07s749gs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe-exceptions text ]; @@ -330056,8 +331333,8 @@ self: { }: mkDerivation { pname = "word8set"; - version = "0.1.1"; - sha256 = "106sp0qqywfm43c4lriyvfaxzgn03z6m2krarysvp9ff0q3j2nhi"; + version = "0.1.2"; + sha256 = "0jbr571rxw0vxxc95568kdxrw9d0kk6np9wrwjd6rj6ybh532zr7"; libraryHaskellDepends = [ base deepseq lattices QuickCheck template-haskell wide-word ]; @@ -331281,21 +332558,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, crypton-connection, exceptions - , network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "2.0.1.8"; - sha256 = "1pdh44r11yxyjgyb8la28crsm7sk09fshmqcgxyxczwfjsa85dpk"; - libraryHaskellDepends = [ - base bytestring crypton-connection exceptions network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = lib.licenses.mit; - }) {}; - - "wuss_2_0_1_9" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, data-default , exceptions, network, websockets }: @@ -331309,7 +332571,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wx" = callPackage @@ -331577,19 +332838,21 @@ self: { "x509-ocsp" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , cryptohash-sha1, crypton-x509, HUnit, pem + , cryptohash-sha1, crypton-x509, crypton-x509-validation, HUnit + , pem }: mkDerivation { pname = "x509-ocsp"; - version = "0.2.0.0"; - sha256 = "0vfk58yyk08w1752addpp4s2bn4d9395k7ajd5jal6wab400qgk6"; + version = "0.4.0.1"; + sha256 = "0pq1xxa5wl5gprkxjc31112mi9s8q4i5anr698hssziaglh4h13r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring cryptohash-sha1 - crypton-x509 + crypton-x509 crypton-x509-validation ]; testHaskellDepends = [ - asn1-encoding asn1-types base bytestring crypton-x509 HUnit pem + asn1-encoding asn1-types base bytestring crypton-x509 + crypton-x509-validation HUnit pem ]; description = "Basic X509 OCSP implementation"; license = lib.licenses.bsd3; @@ -333699,10 +334962,8 @@ self: { }: mkDerivation { pname = "xor"; - version = "0.0.1.2"; - sha256 = "0c0a1zg0kwp3jdlgw6y1l6qp00680khxa3sizx5wafdv09rwmrxc"; - revision = "3"; - editedCabalFile = "0lj7kp8119cbl5g3ndnkr4fjgcwk6liar79j4rvrf1zyr5xflknr"; + version = "0.0.1.3"; + sha256 = "12hqm6imp3qvnnrkds77jsi0zx2dza1h9g88adnxiksv62fybymv"; libraryHaskellDepends = [ base bytestring ghc-byteorder ]; testHaskellDepends = [ base bytestring ghc-byteorder QuickCheck tasty tasty-hunit @@ -334118,6 +335379,8 @@ self: { pname = "xxhash-ffi"; version = "0.3"; sha256 = "0cqayny8g0lbafysbyzw43jnf3mijx6smlpzwsfdv3xc3wk42v4r"; + revision = "1"; + editedCabalFile = "07mc7rllnf3hgnqnywzmjpafmrpr4jdbvj4iwifz72n5c2marr1z"; libraryHaskellDepends = [ base bytestring hashable text ]; libraryPkgconfigDepends = [ libxxhash ]; testHaskellDepends = [ @@ -335014,8 +336277,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.8"; - sha256 = "0bsah360hxb1w9b1ypmgcdr1lb2wi4pzlbvgd106kqslkfyk942x"; + version = "0.14.9"; + sha256 = "19d53gl477ik0zb8fxq5irvjddgg7n2hjrg4j0x36pvsq3sy2zz9"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -335232,8 +336495,8 @@ self: { pname = "yasi"; version = "0.2.0.1"; sha256 = "0j5g5h40qvz2rinka7mrb8nc7dzhnprdfpjmzc4pdlx1w8fzw8xy"; - revision = "5"; - editedCabalFile = "0vspxq76ivd49799r9f29kq7xxzjbs6vcvym8ccbs1sd82inzxs2"; + revision = "6"; + editedCabalFile = "0w8xrfdb6mwzdzwlal9mi60gbs7l6v0hplw35ba2v1533md9z2a6"; libraryHaskellDepends = [ base ghc-hs-meta template-haskell text text-display ]; @@ -336087,6 +337350,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-oauth2_0_7_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, crypton, errors, hoauth2 + , hspec, http-client, http-conduit, http-types, memory, microlens + , mtl, safe-exceptions, text, transformers, unliftio + , uri-bytestring, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.7.3.0"; + sha256 = "162fr9lpcqgni6pm2d9y1a2frc234xipl5kllxkncwnnf748g234"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring crypton errors hoauth2 http-client + http-conduit http-types memory microlens mtl safe-exceptions text + transformers unliftio uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-oidc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring , classy-prelude-yesod, containers, cryptonite, http-client @@ -338011,10 +339297,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.19.2"; - sha256 = "1ipmycwf2fqk701x0d32bv03aviv7z57m0knpc3np5cvss9mjzvr"; - revision = "1"; - editedCabalFile = "1j3in75pnf72000hfia13z21d6z8vml3wg2sk35nsmr1x8r96xzf"; + version = "0.19.3"; + sha256 = "0l0rqvgm1i43x2q4cwdxwy9bmpvgw0wxmcij31yyx2py01ws863i"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -339184,6 +340468,7 @@ self: { license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "zephyr"; + broken = true; }) {}; "zephyr-copilot" = callPackage @@ -339467,16 +340752,17 @@ self: { "zeugma" = callPackage ({ mkDerivation, base, chronos, hedgehog, incipit, polysemy - , polysemy-chronos, polysemy-test, tasty, tasty-expected-failure - , tasty-hedgehog + , polysemy-chronos, polysemy-process, polysemy-test, tasty + , tasty-expected-failure, tasty-hedgehog }: mkDerivation { pname = "zeugma"; - version = "0.9.0.1"; - sha256 = "1idiinilcxw97fff6yq59a4472y8qy7b28gx2nnzsi6ajq9azazk"; + version = "0.10.0.0"; + sha256 = "0q1q3hhj8lf10zbb34rx317h2pr6hp8807p2zsi4n7xdgi6qjz3s"; libraryHaskellDepends = [ base chronos hedgehog incipit polysemy polysemy-chronos - polysemy-test tasty tasty-expected-failure tasty-hedgehog + polysemy-process polysemy-test tasty tasty-expected-failure + tasty-hedgehog ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -339675,10 +340961,8 @@ self: { }: mkDerivation { pname = "zinza"; - version = "0.2"; - sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "7"; - editedCabalFile = "192d8y4wh1xaylmfzwcjfck3hcyzbz5726zfp25rkc5jv5mp7p4s"; + version = "0.2.1"; + sha256 = "1k4k2yvijg0vwp3ykp9l77n3qdpivikqxx78ilvk6nx6w9sj58c8"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -339737,6 +341021,38 @@ self: { description = "Operations on zip archives"; license = lib.licenses.bsd3; mainProgram = "haskell-zip-app"; + maintainers = [ lib.maintainers.mpscholten ]; + }) {}; + + "zip_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base, unix + }: + mkDerivation { + pname = "zip"; + version = "2.1.0"; + sha256 = "1rbrayns2q34b0cp9b6zl3k600lbgck1c214rmvmywkhmms07slm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base unix + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist filepath hspec + QuickCheck temporary text time + ]; + description = "Operations on zip archives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "haskell-zip-app"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "zip-archive" = callPackage @@ -339976,8 +341292,8 @@ self: { pname = "zlib"; version = "0.6.3.0"; sha256 = "1nh4xsm3kgsg76jmkcphvy7hhslg9hx1s75mpsskhi2ksjd9ialy"; - revision = "4"; - editedCabalFile = "0v8f3y0isi60c1ldmh5rvl08gjglwaqxs47csl8pi5bimxcpgsqr"; + revision = "5"; + editedCabalFile = "0mj3f7ql54p0pfa5a6q4xv4ci8xf00616ls0nyadpmlqbb4qilwn"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ @@ -339995,6 +341311,8 @@ self: { pname = "zlib"; version = "0.7.1.0"; sha256 = "1g2md8z0ijcbrqlx9q9i49myi2lnlvzmma1ajmsd5y0xp2v3ipbf"; + revision = "1"; + editedCabalFile = "03r5ib477af94l3i6mdhgkil6gzg9zh92vr4cgkwar9d16kcbqds"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; testHaskellDepends = [ @@ -340306,8 +341624,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.6.1"; - sha256 = "1lkmkv03k6icd85jbrv8rzwr1kl8v496m86kyc7sy773vlslkds1"; + version = "0.2.7.0"; + sha256 = "1lwkifawn33c005lwqrr0hyisvs5p37kl03j0vab8qhpz9wbnydk"; libraryHaskellDepends = [ base bytestring exceptions Z-Data ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; @@ -340322,8 +341640,8 @@ self: { pname = "zot"; version = "0.0.3"; sha256 = "0cibi8zm9v8vi4i2xdm4kpk1v2kc0sh0fc5ylsn78gwyjcdhkaf8"; - revision = "1"; - editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm"; + revision = "2"; + editedCabalFile = "1vfwh6rpr76wbjd8hwn575yycmz2bjj9pbjbh64lmfq116nfk63l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 50dc7414ca936..b07196db9b7ff 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -624,7 +624,7 @@ in package-set { inherit pkgs lib callPackage; } self // { Type: [str] -> drv -> drv */ generateOptparseApplicativeCompletions = - (self.callPackage ( + self.callPackage ( { stdenv }: commands: @@ -633,7 +633,7 @@ in package-set { inherit pkgs lib callPackage; } self // { if stdenv.buildPlatform.canExecute stdenv.hostPlatform then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands else pkg - ) { }) // { __attrsFailEvaluation = true; }; + ) { }; /* Modify given Haskell package to force GHC to employ the LLVM diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index bde8daed6f355..3b0efe120b0ec 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -1,4 +1,4 @@ -{ runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }: +{ runCommand, haskellPackages, lib, all-cabal-hashes }: let # Checks if the version looks like a Haskell PVP version which is the format # Hackage enforces. This will return false if the version strings is empty or diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix index ad95711e6dfaa..3da3e1be2d621 100644 --- a/pkgs/development/interpreters/cel-go/default.nix +++ b/pkgs/development/interpreters/cel-go/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cel-go"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-RN3Eqdf1Zon0gSsP3jGxydVEa0NL5filAei4+xPFNv8="; + hash = "sha256-t451e3Pkkt4pmBvS0DBSHOVg7P8ipJd28XyiQ6P/QIQ="; }; modRoot = "repl"; - vendorHash = "sha256-jNlzsx1QII9UBHQDU7nSzkNLtfbuce4O1AcPaFqtj9c="; + vendorHash = "sha256-t/GEbpnqpLQ79ETqS9TAgy+2z9FoifAmkHbfKUxDBZA="; subPackages = [ "main" diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 7022886379080..f73631ff8d3b7 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "chrisamaphone"; repo = "interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; + hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 2b6d2c26c09f3..f1cbd213b871e 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -7,7 +7,6 @@ , makeWrapper , ncurses , python3 -, runCommand , zlib # *NOT* from LLVM 9! diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 77bfda26bd7ce..f491005f5d7c4 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.3.1463"; + version = "1.11.4.1474"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-26QZ3j54XztpW2WJ1xg0Gc+OwrsvmfK4iv0GsLV8FIc="; + hash = "sha256-sNFDXvrHMrFgLrBHmbv3DKOXuNu6u1OqcmlqZNX/EAg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/development/interpreters/cyclone/default.nix index d5a31c7aeb766..643ee3a63216b 100644 --- a/pkgs/development/interpreters/cyclone/default.nix +++ b/pkgs/development/interpreters/cyclone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libck, darwin }: +{ lib, stdenv, fetchFromGitHub, libck, cctools }: let version = "0.34.0"; @@ -15,7 +15,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ]; buildInputs = [ libck ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ bootstrap ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; + ++ lib.optionals stdenv.isDarwin [ cctools ]; buildInputs = [ libck ]; diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix index 32b09d76384ee..ac1ddc8134b51 100644 --- a/pkgs/development/interpreters/elixir/1.17.nix +++ b/pkgs/development/interpreters/elixir/1.17.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.17.1"; - sha256 = "sha256-a7A+426uuo3bUjggkglY1lqHmSbZNpjPaFpQUXYtW9k="; - # https://hexdocs.pm/elixir/1.17.1/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.17.2"; + sha256 = "sha256-8rb2f4CvJzio3QgoxvCv1iz8HooXze0tWUJ4Sc13dxg="; + # https://hexdocs.pm/elixir/1.17.2/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 396164b14a891..4ef35441d3449 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -71,13 +71,6 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; - # Meson is no longer able to pick up Boost automatically. - # https://github.com/NixOS/nixpkgs/issues/86131 - env = { - BOOST_INCLUDEDIR = "${lib.getDev boost182}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib"; - }; - mesonFlags = [ (lib.mesonBool "enable_file_io" true) (lib.mesonBool "enable_io_uring" true) diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 57de6e35dcf2e..2a5f82d6b8f31 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.12"; - sha256 = "sha256-ZqyJtKr0QdzuuzKnJ/S6Z4cGLWolVMVWcMuAHyOGzkQ="; + version = "25.3.2.13"; + sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc="; } diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index a17facb1c114b..f5fa3522c3ed5 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5"; - sha256 = "sha256-tUAvzkTE51gT4kS7voEZZpsMKVyBQR+wgk6mI0s1Vac="; + version = "26.2.5.1"; + sha256 = "sha256-oxOynBFW++igiJtIv1ZjoMgtmumgnsWgwyVx4buhxCo="; } diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 883f3df647ef1..d854643bb2fe8 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnu-apl"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql"; + sha256 = "sha256-KRhn8bGTdpOrtXvn2aN2GLA3bj4nCVdIVKe75Suyjrg="; }; buildInputs = [ readline gettext ncurses ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 18daad8005686..57ff880256900 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -152,7 +152,7 @@ builder rec { processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ludo lovek323 vrthra ]; + maintainers = with maintainers; [ ludo ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 918735517ea34..9dd102012068e 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -142,7 +142,7 @@ builder rec { foreign function call interface, and powerful string processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ludo lovek323 vrthra ]; + maintainers = with maintainers; [ ludo ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 7eb0f1abc4cff..f7797a7c8ad2b 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -163,7 +163,7 @@ builder rec { foreign function call interface, and powerful string processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index e6afedb5b31c8..e5c486ed8de20 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Very high level general-purpose programming language"; - maintainers = with maintainers; [ vrthra yurrriq ]; + maintainers = with maintainers; [ yurrriq ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos; license = licenses.publicDomain; homepage = "https://www.cs.arizona.edu/icon/"; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 64e5b7c4d8279..0d522055d9adf 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ raskin maggesi - vrthra ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 4e9e9d1f87ae1..2215fcaa06f37 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://jim.tcl.tk/"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dbohdan fgaz vrthra ]; + maintainers = with lib.maintainers; [ dbohdan fgaz ]; }; }) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index ced244e297808..aa0d2ebe593d8 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.3.5"; + version = "1.4.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-aBZ0KlXWKAF70xFxc+WWXucLPnxyaCxu97IYkPuKcCA="; + sha256 = "sha256-Y7FaW3V80mXp3l87srTLyhF45MlNH7QUZ5hrTudPtDU="; }; - vendorHash = "sha256-k17BthjOjZs0WB88AVVIM00HcSZl2S5u8n9eB2NFdrk="; + vendorHash = "sha256-t/28kTJVgVoe7DgGzNgA1sYKoA6oNC46AeJSrW/JetU="; doCheck = false; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 8758c88b9c01e..b681109e0bc32 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.7.0"; + version = "9.4.8.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-8cOfgldQUwClKP+D/kch++YahVq7JePSfVLUOsl6TYA="; + hash = "sha256-NHtmkr2ckcSApFryXOiNd76LbkrEp3vJSHDyxbVLySk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 55bd577e46d1a..263cd11dd5726 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -134,12 +134,15 @@ let externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated); local_cache = ""; + # To prevent collisions when creating environments, we install the rock + # files into per-package subdirectories + rocks_subdir = self.rocksSubdir; + # Filter out the lua derivation itself from the Lua module dependency # closure, as it doesn't have a rock tree :) # luaLib.hasLuaModule requiredLuaRocks = lib.filter luaLib.hasLuaModule (lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs)); - inherit (self) rocksSubdir; }; luarocksConfig' = lib.recursiveUpdate luarocksConfig diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index c5e7c806cd179..1b9409ff948e7 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -1,5 +1,4 @@ -{ lib -, lua +{ lua , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/development/interpreters/lune/default.nix index 5403a2573c33e..c6fa16269ff90 100644 --- a/pkgs/development/interpreters/lune/default.nix +++ b/pkgs/development/interpreters/lune/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "lune"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "filiptibell"; repo = "lune"; rev = "v${version}"; - hash = "sha256-03ckR2FpSlaAZlhjyX3ob+7W5Pq8OLri7jT+XIM7oeQ="; + hash = "sha256-fWfBXcJq8WBYPu0/VKksbC5q9lKzf0psjBNMlAq/iig="; fetchSubmodules = true; }; - cargoHash = "sha256-xEUq3Cc15bUAXpUoZw8tNQo6tW3/VXeuOtjIW4zrh1Q="; + cargoHash = "sha256-+T5+rG4mxhAB/67DXQ6y+uK7A1Mbksc2BYaz4yOkLcA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 4b9893f228c99..25097e0876061 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-sfJohmsqq5FumUoVE8x3yWv12DiCJJXae62br0j+190="; + hash = "sha256-sfJohmsqq5FumUoVE8x3yWv12DiCJJXae62br0j+190="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 2ea608f440a3a..2022141daf37e 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "0-unstable-2024-06-16"; + version = "0-unstable-2024-08-04"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "4b2c75f8fe5c1d11a966b2fe8974a256868749a6"; - hash = "sha256-98QKg9eKBDEobmARpH3FAS2C32iViSsBs71n1E8uI2s="; + rev = "38c2d9ca14c992ddcd73f4067af8c6f37c550979"; + hash = "sha256-mpKGD9YP+D+1ySq+8lyRjXwptWL+uBG/p37bHDBoTJ8="; }; postPatch = '' diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index e7da04b38144e..8e81d7eebc389 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -1,6 +1,5 @@ { lib, stdenv, octave, buildEnv , makeWrapper, texinfo -, octavePackages , wrapOctave , computeRequiredOctavePackages , extraLibs ? [] diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ab9128772d3cf..8bf1c43d12398 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -93,12 +93,12 @@ let # To avoid confusion later in passthru allPkgs = pkgs; in stdenv.mkDerivation (finalAttrs: { - version = "8.4.0"; + version = "9.2.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-azjdl1FnhCSus6nWZkMrHzeOs5caISkKkM09NRGdVq0="; + sha256 = "sha256-BjZVSwWZaZfkMcqtRCLAA4bS18aJAEcnAP7PX/63yZE="; }; buildInputs = [ @@ -204,7 +204,7 @@ in stdenv.mkDerivation (finalAttrs: { inherit enableQt enableReadline enableJava; buildEnv = callPackage ./build-env.nix { octave = finalAttrs.finalPackage; - inherit octavePackages wrapOctave; + inherit wrapOctave; inherit (octavePackages) computeRequiredOctavePackages; }; withPackages = import ./with-packages.nix { inherit buildEnv octavePackages; }; diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 1959ba6c49251..18a532226efe6 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -1,5 +1,4 @@ -{ lib -, octave +{ octave , makeSetupHook , makeWrapper }: diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index e50bdfd137412..7b533cb13ea98 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.20"; - hash = "sha256-Xexvphx7nEeqHXZma+ZR8mQu0rz2zYY4xX41cc4qrGE="; + version = "8.2.22"; + hash = "sha256-Wq5ZZMYFMxhfm+koz315oTOTzFVgzt8fS5d5RMx2pYU="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index ae4ad6e949b11..53c720a013468 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.3.8"; - hash = "sha256-9KbLAFrhF6uobCBEkyz1Y4maLpd6wJeBqnSyFh3cVjs="; + version = "8.3.9"; + hash = "sha256-lu3G2Ct1A6ZlBUH8R3q9VFbfKN+qjJOI/54x2f4eMRI="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch b/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch new file mode 100644 index 0000000000000..a978413a676a6 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch @@ -0,0 +1,53 @@ +From 04bfb877c8ccbd431dcae429abb487c1e3390801 Mon Sep 17 00:00:00 2001 +From: Yureka <yuka@yuka.dev> +Date: Sun, 30 Jun 2024 09:37:49 +0200 +Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0 + +--- + Include/internal/pycore_dtoa.h | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h +index 4d9681d59a..899d413b05 100644 +--- a/Include/internal/pycore_dtoa.h ++++ b/Include/internal/pycore_dtoa.h +@@ -11,8 +11,6 @@ extern "C" { + #include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR + + +-#if _PY_SHORT_FLOAT_REPR == 1 +- + typedef uint32_t ULong; + + struct +@@ -22,15 +20,15 @@ Bigint { + ULong x[1]; + }; + +-#ifdef Py_USING_MEMORY_DEBUGGER ++#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0 + + struct _dtoa_state { + int _not_used; + }; +-#define _dtoa_interp_state_INIT(INTERP) \ ++#define _dtoa_state_INIT(INTERP) \ + {0} + +-#else // !Py_USING_MEMORY_DEBUGGER ++#else // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0 + + /* The size of the Bigint freelist */ + #define Bigint_Kmax 7 +@@ -65,8 +63,6 @@ PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, + int *decpt, int *sign, char **rve); + PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); + +-#endif // _PY_SHORT_FLOAT_REPR == 1 +- + #ifdef __cplusplus + } + #endif +-- +2.45.1 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 0f989419b1288..dd569db153582 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -70,8 +70,7 @@ , enableNoSemanticInterposition ? true # enabling LTO on 32bit arch causes downstream packages to fail when linking -# enabling LTO on *-darwin causes python3 to fail when linking. -, enableLTO ? stdenv.is64bit && stdenv.isLinux +, enableLTO ? stdenv.isDarwin || (stdenv.is64bit && stdenv.isLinux) # enable asserts to ensure the build remains reproducible , reproducibleBuild ? false @@ -367,7 +366,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { }; in [ "${mingw-patch}/*.patch" - ]); + ]) ++ optionals isPy312 [ + # backport fix for various platforms; armv7l, riscv64, s390 + # https://github.com/python/cpython/pull/121178 + ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch + ]; postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ @@ -397,9 +400,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--without-ensurepip" "--with-system-expat" - ] ++ optionals (!(stdenv.isDarwin && pythonAtLeast "3.12")) [ - # ./Modules/_decimal/_decimal.c:4673:6: error: "No valid combination of CONFIG_64, CONFIG_32 and _PyHASH_BITS" - # https://hydra.nixos.org/build/248410479/nixlog/2/tail "--with-system-libmpdec" ] ++ optionals (openssl != null) [ "--with-openssl=${openssl.dev}" @@ -471,6 +471,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix. sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure + '' + optionalString (pythonAtLeast "3.11") '' + # Also override the auto-detection in `configure`. + substituteInPlace configure \ + --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.isAarch64 then "uint128" else "x64"}' '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") '' export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index a15bca1e013ea..ab712cb734ea5 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54b28992d4724..0ae044db37c93 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 84cf35f385a18..85593000d421e 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 5d25344e4bdcf..24a22dd146752 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python27-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix index 6efe8d571a772..0cbe633c63b10 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-html.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-html"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix index 1cbbf179a2e23..bb98fdffb0056 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-a4.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-a4"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix index 6b24450855b2f..8bd6298fe1512 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-pdf-letter.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-pdf-letter"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix index 694ed0e9ad942..35664e17cd685 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-texinfo.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-texinfo"; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix index 4ada4e2b704d4..eec0bf140961a 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.10-text.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation { pname = "python310-docs-text"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template-info.nix b/pkgs/development/interpreters/python/cpython/docs/template-info.nix index 4f5d4b3e37ab1..f1551e1f61eff 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template-info.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template-info.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index fff6e0bedb18e..adf64ddd62244 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -1,6 +1,6 @@ # This file was generated and will be overwritten by ./generate.sh -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl }: stdenv.mkDerivation { pname = "pythonMAJORMINOR-docs-TYPE"; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c406780e83fc0..a05a4edfaddd6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "b3"; + suffix = "rc1"; }; - hash = "sha256-O+CUrQixHcKgZUY1JCOceNyfKzQrAdzU4eYG27xceKU="; + hash = "sha256-Z4uIR3XuwCJNUVn6kAh5AgusoqNs6UL9lf6/oa20pr0="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index 16df000139255..7fd1b52a04bf0 100644 --- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -4,12 +4,10 @@ # # Example usage in a derivation: # -# { …, pythonPackages, … }: +# { …, python3Packages, … }: # -# pythonPackages.buildPythonPackage { +# python3Packages.buildPythonPackage { # … -# nativeBuildInputs = [ pythonPackages.pythonRelaxDepsHook ]; -# # # This will relax the dependency restrictions # # e.g.: abc>1,<=2 -> abc # pythonRelaxDeps = [ "abc" ]; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 2306292eb8c8f..e4be95bb3a100 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -99,6 +99,8 @@ in { inherit toPythonModule toPythonApplication; python = toPythonModule python; - # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions - pythonPackages = self; + + # Don't take pythonPackages from "global" pkgs scope to avoid mixing python versions. + # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here. + pythonPackages = self // { __attrsFailEvaluation = true; }; } diff --git a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix index 0254d843a4cfe..3d3bf549d91c1 100644 --- a/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix +++ b/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix @@ -1,4 +1,4 @@ -{ interpreter, lib, gdb, writeText, runCommand }: +{ interpreter, gdb, writeText, runCommand }: let crashme-py = writeText "crashme.py" '' diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 555d15b8ca4dc..57153383fc189 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -275,16 +275,17 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t release = next(filter(lambda x: strip_prefix(x["tag_name"]) == version, releases)) prefix = get_prefix(release["tag_name"]) - # some attributes require using the fetchgit - git_fetcher_args = [] - if _get_attr_value(f"{attr_path}.src.fetchSubmodules"): - git_fetcher_args.append("--fetch-submodules") - if _get_attr_value(f"{attr_path}.src.fetchLFS"): - git_fetcher_args.append("--fetch-lfs") - if _get_attr_value(f"{attr_path}.src.leaveDotGit"): - git_fetcher_args.append("--leave-dotGit") - - if git_fetcher_args or _get_attr_value(f"{attr_path}.src.fetcher").endswith("nix-prefetch-git"): + fetcher = _get_attr_value(f"{attr_path}.src.fetcher") + if fetcher is not None and fetcher.endswith("nix-prefetch-git"): + # some attributes require using the fetchgit + git_fetcher_args = [] + if _get_attr_value(f"{attr_path}.src.fetchSubmodules"): + git_fetcher_args.append("--fetch-submodules") + if _get_attr_value(f"{attr_path}.src.fetchLFS"): + git_fetcher_args.append("--fetch-lfs") + if _get_attr_value(f"{attr_path}.src.leaveDotGit"): + git_fetcher_args.append("--leave-dotGit") + algorithm = "sha256" cmd = [ "nix-prefetch-git", diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix deleted file mode 100644 index f5d7ef3c70fdd..0000000000000 --- a/pkgs/development/interpreters/qnial/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses, libxcrypt }: - -stdenv.mkDerivation { - pname = "qnial"; - version = "6.3"; - - src = fetchFromGitHub { - sha256 = "0426hb8w0wpkisvmf3danj656j6g7rc6v91gqbgzkcj485qjaliw"; - rev = "cfe8720a4577d6413034faa2878295431bfe39f8"; - repo = "qnial"; - owner = "vrthra"; - }; - - nativeBuildInputs = [ makeWrapper unzip pkg-config ]; - - preConfigure = '' - cd build; - ''; - - installPhase = '' - cd .. - mkdir -p $out/bin $out/lib - cp build/nial $out/bin/ - cp -r niallib $out/lib/ - ''; - - buildInputs = [ - ncurses - libxcrypt - ]; - - meta = { - description = "Array language from Nial Systems"; - mainProgram = "nial"; - homepage = "https://github.com/vrthra/qnial"; - license = lib.licenses.artistic1; - maintainers = [ lib.maintainers.vrthra ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 314c760fa02c5..738e3a8e97174 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation rec { asl20 # or mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" diff --git a/pkgs/development/interpreters/racket/racket_7_9.nix b/pkgs/development/interpreters/racket/racket_7_9.nix index 4db0db9385d00..91f7654fcad29 100644 --- a/pkgs/development/interpreters/racket/racket_7_9.nix +++ b/pkgs/development/interpreters/racket/racket_7_9.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { asl20 # or mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; platforms = [ "x86_64-darwin" "x86_64-linux" diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 8ea91a46dd57c..9381e8a15860f 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; }; } diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 704d75b73bbc3..a42c4a49705a0 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; homepage = "https://moarvm.org"; license = licenses.artistic2; - maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; mainProgram = "moar"; platforms = platforms.unix; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index fafc53267dd8d..9ceaba4446adb 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Raku/nqp"; license = licenses.artistic2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; }; } diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 2d6959c324e06..73ff0b885185e 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-HpDTxu846jb5hasH7nL93vRihFIZbVBXf/dV4itqFQg="; + hash = "sha256-zvFmh4Q1Q6gizxdCCoOX2hgQ7/f8ozczY7IwWqMKGSo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a9e5e5a048429..2ee6ff9b13bad 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -6,6 +6,7 @@ , makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo , openssl , linuxPackages, libsystemtap +, gitUpdater } @ args: let @@ -13,7 +14,7 @@ let ops = lib.optionals; opString = lib.optionalString; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl gitUpdater; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -57,6 +58,7 @@ let rubygemsSupport = false; } , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform + , gitUpdater }: stdenv.mkDerivation ( finalAttrs: { pname = "ruby"; @@ -171,6 +173,14 @@ let export HOME=$TMPDIR ''; + # Work around useSystemCoreFoundationFramework hook causing issues with the ld64 upgrade. + # This will be fixed on staging in https://github.com/NixOS/nixpkgs/pull/329529 + preBuild = + if lib.versionAtLeast ver.majMin "3.3" && stdenv.isDarwin && stdenv.isx86_64 then + "unset NIX_COREFOUNDATION_RPATH" + else + null; + # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips" # mostly TZ- and patch-related tests # TZ- failures are caused by nix sandboxing, I didn't investigate others @@ -267,8 +277,9 @@ let description = "Object-oriented language for quick and easy programming"; homepage = "https://www.ruby-lang.org/"; license = licenses.ruby; - maintainers = with maintainers; [ vrthra manveru ]; + maintainers = with maintainers; [ manveru ]; platforms = platforms.all; + mainProgram = "ruby"; knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/."; }; @@ -299,8 +310,8 @@ in { mkRuby = generic; ruby_3_1 = generic { - version = rubyVersion "3" "1" "5" ""; - hash = "sha256-NoXFHu7hNSwx6gOXBtcZdvU9AKttdzEt5qoauvXNosU="; + version = rubyVersion "3" "1" "6" ""; + hash = "sha256-DQ2vuFnnZ2NDJXGjEJ0VN9l2JmvjCDRFZR3Gje7SXCI="; }; ruby_3_2 = generic { @@ -310,8 +321,8 @@ in { }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "2" ""; - hash = "sha256-O+HRAOvyoM5gws2NIs2dtNZLPgShlDvixP97Ug8ry1s="; + version = rubyVersion "3" "3" "4" ""; + hash = "sha256-/mow+X1U4Cl2jy3fSSNpnEFs28Om6W2z4tVxbH25ajQ="; cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch b/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch new file mode 100644 index 0000000000000..91f221e19680a --- /dev/null +++ b/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch @@ -0,0 +1,36 @@ +A change introduced in PR https://github.com/rubygems/rubygems/pull/7797 +does not delete the binstub lock files after the binstub file is created. + +This change was introduced in rubygems 3.5.15, +and this version causes Hydra builds to fail, in particular mastodon. + +A resolution is delete these binstub lock files after the binstub file is created +to prevent lock files from ending up in the bin folders of the various derivations +which will cause the build to fail. + +--- +diff --git a/bundler/lib/bundler/rubygems_ext.rb b/bundler/lib/bundler/rubygems_ext.rb +index 503959bba7..603b30e277 100644 +--- a/bundler/lib/bundler/rubygems_ext.rb ++++ b/bundler/lib/bundler/rubygems_ext.rb +@@ -47,6 +47,8 @@ def self.open_file_with_flock(path, &block) + else + File.open(path, flags, &block) + end ++ ensure ++ FileUtils.rm_f(path) if File.exist?(path) + end + end + end +diff --git a/lib/rubygems.rb b/lib/rubygems.rb +index 569041f3d7..bcc95ae85c 100644 +--- a/lib/rubygems.rb ++++ b/lib/rubygems.rb +@@ -796,6 +796,8 @@ def self.open_file_with_flock(path, &block) + else + open_file(path, flags, &block) + end ++ ensure ++ FileUtils.rm_f(path) if File.exist?(path) + end + end diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 9ad7a04eab066..9fbfdb59fb075 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,18 +1,24 @@ -{ stdenv, lib, fetchurl }: +{ + fetchurl, + gitUpdater, + lib, + stdenv, +}: stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.11"; + version = "3.5.16"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-RSG1L4Q2IKn8XKdBRSa3RjsJiVZMOugLJraPvRMEyBg="; + hash = "sha256-f9EN6eXpMzIbYrjxGUJWrmRwO6JUHKuR7DEkSgGNkBI="; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch + ./0004-delete-binstub-lock-file.patch ]; installPhase = '' @@ -21,6 +27,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/rubygems/rubygems.git"; + rev-prefix = "v"; + ignoredVersions = "(pre|alpha|beta|rc|bundler).*"; + }; + meta = with lib; { description = "Package management framework for Ruby"; changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix index e6bdf5ea059db..f4dc8ef1f7452 100644 --- a/pkgs/development/interpreters/rune/default.nix +++ b/pkgs/development/interpreters/rune/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "rune"; - version = "0.13.3"; + version = "0.13.4"; src = fetchCrate { pname = "rune-cli"; inherit version; - hash = "sha256-nrHduxHSX31nwqcBbgPT4WH64LXTruScocpqex4zxf4="; + hash = "sha256-+2eXTkn9yOMhvS8cFwAorLBNIPvIRwsPOsGCl3gtRSE="; }; - cargoHash = "sha256-EjUzXb2r6lKV1fBL7KdseC9vmW2L0AjpowYo4j8Xpv8="; + cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix deleted file mode 100644 index ae60e02067897..0000000000000 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "102.15.1"; - hash = "sha512-vbZrT7ViKvPmBYCjvNRk2Y7xPLONasbJ5fwEblZ6ADzwgBJdd0iVDJHEQv3l6AJMUMQYDS9VGqNSgWCjwFrhhw=="; -} diff --git a/pkgs/development/interpreters/spidermonkey/128.nix b/pkgs/development/interpreters/spidermonkey/128.nix new file mode 100644 index 0000000000000..7a46aafdcd961 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/128.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "128.1.0"; + hash = "sha512-gFWn+DrPDKthJLpYCa/xwILoGg0w/zGOxxn4/T9K+apg4glMGr1smBGT11EHWpVpNwF24g5Q88GVn+J6FVETiA=="; +} diff --git a/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch b/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch new file mode 100644 index 0000000000000..997164dd983fb --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch @@ -0,0 +1,37 @@ +From a26bb162d9403138d64b84e8fa4f0471084c45b2 Mon Sep 17 00:00:00 2001 +From: "Kirill A. Korinsky" <kirill@korins.ky> +Date: Fri, 8 Jul 2022 21:21:25 +0200 +Subject: [PATCH] Allow system's nspr and icu on bootstrapped sysroot + +This patch partially reverts https://github.com/mozilla/gecko-dev/commit/9aa3587bbf0416dd2eb5b614f7b301c71c64286b +--- + build/moz.configure/nspr.configure | 2 +- + js/moz.configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/moz.configure/nspr.configure b/build/moz.configure/nspr.configure +index bc6d62982b87a..8346f08b86923 100644 +--- a/build/moz.configure/nspr.configure ++++ b/build/moz.configure/nspr.configure +@@ -19,7 +19,7 @@ def enable_nspr_build(enable): + return enable + + +-system_lib_option( ++option( + "--with-system-nspr", + help="Use system NSPR", + when=use_pkg_config, +diff --git a/js/moz.configure b/js/moz.configure +index 8fb51095876fa..7629b29d33c8f 100644 +--- a/js/moz.configure ++++ b/js/moz.configure +@@ -1296,7 +1296,7 @@ set_define( + + # ECMAScript Internationalization API Support (uses ICU) + # ====================================================== +-system_lib_option( ++option( + "--with-system-icu", + help="Use system ICU", + when=use_pkg_config, diff --git a/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config-128.patch b/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config-128.patch new file mode 100644 index 0000000000000..334d78c2ac4cf --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config-128.patch @@ -0,0 +1,22 @@ +From 9d3f6e9ff5e66af90a5d187d902f7893fb91c24b Mon Sep 17 00:00:00 2001 +From: "Kirill A. Korinsky" <kirill@korins.ky> +Date: Fri, 1 Jul 2022 12:23:37 +0200 +Subject: [PATCH] Always check for pkg-config + +--- + build/moz.configure/pkg.configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletions(-) + +diff --git a/build/moz.configure/pkg.configure b/build/moz.configure/pkg.configure +index 418331b874f47..09cc40eda03fa 100644 +--- a/build/moz.configure/pkg.configure ++++ b/build/moz.configure/pkg.configure +@@ -12,7 +12,7 @@ def pkg_config(prefixes): + + @depends(compile_environment, target) + def use_pkg_config(compile_environment, target): +- return compile_environment and target.os not in ("WINNT", "OSX", "Android") ++ return compile_environment + + + pkg_config = check_prog( diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 46af4ec26bbe5..cc1d3923fef98 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -14,6 +14,9 @@ , pkg-config , python3 , python39 +, python311 +, rust-cbindgen +, rustPlatform , rustc , which , zip @@ -58,17 +61,21 @@ stdenv.mkDerivation (finalAttrs: rec { # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 ./add-riscv64-support.patch - ] ++ lib.optionals (lib.versionAtLeast version "102") [ + ] ++ lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch + ] ++ lib.optionals (lib.versionAtLeast version "128") [ + # rebased version of the above 2 patches + ./always-check-for-pkg-config-128.patch + ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch ] ++ lib.optionals (lib.versionAtLeast version "91" && lib.versionOlder version "102") [ # Fix 91 compatibility with python311 (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mozjs91/raw/rawhide/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch"; + url = "https://src.fedoraproject.org/rpms/mozjs91/raw/e3729167646775e60a3d8c602c0412e04f206baf/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch"; hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48="; }) ]; @@ -79,11 +86,23 @@ stdenv.mkDerivation (finalAttrs: rec { perl pkg-config # 78 requires python up to 3.9 - (if lib.versionOlder version "91" then python39 else python3) + # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves' + # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils' + ( + if lib.versionOlder version "91" then + python39 + else if lib.versionOlder version "115" then + python311 + else + python3 + ) rustc rustc.llvmPackages.llvm # for llvm-objdump which zip + ] ++ lib.optionals (lib.versionAtLeast version "128") [ + rust-cbindgen + rustPlatform.bindgenHook ] ++ lib.optionals (lib.versionOlder version "91") [ autoconf213 yasm # to buid icu? seems weird @@ -151,7 +170,9 @@ stdenv.mkDerivation (finalAttrs: rec { "class JS_PUBLIC_API SharedArrayRawBufferRefs {" ''; - preConfigure = lib.optionalString (lib.versionOlder version "91") '' + preConfigure = lib.optionalString (lib.versionAtLeast version "128") '' + export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild + '' + lib.optionalString (lib.versionOlder version "91") '' export CXXFLAGS="-fpermissive" '' + '' export LIBXUL_DIST=$out diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index b69658ff03c74..7eb0de6f689f0 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; changelog = "https://github.com/supercollider/supercollider/blob/Version-${version}/CHANGELOG.md"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index 492033c52c70d..8a2d9a371d3f5 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 8dfa36e586b88..f0a45495d70dc 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Very high level, goal-directed, object-oriented, general purpose applications language"; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; platforms = platforms.linux; license = licenses.gpl2; homepage = "http://unicon.org"; diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix index 06fc84eeae7ec..e5b9b904a0611 100644 --- a/pkgs/development/interpreters/wamr/default.nix +++ b/pkgs/development/interpreters/wamr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wamr"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-micro-runtime"; rev = "WAMR-${finalAttrs.version}"; - hash = "sha256-2jZnvfW/f928DxVwd+z/BVPNPWfbyV8Rjek23NQhFz8="; + hash = "sha256-/DQ+dZ3VoijL7FdgRgPg3H7whhXhjIzjhCaqpjPYw4k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index b021c43ab9d73..2256851c3d2f8 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.3"; + version = "4.3.5"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-k0XyVdSbb0sP4CwU6q0yiY+Ki6don742hCmL0zaj1tQ="; + hash = "sha256-hEhU3o/SLHWV9zmgCtW+7K/2ev+oGAnrZmlyNtoeSV4="; }; - cargoHash = "sha256-5OxBrYCNBBr7d+wdnJma/RJ3P9vc+nRVrzFGu8UmPWc="; + cargoHash = "sha256-xyR5pnwMGE5K4o7X0Q2JEervSgR5LK1vqpOa3Mm6xkU="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index b54a6478be022..d7b3b751ac902 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "22.0.0"; + version = "23.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-pVASjiGADtimXqnsit673v6nD77loN2nBphwgIMAvBA="; + hash = "sha256-3PvxMwsFnX2f9sosp93ZHBZDJUUbwLb8lHgaMVqJf6E="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-s/+aKIu1V9iD8eTqHlHuhvC6oRDjX9IfI7tz3R1M5tw="; + cargoHash = "sha256-ABDjdkHXSu80yUnXBNsUmpbtl9F3CYxy2GvYGN2fEuY="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix index 772a2b5acf529..87719884a06ec 100644 --- a/pkgs/development/interpreters/yex-lang/default.nix +++ b/pkgs/development/interpreters/yex-lang/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: @@ -15,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k="; }; - cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI="; + cargoHash = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI="; meta = with lib; { homepage = "https://github.com/nonamescm/yex-lang"; diff --git a/pkgs/development/julia-modules/tests/top-julia-packages.nix b/pkgs/development/julia-modules/tests/top-julia-packages.nix index ca93f42875b33..3c50b5eed676c 100644 --- a/pkgs/development/julia-modules/tests/top-julia-packages.nix +++ b/pkgs/development/julia-modules/tests/top-julia-packages.nix @@ -11,7 +11,6 @@ let buildCommand = '' wget https://julialang-logs.s3.amazonaws.com/public_outputs/current/package_requests.csv.gz gunzip package_requests.csv.gz - ls -lh cp package_requests.csv $out ''; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 816afa176754d..2e91a39cc81f9 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -51,6 +51,15 @@ , withStatic ? stdenv.hostPlatform.isMinGW # passthru.tests , testers +, guile-sdl2 +, jazz2 +, SDL2_ttf +, SDL2_net +, SDL2_gfx +, SDL2_sound +, SDL2_mixer +, SDL2_image +, python3Packages }: # NOTE: When editing this expression see if the same change applies to @@ -173,8 +182,25 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit openglSupport; updateScript = nix-update-script { extraArgs = [ "--version-regex" "release-(.*)" ]; }; - tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + inherit + guile-sdl2 + jazz2 + SDL2_ttf + SDL2_net + SDL2_gfx + SDL2_sound + SDL2_mixer + SDL2_image + ; + inherit (python3Packages) + pygame + pygame-ce + pygame-sdl2 + ; }; }; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix deleted file mode 100644 index 03b3f146ca939..0000000000000 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl -, pkg-config -, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "SDL2_image"; - version = "2.8.2"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz"; - hash = "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ] - ++ lib.optional stdenv.isDarwin Foundation; - - configureFlags = [ - # Disable dynamically loaded dependencies - "--disable-jpg-shared" - "--disable-png-shared" - "--disable-tif-shared" - "--disable-webp-shared" - ] ++ lib.optionals stdenv.isDarwin [ - # Darwin headless will hang when trying to run the SDL test program - "--disable-sdltest" - # Don't use native macOS frameworks - "--disable-imageio" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "SDL image library"; - homepage = "http://www.libsdl.org/projects/SDL_image/"; - platforms = platforms.unix; - license = licenses.zlib; - maintainers = with maintainers; [ cpages ]; - }; -}) diff --git a/pkgs/development/libraries/accounts-qml-module/default.nix b/pkgs/development/libraries/accounts-qml-module/default.nix index aa68cb105af37..858f9c0d57b80 100644 --- a/pkgs/development/libraries/accounts-qml-module/default.nix +++ b/pkgs/development/libraries/accounts-qml-module/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { # Don't install test binary sed -i tests/tst_plugin.pro \ -e '/TARGET = tst_plugin/a INSTALLS -= target' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i accounts-qml-module.pro -e '/tests/d' ''; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 42edfc190c092..60de8957d088f 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, fetchurl, gnum4 }: +{ stdenv, lib, fetchurl, gnum4, gitUpdater }: stdenv.mkDerivation rec { pname = "adns"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { urls = [ "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; - sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv"; + hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0="; }; nativeBuildInputs = [ gnum4 ]; @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = gitUpdater { + url = "https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/githttp/adns.git"; + rev-prefix = "adns-"; + }; + meta = with lib; { homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; diff --git a/pkgs/development/libraries/aemu/LFS64.patch b/pkgs/development/libraries/aemu/LFS64.patch new file mode 100644 index 0000000000000..e1d06d8073ef7 --- /dev/null +++ b/pkgs/development/libraries/aemu/LFS64.patch @@ -0,0 +1,98 @@ +From 455341880f52b4df3b30490db1c17eb65110c00c Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Wed, 29 May 2024 10:29:02 +0200 +Subject: [PATCH] Stop using transitional LFS64 APIs + +The *64 APIs were intended for transitional use, and have been removed +in musl 1.2.4. Nowadays, the best practice is to set +_FILE_OFFSET_BITS=64 across the board, making all the unsuffixed APIs +will be 64-bit. This fixes building with recent versions of musl, and +avoids the need to remember to use the *64 variants every time to +properly handle large files on 32-bit platforms. + +Test: build with musl 1.2.4. +Change-Id: I7fa7a3ae4aa19a765740f5b2af916fd6f0ed0b32 +--- + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4de86a4..10c402a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,7 +69,7 @@ + add_subdirectory(build-config/${AEMU_COMMON_BUILD_CONFIG}) + endif() + +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extern-c-compat -Wno-return-type-c-linkage") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extern-c-compat -Wno-return-type-c-linkage -D_FILE_OFFSET_BITS=64") + + add_subdirectory(base) + add_subdirectory(snapshot) +diff --git a/snapshot/TextureLoader.cpp b/snapshot/TextureLoader.cpp +index 31e02e8..5c21134 100644 +--- a/snapshot/TextureLoader.cpp ++++ b/snapshot/TextureLoader.cpp +@@ -46,7 +46,7 @@ + void TextureLoader::loadTexture(uint32_t texId, const loader_t& loader) { + android::base::AutoLock scopedLock(mLock); + assert(mIndex.count(texId)); +- HANDLE_EINTR(fseeko64(mStream.get(), mIndex[texId], SEEK_SET)); ++ HANDLE_EINTR(fseeko(mStream.get(), mIndex[texId], SEEK_SET)); + switch (mVersion) { + case 1: + loader(&mStream); +@@ -71,7 +71,7 @@ + mDiskSize = size; + } + auto indexPos = mStream.getBe64(); +- HANDLE_EINTR(fseeko64(mStream.get(), static_cast<int64_t>(indexPos), SEEK_SET)); ++ HANDLE_EINTR(fseeko(mStream.get(), static_cast<int64_t>(indexPos), SEEK_SET)); + mVersion = mStream.getBe32(); + if (mVersion < 1 || mVersion > 2) { + return false; +diff --git a/snapshot/TextureSaver.cpp b/snapshot/TextureSaver.cpp +index 537626b..c8854e9 100644 +--- a/snapshot/TextureSaver.cpp ++++ b/snapshot/TextureSaver.cpp +@@ -50,7 +50,7 @@ + [texId](FileIndex::Texture& tex) { + return tex.texId == texId; + })); +- mIndex.textures.push_back({texId, ftello64(mStream.get())}); ++ mIndex.textures.push_back({texId, ftello(mStream.get())}); + + CompressingStream stream(mStream); + saver(&stream, &mBuffer); +@@ -60,7 +60,7 @@ + if (mFinished) { + return; + } +- mIndex.startPosInFile = ftello64(mStream.get()); ++ mIndex.startPosInFile = ftello(mStream.get()); + writeIndex(); + mEndTime = base::getHighResTimeUs(); + #if SNAPSHOT_PROFILE > 1 +@@ -74,7 +74,7 @@ + + void TextureSaver::writeIndex() { + #if SNAPSHOT_PROFILE > 1 +- auto start = ftello64(mStream.get()); ++ auto start = ftello(mStream.get()); + #endif + + mStream.putBe32(static_cast<uint32_t>(mIndex.version)); +@@ -83,13 +83,13 @@ + mStream.putBe32(b.texId); + mStream.putBe64(static_cast<uint64_t>(b.filePos)); + } +- auto end = ftello64(mStream.get()); ++ auto end = ftello(mStream.get()); + mDiskSize = uint64_t(end); + #if SNAPSHOT_PROFILE > 1 + printf("texture: index size: %d\n", int(end - start)); + #endif + +- fseeko64(mStream.get(), 0, SEEK_SET); ++ fseeko(mStream.get(), 0, SEEK_SET); + mStream.putBe64(static_cast<uint64_t>(mIndex.startPosInFile)); + } + diff --git a/pkgs/development/libraries/aemu/default.nix b/pkgs/development/libraries/aemu/default.nix index e2ea8e5b1cd55..0a2f6fa8b8b20 100644 --- a/pkgs/development/libraries/aemu/default.nix +++ b/pkgs/development/libraries/aemu/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation { hash = "sha256-H3IU9aTFSzUAqYgrtHd4F18hbhZsbOJGC4K5JwMQOOw="; }; + patches = [ + # stop using transitional LFS64 APIs, which are removed in musl 1.2.4 + # https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/3105640/1 + ./LFS64.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 9779277b5e7cf..cbf3100347ef7 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-TjGvY3eqpF+DDwatT7A78flyPcTkcLHQ1xcg+MKgCoE="; + hash = "sha256-tv/Fj8ZJgSvieNLlXBjyIR7MSmDp0e2QbN1d/0xBpFg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 609d29ed69096..5543c12ac9ede 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.18.3"; + version = "6.1.2"; src = fetchurl { - sha256 = "sha256-lDOBqm00BwfebELq2/e0G3/fk99gQVbZctUMTaeDVE8="; + sha256 = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index b2b1e40576eae..6f2f3def2b49c 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , meson , mesonEmulatorHook +, appstream , ninja , pkg-config , cmake @@ -36,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "appstream"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "installedTests" ]; @@ -44,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ximion"; repo = "appstream"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-0NzZku6TQyyaTOAMWZD459RayhsH8cotlOaSKkVY/EQ="; + sha256 = "sha256-pniZq+rR9wW86QqfRw4WZiBo1F16aSAb1J2RjI4aqE0="; }; patches = [ @@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { gperf ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook + appstream ]; buildInputs = [ diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 1916774b8cfc3..4699c7ce934ec 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -24,9 +24,13 @@ stdenv.mkDerivation { dontWrapQtApps = true; + # AppStreamQt tries to be relocatable, in hacky cmake ways that generally fail + # horribly on NixOS. Just hardcode the paths. postFixup = '' sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \ -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" + sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \ + -e "/IMPORTED_LOCATION/ s@\''${PACKAGE_PREFIX_DIR}@$out@" ''; passthru = appstream.passthru // { diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 8d5b597d26610..2b9f1a5913feb 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.aquamaniac.de/rdm/"; hydraPlatforms = []; license = licenses.gpl2Plus; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 4f2326b007a5d..ff0e55a446dbd 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "https://www.aquamaniac.de/rdm/projects/gwenhywfar"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/development/libraries/argparse/default.nix index 16a4f3b7a21e0..3b10b70e20403 100644 --- a/pkgs/development/libraries/argparse/default.nix +++ b/pkgs/development/libraries/argparse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "argparse"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; rev = "v${version}"; - sha256 = "sha256-0fgMy7Q9BiQ/C1tmhuNpQgad8yzaLYxh5f6Ps38f2mk="; + sha256 = "sha256-JH9t/e/6RaSz+3LjmuNBYOy5gJT3zA+Vz4CxuwEXlvA="; }; postPatch = '' diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/development/libraries/arpa2common/default.nix index 0ada354ce1e6a..fc7a897f0d143 100644 --- a/pkgs/development/libraries/arpa2common/default.nix +++ b/pkgs/development/libraries/arpa2common/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; + hash = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/arrow-glib/default.nix b/pkgs/development/libraries/arrow-glib/default.nix deleted file mode 100644 index cce59dc026e94..0000000000000 --- a/pkgs/development/libraries/arrow-glib/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, arrow-cpp -, glib -, gobject-introspection -, lib -, meson -, ninja -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "arrow-glib"; - inherit (arrow-cpp) src version; - sourceRoot = "apache-arrow-${version}/c_glib"; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - ]; - - buildInputs = [ - arrow-cpp - glib - ]; - - meta = with lib; { - inherit (arrow-cpp.meta) license platforms; - description = "GLib bindings for Apache Arrow"; - homepage = "https://arrow.apache.org/docs/c_glib/"; - maintainers = with maintainers; [ amarshall ]; - }; -} diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index a3e4a120e9ad7..6aba488f2457c 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Library for audio labelling"; homepage = "https://aubio.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ goibhniu marcweber fpletz ]; + maintainers = with maintainers; [ marcweber fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 3b5224c97f936..5125d4c76ebac 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index 064a167bfb773..c8d33508672e9 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "C library for reading and writing Standard MIDI Files"; homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; mainProgram = "smfsh"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 4e83452874624..fdd50d8af9370 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "http://drobilla.net/software/lilv"; description = "C library to make the use of LV2 plugins"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index d9952877d80de..8391c93cc594a 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Plugin standard for audio systems"; mainProgram = "lv2_validate"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index b340dafbc3158..54c76e5bc60cc 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index d67e18476a91b..d2c9d28f208cc 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index d101e2a960c62..4ad3ba33cb5c9 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { cairo libjpeg libXft python3 ]; + # NOTE: ntk provides its own waf script that is incompatible with new + # python versions. If the script is not present, wafHook will install + # a compatible version from nixpkgs. + prePatch = '' + rm waf + ''; + meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index 92024cd81fb8f..06b08b7e0c92b 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "C++ library of functions for DSP and Music Informatics purposes"; homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index cd8c3d3a70f3c..19853fd885f99 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,27 +1,34 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raul"; - version = "unstable-2019-12-09"; - name = "${pname}-${version}"; + version = "2.0.0-unstable-2024-07-04"; - src = fetchgit { - url = "https://gitlab.com/drobilla/raul.git"; - fetchSubmodules = true; - rev = "e87bb398f025912fb989a09f1450b838b251aea1"; - sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; + src = fetchFromGitLab { + owner = "drobilla"; + repo = "raul"; + rev = "9097952a918f8330a5db9039ad390fc2457f841d"; + hash = "sha256-k+EU3ROVJyjJPAtNxPmRXp9DALpUHzohCLL6Xe3NUxk="; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; - buildInputs = [ boost gtk2 ]; + nativeBuildInputs = [ + meson + ninja + ]; strictDeps = true; - meta = with lib; { + meta = { description = "C++ utility library primarily aimed at audio/musical applications"; homepage = "http://drobilla.net/software/raul"; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ t4ccer ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index bd12fc9b4a324..8f793b359886f 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://drobilla.net/software/sratom"; description = "Library for serialising LV2 atoms to/from RDF"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index df63737474ebd..350adc8a45832 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "http://drobilla.net/software/suil"; description = "Lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 198d94dbee7eb..a483f7023d045 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; - enableParallelBuilding = true; + # build is susceptible to race conditions: https://github.com/vamp-plugins/vamp-plugin-sdk/issues/12 + enableParallelBuilding = false; makeFlags = [ "AR:=$(AR)" "RANLIB:=$(RANLIB)" @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; homepage = "https://vamp-plugins.org/"; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 6b88fa8aa47e4..caf0ce60cdb2d 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "awslabs"; - repo = finalAttrs.pname; + repo = "aws-c-cal"; rev = "v${finalAttrs.version}"; hash = "sha256-RrUJz3IqwbBJ8NuJTIWqK33FlJHolcaid55PT2EhO24="; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "AWS Crypto Abstraction Layer "; + description = "AWS Crypto Abstraction Layer"; homepage = "https://github.com/awslabs/aws-c-cal"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 6bb9fc493fe87..f6d5050be3bad 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.9.21"; + version = "0.9.23"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-lJCQPatwZeHpuzQni6SMMGYBH4iESQH8ofFgmRbxtnM="; + hash = "sha256-VN+fy1vWx8ubcsFYOW2STXFNDbmZKcjmCkv5qw2Sp2Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 65e84c3bcb84a..5c834da72cc41 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - hash = "sha256-yQY5yZFRm/2K97ffyumAQhgPlU6Nzy8PDGcy9L53Y84="; + hash = "sha256-qPVITirqhExIeayh6AWEyAXPlkUtk7gkIcmT/IpNisw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index cbf2e22ec7322..534314443e4f8 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.26.8"; + version = "0.26.12"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-TW17Jcs9y8OqB0mnbHbOZgSWkYs70o2bhiLT/Rr1e8k="; + sha256 = "sha256-mVihmcl24gFLnF3A/qLSvr2npOotMlBH7TqU5vOwI9g="; }; patches = [ diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 7e15b74ebee47..af3476ce1a69c 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-Y+5fHUe1HAjU/cy7jWKE7zVQUezJNFg4q9tn7H1+NuA="; + sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index e74947dd8194a..0806364a7f672 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dprefix-dev=${placeholder "dev"}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # Docs are opt-out in native but opt-in in cross builds. + "-Dwith-docs=true" + "-Denable-gir=true" ]; postFixup = '' @@ -52,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Image pixel format conversion library"; mainProgram = "babl"; homepage = "https://gegl.org/babl/"; - changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS"; + changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${replaceStrings [ "." ] [ "_" ] finalAttrs.version}/NEWS"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 15556a4108c67..1cea8079024ca 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/development/libraries/blaze/default.nix index 70d7cdff13b40..d52176518da99 100644 --- a/pkgs/development/libraries/blaze/default.nix +++ b/pkgs/development/libraries/blaze/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromBitbucket { owner = "blaze-lib"; - repo = finalAttrs.pname; + repo = "blaze"; rev = "v${finalAttrs.version}"; hash = "sha256-Jl9ZWFqBvLgQwCoMNX3g7z02yc7oYx+d6mbyLBzBJOs="; }; diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index e5eb5b64aa9f0..2bf2e2c614e7c 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation ( finalAttrs: { pname = "blst"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; rev = "v${finalAttrs.version}"; - hash = "sha256-z/xnttMuAOfoKn/yCBwdYbgcd6cDLD6tZxInAWn8XIk="; + hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc="; }; buildPhase = '' diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3db9b77bf05d5..5efcb49510d12 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,6 @@ { lib, stdenv, icu, expat, zlib, bzip2, zstd, xz, python ? null, fixDarwinDylibNames, libiconv, libxcrypt +, makePkgconfigItem +, copyPkgconfigItems , boost-build , fetchpatch , which @@ -70,7 +72,7 @@ let "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" "architecture=${if stdenv.hostPlatform.isMips64 then if lib.versionOlder version "1.78" then "mips1" else "mips" - else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" + else if stdenv.hostPlatform.isS390 then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o" "binary-format=${if stdenv.hostPlatform.isMacho then "mach-o" @@ -210,12 +212,28 @@ stdenv.mkDerivation { EOF ''; - NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin - "-headerpad_max_install_names"; + env = { + NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names"; + # copyPkgconfigItems will substitute these in the pkg-config file + includedir = "${placeholder "dev"}/include"; + libdir = "${placeholder "out"}/lib"; + }; + + pkgconfigItems = [ + (makePkgconfigItem { + name = "boost"; + inherit version; + # Exclude other variables not needed by meson + variables = { + includedir = "@includedir@"; + libdir = "@libdir@"; + }; + }) + ]; enableParallelBuilding = true; - nativeBuildInputs = [ which boost-build ] + nativeBuildInputs = [ which boost-build copyPkgconfigItems ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ expat zlib bzip2 libiconv ] ++ lib.optional (lib.versionAtLeast version "1.69") zstd diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index c9a45218dfb4c..c14fdb4cef1f7 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix (args // { baseVersion = "2.19"; - revision = "4"; - hash = "sha256-WjqI72Qz6XvKsO+h7WDGGX5K2p2dMLwcR0N7+JuX8nY="; + revision = "5"; + hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; }) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index d55d7edfb74cc..0cffb67104c68 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,7 +1,9 @@ -{ callPackage, ... } @ args: +{ callPackage, stdenv, lib, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.4"; + baseVersion = "3.5"; revision = "0"; - hash = "sha256-cYQ6/MCixYX48z+jBPC1iuS5xdgwb4lGZ7N0YEQndVc="; + hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8="; + # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again + extraPatches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ]; }) diff --git a/pkgs/development/libraries/botan/botan3-macos.patch b/pkgs/development/libraries/botan/botan3-macos.patch new file mode 100644 index 0000000000000..4fde08c32d3f2 --- /dev/null +++ b/pkgs/development/libraries/botan/botan3-macos.patch @@ -0,0 +1,48 @@ +diff --git a/src/lib/prov/commoncrypto/commoncrypto_block.cpp b/src/lib/prov/commoncrypto/commoncrypto_block.cpp +index a07fe118d..f059ee497 100644 +--- a/src/lib/prov/commoncrypto/commoncrypto_block.cpp ++++ b/src/lib/prov/commoncrypto/commoncrypto_block.cpp +@@ -11,6 +11,7 @@ + #include <botan/hex.h> + #include <botan/internal/commoncrypto_utils.h> + ++#include <CommonCrypto/CommonCryptoError.h> + #include <CommonCrypto/CommonCrypto.h> + + namespace Botan { +diff --git a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp +index 1fb79c419..faf9575c2 100644 +--- a/src/lib/prov/commoncrypto/commoncrypto_hash.cpp ++++ b/src/lib/prov/commoncrypto/commoncrypto_hash.cpp +@@ -11,6 +11,7 @@ + #include <botan/internal/stl_util.h> + #include <unordered_map> + ++#include <CommonCrypto/CommonCryptoError.h> + #include <CommonCrypto/CommonCrypto.h> + + namespace Botan { +diff --git a/src/lib/prov/commoncrypto/commoncrypto_utils.h b/src/lib/prov/commoncrypto/commoncrypto_utils.h +index b1c7411fd..9becab2d1 100644 +--- a/src/lib/prov/commoncrypto/commoncrypto_utils.h ++++ b/src/lib/prov/commoncrypto/commoncrypto_utils.h +@@ -10,6 +10,7 @@ + + #include <botan/sym_algo.h> + ++#include <CommonCrypto/CommonCryptoError.h> + #include <CommonCrypto/CommonCrypto.h> + + namespace Botan { +diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp +index b2f7b4c45..f4933b1e3 100644 +--- a/src/lib/rng/system_rng/system_rng.cpp ++++ b/src/lib/rng/system_rng/system_rng.cpp +@@ -20,6 +20,7 @@ + #include <bcrypt.h> + #include <windows.h> + #elif defined(BOTAN_TARGET_OS_HAS_CCRANDOM) ++ #include <CommonCrypto/CommonCryptoError.h> + #include <CommonCrypto/CommonRandom.h> + #elif defined(BOTAN_TARGET_OS_HAS_ARC4RANDOM) + #include <stdlib.h> diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 2008cab52ac36..a445a0c533155 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "box2d"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "erincatto"; repo = "box2d"; rev = "v${finalAttrs.version}"; - hash = "sha256-cL8L+WSTcswj+Bwy8kSOwuEqLyWEM6xa/j/94aBiSck="; + hash = "sha256-yvhpgiZpjTPeSY7Ma1bh4LwIokUUKB10v2WHlamL9D8="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; prePatch = '' @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; - # tests are broken on 2.4.1 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677 + # tests are broken on 2.4.2 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677 doCheck = lib.versionAtLeast finalAttrs.version "2.4.2"; meta = with lib; { diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index 1ea7c63213870..c8bc3ec34eea6 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc2"; - version = "2.15.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc2"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-XVxui3+IoygjU0I688Mtbof/kHLzpb0HMcVPbt3i7PQ="; + sha256 = "sha256-g/MUgVWeVVREiHX59XYbhXjtigJesyooxjnEdKA844M="; }; # https://github.com/NixOS/nixpkgs/issues/144170 diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 500b868edc07e..854032d56157c 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-woyl6HcUGOB3WWiNVMrmrpDAePFTzNtqK9V4UOzDb50="; + hash = "sha256-ANtqGFctgOAynDiZS9tmWRASVpB2RqRTG7JSXZIDmP8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index 9da00741c34e1..83428f0fef9be 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { "-Dbuild-tests=true" ]; - # Meson is no longer able to pick up Boost automatically. - # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - # Tests fail on Darwin, possibly because of sandboxing. doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index d8d908cbc40d4..957cfa26ac732 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { "-Dbuild-tests=true" ]; - # Meson is no longer able to pick up Boost automatically. - # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - doCheck = !stdenv.isDarwin; meta = with lib; { diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 669e2c7d18598..4e96d6a6b9931 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/development/libraries/catboost/default.nix index b4fa78a125265..3824cf046b95a 100644 --- a/pkgs/development/libraries/catboost/default.nix +++ b/pkgs/development/libraries/catboost/default.nix @@ -2,7 +2,7 @@ , config , fetchFromGitHub , cmake -, darwin +, cctools , libiconv , llvmPackages , ninja @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ragel yasm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.cctools + cctools ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 0a1fd07e25081..af52aabca79b0 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, writeShellScript , cmake , ogre , freetype diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 6211a801d0f90..3ad9c33bb3cff 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-jaG+XGbSx5SaNhGFWLh+1WTB+ya3c5tBZYs9xKIRafI="; + sha256 = "sha256-VQgnc3DSZoY1ounc9fj3Mju52noI0JZ7ck8FqWpEgY8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix index ee9ee04aa62fd..6369128d5a05c 100644 --- a/pkgs/development/libraries/clanlib/default.nix +++ b/pkgs/development/libraries/clanlib/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, libGL -, libpng -, pkg-config -, xorg -, file -, freetype -, fontconfig -, alsa-lib -, libXrender +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoreconfHook, + libGL, + libpng, + pkg-config, + xorg, + freetype, + fontconfig, + alsa-lib, + libXrender, }: stdenv.mkDerivation rec { @@ -24,10 +25,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE="; }; + patches = [ + (fetchpatch { + name = "clanlib-add-support-for-riscv.patch"; + url = "https://github.com/sphair/ClanLib/commit/f5f694205054b66dc800135c9b01673f69a7a671.patch"; + hash = "sha256-/1XLFaTZDQAlT2mG9P6SJzXtTg7IWYGQ18Sx0e9zh0s="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ libGL libpng @@ -38,11 +48,11 @@ stdenv.mkDerivation rec { libXrender ]; - meta = with lib; { + meta = { homepage = "https://github.com/sphair/ClanLib"; description = "Cross platform toolkit library with a primary focus on game creation"; - license = licenses.mit; - maintainers = with maintainers; [ nixinator ]; - platforms = [ "x86_64-linux" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nixinator ]; + platforms = with lib.platforms; lib.intersectLists linux (x86 ++ arm ++ aarch64 ++ riscv); }; } diff --git a/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch b/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch deleted file mode 100644 index 93407d5f9ff6e..0000000000000 --- a/pkgs/development/libraries/clipper2/0001-fix-pc-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Clipper2.pc.cmakein b/Clipper2.pc.cmakein -index 5632c93..0a5d6ba 100644 ---- a/Clipper2.pc.cmakein -+++ b/Clipper2.pc.cmakein -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: Clipper2@PCFILE_LIB_SUFFIX@ - Description: A Polygon Clipping and Offsetting library in C++ diff --git a/pkgs/development/libraries/clipper2/default.nix b/pkgs/development/libraries/clipper2/default.nix deleted file mode 100644 index 4f4dee29ec988..0000000000000 --- a/pkgs/development/libraries/clipper2/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "clipper2"; - version = "1.3.0"; - - src = fetchFromGitHub { - owner = "AngusJohnson"; - repo = "Clipper2"; - rev = "Clipper2_${version}"; - sha256 = "sha256-3TKhb48cABl0QcbeG12xlA1taQ/8/RdUUHSp0Qh85eE="; - }; - - sourceRoot = "${src.name}/CPP"; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DCLIPPER2_EXAMPLES=OFF" - "-DCLIPPER2_TESTS=OFF" - "-DBUILD_SHARED_LIBS=ON" - ]; - - patches = [ - ./0001-fix-pc-paths.patch - ]; - - meta = { - description = "Polygon Clipping and Offsetting - C++ Only"; - longDescription = '' - The Clipper2 library performs intersection, union, difference and XOR boolean operations on both simple and - complex polygons. It also performs polygon offsetting. - ''; - homepage = "https://github.com/AngusJohnson/Clipper2"; - license = lib.licenses.boost; - maintainers = [ lib.maintainers.cadkin ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 4d21cd10f8ef1..e741893168a93 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 31743a8f68955..7800e82ff27ac 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Clutter-GTK"; homepage = "http://www.clutter-project.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 804aa13ed91a9..d6720eb181f4c 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 7f127870032cf..308db170bc329 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,6 @@ , cmake , freedvSupport ? false , lpcnetfreedv -, codec2 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index e1a5db9c0f19a..f4ea863383e48 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "High-level, retained-mode toolkit for effective 3D graphics development"; mainProgram = "coin-config"; license = licenses.bsd3; - maintainers = with maintainers; [ gebner viric ]; + maintainers = with maintainers; [ gebner ]; platforms = platforms.linux ++ platforms.darwin; }; }) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 93fcbf42c0507..355a404bb3aa7 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.25.0"; + version = "5.26.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ECTtKx/N5MfWwYSwOycs6FXxDR56DT9tkdRxrhX4fVU="; + sha256 = "sha256-PU3Cn+T/ngbK2/3cBkvI1pCHKnYTWP4JepMMAmWNK1k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 718c73fd3f5fa..86aa687aaa71e 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ pcre zlib python3 openssl ]; + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ pcre zlib openssl ]; strictDeps = true; diff --git a/pkgs/development/libraries/cppcodec/default.nix b/pkgs/development/libraries/cppcodec/default.nix index d3ead22f6b134..99a8eda1477c6 100644 --- a/pkgs/development/libraries/cppcodec/default.nix +++ b/pkgs/development/libraries/cppcodec/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "tplgy"; - repo = finalAttrs.pname; + repo = "cppcodec"; rev = "v${finalAttrs.version}"; hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw="; }; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 44c615b38abcf..2ccb2988305e1 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,8 +1,8 @@ -let version = "2.9.11"; in -{ stdenv, lib, buildPackages, fetchurl, zlib, gettext +let version = "2.10.0"; in +{ stdenv, lib, buildPackages, fetchurl, zlib, gettext, fetchpatch2 , lists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; - hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo="; + hash = "sha256-JDLo/bSLIijC2DUl+8Q704i2zgw5cxL6t68wvuivPpY="; }) ] }: @@ -12,9 +12,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-yosEmjwtOyIloejRXWE3mOvHSOOVA4jtomlN5Qe6YCA="; + hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y="; }; + patches = lib.optionals stdenv.isDarwin [ + # Fixes build failure on Darwin due to missing byte order functions. + # https://github.com/cracklib/cracklib/pull/96 + (fetchpatch2 { + url = "https://github.com/cracklib/cracklib/commit/dff319e543272c1fb958261cf9ee8bb82960bc40.patch"; + hash = "sha256-QaWpEVV6l1kl4OIkJAqkXPVThbo040Rv9X2dY/+syqs="; + stripLen = 1; + }) + ]; + nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index 394efd6317d80..046a6a014d1ad 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "loco-3d"; - repo = finalAttrs.pname; + repo = "crocoddyl"; rev = "v${finalAttrs.version}"; hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; }; @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + ] ++ lib.optionals pythonSupport [ + python3Packages.python ]; propagatedBuildInputs = lib.optionals (!pythonSupport) [ diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index b26e630f1eae3..c4c015d924813 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; homepage = "https://github.com/graeme-hill/crossguid"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index f3c78567efc16..44f71982062cd 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mainProgram = "ctypes.sh"; homepage = "https://github.com/taviso/ctypes.sh"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 96d560b187855..d0b77e2477c9c 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -26,13 +26,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-PBFQrGGP7hKNMuwkl7q/7/C7v41xqdOYW+pJ70fI4Uo="; + hash = "sha256-uudtA9ZpGIpw1yfCzbywFyH7EWYHuXfE6pBb2eksx1g="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 13776e891ce50..95dbdce239c79 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "C++ API for D-BUS"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 0a8b630d073b1..d6e3e86200cf0 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,5 +1,4 @@ { runCommand -, writeText , libxslt , dbus , findXMLCatalogs diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index f50b53d47e05c..207904b96cdc9 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; license = licenses.agpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/discord-rpc/default.nix b/pkgs/development/libraries/discord-rpc/default.nix index 4fa74b57404c2..f0c60e9506d5c 100644 --- a/pkgs/development/libraries/discord-rpc/default.nix +++ b/pkgs/development/libraries/discord-rpc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Official library to interface with the Discord client"; homepage = "https://github.com/discordapp/discord-rpc"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index cf120405a5fa6..7aba10fcc018c 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -19,13 +19,13 @@ }@inputs: (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; - version = "19.24.4"; + version = "19.24.5"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev = "v${version}"; - sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc="; + sha256 = "sha256-ge35ZytgEbUVG2IWEPp6o9qhQ6z8UnuBR1k7sMRr4j0="; }; postPatch = '' diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 1acddbbd12ec6..1ce0855444927 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "doctest"; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index d0a8bdbafb240..79226377bac30 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.5"; + version = "1.16.7"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dk4OEQuADPMfdfAmrgA36Bdzo6qm5Ak4/Rw/L9C75a0="; + hash = "sha256-XQvJO4sFKRKDVdtoXP2Ue80otDC0Ry6EB1Z0shetuhw="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 1710d6046e338..63f387db9046b 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; + hash = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 3571554559c78..95776d885f06b 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://troglobit.com/projects/editline/"; description = "Readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ dtzWill oxalica ]; + maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 7291ff8f8e9d3..3cb34f871e3a8 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.13"; + version = "1.1.14"; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc="; + hash = "sha256-MD+D/dRem3ONWGPoZ77j2UKcOCUuQ0nrahEQkNVEUnI="; }; postPatch = '' diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 4befab1e7b7f2..65493e661beb6 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "libeigen"; repo = pname; rev = version; - sha256 = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; }; patches = [ diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 6e0c1b5375182..f13b1a167e236 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook -, gfortran, perl, mpi, blas, lapack, scalapack, openssh +, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -19,13 +19,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2023.11.001"; + version = "2024.05.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-tXvRl85nvbbiRRJOn9q4mz/a3dvTTYEu5JDVdH7npBA="; + sha256 = "sha256-nK9Bo+YA4vb0zhkxvVQYUXna3pwXFVbQybQbvGlA8vY="; }; patches = [ @@ -101,7 +101,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Only; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; - broken = true; # At 2024-06-25. 49 unit tests fail. - # https://hydra.nixos.org/build/263906391/nixlog/1 }; } diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 33e7f45c3da1b..b53be3ae7cf56 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-CK7M8DsnY++KId5iyaTRuPtyWJFaMfaYUkIJpklcIeo="; + sha256 = "sha256-bHVokEfnTW2cJqx3Zz2x1hIH07WamPAVFY9tiv6nHd0="; }; postPatch = '' diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index cb57f5a2f07e0..f9583a097a6ab 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = "http://enet.bespin.org/"; description = "Simple and robust network communication layer on top of UDP"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 9100ccad3b31e..adc9649b4d90a 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index b32bffb2b575f..1591b80215010 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.2"; + version = "0.28.3"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-0TgvIiuHMeohStIwmHOq4yvTj2H07wyx4w3iIdkrLTc="; + hash = "sha256-KD3kkIQXPcjCVZZrmbn93xYbJ8ryG0mLFbkO5AVqnTw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix index 1d917f6de6ed1..90fe883a27661 100644 --- a/pkgs/development/libraries/exprtk/default.nix +++ b/pkgs/development/libraries/exprtk/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "C++ Mathematical Expression Toolkit Library"; homepage = "https://www.partow.net/programming/exprtk/index.html"; license = licenses.mit; - maintainers = with maintainers; [ anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index aef6f10febe2d..17bf254338481 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.07"; + version = "24.08"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-2J03W2jyQKD1QYRJoOZlIKElsZNqPMQ1AxAoFhWz1eU="; + sha256 = "sha256-DbfUuLKsArznZ4iNUiQfn1hU61bVf4HvEUx9dCrXfYg="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix index eec0756abf4ee..aaab456ab6a58 100644 --- a/pkgs/development/libraries/fbjni/default.nix +++ b/pkgs/development/libraries/fbjni/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { description = "Library designed to simplify the usage of the Java Native Interface"; homepage = "https://github.com/facebookincubator/fbjni"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index faf5906f7a989..87070ac1fb72c 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; + hash = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix deleted file mode 100644 index d59fac5ff4dc9..0000000000000 --- a/pkgs/development/libraries/fcgi/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "fcgi"; - version = "2.4.2"; - - src = fetchFromGitHub { - owner = "FastCGI-Archives"; - repo = "fcgi2"; - rev = version; - sha256 = "1jhz6jfwv5kawa8kajvg18nfwc1b30f38zc0lggszd1vcmrwqkz1"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - postInstall = "ln -s . $out/include/fastcgi"; - - meta = with lib; { - description = "Language independent, scalable, open extension to CG"; - homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ - license = "FastCGI see LICENSE.TERMS"; - mainProgram = "cgi-fcgi"; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/fcgi/gcc-4.4.diff b/pkgs/development/libraries/fcgi/gcc-4.4.diff deleted file mode 100644 index c6806c12c0676..0000000000000 --- a/pkgs/development/libraries/fcgi/gcc-4.4.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libfcgi/fcgio.cpp b/libfcgi/fcgio.cpp -index 95e28ca..a7eda0e 100644 ---- a/libfcgi/fcgio.cpp -+++ b/libfcgi/fcgio.cpp -@@ -23,6 +23,7 @@ - #endif - - #include <limits.h> -+#include <cstdio> - #include "fcgio.h" - - using std::streambuf; diff --git a/pkgs/development/libraries/febio/default.nix b/pkgs/development/libraries/febio/default.nix deleted file mode 100644 index d0c54b8b157d7..0000000000000 --- a/pkgs/development/libraries/febio/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 -, mklSupport ? true, mkl -, substituteAll -}: - -stdenv.mkDerivation rec { - pname = "FEBio"; - version = "3.6"; - - src = fetchFromGitHub { - owner = "febiosoftware"; - repo = pname; - rev = "v${version}"; - sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am"; - }; - - patches = [ - (substituteAll { - src = ./fix-cmake.patch; # cannot find mkl libraries without this - so = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" - ++ lib.optional mklSupport "-DMKLROOT=${mkl}" - ; - - env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/include - cp -R lib bin $out/ - cp -R ../FECore \ - ../FEBioFluid \ - ../FEBioLib \ - ../FEBioMech \ - ../FEBioMix \ - ../FEBioOpt \ - ../FEBioPlot \ - ../FEBioXML \ - ../NumCore \ - $out/include - - runHook postInstall - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ] - ++ lib.optional mklSupport mkl - ; - - meta = { - description = "FEBio Suite Solver"; - license = with lib.licenses; [ mit ]; - homepage = "https://febio.org/"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ Scriptkiddi ]; - }; -} diff --git a/pkgs/development/libraries/febio/fix-cmake.patch b/pkgs/development/libraries/febio/fix-cmake.patch deleted file mode 100644 index 456179ca83647..0000000000000 --- a/pkgs/development/libraries/febio/fix-cmake.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,7 +47,7 @@ function(findLib libName libDir libOut) - find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib - PATHS ${${libDir}} NO_DEFAULT_PATH) - else() -- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a -+ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@ - PATHS ${${libDir}} NO_DEFAULT_PATH) - endif() - -diff --git a/FindDependencies.cmake b/FindDependencies.cmake -index 2d644005f..7261ba923 100644 ---- a/FindDependencies.cmake -+++ b/FindDependencies.cmake -@@ -46,8 +46,8 @@ if(MKLROOT) - NO_DEFAULT_PATH) - - find_library(MKL_OMP_LIB -- NAMES iomp5 iomp5md libiomp5md.lib -- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib -+ NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib -+ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib - PATH_SUFFIXES "intel64" "intel32" - NO_DEFAULT_PATH - DOC "MKL OMP Library") diff --git a/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch b/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch new file mode 100644 index 0000000000000..60004b1766ca2 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch @@ -0,0 +1,25 @@ +From a804dd05351716b1fd9a7c2b7ed636613edd9c0f Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Fri, 21 Jun 2024 18:59:49 +0000 +Subject: [PATCH] avfoundation.m: macOS SDK 10.12 compatibility + +--- + libavdevice/avfoundation.m | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m +index d9b17ccdae..2a1f66d751 100644 +--- a/libavdevice/avfoundation.m ++++ b/libavdevice/avfoundation.m +@@ -762,7 +762,7 @@ static int get_audio_config(AVFormatContext *s) + return 0; + } + +-static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { ++static NSArray* getDevicesWithMediaType(NSString * mediaType) { + #if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)) + NSMutableArray *deviceTypes = nil; + if (mediaType == AVMediaTypeVideo) { +-- +2.44.0 + diff --git a/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch b/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch deleted file mode 100644 index ca8b8b4d15bdb..0000000000000 --- a/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch +++ /dev/null @@ -1,26 +0,0 @@ -Based on upstream 737ede405b11a37fdd61d19cf25df296a0cb0b75, with cuda and -vulkan implementations removed, bwdif adjusted to apply to 5.1.4 - -diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c -index 65c617ebb3..35c864f71e 100644 ---- a/libavfilter/vf_bwdif.c -+++ b/libavfilter/vf_bwdif.c -@@ -333,13 +333,14 @@ static int config_props(AVFilterLink *link) - if(yadif->mode&1) - link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1}); - -- if (link->w < 3 || link->h < 4) { -- av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n"); -+ yadif->csp = av_pix_fmt_desc_get(link->format); -+ yadif->filter = filter; -+ -+ if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) { -+ av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n"); - return AVERROR(EINVAL); - } - -- yadif->csp = av_pix_fmt_desc_get(link->format); -- yadif->filter = filter; - if (yadif->csp->comp[0].depth > 8) { - s->filter_intra = filter_intra_16bit; - s->filter_line = filter_line_c_16bit; diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 88b5564ecba41..a4869184bdc68 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -22,11 +22,6 @@ let hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; }; - v5 = { - version = "5.1.4"; - hash = "sha256-2jUL1/xGUf7aMooST2DW41KE7bC+BtgChXmj0sAJZ90="; - }; - v6 = { version = "6.1.1"; hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; @@ -43,10 +38,6 @@ rec { ffmpeg_4-headless = mkFFmpeg v4 "headless"; ffmpeg_4-full = mkFFmpeg v4 "full"; - ffmpeg_5 = mkFFmpeg v5 "small"; - ffmpeg_5-headless = mkFFmpeg v5 "headless"; - ffmpeg_5-full = mkFFmpeg v5 "full"; - ffmpeg_6 = mkFFmpeg v6 "small"; ffmpeg_6-headless = mkFFmpeg v6 "headless"; ffmpeg_6-full = mkFFmpeg v6 "full"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6d54d63c6ca8d..4d73c8ae72bed 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm +{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm # You can fetch any upstream version using this derivation by specifying version and hash # NOTICE: Always use this argument to override the version. Do not use overrideAttrs. @@ -72,6 +72,7 @@ , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering +, withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils , withMetal ? false # Unfree and requires manual downloading of files , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx @@ -128,8 +129,8 @@ , withXcbShape ? withFullDeps # X11 grabbing shape rendering , withXcbShm ? withFullDeps # X11 grabbing shm communication , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering -, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC decoding -, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 # MPEG-5 EVC encoding +, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding +, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding , withXlib ? withFullDeps # Xlib support , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists @@ -236,6 +237,7 @@ , intel-media-sdk , ladspaH , lame +, lcms2 , libaom , libaribcaption , libass @@ -424,43 +426,10 @@ stdenv.mkDerivation (finalAttrs: { --replace 'const AVInputFormat *const ' 'const AVInputFormat *' ''; }) - ] - ++ optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [ - (fetchpatch2 { - name = "fix_build_failure_due_to_libjxl_version_to_new"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2"; - hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU="; - }) - (fetchpatch2 { - name = "5.x-CVE-2024-31585.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8711cea3841fc385cccb1e7255176479e865cd4d"; - hash = "sha256-WT+ly/l04yM/tRVbhkESA3sDDjwvtd/Cg2y8tQo4ApI="; - }) - (fetchpatch2 { - name = "CVE-2024-31582.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2"; - hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA="; - }) (fetchpatch2 { - name = "CVE-2024-31578.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7"; - hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; - }) - ./5.1.4-CVE-2023-49502.patch - (fetchpatch2 { - name = "CVE-2023-50008.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b"; - hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y="; - }) - (fetchpatch2 { - name = "CVE-2023-51793.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8b8b4bdef311f88c0075a06a25320187aff00bf2"; - hash = "sha256-e7oGyOfUXuA8XK3vfygNtFlHpHl92O2KSLAo50sNJ5o="; - }) - (fetchpatch2 { - name = "CVE-2023-51796.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e01a55c5283b82667dad347331816a5e20869ce9"; - hash = "sha256-m4rq+UFG3nXdgOJ3S6XcruMZ+CPw+twmy2HFv3cnvJc="; + name = "CVE-2023-51794.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/50f0f8c53c818f73fe2d752708e2fa9d2a2d8a07"; + hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28="; }) ] ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ @@ -512,6 +481,15 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834"; hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I="; }) + ] + ++ optionals (lib.versionAtLeast version "7.0") [ + ./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch + + # Expose a private API for Chromium / Qt WebEngine. + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/a02c1a15706ea832c0d52a4d66be8fb29499801a/add-av_stream_get_first_dts-for-chromium.patch"; + hash = "sha256-DbH6ieJwDwTjKOdQ04xvRcSLeeLP2Z2qEmqeo8HsPr4="; + }) ]; configurePlatforms = []; @@ -644,6 +622,9 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withJxl "libjxl") ] ++ [ (enableFeature withLadspa "ladspa") + ] ++ optionals (versionAtLeast version "5.1") [ + (enableFeature withLcms2 "lcms2") + ] ++ [ (enableFeature withLzma "lzma") ] ++ optionals (versionAtLeast version "5.0") [ (enableFeature withMetal "metal") @@ -751,7 +732,9 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] + nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config yasm ] + # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. + ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ]) ++ optionals withCudaLLVM [ clang ]; buildInputs = [] @@ -791,6 +774,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withJack [ libjack2 ] ++ optionals withJxl [ libjxl ] ++ optionals withLadspa [ ladspaH ] + ++ optionals withLcms2 [ lcms2 ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] ++ optionals withModplug [ libmodplug ] @@ -884,10 +868,10 @@ stdenv.mkDerivation (finalAttrs: { ''; # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. + # See the explanation in addDriverRunpath. postFixup = optionalString (stdenv.isLinux && withLib) '' - addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so - addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so + addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so + addDriverRunpath ${placeholder "lib"}/lib/libavutil.so '' # https://trac.ffmpeg.org/ticket/10809 + optionalString (versionAtLeast version "5.0" && withVulkan && !stdenv.hostPlatform.isMinGW) '' @@ -928,7 +912,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658 broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit; - maintainers = with maintainers; [ atemu arthsmn jopejoe1 ]; + maintainers = with maintainers; [ atemu jopejoe1 emily ]; mainProgram = "ffmpeg"; }; } // lib.optionalAttrs withCudaLLVM { diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 54ffad6fc3955..6d5db4cdac5b5 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "FFmpeg based source library for easy frame accurate access"; mainProgram = "ffmsindex"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index a412f70704703..8b76c151b4728 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight audio filtering library made from webrtc code"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index eeac7d14568eb..52d64f18e8e50 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flann-lib/flann"; license = lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/development/libraries/flatbuffers/23.nix new file mode 100644 index 0000000000000..5263694b05623 --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/23.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + python3, +}: + +stdenv.mkDerivation rec { + pname = "flatbuffers"; + version = "23.5.26"; + + src = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "v${version}"; + hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE="; + }; + + nativeBuildInputs = [ + cmake + python3 + ]; + + cmakeFlags = [ + "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" + ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkTarget = "test"; + + meta = with lib; { + description = "Memory Efficient Serialization Library"; + longDescription = '' + FlatBuffers is an efficient cross platform serialization library for + games and other memory constrained apps. It allows you to directly + access serialized data without unpacking/parsing it first, while still + having great forwards/backwards compatibility. + ''; + homepage = "https://google.github.io/flatbuffers/"; + license = licenses.asl20; + maintainers = [ maintainers.teh ]; + mainProgram = "flatc"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 747a976f4c9e3..00bb9cc8d1875 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "23.5.26"; + version = "24.3.25"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE="; + hash = "sha256-uE9CQnhzVgOweYLhWPn2hvzXHyBbFiFVESJ1AEM3BmA="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 4d74627ee3c93..888fd9f61288d 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake }: @@ -14,19 +15,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ="; }; + patches = [ + # Fix builds on clang15. Remove post-0.6.1. + (fetchpatch { + name = "clang15fixes.patch"; + url = "https://github.com/dvidelabs/flatcc/commit/5885e50f88248bc7ed398880c887ab23db89f05a.patch"; + hash = "sha256-z2HSxNXerDFKtMGu6/vnzGRlqfz476bFMjg4DVfbObQ"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DFLATCC_INSTALL=on" ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=misleading-indentation" - "-Wno-error=stringop-overflow" - ]; - meta = with lib; { - description = "FlatBuffers Compiler and Library in C for C "; + description = "FlatBuffers Compiler and Library in C for C"; mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; license = [ licenses.asl20 ]; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 9ce329df79573..f42e12f03beca 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,23 +1,32 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, enableShared ? !stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + enableShared ? !stdenv.hostPlatform.isStatic, -# tests -, mpd -, openimageio -, fcitx5 -, spdlog + # tests + mpd, + openimageio, + fcitx5, + spdlog, }: let - generic = { version, sha256, patches ? [ ] }: + generic = + { + version, + sha256, + patches ? [ ], + }: stdenv.mkDerivation { pname = "fmt"; inherit version; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchFromGitHub { owner = "fmtlib"; @@ -30,14 +39,17 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; doCheck = true; passthru.tests = { - inherit mpd openimageio fcitx5 spdlog; + inherit + mpd + openimageio + fcitx5 + spdlog + ; }; meta = with lib; { @@ -70,4 +82,9 @@ in version = "10.2.1"; sha256 = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co="; }; + + fmt_11 = generic { + version = "11.0.1"; + sha256 = "sha256-EPidbZxCvysrL64AzbpJDowiNxqy4ii+qwSWAFwf/Ps="; + }; } diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 8a44cd09dac94..edbebdb1b8dad 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - "-Dtests=${lib.boolToString (finalAttrs.doCheck && stdenv.isLinux)}" + "-Dtests=${lib.boolToString (finalAttrs.finalPackage.doCheck && stdenv.isLinux)}" ]; # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 171b81af8365d..532fc4847715e 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, overrideSDK , fetchFromGitHub , boost , cmake diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 6286155d8efb0..68a9806cf47f7 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://fox-toolkit.org"; license = licenses.lgpl3Plus; - maintainers = []; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 0ab874fd76dd2..775340af302f6 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://fox-toolkit.org"; license = lib.licenses.lgpl3; - maintainers = []; + maintainers = [ ]; platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 8e79b3e57dea1..c3a0fdb797f62 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freeglut"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-PAvLkV2bGAqX7a69ARt6HeVFg6g4ZE3NQrsOoMbz6uw="; + sha256 = "sha256-nD1NZRb7+gKA7ck8d2mPtzA+RDwaqvN9Jp4yiKbD6lI="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 245ea93f63e40..20ced14ace6ef 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, darwin, libtiff +{ lib, stdenv, fetchsvn, cctools, libtiff , libpng, zlib, libwebp, libraw, openexr, openjpeg , libjpeg, jxrlib, pkg-config , fixDarwinDylibNames, autoSignDarwinBinariesHook }: @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ - darwin.cctools + cctools fixDarwinDylibNames ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { "CVE-2023-47995" "CVE-2023-47996" ]; - maintainers = with lib.maintainers; [viric l-as]; + maintainers = with lib.maintainers; [ l-as ]; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index bcc5e8dacfe95..fa86bc4a18c9e 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.19"; + version = "1.4.22"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-kK65g8NLMT+dxJTaAFviJNToS9EZ/rKlsey3OpQon5U="; + hash = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE="; }; buildInputs = [ diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index ec948f1fdccc9..8f6fbad6d4d64 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.2.2"; src = fetchzip { - url = "mirror://sourceforge/freetts/${finalAttrs.pname}-${finalAttrs.version}-src.zip"; + url = "mirror://sourceforge/freetts/freetts-${finalAttrs.version}-src.zip"; hash = "sha256-+bhM0ErEZVnmcz5CBqn/AeGaOhKnCjZzGeqgO/89wms="; stripRoot = false; }; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 1b0a3007710b4..d05d8ddd5f4ae 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "frei0r-plugins"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "dyne"; repo = "frei0r"; rev = "v${version}"; - hash = "sha256-shPCCKcmacSB/mqwLU6BPR1p+/9Myg759MMehj9yijI="; + hash = "sha256-uKYCJD88TnrJTTnzCCietNt01QPeFW+hhnjcBNKUWsY="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://frei0r.dyne.org"; description = "Minimalist, cross-platform, shared video plugins"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index e4eef8dfe532c..e07fa8fec5f26 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.24"; + version = "0.2.25"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-iQGvqFiTqejSqXALgUWCBjfH9QO0cg3vnI5PphgVoms="; + sha256 = "sha256-eKCOi5g8YdKgxaI/mLlqB2m1zwrU9DOSrQF+PW2DBBQ="; }; nativeBuildInputs = [ cmake ]; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Dobiasd/FunctionalPlus"; license = licenses.boost; platforms = platforms.all; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 1e4b8436e8228..4c477421a7fd5 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,27 +1,51 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitLab, + graphviz, + gtk2, + gtkmm2, + meson, + ninja, + cmake, + pkg-config, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ganv"; - version = "unstable-2019-12-30"; + version = "1.8.2-unstable-2024-07-04"; - src = fetchgit { - url = "https://gitlab.com/drobilla/${pname}.git"; - fetchSubmodules = true; - rev = "90bd022f8909f92cc5290fdcfc76c626749e1186"; - sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; + src = fetchFromGitLab { + owner = "drobilla"; + repo = "ganv"; + rev = "4d2e04dbcabd0b5d715ea7eeeb909f4088055763"; + hash = "sha256-DzODtYI8uwP65ck8Q90QEnjQbvPobepeQVgNZZjF+jk="; }; - nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; - buildInputs = [ graphviz gtkmm2 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + cmake + ]; + + buildInputs = [ + gtk2 + gtkmm2 + graphviz + ]; strictDeps = true; - meta = with lib; { + # libintl detection does not work even if provided + mesonAutoFeatures = "disabled"; + + meta = { description = "Interactive Gtk canvas widget for graph-based interfaces"; mainProgram = "ganv_bench"; homepage = "http://drobilla.net"; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ t4ccer ]; + platforms = lib.platforms.linux; }; - } +} diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index fd7c22a674d0b..d8666d92cf3e3 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME="; + sha256 = "sha256-O+1ZHaNHSkKz3PlKDyI94LqiLtjyrKxjOIi8Q236/MI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index bf59bdd1f625a..0a74d6122ee2e 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { description = "Dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 611b547b101ab..812eb8663732d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { json_c lerc xz - libxml2 + (libxml2.override { enableHttp = true; }) lz4 openjpeg openssl diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index bdfa576f23dfe..cacfb778c7bcc 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "TestFind" "gdcmscu-echo-dicomserver" "gdcmscu-find-dicomserver" - # seemingly ought to be be disabled when the test data submodule is not present: + # seemingly ought to be disabled when the test data submodule is not present: "TestvtkGDCMImageReader2_3" "TestSCUValidation" # errors because 3 classes not wrapped: diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix deleted file mode 100644 index 70eba2c3a384a..0000000000000 --- a/pkgs/development/libraries/geographiclib/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen }: - -stdenv.mkDerivation rec { - pname = "geographiclib"; - version = "2.3"; - - src = fetchFromGitHub { - owner = "geographiclib"; - repo = "geographiclib"; - rev = "v${version}"; - hash = "sha256-FVA2y1q0WjRSCltCN2qntWC//Zj94TXO/fTebFfQ9NY="; - }; - - nativeBuildInputs = [ cmake doxygen ]; - - cmakeFlags = [ - "-DBUILD_DOCUMENTATION=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - meta = with lib; { - description = "C++ geographic library"; - longDescription = '' - GeographicLib is a small C++ library for: - * geodesic and rhumb line calculations - * conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates - * gravity (e.g., EGM2008) and geomagnetic field (e.g., WMM2020) calculations - ''; - homepage = "https://geographiclib.sourceforge.io/"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix index da276f35a6f8b..fb3eccf997a1d 100644 --- a/pkgs/development/libraries/geos/3.11.nix +++ b/pkgs/development/libraries/geos/3.11.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.11.4"; src = fetchurl { - url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; hash = "sha256-NkyIzPw4qlDPZccA57KuRwbtEDMmEoST2/dQx40TbSw="; }; diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix index 4ca53e36971ba..b2cf3e8f96292 100644 --- a/pkgs/development/libraries/geos/3.9.nix +++ b/pkgs/development/libraries/geos/3.9.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.9.5"; src = fetchurl { - url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; hash = "sha256-xsmu36iGT7RLp4kRQIRCOCv9BpDPLUCRrjgFyGN4kDY="; }; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c68b4a02d662a..849fe64634a55 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.12.2"; src = fetchurl { - url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; hash = "sha256-NMd3C/AJDuiEiK+Ydn0I53nxJPozQ34Kq+yKvUYJ/sY="; }; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 7a0d7a3ee667b..abb692aebc1e9 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gettext/"; - maintainers = with maintainers; [ zimbatm vrthra ]; + maintainers = with maintainers; [ zimbatm ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index c3c41d971beb9..b099a2dd10e31 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -10,7 +10,6 @@ , json-glib , gobject-introspection , gtk-doc -, pkgs , docbook-xsl-nons }: diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 67677e8a85110..cc5ef6f643695 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://giflib.sourceforge.net/"; platforms = lib.platforms.unix ++ lib.platforms.windows; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; branch = "5.2"; }; } diff --git a/pkgs/development/libraries/git2-cpp/default.nix b/pkgs/development/libraries/git2-cpp/default.nix index bf12d2c489489..45750d0b24d47 100644 --- a/pkgs/development/libraries/git2-cpp/default.nix +++ b/pkgs/development/libraries/git2-cpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ken-matsui/git2-cpp"; description = "libgit2 bindings for C++"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index 541fb7c14ebb4..c12ab1f22a8f6 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; license = licenses.unlicense; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 7d8e0689c95ec..1a9993532837d 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; + url = "mirror://sourceforge/glew/glew-${finalAttrs.version}.tgz"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 4681e4f6abce0..3385637d297a3 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; + url = "mirror://sourceforge/glew/glew-${finalAttrs.version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 7ca694827301b..2ec1f42d2840f 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -2,7 +2,7 @@ , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Carbon, Cocoa, Kernel, fixDarwinDylibNames , extra-cmake-modules, wayland -, wayland-scanner, wayland-protocols, libxkbcommon +, wayland-scanner, wayland-protocols, libxkbcommon, libdecor }: stdenv.mkDerivation rec { @@ -48,7 +48,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace src/wl_init.c \ - --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" + --replace-fail "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" \ + --replace-fail "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" \ + --replace-fail "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" \ + --replace-fail "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" \ + --replace-fail "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" ''; # glfw may dlopen libwayland-client.so: diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 47ca3f35b218f..22df229d47cc3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -17,7 +17,7 @@ , buildPackages # this is just for tests (not in the closure of any regular package) -, coreutils, dbus, tzdata +, dbus, tzdata , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch @@ -61,11 +61,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.80.3"; + version = "2.80.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - hash = "sha256-OUeg6t3Q82E9AjC7JG0MaeRhQsGQIvXEsbLjy6I21Bc="; + hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 4ecae5fe48e07..ed5e4ec9b06fc 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec{ mainProgram = "gloox-config"; homepage = "http://camaya.net/gloox"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 6f48f6ed3af44..e004437a77644 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jstedfast/gmime/"; description = "C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 1fea5408ef2a4..0d1997cf1afc9 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jstedfast/gmime/"; description = "C/C++ library for creating, editing and parsing MIME messages and structures"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 44874246b6ea4..3187b529aa178 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -87,7 +87,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; }; }; in self diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 4b5df003dcf73..dc797dd02d16c 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.50.3"; + version = "3.50.4"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-5xSmfRccVxRDYet07oKhexXQqCIo/xiM+ScE9WJsopQ="; + hash = "sha256-MMoTA4zXpp1bay1TZD+6ZUjRcSuSXwwhbzEzw2y/d3M="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 31b6f7c7d2286..7eb508f27ae9e 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 48e027f5246bb..33b35446d7257 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-ZiaaLP4OHC2r7Ie9u9irZW85bt2aQN0AaXjgA8+lK/w="; + hash = "sha256-LhWIquU8sy1Dk38fTsoo/r2cDHqhc0/F3WGn6B4OvN0="; }; outputs = [ "bin" "dev" "out" ] @@ -85,16 +85,6 @@ stdenv.mkDerivation rec { revert = true; hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM="; }) - # Makes the system-wide configuration for RSAES-PKCS1-v1_5 actually apply - # and makes it enabled by default when the config file is missing - # Without this an error 113 is thrown when using some RSA certificates - # see https://gitlab.com/gnutls/gnutls/-/issues/1540 - # "This is pretty sever[e], since it breaks on letsencrypt-issued RSA keys." (comment from above issue) - (fetchpatch2 { - name = "fix-rsaes-pkcs1-v1_5-system-wide-configuration.patch"; - url = "https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.diff"; - hash = "sha256-2aWcLff9jzJnY+XSqCIaK/zdwSLwkNlfDeMlWyRShN8="; - }) ]; # Skip some tests: diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 1a205a6c04cb7..d58bdd2e7800d 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -8,7 +8,6 @@ , ninja , gtk-doc , docbook-xsl-nons -, docbook_xml_dtd_43 , docbook_xml_dtd_45 , pkg-config , libffi diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 46c7b188c9079..2066b1b72ec56 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://gitlab.gnome.org/Archive/goocanvas"; license = licenses.lgpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index ccee4831dc7f4..ca6951c30e4d7 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "C++ bindings for GooCanvas"; homepage = "https://gitlab.gnome.org/Archive/goocanvasmm"; license = licenses.lgpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gpgme/LFS64.patch b/pkgs/development/libraries/gpgme/LFS64.patch new file mode 100644 index 0000000000000..8aaed815d386a --- /dev/null +++ b/pkgs/development/libraries/gpgme/LFS64.patch @@ -0,0 +1,34 @@ +From 1726e0a0a3b9765a4ddf99c506178d3939a46ccd Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Fri, 3 May 2024 13:39:26 +0200 +Subject: [PATCH] posix: don't use LFS64 types in struct linux_dirent64 + +The *64_t types are transitional APIs for applications that do not yet +fully support large files on 32-bit platforms. They have been removed +in musl 1.2.5, which caused gpgme to fail to build. Since this is for +a raw syscall anyway, it doesn't make sense to use libc-specific types +here anyway, so I've changed this to match the definition of the +struct used in the kernel (except there the kernel-specific u64 and +s64 typedefs are used instead). +--- + src/posix-io.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/posix-io.c b/src/posix-io.c +index a422d8f6..c943f75c 100644 +--- a/src/posix-io.c ++++ b/src/posix-io.c +@@ -74,8 +74,8 @@ + * define it ourselves. */ + struct linux_dirent64 + { +- ino64_t d_ino; +- off64_t d_off; ++ uint64_t d_ino; ++ int64_t d_off; + unsigned short d_reclen; + unsigned char d_type; + char d_name[]; +-- +2.44.0 + diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index c712b5195dc52..395ccfde06329 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { ./python-310-312-remove-distutils.patch # Fix a test after disallowing compressed signatures in gpg (PR #180336) ./test_t-verify_double-plaintext.patch + # Don't use deprecated LFS64 APIs (removed in musl 1.2.4) + # https://dev.gnupg.org/D600 + ./LFS64.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 3e81f031a851c..7b64aa2bc586b 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ebassi"; - repo = finalAttrs.pname; + repo = "graphene"; rev = finalAttrs.version; sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI="; }; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 5193cedf868bd..128ed788f43fb 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -14,7 +14,6 @@ , libxml2 , lua5_4 , liboauth -, libgdata , libmediaart , grilo , gst_all_1 diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 787c096fea4f8..b9b57de4274ab 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.2.1"; src = fetchurl { - url = "mirror://gnu/gsasl/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz"; sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU="; }; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index 863ac7ba4bb24..6c1ee550f797d 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec { mainProgram = "gsignond"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; }; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 6141528a9fe6b..7f58b4d11ce32 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 977bc1489420c..d9012a3aa7981 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index bc496e8ac2ccd..06999b225de14 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index bd87d4f72bb5d..3154f92b596f6 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 883d68d42c6a6..ffa4ca77e251e 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { url = "mirror://gnu/gss/gss-${version}.tar.gz"; hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM="; }; + # This test crashes now. Most likely triggered by expiration on 20240711. + postPatch = '' + rm tests/krb5context.c + ''; buildInputs = lib.optional withShishi shishi; @@ -25,7 +29,9 @@ stdenv.mkDerivation rec { "--${if withShishi then "enable" else "disable"}-kerberos5" ]; - doCheck = true; + # krb5context test uses certificates that expired on 2024-07-11. + # Reported to bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>. + doCheck = !withShishi; # Fixup .la files postInstall = lib.optionalString withShishi '' @@ -37,7 +43,7 @@ stdenv.mkDerivation rec { description = "Generic Security Service"; mainProgram = "gss"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b203eab089653..03e7637944e51 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -59,6 +59,7 @@ , neon , openal , openexr_3 +, openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264 , openh264 , libopenmpt , pango @@ -81,7 +82,7 @@ , mjpegtools , libGLU , libGL -, addOpenGLRunpath +, addDriverRunpath , gtk3 , libintl , game-music-emu @@ -125,7 +126,7 @@ stdenv.mkDerivation rec { # Add fallback paths for nvidia userspace libraries (substituteAll { src = ./fix-paths.patch; - inherit (addOpenGLRunpath) driverLink; + inherit (addDriverRunpath) driverLink; }) ]; @@ -175,7 +176,6 @@ stdenv.mkDerivation rec { neon openal openexr_3 - openh264 rtmpdump pango soundtouch @@ -211,6 +211,8 @@ stdenv.mkDerivation rec { bluez ] ++ lib.optionals microdnsSupport [ libmicrodns + ] ++ lib.optionals openh264Support [ + openh264 ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland @@ -300,6 +302,7 @@ stdenv.mkDerivation rec { "-Daja=disabled" # should pass libajantv2 via aja-sdk-dir instead "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}" "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" + (lib.mesonEnable "openh264" openh264Support) (lib.mesonEnable "doc" enableDocumentation) ] ++ lib.optionals (!stdenv.isLinux) [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 930cdd79b7329..e03b223f126b5 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + separateDebugInfo = true; + src = let inherit (finalAttrs) pname version; in fetchurl { diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index a6f0cee7d7dbb..40d40d742463f 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + separateDebugInfo = true; + src = let inherit (finalAttrs) pname version; in fetchurl { diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 41e3e1cba97d6..1232224faa131 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index cf15a4c406263..89830f3aed312 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index da74ec243cefa..68485f7e7454a 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { description = "GStreamer Plugin for MIPI camera support through the IPU6/IPU6EP/IPU6SE on Intel Tigerlake/Alderlake/Jasperlake platforms"; homepage = "https://github.com/intel/icamerasrc/tree/icamerasrc_slim_api"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index e3065437f5d84..92156dec54ea8 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 4c0d8bffb35a7..9e8d95b77a908 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -11,6 +11,7 @@ , rustc , cargo , cargo-c +, lld , nasm , gstreamer , gst-plugins-base @@ -199,10 +200,14 @@ stdenv.mkDerivation (finalAttrs: { cargo cargo-c' nasm + ] ++ lib.optionals stdenv.isDarwin [ + lld ] ++ lib.optionals enableDocumentation [ hotdoc ]; + env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; + buildInputs = [ gstreamer gst-plugins-base @@ -258,6 +263,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"; license = with licenses; [ mpl20 asl20 mit lgpl21Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 62f11a580c21d..a341f4df4efd0 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index f8e50f384590e..3657f62f929c4 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "GObject/GTK port of three.js"; homepage = "https://github.com/alexlarsson/gthree"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin }; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 9d9b855c9da89..ed0900ee1a927 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchurl +, fetchpatch , atk , buildPackages , cairo @@ -63,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./patches/2.0-immodules.cache.patch ./patches/gtk2-theme-paths.patch + (fetchpatch { + # https://gitlab.gnome.org/GNOME/gtk/-/issues/6786 + name = "CVE-2024-6655.patch"; + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch"; + hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index f194dee9c9ec8..ed0612bf2ecb9 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -30,7 +30,6 @@ , libepoxy , libxkbcommon , libxml2 -, gmp , gnome , gsettings-desktop-schemas , sassc @@ -64,7 +63,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.42"; + version = "3.24.43"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -78,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-UPifYVCS1N0Bu9dZcZ+L04Dl8Un2/XipRyXi3hEjd+I="; + hash = "sha256-fgTwZIUVA0uAa3SuXXdNh8/7GiqWxGjLW+R21Rvy88c="; }; patches = [ diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index dfd09e5dc6c45..57ef21ed595f7 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -17,7 +17,6 @@ , glib , cairo , pango -, pandoc , gdk-pixbuf , gobject-introspection , fribidi diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d773434b8323f..faba68ede1482 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index d4ac1e9bb09f1..f1a12eb0de120 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { ./4.x-nix_share_path.patch ]; + # The 10.12 SDK used by x86_64-darwin requires defining `_POSIX_C_SOURCE` to use `strnlen`. + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_POSIX_C_SOURCE=200809L"; + nativeBuildInputs = [ meson ninja @@ -113,7 +116,5 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; - # https://hydra.nixos.org/build/258191535/nixlog/1 - broken = stdenv.isDarwin && stdenv.isx86_64; }; }) diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 3c7a6a3b3b23b..7e75108b1a3ec 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 5aa8aca6ffb3d..9586c3be7b784 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 3D surfaces meshed with interconnected triangles. ''; - maintainers = [ lib.maintainers.viric ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 27f9174c444d9..3e75bdecaecd2 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - ls -la "$out/share/doc" moveToOutput "share/doc" "$devdoc" ''; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index d60f95c548391..7c5cdca3f6198 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,17 +41,16 @@ , libgdata , libmsgraph , python3 -, python3Packages , gsettings-desktop-schemas }: stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.54.1"; + version = "1.54.2"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-rEo7zLf+FQIVjvD95cl5q0RxJVfQKKjk8wop8PvZ0Z8="; + hash = "sha256-VJCPThC18cIx6QMwyMFbfyHyu2EPGUwDSzOON5xQjjw="; }; patches = [ @@ -137,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" - doInstallCheck = finalAttrs.doCheck; + doInstallCheck = finalAttrs.finalPackage.doCheck; separateDebugInfo = true; diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 2b7f05bcdef0a..2089050552e7e 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -12,7 +12,6 @@ , pkg-config , boost , libtool -, perlPackages , pythonBindings ? true , tclBindings ? true , perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 657ea82f0b85b..3c0e4668781e0 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-r06nPiWrdIyMBjt4wviOSIM9ubKsNp4pvRFXAueJdV4="; + hash = "sha256-pBsnLO65IMVyY+yFFgRULZ7IXuMDBQbZRmIGfHtquJ4="; }; postPatch = '' diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/development/libraries/hfst-ospell/default.nix index f0a0bc6bef48a..823bcbbe8c08e 100644 --- a/pkgs/development/libraries/hfst-ospell/default.nix +++ b/pkgs/development/libraries/hfst-ospell/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/hfst/hfst-ospell/"; - description = "HFST spell checker library and command line tool "; + description = "HFST spell checker library and command line tool"; license = licenses.asl20; maintainers = with maintainers; [ lurkki ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index dfba7f4e11710..05b915efb8f97 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; - rev = "${finalAttrs.pname}-${finalAttrs.version}"; + rev = "hidapi-${finalAttrs.version}"; sha256 = "sha256-p3uzBq5VxxQbVuy1lEHEEQdxXwnhQgJDIyAAWjVWNIg="; }; @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { "hidapi-hidraw" "hidapi-libusb" ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; }) diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 364c99fa29234..5ee46c698fe90 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "sha256-4n7J0qf4josYVsbVF4u+NLdecpA9gqHXCfibr0QfyJ4="; + sha256 = "sha256-0ACT899G+CCc08UFsSC8SnUEZR2mrpQbqXW9FklRAjU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index fe9442b7d80d0..68c2dc209514e 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "hiredis"; version = "1.2.0"; - nativeBuildInputs = [openssl]; src = fetchFromGitHub { owner = "redis"; @@ -12,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg="; }; + buildInputs = [ + openssl + ]; + PREFIX = "\${out}"; USE_SSL = 1; diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix index 7aca6227e81bc..0981ff2f82140 100644 --- a/pkgs/development/libraries/hmat-oss/default.nix +++ b/pkgs/development/libraries/hmat-oss/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hmat-oss"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = "hmat-oss"; rev = "refs/tags/${version}"; - sha256 = "sha256-JW6zghoYnF7NcAuAACgTQoxANEnmwjUAB8jCpof7Ums="; + sha256 = "sha256-GnFlvZCEzSCcBVLjFWLe+AKXVA6UMs/gycrOJ2TBqrE="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 024461046f461..0359abec9b08d 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "humanoid-path-planner"; - repo = finalAttrs.pname; + repo = "hpp-fcl"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-BwS9RSirdlD6Cqwp7KD59dkh2WsJVwdlH9LzM2AFjI4="; + hash = "sha256-0OORdtT7vMpvK3BPJvtvuLcz0+bfu1+nVvzs3y+LyQw="; }; strictDeps = true; @@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake doxygen + ] ++ lib.optionals pythonSupport [ + python3Packages.numpy ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index cef877d286a62..843fc1991f279 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -6,7 +6,6 @@ , cmake , hwloc , gperftools -, ninja , pkg-config , python3 }: diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 95c15fdc610af..9abe05161ab5d 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-1w7uu2E4YIcGWNq//BZ2wtDKj9/tgmIhkJgadvCKmVg="; + hash = "sha256-8/m3i1ciSq+jybz0yxS3Lr9oeHpvOf6qKOwmzNloi+Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 2f48bd668de47..4e704a4859132 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; license = with licenses; [ gpl2 lgpl21 mpl11 ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 6b6640ddfb712..c26f6d3aa7157 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1021,4 +1021,15 @@ rec { platforms = platforms.all; }; }; + + /* GREEK */ + + el_GR = el-gr; + el-gr = mkDictFromLibreOffice { + shortName = "el-gr"; + dictFileName = "el_GR"; + shortDescription = "Greek (Greece)"; + readmeFile = "README_el_GR.txt"; + license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; + }; } diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix index 2759ad9af7374..85bee97a76d55 100644 --- a/pkgs/development/libraries/hyphen/default.nix +++ b/pkgs/development/libraries/hyphen/default.nix @@ -17,6 +17,18 @@ in stdenv.mkDerivation rec { sha256 = "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih"; }; + # Do not install the en_US dictionary. + installPhase = '' + runHook preInstall + make install-libLTLIBRARIES + make install-binSCRIPTS + make install-includeHEADERS + + # license + install -D -m644 COPYING "$out/share/licenses/${pname}/LICENSE" + runHook postInstall + ''; + meta = with lib; { description = "Text hyphenation library"; mainProgram = "substrings.pl"; diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix new file mode 100644 index 0000000000000..49d314095c577 --- /dev/null +++ b/pkgs/development/libraries/hyphen/dictionaries.nix @@ -0,0 +1,91 @@ +/* hyphen dictionaries */ + +{ hyphen, stdenv, lib, fetchgit, fetchurl }: + + +let + libreofficeRepository = "https://anongit.freedesktop.org/git/libreoffice/dictionaries.git"; + libreofficeCommit = "9e27d044d98e65f89af8c86df722a77be827bdc8"; + libreofficeSubdir = "de"; + + mkDictFromLibreofficeGit = + { subdir, shortName, shortDescription, dictFileName, readmeFileName }: + stdenv.mkDerivation rec { + version = "24.8"; + pname = "hyphen-dict-${shortName}-libreoffice"; + src = fetchgit { + url = "https://anongit.freedesktop.org/git/libreoffice/dictionaries.git"; + rev = "a2bf59878dd76685803ec260e15d875746ad6e25"; + hash = "sha256-3CvjgNjsrm4obATK6LmtYob8i2ngTbwP6FB4HlJMPCE="; + }; + meta = with lib; { + description = "Hyphen dictionary for ${shortDescription} from LibreOffice"; + homepage = "https://wiki.documentfoundation.org/Development/Dictionaries"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ theCapypara ]; + platforms = platforms.all; + }; + dontBuild = true; + installPhase = '' + runHook preInstall + cd $src/${subdir} + install -dm755 "$out/share/hyphen" + install -m644 "hyph_${dictFileName}.dic" "$out/share/hyphen" + # docs + install -dm755 "$out/share/doc/" + install -m644 "README_hyph_${readmeFileName}.txt" "$out/share/doc/${pname}.txt" + runHook postInstall + ''; + }; + +in +rec { + + /* ENGLISH */ + + en_US = en-us; + en-us = stdenv.mkDerivation rec { + nativeBuildInputs = hyphen.nativeBuildInputs; + version = hyphen.version; + pname = "hyphen-dict-en-us"; + src = hyphen.src; + meta = { + inherit (hyphen.meta) homepage platforms license maintainers; + description = "Hyphen dictionary for English (United States)"; + }; + installPhase = '' + runHook preInstall + make install-hyphDATA + runHook postInstall + ''; + }; + + /* GERMAN */ + + de_DE = de-de; + de-de = mkDictFromLibreofficeGit { + subdir = "de"; + shortName = "de-de"; + shortDescription = "German (Germany)"; + dictFileName = "de_DE"; + readmeFileName = "de"; + }; + + de_AT = de-at; + de-at = mkDictFromLibreofficeGit { + subdir = "de"; + shortName = "de-at"; + shortDescription = "German (Austria)"; + dictFileName = "de_AT"; + readmeFileName = "de"; + }; + + de_CH = de-ch; + de-ch = mkDictFromLibreofficeGit { + subdir = "de"; + shortName = "de-ch"; + shortDescription = "German (Switzerland)"; + dictFileName = "de_CH"; + readmeFileName = "de"; + }; +} diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 1e3d2e4923d98..63ca16e19d7a0 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "igraph"; - repo = finalAttrs.pname; + repo = "igraph"; rev = finalAttrs.version; hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U="; }; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index cc1f6b5440483..edd9c8a79e9cd 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.12.2"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + url = "mirror://sourceforge/enlightenment/imlib2-${finalAttrs.version}.tar.xz"; hash = "sha256-zEmTGiBWCWioZIycoHkIWXYIXqltWaAbHhfLVa8P/kI="; }; @@ -96,6 +96,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.imlib2; pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index a35deb12e6837..b0bb4dce192fd 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-R069LuOmjCFj7dHXiMjuK7WUupk5+dVd8IDKY/wBn2o="; }; - patches = lib.optionals finalAttrs.doCheck [ + patches = lib.optionals finalAttrs.finalPackage.doCheck [ (substituteAll { # Do not let cmake's fetchContent download unity src = ./remove-fetchcontent-usage.patch; @@ -48,9 +48,9 @@ stdenv.mkDerivation (finalAttrs: { cmake doxygen validatePkgConfig - ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ ruby ]; - cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" ]; + cmakeFlags = [ "-DBUILD_TESTING=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; doCheck = false; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 6dec37315ab94..5b5cfac9e06b1 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "24.2.1"; + version = "24.2.5"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - hash = "sha256-75NNxcWQUx0Qs7TWZMxu1TMm22/wCsmQPZXKGKFHEh0="; + hash = "sha256-nnaKfGMRNMZzrgMv7OgXj+11RaZSFijrxunnbGSWQlw="; }; patches = [ diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 0e74478982f3f..bc1c3736f730b 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.ip2location.com/developers/c"; license = with licenses; [ gpl3Plus lgpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index ff490414da858..9c6cc585f9b32 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { description = "HAL for processing of images in userspace"; homepage = "https://github.com/intel/ipu6-camera-hal"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index b3ef27e38774e..06a5dfa5e9aad 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 54f725683a2e3..1db337611dcaa 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -112,6 +112,6 @@ stdenv.mkDerivation { mainProgram = "itkTestDriver"; homepage = "https://www.itk.org"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix deleted file mode 100644 index e86832420969c..0000000000000 --- a/pkgs/development/libraries/jansson/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "jansson"; - version = "2.14"; - - src = fetchFromGitHub { - owner = "akheron"; - repo = "jansson"; - rev = "v${version}"; - sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - # networkmanager relies on libjansson.so: - # https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453 - "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - meta = with lib; { - homepage = "https://github.com/akheron/jansson"; - description = "C library for encoding, decoding and manipulating JSON data"; - changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index c4f9bf9773020..b4aaed0078957 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.7.2"; + version = "2.7.3"; underscoreMajMin = lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-/7NZy+ZroxeTF7av22LNJ0dlMzvTAWfOMypLLYWXWBI="; + sha256 = "sha256-0+3uhZ9/xYI34QiGSnFzPv9WE9ktxlUI36M1vAxbHpQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index 46f2701635498..dddcfd1fa3031 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { broken = stdenv.isDarwin; - description = "Java Foreign Function Interface "; + description = "Java Foreign Function Interface"; homepage = "https://github.com/jnr/jffi"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 5469266d0c12d..cb6df7e5558b8 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -145,11 +145,11 @@ in { saxon_12-he = common rec { pname = "saxon-he"; - version = "12.4"; + version = "12.5"; jar = "saxon-he-${version}"; src = fetchurl { url = github.downloadUrl version; - hash = "sha256-RKso6pRQkJgxlvC2R5WWon/VejQehGW223/C7KjD3c4="; + hash = "sha256-NaRnKHkr1M7C/CYtSHd7THm1ze7wPSmB46ZOyzoZ9xY="; }; updateScript = github.updateScript version; description = "Processor for XSLT 3.0, XPath 3.1, and XQuery 3.1"; diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 39e10e2dbebd4..362a084d03240 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "C-language implementation of Javascript Object Signing and Encryption"; mainProgram = "jose"; homepage = "https://github.com/latchset/jose"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index ea530a955f75d..f7b6d1c4baab7 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "C++ library for interacting with JSON"; - maintainers = with maintainers; [ ttuegel cpages ]; + maintainers = with maintainers; [ ttuegel ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index e17498031da6e..8071fce57ef92 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.44.0"; + version = "3.44.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "aUBqAlDQzFF1QIyufsqAwMa/rvxK4YMLNUwEM7zVzgY="; + sha256 = "E2HRfpyAVkav5RAuWbr4ykUCOGAPyr0BWGxlS3i7MN8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/development/libraries/kcp/default.nix index 2468ba22d3051..b473419bfdf2d 100644 --- a/pkgs/development/libraries/kcp/default.nix +++ b/pkgs/development/libraries/kcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Fast and Reliable ARQ Protocol"; homepage = "https://github.com/skywind3000/kcp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index 3f02765af8ea0..6d4fb30ef75d4 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -2,7 +2,6 @@ mkDerivation, extra-cmake-modules, libical, - qtbase }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index be8016155b87b..fc04f2074501b 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, python3, - qtbase, qtdeclarative, qtscript, + qtdeclarative, qtscript, }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 5954d56e6cca6..d516081da2d75 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ilmbase, karchive, openexr, libavif, libheif, libjxl, libraw, qtbase + ilmbase, karchive, openexr, dav1d, libaom, libavif, libheif, libjxl, libraw, libyuv, qtbase }: let inherit (lib) getDev; in @@ -10,7 +10,7 @@ mkDerivation { pname = "kimageformats"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive openexr libavif libheif libjxl libraw qtbase ]; + buildInputs = [ karchive openexr libaom libavif dav1d libheif libjxl libraw libyuv qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; cmakeFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index ef350835f05df..20ae20f9e99e9 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools }: diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 20c1b2368a7b5..a7e42f48c18d6 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, - qtquickcontrols2, qtbase, + qtquickcontrols2, }: mkDerivation { diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 73bb856de4163..60b3ad00aedac 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -17,7 +17,6 @@ , db , libedit , pam -, krb5 , libmicrohttpd , cjson @@ -26,7 +25,7 @@ , SystemConfiguration , curl -, jdk +, jdk_headless , unzip , which @@ -83,7 +82,7 @@ stdenv.mkDerivation { doCheck = true; nativeCheckInputs = [ curl - jdk + jdk_headless unzip which ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 8dd68af4fd1d5..7a51d454cf148 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -31,11 +31,11 @@ assert withLdap -> !libOnly; stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.21.2"; + version = "1.21.3"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - hash = "sha256-lWCUGp2EPAJDpxsXp6xv4xx867W845g9t55Srn6FBJE="; + hash = "sha256-t6TNXq1n+wi5gLIavRUP9yF+heoyDJ7QxtrdMEhArTU="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index df2b9d5561f52..5156e1ccd8989 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Mixed-radix Fast Fourier Transform based up on the KISS principle"; homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index a07bc73a64ce8..0347339205c65 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { repo = "kmsxx"; fetchSubmodules = true; rev = "54f591ec0de61dd192baf781c9b2ec87d5b461f7"; - sha256 = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c="; + hash = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c="; }; # Didn't detect pybind11 without cmake @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ktextaddons/default.nix b/pkgs/development/libraries/ktextaddons/default.nix index b648109d150e8..15286ff162cc9 100644 --- a/pkgs/development/libraries/ktextaddons/default.nix +++ b/pkgs/development/libraries/ktextaddons/default.nix @@ -15,6 +15,6 @@ mkDerivation rec { description = "Various text handling addons for KDE applications"; homepage = "https://invent.kde.org/libraries/ktextaddons/"; license = licenses.gpl2Plus; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index fe3a88dc711c2..1439c1046fe2b 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/development/libraries/lcrq/default.nix index 3d1818cf779db..25589d28d9552 100644 --- a/pkgs/development/libraries/lcrq/default.nix +++ b/pkgs/development/libraries/lcrq/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "lcrq"; - version = "0.1.2"; + version = "0.2.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; - hash = "sha256-r4UiZ9oNDxF3rHMqg+1NLLjm6LPZtzgtZOs7pRe5SdQ="; + hash = "sha256-xhv1rU0CImd5vs0bMdF1eJZt2AToU/JhBsoCsCLdyyg="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index a467eb8e0d51c..b11da8cb59d38 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; # libldac code detects & #error's out on non-LE byte order platforms = platforms.littleEndian; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 6c5fa48affc1a..80a3f725f9704 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldb"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "mirror://samba/ldb/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-EFqv9xrYgaf661gv1BauKCIbb94zj/+CgoBlBiwlB6U="; + url = "mirror://samba/ldb/ldb-${finalAttrs.version}.tar.gz"; + hash = "sha256-yV5Nwy3qiGS3mJnuNAyf3yi0hvRku8OLqZFRoItJP5s="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ldutils/default.nix b/pkgs/development/libraries/ldutils/default.nix index 157c86ec553e1..0bdd8b9ac5996 100644 --- a/pkgs/development/libraries/ldutils/default.nix +++ b/pkgs/development/libraries/ldutils/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { repo = pname; rev = "4fc416f694ce888c5bd4c4432a7730bb6260475c"; #rev = "v_${version}"; - sha256 = "sha256-UMDayvz9RlcR4HVJNn7tN4FKbiKAFRSPaK0osA6OGTI="; + hash = "sha256-UMDayvz9RlcR4HVJNn7tN4FKbiKAFRSPaK0osA6OGTI="; }; buildInputs = with libsForQt5.qt5; [ diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 82e519f6f100e..766a1161e2c62 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, python3 }: let version = "0.3.4"; diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix index f7bba5125a72b..463344f5b7f68 100644 --- a/pkgs/development/libraries/lerc/default.nix +++ b/pkgs/development/libraries/lerc/default.nix @@ -3,9 +3,10 @@ , fetchFromGitHub , fetchpatch , cmake +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lerc"; version = "4.0.0"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esri"; repo = "lerc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; @@ -31,10 +32,15 @@ stdenv.mkDerivation rec { cmake ]; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = { description = "C++ library for Limited Error Raster Compression"; homepage = "https://github.com/esri/lerc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; + pkgConfigModules = [ "Lerc" ]; }; -} +}) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 7805764fc0d79..e3b55c457faf3 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -1,5 +1,5 @@ { lib -, addOpenGLRunpath +, addDriverRunpath , cmake , fetchFromGitHub , intel-compute-runtime @@ -9,19 +9,19 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.17"; + version = "1.17.19"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-+8bIY/90dXsCdCMeoxL1+OK2Yhl4XNRI3RPuPouGWHc="; + hash = "sha256-WfnoYLBBXzYQ35Og6UgGFv6ebLMBos49JvJcZANRhd8="; }; - nativeBuildInputs = [ cmake addOpenGLRunpath ]; + nativeBuildInputs = [ cmake addDriverRunpath ]; postFixup = '' - addOpenGLRunpath $out/lib/libze_loader.so + addDriverRunpath $out/lib/libze_loader.so ''; passthru.tests = { diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 4ca2eb75b44f3..fcfc88cbb667b 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libabigail"; - version = "2.1"; + version = "2.5"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { - url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-SmKX1B0V0ZNiVhFxFr1hKW5rm+4j1UoMr40/WrjdzEw="; + url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-fPxOmwCuONh/sMY76rsyucv5zkEOUs7rWtWzxb6xEfM="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "ABI Generic Analysis and Instrumentation Library"; homepage = "https://sourceware.org/libabigail/"; license = licenses.asl20-llvm; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 3da65787e0363..5476b3c7402b5 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }: +{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl, zlib }: stdenv.mkDerivation rec { pname = "libabw"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; + buildInputs = [ boost doxygen gperf librevenge libxml2 perl zlib ]; meta = with lib; { homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw"; diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index cfac6c97ac74a..3ed46996056ae 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; repo = "libaccounts-glib"; rev = "VERSION_${version}"; - sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; + hash = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index cfb86575f52d8..924b8884df803 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.5.2"; + version = "1.5.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-0Zu6knxP6GiqJMtwd8uRN72Lf7JfwB6JWjS1ggeANPM="; + hash = "sha256-NCQCd/QnJg2fEI6q5ys8HQXinGnKaoxhMUHd8rwxAmk="; }; depsBuildBuild = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgtk_doc=true" - ] ++ lib.optionals (!finalAttrs.doCheck) [ + ] ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dtests=false" ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index bff80ab996db6..a6fad154ad255 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, libXinerama, freetype, SDL, libGLU, libGL +, libpng, libjpeg, libXinerama, freetype, SDL, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/development/libraries/libajantv2/default.nix index 278752b18738d..ed5a57ed7364e 100644 --- a/pkgs/development/libraries/libajantv2/default.nix +++ b/pkgs/development/libraries/libajantv2/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against"; homepage = "https://github.com/aja-video/ntv2"; license = with licenses; [ mit ]; - maintainers = with maintainers; []; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 63cb0401aae40..b920fe9c3b4e7 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://xiph.org/ao/"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 16a9e872aae8f..8f4afbf5a3e04 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.9.0"; + version = "3.9.1"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-ON/BWCO2k7fADW3ZANKjnRE8SrQZpjdyUF1N0fD/xnc="; + hash = "sha256-XQ1sekNZDUAiYP/HriYRj4+40PAvE/OiyG9bbrdg63I="; stripRoot = false; }; diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index 767d9228f33ad..db1fd7274747a 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco="; + hash = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 5e37255d235bb..09a96e829e330 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -23,6 +23,9 @@ , cmake , nix , samba + +# for passthru.lore +, binlore }: assert xarSupport -> libxml2 != null; @@ -125,4 +128,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit cmake nix samba; }; + + # bsdtar is detected as "cannot" because its exec is internal to + # calls it makes into libarchive itself. If binlore gains support + # for detecting another layer down into libraries, this can be cut. + passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage '' + execer can bin/bsdtar + ''; }) diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index 0ad0a264f0074..227afc0eb1f83 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Simple header-only C++ argument parser library"; homepage = "https://github.com/Taywee/args"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index cf8f4c85e0c61..3c3fa3ee7066d 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -11,11 +11,11 @@ assert fontconfigSupport -> fontconfig != null; stdenv.mkDerivation rec { pname = "libass"; - version = "0.17.2"; + version = "0.17.3"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6CYbUdZrqTP+mSSMb92HZ+2WxaflNjyDmSxzWiwvv3Q="; + hash = "sha256-6uQl2lDwAVwh97OpxyYqkQ8CGK9GniLikxRi/tPFCVk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 6df341d68eb84..ec2c22a247c0e 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - hash = "sha256-9YP4Zq6dehIJanNkpAJK1aYwSOAueqonF8k2t/3B4kw="; + hash = "sha256-yNJiMTWgOKR1c2pxTkLY/uPWGIY4xgH+Ee0r15oroDU="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 158493b80e905..94d1257d0e7d0 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; + hash = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch new file mode 100644 index 0000000000000..b2123c78bec2f --- /dev/null +++ b/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 2a15d720f9...186ab24978 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -254,7 +254,7 @@ + abi_strl=no + abi_strmode=no + abi_strnstr=no +- abi_strtonum=no ++ abi_strtonum=yes + abi_strtox=yes + abi_timeconv=no + # On libmd. diff --git a/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch b/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch deleted file mode 100644 index de40da981623b..0000000000000 --- a/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 9d22b00..c6848fc 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -198,7 +198,9 @@ libbsd_ctor_a_SOURCES = \ - # Generate a simple libtool symbol export list to be used as a fallback if - # there is no version script support. - libbsd.sym: libbsd.map -- $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map > $@ -+ $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map \ -+ | grep -Ev '(group_from_gid|user_from_uid|nlist|__fdnlist|bsd_getopt)' \ -+ > $@ - - if NEED_TRANSPARENT_LIBMD - TRANSPARENT_LIBMD_DEPENDS = format.ld diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index fa8b6b65950bc..90a92f50f4634 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.11.8"; + version = "0.12.2"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM="; + hash = "sha256-uIzJFj0MZSqvOamZkdl03bocOpcR248bWDivKhRzEBQ="; }; outputs = [ "out" "dev" "man" ]; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libmd ]; - patches = lib.optionals stdenv.isDarwin [ - # Temporary build system hack from upstream maintainer - # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684 - ./darwin-fix-libbsd.sym.patch + patches = [ + # `strtonum(3)` is not available on our default SDK version. + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/30 + ./darwin-enable-strtonum.patch ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 1ab5b428f57a7..5f987943d8df7 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Smart card emulation library"; homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 6bfb780d31a35..0a9aabf731232 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool , gtk2-x11, gtk3-x11 , gtkSupport ? null -, libpulseaudio, gst_all_1, libvorbis, libcap +, libpulseaudio, gst_all_1, libvorbis, libcap, systemd , Carbon, CoreServices, AppKit , withAlsa ? stdenv.isLinux, alsa-lib }: @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { ++ lib.optional (gtkSupport == "gtk2") gtk2-x11 ++ lib.optional (gtkSupport == "gtk3") gtk3-x11 ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ] - ++ lib.optional stdenv.isLinux libcap + ++ lib.optionals stdenv.isLinux [ libcap systemd ] ++ lib.optional withAlsa alsa-lib; - configureFlags = [ "--disable-oss" ]; + configureFlags = [ "--disable-oss" ] + ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/development/libraries/libcaption/default.nix index 78cf5214051de..0070aa3524eec 100644 --- a/pkgs/development/libraries/libcaption/default.nix +++ b/pkgs/development/libraries/libcaption/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "szatmary"; repo = "libcaption"; rev = finalAttrs.version; - sha256 = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; + hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 349f4589172a8..673885b096e45 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { description = "CBOR protocol implementation for C and others"; homepage = "https://github.com/PJK/libcbor"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 5d1d295f74a82..8b1e4e0c7ab42 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - hash = "sha256-rrBmsXBatvaf/u/UVHpTm9YUo+gsQv1rtuprpRF/3kU="; + hash = "sha256-fgH4gl8Uq8mY9gxa968suU66VJYnFzpSLj4JGpJcJA4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index ce113106ce566..aa9f50917be1f 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/libchop/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index c0f02320c7796..049b0c8f4fb87 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://www.hyperrealm.com/libconfig"; description = "Simple library for processing structured configuration files"; license = licenses.lgpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index db04b5f59b5cd..f514d3c00a688 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://codesynthesis.com/projects/libcutl/"; changelog = "https://git.codesynthesis.com/cgit/libcutl/libcutl/plain/NEWS?h=${version}"; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 94c414a08356c..d5e5f1db552a0 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, srcOnly , cmake , ninja , pkg-config diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index 765efe573a64b..e810da2e96cde 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub , autoreconfHook, autoconf-archive , installShellFiles, libiconv }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "This is an implementation of double-array structure for representing trie"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; pkgConfigModules = [ "datrie-0.2" ]; }; } diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index f1352cd47b927..bbd9e3898d912 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index afd53588a336a..0163eb9015d25 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Capture and control API for IIDC compliant cameras"; homepage = "https://sourceforge.net/projects/libdc1394/"; license = licenses.lgpl21Plus; - maintainers = [ maintainers.viric ]; + maintainers = [ ]; mainProgram = "dc1394_reset_bus"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/development/libraries/libde265/test-corpus-decode.nix index 763c93e6a993b..9c184362d10bb 100644 --- a/pkgs/development/libraries/libde265/test-corpus-decode.nix +++ b/pkgs/development/libraries/libde265/test-corpus-decode.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchFromGitHub , libde265 }: diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 4f9efb6bec40c..753fa8032a374 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -53,6 +53,20 @@ dependencies = [ ] [[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] name = "ahash" version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -89,12 +103,6 @@ dependencies = [ ] [[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -182,6 +190,18 @@ dependencies = [ ] [[package]] +name = "argon2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] name = "arrayref" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -212,7 +232,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.34", + "time 0.3.36", ] [[package]] @@ -228,7 +248,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.34", + "time 0.3.36", ] [[package]] @@ -251,7 +271,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "synstructure 0.13.1", ] @@ -274,14 +294,14 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ "event-listener 5.2.0", "event-listener-strategy", @@ -393,7 +413,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -411,6 +431,12 @@ dependencies = [ ] [[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] name = "attohttpc" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -498,9 +524,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -599,6 +625,15 @@ dependencies = [ ] [[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + +[[package]] name = "blake3" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -713,6 +748,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -885,6 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] @@ -893,8 +935,22 @@ version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ + "anstream", "anstyle", "clap_lex", + "strsim 0.10.0", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] @@ -913,6 +969,17 @@ dependencies = [ ] [[package]] +name = "cmac" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa" +dependencies = [ + "cipher", + "dbl", + "digest 0.10.7", +] + +[[package]] name = "cobs" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1151,7 +1218,7 @@ dependencies = [ "aead", "chacha20", "crypto_secretbox", - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "salsa20", "serdect", "subtle", @@ -1175,6 +1242,15 @@ dependencies = [ ] [[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] name = "curve25519-dalek" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1189,16 +1265,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -1212,7 +1287,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1227,12 +1302,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1245,22 +1320,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 1.0.109", + "strsim 0.11.1", + "syn 2.0.68", ] [[package]] @@ -1276,13 +1351,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.14.4", + "darling_core 0.20.9", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] @@ -1292,7 +1367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -1305,6 +1380,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] +name = "dbl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9" +dependencies = [ + "generic-array", +] + +[[package]] name = "default-net" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1323,7 +1407,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.140.2" +version = "1.142.1" dependencies = [ "ansi_term", "anyhow", @@ -1373,12 +1457,12 @@ dependencies = [ "proptest", "qrcodegen", "quick-xml", - "quinn", + "quinn 0.10.2", "quoted_printable", "rand 0.8.5", "ratelimit", "regex", - "reqwest 0.11.27", + "reqwest 0.12.5", "rusqlite", "rust-hsluv", "sanitize-filename", @@ -1417,7 +1501,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.140.2" +version = "1.142.1" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1442,7 +1526,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.140.2" +version = "1.142.1" dependencies = [ "ansi_term", "anyhow", @@ -1457,7 +1541,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.140.2" +version = "1.142.1" dependencies = [ "anyhow", "deltachat", @@ -1481,12 +1565,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "deltachat_ffi" -version = "1.140.2" +version = "1.142.1" dependencies = [ "anyhow", "deltachat", @@ -1574,7 +1658,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1589,33 +1673,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.14.4", + "darling 0.20.9", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] @@ -1648,7 +1732,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "unicode-xid", ] @@ -1738,7 +1822,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1776,6 +1860,15 @@ dependencies = [ ] [[package]] +name = "document-features" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +dependencies = [ + "litrs", +] + +[[package]] name = "dsa" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1816,6 +1909,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] +name = "eax" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9954fabd903b82b9d7a68f65f97dc96dd9ad368e40ccc907a7c19d53e6bfac28" +dependencies = [ + "aead", + "cipher", + "cmac", + "ctr", + "subtle", +] + +[[package]] name = "ecdsa" version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1883,7 +1989,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "ed25519 2.2.3", "rand_core 0.6.4", "serde", @@ -2078,7 +2184,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2091,7 +2197,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2111,7 +2217,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2500,7 +2606,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2591,6 +2697,16 @@ dependencies = [ ] [[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] name = "gif" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2666,7 +2782,26 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap", + "indexmap 2.2.5", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -2685,21 +2820,26 @@ dependencies = [ [[package]] name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", - "allocator-api2", ] [[package]] name = "hashlink" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown", + "hashbrown 0.14.3", ] [[package]] @@ -2932,7 +3072,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2955,6 +3095,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -2982,32 +3123,36 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.2.0", "hyper-util", - "rustls 0.22.4", + "rustls 0.23.10", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tower-service", + "webpki-roots 0.26.1", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper 0.14.28", + "http-body-util", + "hyper 1.2.0", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] @@ -3109,12 +3254,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "gif", "image-webp", @@ -3145,12 +3290,24 @@ dependencies = [ [[package]] name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", + "serde", ] [[package]] @@ -3211,7 +3368,7 @@ dependencies = [ "portable-atomic", "postcard", "quic-rpc", - "quinn", + "quinn 0.10.2", "rand 0.7.3", "rcgen 0.10.0", "ring 0.16.20", @@ -3235,9 +3392,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1be0b442ed44d20905cf77c673169906c883e05c829e3fb303b131e925139fc" +checksum = "f31f493beda1c4f8c7be999eff8a80cd1e2428da4c61f5cdd14990af8122342e" dependencies = [ "aead", "anyhow", @@ -3276,9 +3433,9 @@ dependencies = [ [[package]] name = "iroh-gossip" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857aa77a0b29283edf99224bd12cd739684c5873e639b85adb38b8d1d777162d" +checksum = "60a25bef4066809009d90cb5ff885c0d1adf77690805431f45577e624af0b4c6" dependencies = [ "anyhow", "bytes", @@ -3286,7 +3443,7 @@ dependencies = [ "ed25519-dalek 2.1.1", "futures-lite 2.3.0", "genawaiter", - "indexmap", + "indexmap 2.2.5", "iroh-base", "iroh-blake3", "iroh-metrics", @@ -3302,9 +3459,9 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd54b9cf342b2618efc8d3ff6cdcd083fa5a2cf6cc78bb473bd32e228eabb40e" +checksum = "472ec21d59b34c8fbebbd8fcecfdc0f4b00a7af2d6453b303a1e9c9499674f67" dependencies = [ "anyhow", "erased_set", @@ -3313,26 +3470,26 @@ dependencies = [ "hyper-util", "once_cell", "prometheus-client", - "reqwest 0.12.4", + "reqwest 0.12.5", "serde", "struct_iterable", - "time 0.3.34", + "time 0.3.36", "tokio", "tracing", ] [[package]] name = "iroh-net" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a744000e6c5704479eeb4751eb23b9b8e7e56a0fc484beb8831694fc93e378f" +checksum = "7a3e2e9b2a555736a82cb53d16037b0ba0233034ac5042efce129b1460b0a50a" dependencies = [ - "aead", "anyhow", "axum", "backoff", "base64 0.22.1", "bytes", + "clap", "der 0.7.8", "derive_more 1.0.0-beta.6", "duct", @@ -3371,24 +3528,32 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen 0.12.1", - "reqwest 0.12.4", + "regex", + "reqwest 0.12.5", "ring 0.17.8", "rtnetlink", "rustls 0.21.11", + "rustls-pemfile 1.0.4", "rustls-webpki 0.101.7", "serde", + "serde_with", "smallvec", "socket2", "strum", "stun-rs", "surge-ping", "thiserror", - "time 0.3.34", + "time 0.3.36", "tokio", "tokio-rustls 0.24.1", "tokio-rustls-acme", + "tokio-tungstenite", + "tokio-tungstenite-wasm", "tokio-util", + "toml", "tracing", + "tracing-subscriber", + "tungstenite", "url", "watchable", "webpki-roots 0.25.4", @@ -3600,6 +3765,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] name = "lock_api" version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3611,9 +3782,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" [[package]] name = "lru-cache" @@ -3752,9 +3929,9 @@ dependencies = [ [[package]] name = "netdev" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb353f5a5a852d5cc779c1c80bec0bd14a696ef832f3a761cb10091802c37109" +checksum = "7516ad2c46cc25da098ed7d6b9a0cbe9e1fbffbd04b1596148b95f2841179c83" dependencies = [ "dlopen2 0.5.0", "libc", @@ -3764,7 +3941,7 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration 0.6.0", - "windows 0.54.0", + "windows-sys 0.52.0", ] [[package]] @@ -3980,7 +4157,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4041,19 +4218,31 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "object" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] [[package]] +name = "ocb3" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c196e0276c471c843dd5777e7543a36a298a4be942a2a688d8111cd43390dedb" +dependencies = [ + "aead", + "cipher", + "ctr", + "subtle", +] + +[[package]] name = "oid-registry" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4091,9 +4280,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.4.2", "cfg-if", @@ -4112,7 +4301,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4132,9 +4321,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -4266,6 +4455,17 @@ dependencies = [ ] [[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4345,7 +4545,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4361,12 +4561,14 @@ dependencies = [ [[package]] name = "pgp" -version = "0.11.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031fa1e28c4cb54c90502ef0642a44ef10ec8349349ebe6372089f1b1ef4f297" +checksum = "aeab6e08a63a51a29a65e461d0b6fd0f8d350914712ec43773ca22ed51d5501c" dependencies = [ "aes", - "base64 0.21.7", + "aes-gcm", + "argon2", + "base64 0.22.1", "bitfield", "block-padding", "blowfish", @@ -4380,16 +4582,19 @@ dependencies = [ "cipher", "const-oid", "crc24", - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "derive_builder", "des", "digest 0.10.7", "dsa", + "eax", + "ecdsa 0.16.9", "ed25519-dalek 2.1.1", "elliptic-curve 0.13.8", "flate2", "generic-array", "hex", + "hkdf", "idea", "iter-read", "k256", @@ -4399,12 +4604,15 @@ dependencies = [ "num-bigint-dig", "num-traits", "num_enum", + "ocb3", "p256 0.13.2", "p384 0.13.0", + "p521", "rand 0.8.5", "ripemd", "rsa 0.9.6", "sha1", + "sha1-checked", "sha2 0.10.8", "sha3", "signature 2.2.0", @@ -4432,7 +4640,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4449,18 +4657,25 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkarr" -version = "1.1.5" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "242ae92dfb9d2ba3aaa9caf4723e72043bc50729ad05a763771771ba03196ffb" +checksum = "89f9e12544b00f5561253bbd3cb72a85ff3bc398483dc1bf82bdf095c774136b" dependencies = [ "bytes", + "document-features", "ed25519-dalek 2.1.1", - "rand 0.8.5", - "reqwest 0.11.27", + "flume", + "futures", + "js-sys", + "lru", "self_cell", "simple-dns", "thiserror", - "url", + "tracing", + "ureq", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", "z32", ] @@ -4514,12 +4729,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - -[[package]] name = "plotters" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4565,7 +4774,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4614,6 +4823,18 @@ dependencies = [ ] [[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] name = "portable-atomic" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4770,14 +4991,14 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bitflags 2.4.2", "lazy_static", @@ -4821,7 +5042,7 @@ dependencies = [ "flume", "futures", "pin-project", - "quinn", + "quinn 0.10.2", "serde", "tokio", "tokio-serde", @@ -4837,9 +5058,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "86e446ed58cef1bbfe847bc2fda0e2e4ea9f0e57b90c507d4781292590d72a4e" dependencies = [ "memchr", ] @@ -4852,8 +5073,8 @@ checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", - "quinn-proto", - "quinn-udp", + "quinn-proto 0.10.6", + "quinn-udp 0.4.1", "rustc-hash", "rustls 0.21.11", "thiserror", @@ -4862,6 +5083,23 @@ dependencies = [ ] [[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto 0.11.3", + "quinn-udp 0.5.2", + "rustc-hash", + "rustls 0.23.10", + "thiserror", + "tokio", + "tracing", +] + +[[package]] name = "quinn-proto" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4880,6 +5118,23 @@ dependencies = [ ] [[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring 0.17.8", + "rustc-hash", + "rustls 0.23.10", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] name = "quinn-udp" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4893,6 +5148,19 @@ dependencies = [ ] [[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "quote" version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5054,7 +5322,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem 1.1.1", "ring 0.16.20", - "time 0.3.34", + "time 0.3.36", "yasna", ] @@ -5066,7 +5334,7 @@ checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" dependencies = [ "pem 3.0.4", "ring 0.17.8", - "time 0.3.34", + "time 0.3.36", "yasna", ] @@ -5101,9 +5369,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -5160,17 +5428,15 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", "hyper-rustls 0.24.2", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -5182,7 +5448,6 @@ dependencies = [ "sync_wrapper 0.1.2", "system-configuration 0.5.1", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", "tower-service", "url", @@ -5195,36 +5460,43 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", "futures-util", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "http-body-util", "hyper 1.2.0", - "hyper-rustls 0.26.0", + "hyper-rustls 0.27.2", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.4", + "quinn 0.11.2", + "rustls 0.23.10", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.0", + "system-configuration 0.5.1", "tokio", - "tokio-rustls 0.25.0", + "tokio-native-tls", + "tokio-rustls 0.26.0", "tower-service", "url", "wasm-bindgen", @@ -5441,11 +5713,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring 0.17.8", "rustls-pki-types", "rustls-webpki 0.102.4", @@ -5603,7 +5876,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5723,7 +5996,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5734,14 +6007,14 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -5780,6 +6053,36 @@ dependencies = [ ] [[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.2.5", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time 0.3.36", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] name = "serdect" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5812,6 +6115,16 @@ dependencies = [ ] [[package]] +name = "sha1-checked" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89f599ac0c323ebb1c6082821a54962b839832b03984598375bff3975b804423" +dependencies = [ + "digest 0.10.7", + "sha1", +] + +[[package]] name = "sha2" version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6073,6 +6386,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] name = "struct_iterable" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6092,7 +6411,7 @@ dependencies = [ "proc-macro2", "quote", "struct_iterable_internal", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -6120,7 +6439,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -6182,9 +6501,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -6223,7 +6542,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -6348,7 +6667,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -6374,9 +6693,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -6395,9 +6714,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -6465,7 +6784,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -6490,11 +6809,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.4", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] @@ -6581,6 +6900,24 @@ dependencies = [ ] [[package]] +name = "tokio-tungstenite-wasm" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e57a65894797a018b28345fa298a00c450a574aa9671e50b18218a6292a55ac" +dependencies = [ + "futures-channel", + "futures-util", + "http 1.1.0", + "httparse", + "js-sys", + "thiserror", + "tokio", + "tokio-tungstenite", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "tokio-util" version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6595,14 +6932,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -6620,18 +6957,18 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap", + "indexmap 2.2.5", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ - "indexmap", + "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", @@ -6686,7 +7023,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -6900,10 +7237,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] +name = "ureq" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +dependencies = [ + "base64 0.22.1", + "log", + "once_cell", + "rustls 0.23.10", + "rustls-pki-types", + "url", + "webpki-roots 0.26.1", +] + +[[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -6925,9 +7277,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.12", "serde", @@ -7021,7 +7373,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -7055,7 +7407,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7193,16 +7545,6 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.5", -] - -[[package]] name = "windows-core" version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7221,16 +7563,6 @@ dependencies = [ ] [[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.5", -] - -[[package]] name = "windows-implement" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7238,7 +7570,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -7249,16 +7581,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "windows-result" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" -dependencies = [ - "windows-targets 0.52.5", + "syn 2.0.68", ] [[package]] @@ -7497,7 +7820,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "rand_core 0.6.4", "serde", "zeroize", @@ -7518,7 +7841,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.34", + "time 0.3.36", ] [[package]] @@ -7535,7 +7858,7 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.34", + "time 0.3.36", ] [[package]] @@ -7552,7 +7875,7 @@ dependencies = [ "oid-registry 0.7.0", "rusticata-macros", "thiserror", - "time 0.3.34", + "time 0.3.36", ] [[package]] @@ -7593,14 +7916,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.34", + "time 0.3.36", ] [[package]] name = "yerpc" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31978be1300d9d078f34ebb05660fbf3b5114611316a4777bb9ce269a7a33f38" +checksum = "b4755f069230677a7a8d94164a521d30007c15e3be0eb4c15aa39065b9df25c8" dependencies = [ "anyhow", "async-channel 1.9.0", @@ -7621,15 +7944,15 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.5.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e510aa045bc7be964b982c68f001933fce4fbe609bb98de60068fa8cefe6308" +checksum = "35ba6b4417cfeb26cd806f3aabc22e7c4097632e07b5b61a4c818bccb2df4f21" dependencies = [ "convert_case 0.5.0", - "darling 0.14.4", + "darling 0.20.9", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] @@ -7655,7 +7978,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -7675,7 +7998,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 4f303ba3ff4b2..3d389866dd328 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -31,13 +31,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.140.2"; + version = "1.142.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-BSbvgKiI89B+nxp5McBKTJAwgePt27C1QvSQLhTL7pQ="; + hash = "sha256-ea0OKQWZareqgE1C8lYem3BKaNmqJgYLItOHdPWqz6M="; }; patches = [ diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 63ca4877da65f..409df07cb2880 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl2; pkgConfigModules = [ "IL" ]; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 717d565ef8353..58112ea2c2fd5 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -1,17 +1,33 @@ -{lib, stdenv, fetchurl, automake, autoconf, libtool}: +{ + lib, + stdenv, + fetchFromGitHub, + automake, + autoconf, + libtool, + pkg-config, + check, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdnet"; - version = "1.12"; + version = "1.18.0"; enableParallelBuilding = true; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdnet/libdnet-${version}.tgz"; - sha256 = "09mhbr8x66ykhf5581a5zjpplpjxibqzgkkpx689kybwg0wk1cw3"; + src = fetchFromGitHub { + owner = "ofalk"; + repo = "libdnet"; + rev = "refs/tags/libdnet-${finalAttrs.version}"; + hash = "sha256-oPlBQB9e8vGJ/rVydMqsZqdInhrpm2sNWkDl9JkkXCI="; }; - nativeBuildInputs = [ automake autoconf ]; + nativeBuildInputs = [ + automake + autoconf + pkg-config + check + ]; buildInputs = [ libtool ]; # .so endings are missing (quick and dirty fix) @@ -25,7 +41,7 @@ stdenv.mkDerivation rec { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = "https://github.com/dugsong/libdnet"; license = lib.licenses.bsd3; - maintainers = [lib.maintainers.marcweber]; + maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 31e36be121b5c..f4d54722327d4 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.121"; + version = "2.4.122"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-kJCEpQXXY4iH9ZC3B5Gzu9kGnHEMlI9dHxzm0IDN/Ks="; + hash = "sha256-2fUHm3d9/8qTAMzFaxCpNYjN+8nd4vrhEZQN+2KS8lE="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix index ebf59ccd03f94..4cf3102bbbfce 100644 --- a/pkgs/development/libraries/libdwarf/common.nix +++ b/pkgs/development/libraries/libdwarf/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildInputs, hash, version, libelf, url, knownVulnerabilities }: +{ lib, stdenv, fetchurl, buildInputs, hash, version, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix index 41fda970294da..7e70cb9503106 100644 --- a/pkgs/development/libraries/libe57format/default.nix +++ b/pkgs/development/libraries/libe57format/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # See https://github.com/asmaloney/libE57Format/blob/9372bdea8db2cc0c032a08f6d655a53833d484b8/test/README.md - (if finalAttrs.doCheck + (if finalAttrs.finalPackage.doCheck then "-DE57_TEST_DATA_PATH=${finalAttrs.libE57Format-test-data_src}" else "-DE57_BUILD_TEST=OFF" ) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 3478217d7f6b8..34a45e398bcdb 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Extensible Binary Meta Language library"; homepage = "https://dl.matroska.org/downloads/libebml/"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix index 7d5a928aa2f48..8ff7d8c952373 100644 --- a/pkgs/development/libraries/libelfin/default.nix +++ b/pkgs/development/libraries/libelfin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aclements/libelfin/"; license = licenses.mit; description = "C++11 ELF/DWARF parser"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 95c3959d9dfb5..f771ad140b551 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" - "-Dtests=${lib.boolToString finalAttrs.doCheck}" + "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; pkgConfigModules = [ "epoxy" ]; }; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 34af29955abbf..abd8185eae2a0 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Bqd78qxcmTMFiCvBZBAX9b7BWS1tG2R4e61JKrNPLzY="; + sha256 = "sha256-PsqGps5VuB1bzpEGN/xFHIu+NzsflpjzdcfxrQ3jrEg="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 36f956e777242..24fc1e6dc74ec 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; license = licenses.bsd2; homepage = "https://www.freshports.org/devel/libexecinfo"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index d8e8d6101c136..d947534cb2eca 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, substituteAll +{ lib, stdenv, fetchurl, fetchpatch2, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, pkg-config , rpmSupport ? stdenv.isLinux, rpm @@ -14,23 +14,24 @@ # ''; # See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>. , gtkSupport ? true, glib, gtk3 -, videoSupport ? true, ffmpeg_4, libmpeg2 +, videoSupport ? true, libmpeg2 }: stdenv.mkDerivation rec { pname = "libextractor"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "mirror://gnu/libextractor/${pname}-${version}.tar.gz"; - sha256 = "sha256-FvYzq4dGo4VHxKHaP0WRGSsIJa2DxDNvBXW4WEPYvY8="; + hash = "sha256-u48xLFHSAlciQ/ETxrYtghAwGrMMuu5gT5g32HjN91U="; }; patches = [ - (fetchpatch { - name = "libextractor-exiv2-0.28.patch"; - url = "https://git.pld-linux.org/?p=packages/libextractor.git;a=blob_plain;f=libextractor-exiv2-0.28.patch;h=d763b65f2578f1127713de8dc82f432d34f95a85;hb=0e7de1c6794e8c331a1a1a6a829993c7cd217d3a"; - hash = "sha256-szAv2A+NmiQyj2+R7BO6fHX588vlTgljPtrnMR6mgGY="; + # 0008513: test_exiv2 fails with Exiv2 0.28 + # https://bugs.gnunet.org/view.php?id=8513 + (fetchpatch2 { + url = "https://sources.debian.org/data/main/libe/libextractor/1%3A1.13-4/debian/patches/exiv2-0.28.diff"; + hash = "sha256-Re5iwlSyEpWu3PcHibaRKSfmdyHSZGMOdMZ6svTofvs="; }) ] ++ lib.optionals gstreamerSupport [ @@ -58,14 +59,7 @@ stdenv.mkDerivation rec { ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ lib.optionals gtkSupport [ glib gtk3 ] - ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ]; - - configureFlags = [ - "--disable-ltdl-install" - "--with-ltdl-include=${libtool}/include" - "--with-ltdl-lib=${libtool.lib}/lib" - "--enable-xpdf" - ]; + ++ lib.optionals videoSupport [ libmpeg2 ]; # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index 26e2687575a00..658e380d210b6 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.21.0"; + version = "1.22.0"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p0L9l1UpxD2WCZWXBNaEz9Zjzr5is3iEODcoQQa1f6M="; + sha256 = "sha256-s6e9UMCYqSuAvVvlF+SuduCA5UC43QEahUA8apubnOk="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 3e568759c1bcb..008611594b46c 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,23 +1,50 @@ -{ lib, stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: +{ + lib, + stdenv, + fetchgit, + automake, + autoconf, + libtool, + libX11, + libXi, + libXtst, + pkg-config, + xorgproto, +}: stdenv.mkDerivation rec { pname = "libfakekey"; - version = "0.1"; + version = "0.3"; - src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz"; - sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; + src = fetchgit { + url = "https://git.yoctoproject.org/libfakekey"; + rev = "refs/tags/${version}"; + hash = "sha256-QNJlxZ9uNwNgFWm9qRJdPfusx7dXHZajjFH7wDhpgcs="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXi libXtst xorgproto ]; + preConfigure = "./autogen.sh"; + + nativeBuildInputs = [ + automake + autoconf + pkg-config + libtool + ]; + + buildInputs = [ + libX11 + libXi + libXtst + xorgproto + ]; + NIX_LDFLAGS = "-lX11"; meta = with lib; { description = "X virtual keyboard library"; homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index b3c3cc450237e..04bfadeef979e 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.14.0"; + version = "1.15.0"; # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-NgF5LjIAMtQoACxMzoSZpMe4AzGQUaJaDJ8fE4/+5Fo="; + hash = "sha256-q6qxMY0h0mLs5Bb7inEy+pN0vaifb6UrhqmKL1cSth4="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Yubico/libfido2"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill prusnak ]; + maintainers = with maintainers; [ prusnak ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 9dc2f368e2cd9..c7915ae676ef2 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "libfive"; - version = "0-unstable-2024-03-28"; + version = "0-unstable-2024-06-23"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "4c59b11667bbe8be9802f59697fa64bbfe1ea82d"; - hash = "sha256-scYSprozfC537vAXhMfWswyS3xivpoURWPhplH7yHIg="; + rev = "302553e6aa6ca3cb13b2a149f57b6182ce2406dd"; + hash = "sha256-8J0Pe3lmZCg2YFffmIynxW35w4mHl5cSlLSenm50CWg="; }; nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; @@ -96,7 +96,9 @@ stdenv.mkDerivation { "libfive.stdlib" ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagFormat = ""; + }; meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index fd7797ca0f14c..3c1b14eaf909e 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -9,7 +9,6 @@ , glib , nss , gobject-introspection -, coreutils , cairo , libgudev , gtk-doc diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index cfdfd7482b42d..34eea10474133 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.39"; + version = "1.1.40"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-O+Fg6NtWdBe0k+XhE/h62C1tvC6Y1BQZWva63sXJDfY="; + sha256 = "sha256-bv3UeL5xx28N/fSG1BeUSbbSvDaNgehpnx2OzIIaSXw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 41e420f173fb4..ffe9f42326f8f 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo="; }; - outputs = [ "out" "dev" "info" ]; - outputBin = "dev"; + outputs = [ "bin" "lib" "dev" "info" "out" ]; # The CPU Jitter random number generator must not be compiled with # optimizations and the optimize -O0 pragma only works for gcc. @@ -58,15 +57,22 @@ stdenv.mkDerivation rec { # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h" + '' + # The `libgcrypt-config` script references $dev and in the $dev output, the + # stdenv automagically puts the $bin output into propagatedBuildInputs. This + # would cause a cycle. This is a weird tool anyways, so let's stuff it in $dev + # instead. + + '' + moveToOutput bin/libgcrypt-config $dev '' + lib.optionalString enableCapabilities '' - sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la + sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $lib/lib/libgcrypt.la ''; # TODO: figure out why this is even necessary and why the missing dylib only crashes # random instead of every test preCheck = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/lib - cp src/.libs/libgcrypt.20.dylib $out/lib + mkdir -p $lib/lib + cp src/.libs/libgcrypt.20.dylib $lib/lib ''; doCheck = true; @@ -82,6 +88,6 @@ stdenv.mkDerivation rec { description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index fcc44025400c6..aa710a9161253 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 9a9c3b861d6d4..d3e85c012cf11 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitLab , fetchpatch -, autoreconfHook, pkg-config, python3, addOpenGLRunpath +, autoreconfHook, pkg-config, python3, addDriverRunpath , libX11, libXext, xorgproto }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 addDriverRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addDriverRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" "-Wno-error=array-bounds" ] ++ lib.optionals stdenv.cc.isClang [ @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { # Note that libEGL does not need it because it uses driver config files which should # contain absolute paths to libraries. postFixup = '' - addOpenGLRunpath $out/lib/libGLX.so + addDriverRunpath $out/lib/libGLX.so ''; - passthru = { inherit (addOpenGLRunpath) driverLink; }; + passthru = { inherit (addDriverRunpath) driverLink; }; meta = with lib; { description = "GL Vendor-Neutral Dispatch library"; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index e0de7acd38bad..b3db03d0240b7 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; platforms = platforms.unix; license = licenses.curl; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index a990546108cff..9920a54e04139 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, gettext +{ stdenv, lib, buildPackages, fetchurl, fetchpatch, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -17,13 +17,21 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.49"; + version = "1.50"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-i3nVRjnb9KvAi1QG+y835mmi3sCR3QJPuH3TZxMcY6k="; + hash = "sha256-aUBTSeCmM+REooxbNc6PFEhGhFGKUI3EigiZkv6T4go="; }; + patches = [ + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/cc17f22f4056d84967bd94cf41458e3d3150f9e1/devel/libgpg-error/files/patch-src-spawn-posix.c.diff"; + extraPrefix = ""; + hash = "sha256-nIS9oKcgHdHtRTlaSx7mgwQPXq855t+SNujplQKKhzQ="; + }) + ]; + postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure ''; @@ -75,6 +83,6 @@ in stdenv.mkDerivation (rec { license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; }; } // genPosixLockObjOnlyAttrs) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index fe131f469f0b3..1880b8310fceb 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - hash = "sha256-sb3x4/dSOGlfk+RCBiuvwGkXDyv08M1LjgScpnExofA="; + hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 2de6d8dd4d2c6..a81f9587b3be0 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -9,7 +9,6 @@ , glib , libxml2 , sqlite -, zlib , sg3_utils , gdk-pixbuf , taglib diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index bd3ece4235993..dcb460272d16d 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , autoreconfHook +, fetchpatch2 , gtk-doc , pkg-config , intltool @@ -31,6 +32,14 @@ stdenv.mkDerivation rec { hash = "sha256-uSi2/pZiST07YutU8SHNoY2LifEQhohQeyaH9spyG2s="; }; + patches = [ + # Fixes building when nanohttp is not enabled in libxml2, which is the default since libxml2 2.13. + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c.diff"; + hash = "sha256-2TF1KDUxJtSMTDze2/dOJQRkW8S1GA9OyFpYzYeKpjQ="; + }) + ]; + postPatch = '' # Fix cross-compilation substituteInPlace configure.ac \ diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 0d01b05e223b7..ef9b3d2821569 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchurl, libkrb5 }: +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + libkrb5, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgssglue"; - version = "0.4"; + version = "0.9"; - src = fetchurl { - url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${pname}-${version}.tar.gz"; - sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z"; + src = fetchFromGitLab { + owner = "gsasl"; + repo = "libgssglue"; + rev = "tags/libgssglue-${finalAttrs.version}"; + hash = "sha256-p9dujLklv2ZC1YA1gKGCRJf9EvF3stv5v4Z/5m1nSeM="; }; + nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + touch ChangeLog + sed s:/etc/gssapi_mech.conf:$out/etc/gssapi_mech.conf: -i src/g_initialize.c ''; @@ -27,4 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; }; -} +}) diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index e2b4ce381b7fb..d25335c891572 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { mainProgram = "handy-0.0-demo"; homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index cdff03fc09aec..b3f22bb2b51fa 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -17,12 +17,13 @@ , imagemagick , imlib2Full , imv +, python3Packages , vips }: stdenv.mkDerivation rec { pname = "libheif"; - version = "1.17.6"; + version = "1.18.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-pp+PjV/pfExLqzFE61mxliOtVAYOePh1+i1pwZxDLAM="; + sha256 = "sha256-3au6xCJd1kP6qJI6TBeWJ2ittCqE0QvmSYxWYcgPOcw="; }; nativeBuildInputs = [ @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit gimp imagemagick imlib2Full imv vips; + inherit (python3Packages) pillow-heif; }; meta = { diff --git a/pkgs/development/libraries/libhsts/default.nix b/pkgs/development/libraries/libhsts/default.nix index 967ffe5631726..124b1fc5496c8 100644 --- a/pkgs/development/libraries/libhsts/default.nix +++ b/pkgs/development/libraries/libhsts/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { mainProgram = "hsts"; homepage = "https://gitlab.com/rockdaboot/libhsts"; license = with licenses; [ mit bsd3 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 59cacfc4466e8..916d6d0ad6871 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.42"; src = fetchurl { - url = "mirror://gnu/libidn/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "mirror://gnu/libidn/libidn-${finalAttrs.version}.tar.gz"; sha256 = "sha256-1sGZ3NgG5P4nk2DLSwg0mg05Vg7VSP/RzK3ajN7LRyM="; }; diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock index 8e542f3586935..4925fc1a9e31a 100644 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -28,15 +28,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "c_test" @@ -48,12 +48,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cfg-if" @@ -63,9 +60,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -97,9 +94,9 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "fallible_collections" @@ -112,9 +109,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -131,7 +128,7 @@ dependencies = [ [[package]] name = "imagequant" -version = "4.3.0" +version = "4.3.1" dependencies = [ "arrayvec", "lodepng", @@ -152,9 +149,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "lodepng" @@ -171,9 +168,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -186,27 +183,27 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -233,9 +230,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f" dependencies = [ "proc-macro2", "quote", @@ -244,9 +241,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -266,18 +263,18 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index e4d3f4d0fe01a..f4e3512bdb768 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -14,16 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "libimagequant"; rev = version; - hash = "sha256-/gHe3LQaBWOQImBesKvHK46T42TtRld988wgxbut4i0="; + hash = "sha256-dau+oGwcyN7AA1jEBtCgYV/cmrx5Wo3koKXbloYagrw="; }; cargoLock = { + # created it by running `cargo update` in the source tree. lockFile = ./Cargo.lock; }; diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index d01407b43d0f0..3d73ace3c925a 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Inotify shim for macOS and BSD"; homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 4f7e652e9bb8d..1628cb679d22c 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.26.0"; + version = "1.26.1"; outputs = [ "bin" "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-mlxw4OUjaAdgRLFfPKMZDMOWosW9yKAkzDccwuLGCwQ="; + hash = "sha256-3iWKqg9HSicocDAyp1Lk87nBbj+Slg1/e1VKEOIQkyQ="; }; patches = [ diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index c5e0c55854e60..fbf4f4b648082 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { notification facilities ''; license = licenses.zlib; - maintainers = []; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 33fb21237e411..79a419451de22 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { mainProgram = "jcat-tool"; homepage = "https://github.com/hughsie/libjcat"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 6b1c80c6db2a3..ce73a59553546 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,6 +1,9 @@ -{ lib, stdenv, fetchurl -, testers -, static ? false +{ + lib, + stdenv, + fetchurl, + testers, + static ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -9,21 +12,26 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; + hash = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; }; configureFlags = lib.optional static "--enable-static --disable-shared"; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ + "bin" + "dev" + "out" + "man" + ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { homepage = "https://www.ijg.org/"; description = "Library that implements the JPEG image file format"; - maintainers = with maintainers; [ ]; - license = licenses.free; + maintainers = with lib.maintainers; [ sigmanificient ]; + license = lib.licenses.free; pkgConfigModules = [ "libjpeg" ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 4e97ff2f4d5d5..f132a66560be4 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,47 +1,22 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, cmake -, argtable -, catch2 -, curl -, doxygen -, hiredis -, jsoncpp -, libmicrohttpd -}: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, argtable, catch2 +, curl, doxygen, hiredis, jsoncpp, libmicrohttpd }: stdenv.mkDerivation rec { pname = "libjson-rpc-cpp"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "cinemast"; repo = "libjson-rpc-cpp"; - sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w="; + sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ="; rev = "v${version}"; }; env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; - patches = [ - (fetchpatch { - name = "int-to-MHD_Result.patch"; - url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch"; - sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM="; - }) - ]; - nativeBuildInputs = [ pkg-config cmake doxygen ]; - buildInputs = [ - argtable - catch2 - curl - hiredis - jsoncpp - libmicrohttpd - ]; + + buildInputs = [ argtable catch2 curl hiredis jsoncpp libmicrohttpd ]; postPatch = '' for f in cmake/FindArgtable.cmake \ @@ -71,7 +46,9 @@ stdenv.mkDerivation rec { preInstall = '' function fixRunPath { p=$(patchelf --print-rpath $1) - q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + q="$p:${ + lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ] + }:$out/lib" patchelf --set-rpath $q $1 } @@ -98,5 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; platforms = platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with maintainers; [ robertrichter ]; }; } diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 1b0888348c594..4ae2657de9143 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.10.2"; + version = "0.10.3"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; rev = "v${version}"; - hash = "sha256-Ip/5fbzt6OfIrHJajnxEe14ppvX1hJ1FSJUBEE/h5YQ="; + hash = "sha256-zk/fI1C26K5WC9QBfzS6MqPT9PiR4wmWURjOOIiNsg4="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index de0e20d93ff2c..b08232605ce79 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -6,54 +6,72 @@ , pkg-config , glibc , openssl +, libepoxy +, libdrm +, pipewire +, virglrenderer , libkrunfw +, llvmPackages , rustc +, withGpu ? false +, withSound ? false +, withNet ? false , sevVariant ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libkrun"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; - rev = "refs/tags/v${version}"; - hash = "sha256-LIp2/794gbHPweBJcHCjbF0m+bJAs0SPF7WivW7fxLI="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-QzyNPThwbjPKANeZ4GAT9b4f8LTcjXnCiK+vzRkhM4c="; }; + outputs = [ "out" "dev" ]; + cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; - hash = "sha256-g4ceYi16mjEgvWTAQEW8ShT/e5IKnlgLgk49Mg0N2fQ="; + inherit (finalAttrs) pname version src; + hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; }; nativeBuildInputs = [ + llvmPackages.clang rustPlatform.cargoSetupHook cargo rustc - ] ++ lib.optionals sevVariant [ - pkg-config - ]; + ] ++ lib.optional (sevVariant || withGpu) pkg-config; buildInputs = [ (libkrunfw.override { inherit sevVariant; }) glibc glibc.static - ] ++ lib.optionals sevVariant [ - openssl - ]; + ] ++ lib.optionals withGpu [ libepoxy libdrm virglrenderer ] + ++ lib.optional withSound pipewire + ++ lib.optional sevVariant openssl; + + env.LIBCLANG_PATH = "${llvmPackages.clang-unwrapped.lib}/lib/libclang.so"; makeFlags = [ "PREFIX=${placeholder "out"}" - ] ++ lib.optionals sevVariant [ - "SEV=1" - ]; + ] ++ lib.optional withGpu "GPU=1" + ++ lib.optional withSound "SND=1" + ++ lib.optional withNet "NET=1" + ++ lib.optional sevVariant "SEV=1"; + + postInstall = '' + mkdir -p $dev/lib/pkgconfig + mv $out/lib64/pkgconfig $dev/lib/pkgconfig + mv $out/include $dev/include + ''; meta = with lib; { description = "Dynamic library providing Virtualization-based process isolation capabilities"; homepage = "https://github.com/containers/libkrun"; license = licenses.asl20; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao RossComputerGuy ]; platforms = libkrunfw.meta.platforms; }; -} +}) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 0485c82ffb41e..ef9e430011983 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -5,25 +5,27 @@ , flex , bison , bc +, cpio +, perl , elfutils , python3 , sevVariant ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; - rev = "refs/tags/v${version}"; - hash = "sha256-9oVl4mlJE7QHeehG86pbh7KdShZNUGwlnO75k/F/PQ0="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-LaIyPk9QkxPFP169r6PqyBMpFujbQBlX77z63OqKGYc="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.7.tar.xz"; - hash = "sha256-3hQ8th3Kp1bAX1b/NRRDFtgQYVgZUYoz40dU8GTEp9g="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.32.tar.xz"; + hash = "sha256-qqgk6vB/YZEdIrdf8JCkA8PdC9c+I5M+C7qLWXFDbOE="; }; postPatch = '' @@ -35,6 +37,8 @@ stdenv.mkDerivation rec { flex bison bc + cpio + perl python3 python3.pkgs.pyelftools ]; @@ -49,13 +53,16 @@ stdenv.mkDerivation rec { "SEV=1" ]; + # Fixes https://github.com/containers/libkrunfw/issues/55 + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.targetPlatform.isAarch64 "-march=armv8-a+crypto"; + enableParallelBuilding = true; meta = with lib; { description = "Dynamic library bundling the guest payload consumed by libkrun"; homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; - maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nickcao RossComputerGuy ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index 520c8568ebc17..4122d4f576171 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/pkgs/development/libraries/libks/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libks"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cSBtNOJfau+7wQ5iUs4hnqSMoo8XYN9opwPfox2ke+E="; + sha256 = "sha256-zKL+ukAdKiCC4wh55hnZpebFraIdKWDFsRfhVzhUNj0="; }; patches = [ diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index d33de73e40914..fdebb9d9dc274 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "CMS and X.509 access library"; mainProgram = "ksba-config"; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 634e52b97ab60..3698be42d5f62 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libksi"; - version = "3.21.3075"; + version = "3.21.3087"; src = fetchFromGitHub { owner = "Guardtime"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JEdjy91+8xJPNzjkumadT05SxcvtM551+SjLN1SQcAU="; + sha256 = "sha256-zEWxJpv0MeGUq/xkM26tDoauFyw53enGyWVhlX0jlYI="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/liblc3/default.nix b/pkgs/development/libraries/liblc3/default.nix index 3e1be4ba272ec..ff04d23cb0c63 100644 --- a/pkgs/development/libraries/liblc3/default.nix +++ b/pkgs/development/libraries/liblc3/default.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation { ninja ]; - # LTO does not work on Darwin: https://github.com/NixOS/nixpkgs/issues/19098 - mesonFlags = lib.optionals stdenv.isDarwin [ "-Db_lto=false" ]; - meta = with lib; { description = "LC3 (Low Complexity Communication Codec) is an efficient low latency audio codec"; homepage = "https://github.com/google/liblc3"; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index b91b6ea709adb..07f24f4d5a06a 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix index 8d695b2b9afd8..87a2458bdc8ce 100644 --- a/pkgs/development/libraries/libliftoff/default.nix +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -1,9 +1,17 @@ -{ callPackage, fetchFromGitLab, ... }: +{ + callPackage, + fetchFromGitLab, + fetchpatch, +}: let mkVariant = - version: hash: + { + version, + hash, + patches ? [ ], + }: callPackage ./generic.nix { - inherit version; + inherit version patches; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "emersion"; @@ -14,6 +22,21 @@ let }; in { - libliftoff_0_4 = mkVariant "0.4.1" "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY="; - libliftoff_0_5 = mkVariant "0.5.0" "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g="; + libliftoff_0_4 = mkVariant { + version = "0.4.1"; + hash = "sha256-NPwhsd6IOQ0XxNQQNdaaM4kmwoLftokV86WYhoa5csY="; + patches = [ + # Pull gcc-14 fix: + # https://gitlab.freedesktop.org/emersion/libliftoff/-/merge_requests/78 + (fetchpatch { + name = "libliftoff-gcc-14-calloc.patch"; + url = "https://gitlab.freedesktop.org/emersion/libliftoff/-/commit/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch"; + hash = "sha256-Y8x1RK3o/I9bs/ZOLeC4t9AIK78l0QnlBWHhiVC+sz8="; + }) + ]; + }; + libliftoff_0_5 = mkVariant { + version = "0.5.0"; + hash = "sha256-PcQY8OXPqfn8C30+GAYh0Z916ba5pik8U0fVpZtFb5g="; + }; } diff --git a/pkgs/development/libraries/libliftoff/generic.nix b/pkgs/development/libraries/libliftoff/generic.nix index 0f347a6a9b00e..5e846cd6eb2b4 100644 --- a/pkgs/development/libraries/libliftoff/generic.nix +++ b/pkgs/development/libraries/libliftoff/generic.nix @@ -3,11 +3,12 @@ , libdrm , version , src +, patches }: stdenv.mkDerivation (finalAttrs: { pname = "libliftoff"; - inherit version src; + inherit version src patches; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index c4b792e673fc5..a4a1e03e93ef0 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { jsoncpp libxml2 - (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc zxing-cpp @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen + (python3.withPackages (ps: [ ps.pystache ps.six ])) ]; strictDeps = true; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 993c090299bd1..97c48cfa2ca21 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, +}: stdenv.mkDerivation rec { pname = "liblscp"; - version = "0.9.4"; + version = "1.0.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; - sha256 = "sha256-8+3qHgIv32wfNHHggXID1W8M7pTqji4bHNGob3DTkho="; + sha256 = "sha256-ZaPfB3Veg1YCBHieoK9fFqL0tB4PiNsY81oJmn2rd/I="; }; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + postPatch = '' + # fix prefix to only appear once + substituteInPlace CMakeLists.txt \ + --replace-fail '"''${CONFIG_PREFIX}/' '"' + ''; - preConfigure = "make -f Makefile.git"; + nativeBuildInputs = [ + cmake + pkg-config + ]; enableParallelBuilding = true; @@ -19,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "http://www.linuxsampler.org"; description = "LinuxSampler Control Protocol (LSCP) wrapper library"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 8bbd6d9d9df03..7eb02d3ddd576 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Library to parse Matroska files"; homepage = "https://matroska.org/"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 1651d36710e61..9a944abbb1ecb 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-qAaCqJ2RX99gs10xYjL7BOvzb/8n/am9Of6KONPNPxI="; + sha256 = "sha256-Xm23LfQjriJb/oiXBp9t70D6qJMfRWuZ15uLTWZMZnE="; }; meta = with lib; { diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 672ba730be12b..6a4b0adfefb4f 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }: +{ lib, stdenv, fetchurl, cctools, disablePosixThreads ? false }: stdenv.mkDerivation rec { pname = "libmcrypt"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; - buildInputs = lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = lib.optional stdenv.isDarwin cctools; configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/libraries/libmicrohttpd/1.0.nix b/pkgs/development/libraries/libmicrohttpd/1.0.nix new file mode 100644 index 0000000000000..16a4f2ed884e4 --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/1.0.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl }: + +callPackage ./generic.nix (rec { + version = "1.0.1"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + hash = "sha256-qJ4J/JtN403eGfT8tPqqHOECmbmQjbETK7+h3keIK5Q="; + }; +}) diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix index 0af066c71238a..9427febbb6206 100644 --- a/pkgs/development/libraries/libmicrohttpd/generic.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,10 +1,6 @@ { lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }: -let - meta_ = meta; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmicrohttpd"; inherit version src; @@ -32,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libmicrohttpd/"; - maintainers = with maintainers; [ eelco vrthra fpletz ]; + maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.unix; - } // meta_; -} + } // meta; +}) diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 72fdbc4c02195..e76b528395ef3 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Library to send/receive data according to the Modbus protocol"; homepage = "https://libmodbus.org/"; license = licenses.lgpl21Plus; - platforms = platforms.unix; + platforms = with platforms; unix ++ windows; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index 7011f30bcf9d5..0769cf4b1c2ba 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { mainProgram = "modulemd-validator"; homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 289d5beac8d74..baada92d43405 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://libmpeg2.sourceforge.net/"; description = "Free library for decoding mpeg-2 and mpeg-1 video streams"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index 43d829b983421..daa66847b4082 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.viric ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index c178e152d2304..cdc4b4f077ad9 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libtool, pkg-config, automake, autoconf, intltool -, glib, gobject-introspection, gtk2, gtk-doc +, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk }: @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { feature is the possibility setting style properties from a CSS format file.''; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 655480f75a2ff..2e9f4bc2b8667 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "http://mypaint.org/"; description = "Library for making brushstrokes which is used by MyPaint and other projects"; license = licenses.isc; - maintainers = with maintainers; [ goibhniu jtojnar ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 3fb02abfb5337..1da5bf5a6de5a 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, libmnl }: +{ lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.7"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-zurqLNkhR9oZ8To1p/GkvCdn/4l+g45LR5z1S1nHd/Q="; + hash = "sha256-kSJ3T5aAk9XAus3dZ95IDzH6QHNAWn/AWKNLDzh67LM="; }; configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version"; @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmnl ]; + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { + url = "https://git.netfilter.org/libnftnl"; + rev-prefix = "libnftnl-"; + }; + meta = with lib; { description = "Userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; homepage = "https://netfilter.org/projects/libnftnl/"; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index 6a0c52c9e99a9..69ff6a6ebdc52 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.viric ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/development/libraries/libowlevelzs/default.nix index e3a4ffb11e8e8..6199dcca1bb84 100644 --- a/pkgs/development/libraries/libowlevelzs/default.nix +++ b/pkgs/development/libraries/libowlevelzs/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { description = "Zscheile Lowlevel (utility) library"; homepage = "https://github.com/fogti/libowlevelzs"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/development/libraries/libpam-wrapper/default.nix index 0701ae0fc55f5..6ea6229f4ddac 100644 --- a/pkgs/development/libraries/libpam-wrapper/default.nix +++ b/pkgs/development/libraries/libpam-wrapper/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv -, fetchgit -, cmake -, linux-pam -, enablePython ? false -, python ? null +{ + lib, + stdenv, + fetchgit, + cmake, + linux-pam, + substituteAll, + enablePython ? false, + python ? null, }: assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "libpam-wrapper"; - version = "1.1.3"; + version = "1.1.5"; src = fetchgit { url = "git://git.samba.org/pam_wrapper.git"; rev = "pam_wrapper-${version}"; - sha256 = "00mqhsashx7njrvxz085d0b88nizhdy7m3x17ip5yhvwsl63km6p"; + hash = "sha256-AtfkiCUvCxUfll6lOlbMyy5AhS5R2BGF1+ecC1VuwzM="; }; + patches = [ + (substituteAll { + src = ./python.patch; + siteDir = lib.optionalString enablePython python.sitePackages; + includeDir = lib.optionalString enablePython "include/${python.libPrefix}"; + }) + ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals enablePython [ python ]; # We must use linux-pam, using openpam will result in broken fprintd. diff --git a/pkgs/development/libraries/libpam-wrapper/python.patch b/pkgs/development/libraries/libpam-wrapper/python.patch new file mode 100644 index 0000000000000..0ddb05d26fa9f --- /dev/null +++ b/pkgs/development/libraries/libpam-wrapper/python.patch @@ -0,0 +1,38 @@ +diff --git a/cmake/Modules/FindPythonSiteLibs.cmake b/cmake/Modules/FindPythonSiteLibs.cmake +index ab2931e..08e2c98 100644 +--- a/cmake/Modules/FindPythonSiteLibs.cmake ++++ b/cmake/Modules/FindPythonSiteLibs.cmake +@@ -27,30 +27,9 @@ + + if (PYTHON_EXECUTABLE) + ### PYTHON_SITELIB +- execute_process( +- COMMAND +- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" +- OUTPUT_VARIABLE +- PYTHON_SITELIB_OUTPUT_VARIABLE +- RESULT_VARIABLE +- PYTHON_SITELIB_RESULT_VARIABLE +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if (NOT PYTHON_SITELIB_RESULT_VARIABLE) +- file(TO_CMAKE_PATH "${PYTHON_SITELIB_OUTPUT_VARIABLE}" PYTHON_SITELIB) +- endif () ++ file(TO_CMAKE_PATH "@siteDir@" PYTHON_SITELIB) ++ + + ### PYTHON_SITEINC +- execute_process( +- COMMAND +- ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(plat_specific=True, prefix=''))" +- OUTPUT_VARIABLE +- PYTHON_SITEINC_OUTPUT_VARIABLE +- RESULT_VARIABLE +- PYTHON_SITEINC_RESULT_VARIABLE +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- if (NOT PYTHON_SITEINC_RESULT_VARIABLE) +- file(TO_CMAKE_PATH "${PYTHON_SITEINC_OUTPUT_VARIABLE}" PYTHON_SITEINC) +- endif () ++ file(TO_CMAKE_PATH "@includeDir@" PYTHON_SITEINC) + endif (PYTHON_EXECUTABLE) diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix index 55faa7e628603..416fe1b29e556 100644 --- a/pkgs/development/libraries/libpanel/default.nix +++ b/pkgs/development/libraries/libpanel/default.nix @@ -1,23 +1,29 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gobject-introspection -, vala -, gi-docgen -, glib -, gtk4 -, libadwaita -, gnome +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + gobject-introspection, + vala, + gi-docgen, + glib, + gtk4, + libadwaita, + gnome, }: stdenv.mkDerivation rec { pname = "libpanel"; version = "1.6.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "out" + "dev" + "devdoc" + ]; + outputBin = "dev"; src = fetchurl { @@ -25,6 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-t3NJSjxpMANFzY4nAnRI0RiRgwJswTeAL4hkF8bqMLY="; }; + strictDeps = true; + + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja @@ -32,6 +42,7 @@ stdenv.mkDerivation rec { gobject-introspection vala gi-docgen + gtk4 # gtk4-update-icon-cache ]; buildInputs = [ @@ -40,9 +51,7 @@ stdenv.mkDerivation rec { libadwaita ]; - mesonFlags = [ - "-Dinstall-examples=true" - ]; + mesonFlags = [ (lib.mesonBool "install-examples" true) ]; postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. @@ -50,9 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; + updateScript = gnome.updateScript { packageName = pname; }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 3a46a88f880b1..9e1c6e94ee128 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.13.39"; + version = "8.13.40"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-NfKdOTb/P7RXyvSiTZ/15alw9sBjqoGSOys/kcIXGWg="; + hash = "sha256-3I+/oLJVbgOA+o8jHhOuHhD+0s7sgOghnW7DTMCllBU="; }; patches = [ diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index c8f678ccbb9f3..b9bcd3cd08e2b 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "6.338.2"; + version = "7.349.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - hash = "sha256-gE6yKnFvsOFh8bFYc7b+bS+zmdDU7jucr0HwhdDeFzU="; + hash = "sha256-mIjQvc7SRjE1Orb2BkHK+K1TcRQvzj2oUOCUT4DzIuA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index 1e0fa3160e5a1..fffac0b950372 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-+lsRYKA1FIXQXv0nfDNCAqIbqPunrzlpSC5FoF3VIsg="; + sha256 = "sha256-ZiqHkjpcR5OHJRiTVqlrJwST7vtPPG51trFthea2qlA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 9a69af13d2fd1..eeabf62e1c814 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libplist"; - version = "2.4.0"; + version = "2.6.0"; outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-bH40HSp76w56tlxO5M1INAW4wRR7O27AY4H/CyEcp+Y="; + hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 709ca6876048a..57c629783aa6f 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpointmatcher"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "norlab-ulaval"; repo = "libpointmatcher"; rev = version; - hash = "sha256-XXkvBxG9f8rW1O968+2R+gltMSRGqH225vOmzp6Tpb8="; + hash = "sha256-ewsU3aCFPeem1pJpqKaceMhL7SwTYOaYlcwOfMxwkSs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index a8fcd2581caa5..18927df1f1bc0 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -10,7 +10,6 @@ , libxslt , pkg-config , python3 -, valgrind , publicsuffix-list }: diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 9b2ff09850262..a608b6741b0c0 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.6.76"; src = fetchurl { - url = "http://www.five-ten-sg.com/libpst/packages/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "http://www.five-ten-sg.com/libpst/packages/libpst-${finalAttrs.version}.tar.gz"; hash = "sha256-PSkb7rvbSNK5NGCLwGGVtkHaY9Ko9eDThvLp1tBaC0I="; }; diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix index ff72711c8a75f..a7d7868f30b37 100644 --- a/pkgs/development/libraries/libqofono/default.nix +++ b/pkgs/development/libraries/libqofono/default.nix @@ -1,7 +1,8 @@ { lib , substituteAll , mkDerivation -, fetchFromGitLab +, fetchFromGitHub +, gitUpdater , mobile-broadband-provider-info , qmake , qtbase @@ -10,14 +11,13 @@ mkDerivation rec { pname = "libqofono"; - version = "0.103"; + version = "0.123"; - src = fetchFromGitLab { - domain = "git.sailfishos.org"; - owner = "mer-core"; + src = fetchFromGitHub { + owner = "sailfishos"; repo = "libqofono"; rev = version; - sha256 = "1ly5aj412ljcjvhqyry6nhiglbzzhczsy1a6w4i4fja60b2m1z45"; + hash = "sha256-Ml86wHejSDyR2ibamuzg14GZ5S7zHBgPC9K5G+sgtC0="; }; patches = [ @@ -48,11 +48,13 @@ mkDerivation rec { qtdeclarative ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Library for accessing the ofono daemon, and declarative plugin for it"; homepage = "https://git.sailfishos.org/mer-core/libqofono/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix deleted file mode 100644 index 17862e23b75bc..0000000000000 --- a/pkgs/development/libraries/libqtav/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, extra-cmake-modules -, qtbase -, qtmultimedia -, qttools -, libGL -, libX11 -, libass -, openal -, ffmpeg_4 -, libuchardet -, alsa-lib -, libpulseaudio -, libva -}: - -mkDerivation rec { - pname = "libqtav"; - version = "unstable-2020-09-10"; - - nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ - qtbase - qtmultimedia - libGL - libX11 - libass - openal - ffmpeg_4 - libuchardet - alsa-lib - libpulseaudio - libva - ]; - - src = fetchFromGitHub { - sha256 = "0qwrk40dihkbwmm7krz6qaqyn9v3qdjnd2k9b4s3a67x4403pib3"; - rev = "2a470d2a8d2fe22fae969bee5d594909a07b350a"; - repo = "QtAV"; - owner = "wang-bin"; - fetchSubmodules = true; - }; - - # Make sure libqtav finds its libGL dependency at both link and run time - # by adding libGL to rpath. Not sure why it wasn't done automatically like - # the other libraries as `libGL` is part of our `buildInputs`. - NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - preFixup = '' - mkdir -p "$out/bin" - cp -a "./bin/"* "$out/bin" - ''; - - stripDebugList = [ "lib" "libexec" "bin" "qml" ]; - - meta = with lib; { - description = "Multimedia playback framework based on Qt + FFmpeg"; - #license = licenses.lgpl21; # For the libraries / headers only. - license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. - homepage = "http://www.qtav.org/"; - maintainers = [ maintainers.jraygauthier ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 424022b7ab4bc..a747ad8eb8de3 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -1,6 +1,7 @@ { lib , stdenv , libxml2 +, curl , libxslt , pkg-config , cmake @@ -45,7 +46,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config cmake perl bison flex ]; - buildInputs = [ libxml2 libxslt ]; + buildInputs = [ + curl + libxml2 + libxslt + ]; meta = { description = "RDF Parser Toolkit"; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index f8350f7c4a53f..9629c0e961a90 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -127,10 +127,28 @@ in { libressl_3_8 = generic { version = "3.8.4"; hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0="; + + patches = [ + # Fixes build on ppc64 + # https://github.com/libressl/portable/pull/1073 + (fetchpatch { + url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch"; + hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw="; + }) + ]; }; libressl_3_9 = generic { version = "3.9.2"; hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c="; + + patches = [ + # Fixes build on ppc64 + # https://github.com/libressl/portable/pull/1073 + (fetchpatch { + url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch"; + hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw="; + }) + ]; }; } diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 4a95915d4205b..6ff2abb11de9a 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }: + yaml-cpp, gtest, capnproto, pkg-config, librime-lua, librime-octagram, + plugins ? [ librime-lua librime-octagram ] }: let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index e9a9eb977db3f..e8426b97cec50 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.58.1"; + version = "2.58.2"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-NyhZYpCoV20wXQbsiv30c1Fv7unf8i4DI16sQz1Wgk4="; + hash = "sha256-GOnXDAjPJfUNYQ1tWvVxVh1nz0F5+WLgQmZHXfbi4iQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-FIW92Cr83YkGTOe/xjyZGZvHYSrG70GBpHc9l0sMjLg="; + hash = "sha256-E0bXSxWI0MkJmNvl8gxklXHgy4zlkiee59+s0h4Gw5s="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 027cfa2b5c8be..aedcafd4ce73b 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "sass"; - repo = finalAttrs.pname; + repo = "libsass"; rev = finalAttrs.version; hash = "sha256-FkLL3OAJXDptRQY6ZkYbss2pcc40f/wasIvEIyHRQFo="; # Remove unicode file names which leads to different checksums on HFS+ diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index 19ba1f2b8911b..a8b2a98850dd9 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeCheckInputs = [ util-linuxMinimal which ]; - doCheck = true; + doCheck = !(stdenv.targetPlatform.useLLVM or false); # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. preFixup = "rm -rfv src"; diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index 11d10ff64d7c2..38f7d1c5d9340 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libserdes"; - version = "7.6.1"; + version = "7.7.0"; src = fetchFromGitHub { owner = "confluentinc"; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index d0e6e95ad0c7b..17783999b53c2 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-b1h1effy1gs40/RyfrGo0v6snL3AGOU/9fdyqGCPpEs="; + hash = "sha256-TMbNc/bYcVX2J2arY+WqzEc72aDONZBpMqz8g56WTAw="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index bdb6df0e52f89..95541c97eb89f 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "Library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 5bdaafc9f15c6..81f13acb340a6 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -5,7 +5,6 @@ , ninja , gdk-pixbuf , gd -, libjpeg , pkg-config }: stdenv.mkDerivation rec { @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SIXEL library for console graphics, and converter programs"; homepage = "https://github.com/libsixel/libsixel"; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index ac304ce31a048..044450c1825de 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.20"; src = fetchurl { - url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "https://download.libsodium.org/libsodium/releases/libsodium-${finalAttrs.version}.tar.gz"; hash = "sha256-67Ze9spDkzPCu0GgwZkFhyiNoH9sf9B8s6GMwY0wzhk="; }; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index d8c49efd43caa..a0f5cd610e34e 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.29"; + version = "0.7.30"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - hash = "sha256-867sCGFvKib1As9BCiCi6LYVrLUK0pjtM5Bw9Yuu0D8="; + hash = "sha256-De2lQu80MjKvjnN0W3/Y9JwFbA8g7tleflVXC9Lib5Y="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index b8d1fe45e44ee..98d184ae703c1 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -11,6 +11,7 @@ , proj , sqlite , libiconv +, zlib }: stdenv.mkDerivation rec { @@ -34,10 +35,11 @@ stdenv.mkDerivation rec { freexl geos librttopo - libxml2 + (libxml2.override { enableHttp = true; }) minizip proj sqlite + zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 65770cb657101..ad7dc331b018b 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, openssl, zlib, windows }: +{ lib +, stdenv +, fetchurl +, openssl +, zlib +, windows + +# for passthru.tests +, aria2 +, curl +, libgit2 +, mc +, vlc +}: stdenv.mkDerivation rec { pname = "libssh2"; @@ -27,6 +40,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; + passthru.tests = { + inherit aria2 libgit2 mc vlc; + curl = (curl.override { scpSupport = true; }).tests.withCheck; + }; + meta = with lib; { description = "Client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index e5a17b68e0831..abda8137f5c8f 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; description = "Library that provides cross platforms access to statistics about the running system"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index fae57569067ac..53ebe6f18e411 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; # Fixes 'Unknown CMake command "cnkalman_generate_code"' fetchSubmodules = true; - sha256 = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; + hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index 0406c3dbafb1a..a72bfc6f25d59 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: +{ lib, stdenv, fetchurl, installShellFiles, pkg-config, libdatrie }: stdenv.mkDerivation rec { pname = "libthai"; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 45b7e4caaf1dd..d529c22c9f670 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://www.theora.org/"; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 1457030f874cb..2a32900040d8b 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://www.libtom.net/LibTomCrypt/"; changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes"; license = with licenses; [ publicDomain wtfpl ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix deleted file mode 100644 index 6b4be4b832a44..0000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf -, zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration -}: - -let - version = "1.2.11"; - - # Make sure we override python, so the correct version is chosen - # for the bindings, if overridden - boostPython = boost.override { enablePython = true; inherit python; }; - -in stdenv.mkDerivation { - pname = "libtorrent-rasterbar"; - inherit version; - - src = fetchFromGitHub { - owner = "arvidn"; - repo = "libtorrent"; - rev = "v${version}"; - sha256 = "05qm8mcyxsnb6zb8nckln1gkk8ncwzfhsz7d7p3fhx6gdsc8j71b"; - }; - - enableParallelBuilding = true; - - nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - - buildInputs = [ boostPython openssl zlib python libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - - preConfigure = "./autotool.sh"; - - postInstall = '' - moveToOutput "include" "$dev" - moveToOutput "lib/${python.libPrefix}" "$python" - ''; - - outputs = [ "out" "dev" "python" ]; - - configureFlags = [ - "--enable-python-binding" - "--with-libiconv=yes" - "--with-boost=${boostPython.dev}" - "--with-boost-libdir=${boostPython.out}/lib" - ]; - - meta = with lib; { - homepage = "https://libtorrent.org/"; - description = "C++ BitTorrent implementation focusing on efficiency and scalability"; - license = licenses.bsd3; - maintainers = [ ]; - broken = stdenv.isDarwin; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix deleted file mode 100644 index 55c284987a9b5..0000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake -, zlib, boost, openssl, python, ncurses, SystemConfiguration -}: - -let - version = "2.0.10"; - - # Make sure we override python, so the correct version is chosen - boostPython = boost.override { enablePython = true; inherit python; }; - -in stdenv.mkDerivation { - pname = "libtorrent-rasterbar"; - inherit version; - - src = fetchFromGitHub { - owner = "arvidn"; - repo = "libtorrent"; - rev = "v${version}"; - sha256 = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ boostPython openssl zlib python ncurses ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - - patches = [ - # provide distutils alternative for python 3.12 - ./distutils.patch - ]; - - # https://github.com/arvidn/libtorrent/issues/6865 - postPatch = '' - substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \ - --replace 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \ - 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") - set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")' - substituteInPlace cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \ - --replace '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@ - ''; - - postInstall = '' - moveToOutput "include" "$dev" - moveToOutput "lib/${python.libPrefix}" "$python" - ''; - - postFixup = '' - substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" - ''; - - outputs = [ "out" "dev" "python" ]; - - cmakeFlags = [ - "-Dpython-bindings=on" - ]; - - meta = with lib; { - homepage = "https://libtorrent.org/"; - description = "C++ BitTorrent implementation focusing on efficiency and scalability"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch b/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch deleted file mode 100644 index 57c90b69808c0..0000000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt -index 2f4de4854..a68d547e6 100644 ---- a/bindings/python/CMakeLists.txt -+++ b/bindings/python/CMakeLists.txt -@@ -95,8 +95,13 @@ if (python-install-system-dir) - else() - execute_process( - COMMAND "${Python3_EXECUTABLE}" -c [=[ --import distutils.sysconfig --print(distutils.sysconfig.get_python_lib(prefix='', plat_specific=True)) -+try: -+ import distutils.sysconfig -+ print(distutils.sysconfig.get_python_lib(prefix='', plat_specific=True)) -+except ModuleNotFoundError: -+ import os, sys -+ version = f"{sys.version_info.major}.{sys.version_info.minor}" -+ print(os.sep.join(["lib", f"python{version}", "site-packages"])) - ]=] - OUTPUT_VARIABLE _PYTHON3_SITE_ARCH - OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index c8e00cf4a9419..bcf9270a7158e 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Terminal-emulator State Machine"; homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 642c39e5974a1..1b54ea948dd0c 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mainProgram = "uchardet"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index e865873c2851b..13ffffe6aa741 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,42 +1,56 @@ -{ fetchurl, lib, stdenv, libiconv, updateAutotoolsGnuConfigScriptsHook }: +{ + fetchurl, + lib, + stdenv, + libiconv, + updateAutotoolsGnuConfigScriptsHook, + darwin +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libunistring"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; - sha256 = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o="; + url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz"; + hash = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4="; }; - outputs = [ "out" "dev" "info" "doc" ]; + outputs = [ + "out" + "dev" + "info" + "doc" + ]; strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - configureFlags = [ - "--with-libiconv-prefix=${libiconv}" - ]; + configureFlags = [ "--with-libiconv-prefix=${libiconv}" ]; doCheck = false; - /* This seems to cause several random failures like these, which I assume - is because of bad or missing target dependencies in their build system: + /* + This seems to cause several random failures like these, which I assume + is because of bad or missing target dependencies in their build system: - ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory - FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1) + ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory + FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1) - FAIL: unistdio/test-u16-vasnprintf3.sh - ====================================== + FAIL: unistdio/test-u16-vasnprintf3.sh + ====================================== - ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory - FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1) + ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory + FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1) */ enableParallelChecking = false; enableParallelBuilding = true; @@ -72,4 +86,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 066f23cf542aa..5905798ee8808 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation { homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 7999fa4971877..1f7074866d589 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE="; }; + patches = lib.optional (stdenv.targetPlatform.useLLVM or false) (fetchpatch { + url = "https://github.com/libunwind/libunwind/pull/770/commits/a69d0f14c9e6c46e82ba6e02fcdedb2eb63b7f7f.patch"; + hash = "sha256-9oBZimCXonNN++jJs3emp9w+q1aj3eNzvSKPgh92itA="; + }); + postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then '' substituteInPlace configure.ac --replace "-lgcc_s" "" '' else lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/development/libraries/libusbgx/default.nix index 1f6e8f1697729..dacaf6d42da9e 100644 --- a/pkgs/development/libraries/libusbgx/default.nix +++ b/pkgs/development/libraries/libusbgx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, bash-completion, pkg-config, libconfig, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub, pkg-config, libconfig, autoreconfHook }: stdenv.mkDerivation { pname = "libusbgx"; version = "unstable-2021-10-31"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { lgpl21Plus # library gpl2Plus # examples ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix deleted file mode 100644 index 33c821302cb2e..0000000000000 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, libplist -, libimobiledevice-glue -}: - -stdenv.mkDerivation rec { - pname = "libusbmuxd"; - version = "2.0.2+date=2023-04-30"; - - src = fetchFromGitHub { - owner = "libimobiledevice"; - repo = pname; - rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb"; - hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - libplist - libimobiledevice-glue - ]; - - preAutoreconf = '' - export RELEASE_VERSION=${version} - ''; - - meta = with lib; { - description = "Client library to multiplex connections from and to iOS devices"; - homepage = "https://github.com/libimobiledevice/libusbmuxd"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 82a37d0434d0a..a4254921e179d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; pkgConfigModules = [ "libuv" ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index aad42d7e51f80..c4decf850cf3b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = finalAttrs.version; - sha256 = "sha256-X9H5nxbYFSMfxZMxs3iWwCgdrJ2FTVWW7tlgQek3WIg="; + sha256 = "sha256-0eOYxyMt2M2lkhoWOhoUQgP/1LYY3QQqSF5TdRUuCbs="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/development/libraries/libvarlink/default.nix index 0efca00a3e100..28a80052def87 100644 --- a/pkgs/development/libraries/libvarlink/default.nix +++ b/pkgs/development/libraries/libvarlink/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "varlink"; - repo = finalAttrs.pname; + repo = "libvarlink"; rev = finalAttrs.version; sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE="; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 67d1f22dcae9f..d7aac099b821a 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,7 +9,6 @@ , dnsmasq , docutils , fetchFromGitLab -, fetchpatch , gettext , glib , gnutls @@ -115,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "10.4.0"; + version = "10.5.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-grQyILVy0IYbbz/Wau8QRfCub7j+5nhnkfs2tprfpO0="; + hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index 265e19a1ae77b..b350592147bca 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ gpl3 lgpl3 ]; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; + broken = true; }; } diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix deleted file mode 100644 index 643dcb4d8f401..0000000000000 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, perl, yasm -, vp8DecoderSupport ? true # VP8 decoder -, vp8EncoderSupport ? true # VP8 encoder -, vp9DecoderSupport ? true # VP9 decoder -, vp9EncoderSupport ? true # VP9 encoder -, extraWarningsSupport ? false # emit non-fatal warnings -, werrorSupport ? false # treat warnings as errors (not available with all compilers) -, debugSupport ? false # debug mode -, gprofSupport ? false # gprof profiling instrumentation -, gcovSupport ? false # gcov coverage instrumentation -, sizeLimitSupport ? true # limit max size to allow in the decoder -, optimizationsSupport ? true # compiler optimization flags -, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime -, thumbSupport ? false # build arm assembly in thumb mode -, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) -, debugLibsSupport ? false # include debug version of each library -, postprocSupport ? true # postprocessing -, multithreadSupport ? true # multithreaded decoding & encoding -, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) -, spatialResamplingSupport ? true # spatial sampling (scaling) -, realtimeOnlySupport ? false # build for real-time encoding -, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding -, errorConcealmentSupport ? false # decoder conceals losses -, smallSupport ? false # favor smaller binary over speed -, postprocVisualizerSupport ? false # macro block/block level visualizers -, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests -, webmIOSupport ? true # input from and output to webm container -, libyuvSupport ? true # libyuv -, decodePerfTestsSupport ? false # build decoder perf tests with unit tests -, encodePerfTestsSupport ? false # build encoder perf tests with unit tests -, multiResEncodingSupport ? false # multiple-resolution encoding -, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising -, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range -, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 -# Experimental features -, experimentalSpatialSvcSupport ? false # Spatial scalable video coding -, experimentalFpMbStatsSupport ? false -, experimentalEmulateHardwareSupport ? false -}: - -let - inherit (stdenv) is64bit isMips isDarwin isCygwin; - inherit (lib) enableFeature optional optionals; -in - -assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; -assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; -/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. - Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, - but is only executed if spatialResamplingSupport is enabled */ -assert spatialResamplingSupport; -assert postprocVisualizerSupport -> postprocSupport; -assert unitTestsSupport -> curl != null && coreutils != null; -assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); -assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; - -stdenv.mkDerivation rec { - pname = "libvpx"; - version = "1.8.2"; - - src = fetchFromGitHub { - owner = "webmproject"; - repo = "libvpx"; - rev = "v${version}"; - sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr"; - }; - - patches = [ -# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch - ]; - - postPatch = '' - patchShebangs --build \ - build/make/*.sh \ - build/make/*.pl \ - build/make/*.pm \ - test/*.sh \ - configure - ''; - - outputs = [ "bin" "dev" "out" ]; - setOutputFlags = false; - - configurePlatforms = []; - configureFlags = [ - (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") - (enableFeature vp8EncoderSupport "vp8-encoder") - (enableFeature vp8DecoderSupport "vp8-decoder") - (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") - (enableFeature vp9EncoderSupport "vp9-encoder") - (enableFeature vp9DecoderSupport "vp9-decoder") - (enableFeature extraWarningsSupport "extra-warnings") - (enableFeature werrorSupport "werror") - "--disable-install-docs" - (enableFeature examplesSupport "install-bins") - "--enable-install-libs" - "--disable-install-srcs" - (enableFeature debugSupport "debug") - (enableFeature gprofSupport "gprof") - (enableFeature gcovSupport "gcov") - # Required to build shared libraries - (enableFeature (!isCygwin) "pic") - (enableFeature optimizationsSupport "optimizations") - (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") - (enableFeature thumbSupport "thumb") - "--enable-libs" - (enableFeature examplesSupport "examples") - "--disable-docs" - "--as=yasm" - # Limit default decoder max to WHXGA - (if sizeLimitSupport then "--size-limit=5120x3200" else null) - "--disable-codec-srcs" - (enableFeature debugLibsSupport "debug-libs") - (enableFeature isMips "dequant-tokens") - (enableFeature isMips "dc-recon") - (enableFeature postprocSupport "postproc") - (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") - (enableFeature multithreadSupport "multithread") - (enableFeature internalStatsSupport "internal-stats") - (enableFeature spatialResamplingSupport "spatial-resampling") - (enableFeature realtimeOnlySupport "realtime-only") - (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") - (enableFeature errorConcealmentSupport "error-concealment") - # Shared libraries are only supported on ELF platforms - (if isDarwin || isCygwin then - "--enable-static --disable-shared" - else - "--enable-shared") - (enableFeature smallSupport "small") - (enableFeature postprocVisualizerSupport "postproc-visualizer") - (enableFeature unitTestsSupport "unit-tests") - (enableFeature webmIOSupport "webm-io") - (enableFeature libyuvSupport "libyuv") - (enableFeature decodePerfTestsSupport "decode-perf-tests") - (enableFeature encodePerfTestsSupport "encode-perf-tests") - (enableFeature multiResEncodingSupport "multi-res-encoding") - (enableFeature temporalDenoisingSupport "temporal-denoising") - (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") - (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") - (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") - (enableFeature (experimentalSpatialSvcSupport || - experimentalFpMbStatsSupport || - experimentalEmulateHardwareSupport) "experimental") - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--enable-external-build" - # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) - # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure - # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.hostPlatform.config}${ - if stdenv.hostPlatform.isDarwin then - if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" - else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" - else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" - else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" - else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" - else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" - else "8" - else ""}-gcc" - (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") - ] # Experimental features - ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" - ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" - ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; - - nativeBuildInputs = [ perl yasm ]; - - buildInputs = [ ] - ++ optionals unitTestsSupport [ coreutils curl ]; - - NIX_LDFLAGS = [ - "-lpthread" # fixes linker errors - ]; - - enableParallelBuilding = true; - - postInstall = ''moveToOutput bin "$bin" ''; - - meta = with lib; { - description = "WebM VP8/VP9 codec SDK"; - homepage = "https://www.webmproject.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index f028a1ca73339..ef0929a841d81 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -72,7 +72,8 @@ let isGeneric = /**/ (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) - || stdenv.hostPlatform.parsed.cpu.name == "armv6l"; + || stdenv.hostPlatform.parsed.cpu.name == "armv6l" + || stdenv.hostPlatform.isRiscV; target = /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 184a48adf0ddd..f788a7f59b9c6 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -13,7 +13,6 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder # for passthru.tests -, freeimage , gd , graphicsmagick , haskellPackages diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 0263b25f3ba4d..3a6c0ca18edd4 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://www.libxl.com/"; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 6859caff61aa9..b5128c1180e4a 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; - rev = "RELEASE_${version}"; - hash = "sha256-bJ0NMbK9c21YYdcg/TW3ePSDVi5hly6lSW7wXFskI8M="; + rev = "refs/tags/v${version}"; + hash = "sha256-GtH8324whOUizGZTzQtD53WTy4BNPnpTSkCX/iOIolQ="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 79fe8c9f52dac..be57d05910055 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, zlib +, fetchpatch , pkg-config , autoreconfHook , libintl @@ -20,26 +20,41 @@ , enableStatic ? !enableShared , gnome , testers +, enableHttp ? false }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxml2"; - version = "2.12.7"; + version = "2.13.2"; - outputs = [ "bin" "dev" "out" "doc" ] + outputs = [ "bin" "dev" "out" "devdoc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; outputMan = "bin"; src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y="; + url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz"; + hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM="; }; - # https://gitlab.gnome.org/GNOME/libxml2/-/issues/725 - postPatch = if stdenv.hostPlatform.isFreeBSD then '' - substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create - '' else null; + patches = [ + # Fix XInclude failing too aggresively. + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/772 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/a0330b53c8034bb79220e403e8d4ad8c23ef088f.patch"; + hash = "sha256-iVAgX8qNF0fw8GYUKsWduudjEuRMEOTAENAIFTjyRjU="; + }) + # Fix error handling + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch"; + hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI="; + }) + # Fix more error handling + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/e30cb632e734394ddbd7bd62b57cee3586424352.patch"; + hash = "sha256-C0ef17wTRC9rH0dKua/LJwwqTRI5W8sKWmvL7JxzT4o="; + }) + ]; strictDeps = true; @@ -59,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: rec { ]; propagatedBuildInputs = [ - zlib findXMLCatalogs ] ++ lib.optionals stdenv.isDarwin [ libiconv @@ -74,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: rec { (lib.withFeature icuSupport "icu") (lib.withFeature pythonSupport "python") (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") - ]; + ] ++ lib.optional enableHttp "--with-http"; installFlags = lib.optionals pythonSupport [ "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" @@ -95,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: rec { ''; preInstall = lib.optionalString pythonSupport '' - substituteInPlace python/libxml2mod.la --replace "$dev/${python.sitePackages}" "$py/${python.sitePackages}" + substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}" ''; postFixup = '' @@ -106,11 +120,10 @@ stdenv.mkDerivation (finalAttrs: rec { ''; passthru = { - inherit version; - pythonSupport = pythonSupport; + inherit pythonSupport; updateScript = gnome.updateScript { - packageName = pname; + packageName = "libxml2"; versionPolicy = "none"; }; tests = { diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 4cc4e2b15c43b..a90ae30fec1ee 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { mainProgram = "xb-tool"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 9ec4090f60f0b..5d55e242f0064 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index df04c749d07e8..10ee52a027a35 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxslt"; - version = "1.1.41"; + version = "1.1.42"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz"; - hash = "sha256-OtOSr5ERW3dA97UNIozBxfwTr8HafxbLAhORejf3G9o="; + hash = "sha256-hcpiysDUH8d9P2Az2p32/XPSDqL8GLCjYJ/7QRDhuus="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 240f771e49f19..0f99c86f93921 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { mainProgram = "ykclient"; homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix index 77e32c09de8f0..68d3b5ff27892 100644 --- a/pkgs/development/libraries/libyuv/default.nix +++ b/pkgs/development/libraries/libyuv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://chromium.googlesource.com/libyuv/libyuv.git"; rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable - sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; + hash = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 82f7f88b19a69..453722ccf49ba 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.10.1"; src = fetchurl { - url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "https://libzip.org/download/libzip-${finalAttrs.version}.tar.gz"; sha256 = "sha256-lmmuXf46xbOJdTbchGaodMjPLA47H90I11snOIQpk2M="; }; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 4b691ba3d8880..1f7e8fdf2c49b 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.13.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg="; + sha256 = "sha256-2W/p6p7YXqSNaVs8yPAnLQhbBVIQWEbUVnhx9edV5gI="; }; outputs = [ "out" "py" ]; @@ -29,21 +29,26 @@ stdenv.mkDerivation rec { # Not a propagatedBuildInput because only the $py output needs it; $out is # just the library itself (e.g. C/C++ headers). - buildInputs = [ + buildInputs = with python.pkgs; [ python + build + pathspec + pip + pydantic + scikit-build-core ]; env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); postBuild = '' pushd ../api/python - ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES + ${pyEnv.interpreter} -m build --no-isolation --wheel --skip-dependency-check --config-setting=--parallel=$NIX_BUILD_CORES popd ''; postInstall = '' pushd ../api/python - ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py + ${pyEnv.interpreter} -m pip install --prefix $py dist/*.whl popd ''; diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index abb52eb5f0aa1..86c85e66ace25 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -4,9 +4,9 @@ , rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost , llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages, pandoc }: -assert doCheck -> mpiSupport != true; -assert openclSupport -> cudaSupport != true; -assert cudaSupport -> openclSupport != true; +assert doCheck -> !mpiSupport; +assert openclSupport -> !cudaSupport; +assert cudaSupport -> !openclSupport; stdenv.mkDerivation rec { pnameBase = "lightgbm"; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 0832ef5c6caf2..c52b7085796cc 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/arangodb/linenoise-ng"; description = "Small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.all; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index b3b1d7059d81b..c8af5c6baf33e 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, codec2 }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake }: let dataVersion = "191005_v1.0"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index bd78a4329a597..c9597f8320cb6 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,6 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, librdf_raptor2, ladspaH, openssl, zlib -, doCheck ? config.doCheckByDefault or false, ladspaPlugins +, librdf_raptor2, doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/development/libraries/luabridge/default.nix index b2f4db56f66ee..16f8841f89c3f 100644 --- a/pkgs/development/libraries/luabridge/default.nix +++ b/pkgs/development/libraries/luabridge/default.nix @@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md"; platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 0a907bf4d2858..0d34c42b81221 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "lyra"; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 8bb245342ca54..ca58c20eab9b6 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index dddd224ca6faa..ed7406cc52b72 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { description = "Simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; homepage = "http://libmailcore.com"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 0428dd585c661..cd13cc850a15d 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { python3 sqlite zlib - libxml2 + (libxml2.override { enableHttp = true; }) postgresql protozero sparsehash diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix index b173498189d6e..901b26f4e646a 100644 --- a/pkgs/development/libraries/maui-core/default.nix +++ b/pkgs/development/libraries/maui-core/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , mkDerivation , libcanberra , pulseaudio diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix index 89038628f2f91..c172fbf3139e0 100644 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, autoPatchelfHook , alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib -, libva, libvdpau, addOpenGLRunpath +, libva, libvdpau, addDriverRunpath }: stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.27.0"; + version = "0.29.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-JGYZ+Rodvyo/PkQfuW7xM0aIa3Gql75TwRUU1yZHJJ8="; + hash = "sha256-umseIESdiiefQReycc2W8gsurxlpFHfAgV0YdXl1hZE="; }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; appendRunpaths = lib.makeLibraryPath [ - libva libvdpau addOpenGLRunpath.driverLink + libva libvdpau addDriverRunpath.driverLink ]; installPhase = '' diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 55ae2c8d9899e..7c987f6422691 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,9 +1,7 @@ -{ autoreconfHook -, cmake +{ cmake , fetchFromGitLab , mediastreamer , openh264 -, pkg-config , lib , stdenv }: diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index b42403d10aee3..1a60c136be568 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -1,14 +1,18 @@ { lib, fetchurl }: +# When updating this package, please verify at least these build (assuming x86_64-linux): +# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa +# Ideally also verify: +# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.1.2"; + version = "24.1.4"; src = fetchurl { urls = [ "https://archive.mesa3d.org/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - hash = "sha256-osWEyNV9O9i6EXkKbprjcT+IId+WwFm3ivsp3Zdcn0U="; + hash = "sha256-fPfG9mUmOtASKInB1LB2ZUwe7ep6LzjGnIxRV5k3reE="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 43aa88034168e..2266716bd9dae 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,6 +6,7 @@ , expat , fetchCrate , fetchurl +, fetchpatch , file , flex , glslang @@ -93,9 +94,6 @@ , makeSetupHook }: -# When updating this package, please verify at least these build (assuming x86_64-linux): -# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa - let rustDeps = [ { @@ -140,6 +138,13 @@ in stdenv.mkDerivation { patches = [ ./opencl.patch + + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533 + (fetchpatch { + name = "ffmpeg.patch"; + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/241f70e5a13bb9c13a168282446ad074e16c3d74.patch"; + hash = "sha256-Cx7OL8iXGAOuDbCQReCCxSrWYvfZVrGoP0txIKSLTvs="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 4d06613f1de8e..ebb0f28897384 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index baf6a4f687a43..fde280137e749 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "zlib-ng"; - repo = finalAttrs.pname; + repo = "minizip-ng"; rev = finalAttrs.version; hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c="; }; diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/development/libraries/mitama-cpp-result/default.nix index 7700483529a9b..69d910e3bd991 100644 --- a/pkgs/development/libraries/mitama-cpp-result/default.nix +++ b/pkgs/development/libraries/mitama-cpp-result/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { (like Result and Option in Programming Language Rust). ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index e70269bc8d28e..26066ac044fb5 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org/"; license = with licenses; [ lgpl21Plus gpl2Plus ]; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix index a17e7f8d037f6..5659043e2f626 100644 --- a/pkgs/development/libraries/mongocxx/default.nix +++ b/pkgs/development/libraries/mongocxx/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, pkgs , fetchFromGitHub , mongoc , openssl @@ -7,23 +7,26 @@ , cmake , validatePkgConfig , testers +, darwin }: +let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in + stdenv.mkDerivation (finalAttrs: { pname = "mongocxx"; - version = "3.8.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-cxx-driver"; rev = "refs/tags/r${finalAttrs.version}"; - hash = "sha256-fBZg69jsvXzhllpcPBGXkjYyvUQImnGNkb2Ek5Oi0p4="; + hash = "sha256-nGLE0vyCe3PaNJf3duXdBfAhTdRvdeQ+OCwcaSDxi5Y="; }; postPatch = '' - substituteInPlace src/bsoncxx/config/CMakeLists.txt \ - src/mongocxx/config/CMakeLists.txt \ - --replace "\\\''${prefix}/" "" + substituteInPlace src/bsoncxx/cmake/libbsoncxx.pc.in \ + src/mongocxx/cmake/libmongocxx.pc.in \ + --replace "\''${prefix}/" "" ''; nativeBuildInputs = [ @@ -35,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { mongoc openssl cyrus_sasl - ]; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" @@ -49,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Official C++ client library for MongoDB"; homepage = "http://mongocxx.org"; license = licenses.asl20; - maintainers = with maintainers; [ adriandole ]; + maintainers = with maintainers; [ adriandole vcele ]; pkgConfigModules = [ "libmongocxx" "libbsoncxx" ]; platforms = platforms.all; badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14 diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 4601e04f03c95..d2cd26f38bf66 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "High-performance, high-quality video filters for the GPU"; homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix index 687abab7d45b9..1041100f9f8eb 100644 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ kaction ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; }; } diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index bb7f9f5807d69..a4716a47bb1bc 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -21,11 +21,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-IzMbIpnyh8NBlyftwt+JItfnq7uf0Kx04DuZZvmtQtc="; + sha256 = "sha256-iD9bs66r9ifLhJLKAqA7GR0Jg2u+D1mdhQg1EXl4HUE="; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix index 63a712b0881e3..3d8cae18ace05 100644 --- a/pkgs/development/libraries/msgpack-c/default.nix +++ b/pkgs/development/libraries/msgpack-c/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msgpack-c"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "refs/tags/c-${finalAttrs.version}"; - hash = "sha256-BXnK7xNRdZvbSz7tERf/PDJkmxbqAC6trH+h36O/v6k="; + hash = "sha256-Tjgn9ayyPK1mKA4OBr7/VogSzJwh5RZR5BrMNadfqak="; }; strictDeps = true; diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 89665f2efc9af..ef4834b8c0058 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Http multipart parser implemented in C "; + description = "Http multipart parser implemented in C"; homepage = "https://github.com/iafonov/multipart-parser-c"; license = [ lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 24b4a18c70884..811f86b8b749a 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.5"; + version = "1.6.0"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-a1XX1tvXfrPCar9EGMXzxLg2bXJaK85t2Bd8CworwFk="; + hash = "sha256-oAy9/PjYTtnhD+zrMGgYPhjHwE5O7nB0j+1obbAymq8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 85bf4bee634e0..95b427a7bad39 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -11,6 +11,7 @@ , mouseSupport ? false, gpm , unicodeSupport ? true , testers +, binlore }: stdenv.mkDerivation (finalAttrs: { @@ -180,6 +181,17 @@ stdenv.mkDerivation (finalAttrs: { rm "$out"/lib/*.a ''; + # I'm not very familiar with ncurses, but it looks like most of the + # exec here will run hard-coded executables. There's one that is + # dynamic, but it looks like it only comes from executing a terminfo + # file, so I think it isn't going to be under user control via CLI? + # Happy to have someone help nail this down in either direction! + # The "capability" is 'iprog', and I could only find 1 real example: + # https://invisible-island.net/ncurses/terminfo.ti.html#tic-linux-s + passthru.binlore.out = binlore.synthesize ncurses '' + execer cannot bin/{reset,tput,tset} + ''; + meta = with lib; { homepage = "https://www.gnu.org/software/ncurses/"; description = "Free software emulation of curses in SVR4 and more"; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 485c803d4cbea..243c9b81bbe11 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { pname = "neardal"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; homepage = "https://01.org/linux-nfc"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index d8b439847ad47..dbed519662fee 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; + hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; }; strictDeps = true; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 0796e7997d507..65e8b6f46dfd7 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -52,6 +52,11 @@ in stdenv.mkDerivation rec { inherit mpiSupport mpi; }; + env.NIX_CFLAGS_COMPILE = + # Suppress incompatible function pointer errors when building with newer versions of clang 16. + # tracked upstream here: https://github.com/Unidata/netcdf-c/issues/2715 + lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + configureFlags = [ "--enable-netcdf-4" "--enable-dap" diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 1e6f8de2d5890..15a834709806b 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { changelog = "https://pagure.io/newt/blob/master/f/CHANGES"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 0fe8f1d88d513..fbe3e2a92f150 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.61.0"; + version = "1.62.1"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Toz37DLUxaQwlmJC1yA10lXNlHCodm1h7tegGQ3VRP0="; + sha256 = "sha256-OWbsgv2n/DgFBtNyomDY2bbpRr5N6u8f7MGnS0gJrj0="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; @@ -60,6 +60,10 @@ stdenv.mkDerivation rec { (lib.enableFeature enableHttp3 "http3") ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + "-faligned-allocation" + ]); + # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; nativeCheckInputs = lib.optionals (enableTests) [ cunit tzdata ]; diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index 95c9aa0e19976..2473ee1dd4d81 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.90.2"; - hash = "sha256-4r/LhKilkSeEhw/rl2IRAn5xMJ74W5ACg7fX0e4GQxA="; + version = "3.101.1"; + hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index b0a633869abc7..7ef488cca4c1e 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -7,7 +7,7 @@ , zlib , sqlite , ninja -, darwin +, cctools , fixDarwinDylibNames , buildPackages , useP11kit ? true @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames ]; buildInputs = [ zlib sqlite ]; @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load_3.85+.patch ./fix-cross-compilation.patch - ] ++ lib.optionals (lib.versionOlder version "3.91") [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 - # https://phabricator.services.mozilla.com/D180068 - ./remove-c25519-support.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 63a7d2c879edb..22eca6fec1098 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.101.1"; - hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; + version = "3.103"; + hash = "sha256-e57HN50lHT4+nkdZPyixpWFyTD0c+xZBk23BhmIumV8="; } diff --git a/pkgs/development/libraries/nss/remove-c25519-support.patch b/pkgs/development/libraries/nss/remove-c25519-support.patch deleted file mode 100644 index d5dba016278f2..0000000000000 --- a/pkgs/development/libraries/nss/remove-c25519-support.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 74e8e65..aa9dd95 100644 ---- nss/lib/freebl/Makefile -+++ nss/lib/freebl/Makefile -@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc) - HAVE_INT128_SUPPORT = 1 - DEFINES += -DHAVE_INT128_SUPPORT - else ifeq (1,$(CC_IS_GCC)) -- SUPPORTS_VALE_CURVE25519 = 1 - ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) - HAVE_INT128_SUPPORT = 1 - DEFINES += -DHAVE_INT128_SUPPORT -@@ -593,11 +592,6 @@ ifndef HAVE_INT128_SUPPORT - DEFINES += -DKRML_VERIFIED_UINT128 - endif - --ifdef SUPPORTS_VALE_CURVE25519 -- VERIFIED_SRCS += Hacl_Curve25519_64.c -- DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM --endif -- - ifndef NSS_DISABLE_CHACHAPOLY - ifeq ($(CPU_ARCH),x86_64) - ifndef NSS_DISABLE_AVX2 -diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp -index 65f9a80..23940ef 100644 ---- nss/lib/freebl/freebl.gyp -+++ nss/lib/freebl/freebl.gyp -@@ -866,12 +866,6 @@ - }], - ], - }], -- [ 'supports_vale_curve25519==1', { -- 'defines': [ -- # The Makefile does version-tests on GCC, but we're not doing that here. -- 'HACL_CAN_COMPILE_INLINE_ASM', -- ], -- }], - [ 'OS=="linux" or OS=="android"', { - 'conditions': [ - [ 'target_arch=="x64"', { -@@ -934,11 +928,6 @@ - 'variables': { - 'module': 'nss', - 'conditions': [ -- [ 'target_arch=="x64" and cc_is_gcc==1', { -- 'supports_vale_curve25519%': 1, -- }, { -- 'supports_vale_curve25519%': 0, -- }], - [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', { - 'have_int128_support%': 1, - }, { -diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi -index d198c44..34b6b3c 100644 ---- nss/lib/freebl/freebl_base.gypi -+++ nss/lib/freebl/freebl_base.gypi -@@ -151,11 +151,6 @@ - 'ecl/curve25519_32.c', - ], - }], -- ['supports_vale_curve25519==1', { -- 'sources': [ -- 'verified/Hacl_Curve25519_64.c', -- ], -- }], - ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', { - 'sources': [ - # Gyp does not support per-file cflags, so working around like this. diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 3c1a2b33b18f0..9bec1886abb64 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nss_wrapper"; - version = "1.1.15"; + version = "1.1.16"; src = fetchurl { url = "mirror://samba/cwrap/nss_wrapper-${version}.tar.gz"; - sha256 = "sha256-Nvh0gypPIVjgT2mqd+VRXhbPbjv4GWjV3YSW231pBq0="; + sha256 = "sha256-3HmrByd5vkQDtFtgzQRN0TeA1LuWddJ6vxkyrafIqI0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index efa44385901ec..b2bd4de93f033 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2_3 }: +{ lib, stdenv, fetchFromGitHub, cmake, pandoc, pkg-config, icu, catch2_3 }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.1.5"; + version = "5.1.6"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - hash = "sha256-uE5OkjXawYf9O/SUA/SUaIhDydwGcD460+xO5Yoqa0w="; + hash = "sha256-U/lHSxpKsBnamf4ikE2aIjEPSU5fxjtuSmhZR0jxMAI="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pandoc pkg-config ]; buildInputs = [ catch2_3 ]; propagatedBuildInputs = [ icu ]; diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 92f447a32422e..786a11f482046 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -9,7 +9,7 @@ , gst_all_1 , nv-codec-headers-11 , libva -, addOpenGLRunpath +, addDriverRunpath }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - addOpenGLRunpath + addDriverRunpath ]; buildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; postFixup = '' - addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" + addDriverRunpath "$out/lib/dri/nvidia_drv_video.so" ''; meta = with lib;{ diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 0930b8904bdf8..2c092dd57b13e 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , ruby , opencl-headers -, addOpenGLRunpath , autoreconfHook , windows }: diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 6ab232ae42e90..92b943dbdf2f7 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "5.2.0"; + version = "5.3.0"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-2oM78YgP14oyFBWZ8KdHlGsN3hjoWTBcIvOI+93sSyM="; + sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch b/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch index 41a7cf54abaa6..0092ea4d1e8ef 100644 --- a/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch +++ b/pkgs/development/libraries/onnxruntime/0001-eigen-allow-dependency-injection.patch @@ -1,45 +1,20 @@ -From a29cffa646356228d6ec7bd7ce21fe3ab90fdd19 Mon Sep 17 00:00:00 2001 -From: Someone Serge <sergei.kozlukov@aalto.fi> -Date: Wed, 7 Feb 2024 16:59:09 +0000 -Subject: [PATCH] eigen: allow dependency injection - ---- - cmake/external/eigen.cmake | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake -index c0f7ddc50e..996b83d18a 100644 +index b123adb..aab2483 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake -@@ -1,4 +1,3 @@ -- - if (onnxruntime_USE_PREINSTALLED_EIGEN) - add_library(eigen INTERFACE) - file(TO_CMAKE_PATH ${eigen_SOURCE_PATH} eigen_INCLUDE_DIRS) -@@ -10,14 +9,21 @@ else () - URL ${DEP_URL_eigen} - URL_HASH SHA1=${DEP_SHA1_eigen} - PATCH_COMMAND ${Patch_EXECUTABLE} --ignore-space-change --ignore-whitespace < ${PROJECT_SOURCE_DIR}/patches/eigen/Fix_Eigen_Build_Break.patch -+ FIND_PACKAGE_ARGS NAMES Eigen3 - ) - else() - FetchContent_Declare( - eigen - URL ${DEP_URL_eigen} - URL_HASH SHA1=${DEP_SHA1_eigen} -+ FIND_PACKAGE_ARGS NAMES Eigen3 - ) - endif() +@@ -7,8 +7,13 @@ else () + eigen + URL ${DEP_URL_eigen} + URL_HASH SHA1=${DEP_SHA1_eigen} ++ FIND_PACKAGE_ARGS NAMES Eigen3 + ) + - FetchContent_Populate(eigen) - set(eigen_INCLUDE_DIRS "${eigen_SOURCE_DIR}") + FetchContent_MakeAvailable(eigen) + add_library(eigen ALIAS Eigen3::Eigen) -+ + # Onnxruntime doesn't always use `eigen` as a target in + # `target_link_libraries`, sometimes it just uses + # `target_include_directories`: + get_target_property(eigen_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) endif() --- -2.42.0 - diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 1a62114148f75..4eef69d925ee2 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -5,7 +5,11 @@ , Foundation , abseil-cpp , cmake +, cpuinfo , eigen +, flatbuffers_23 +, gbenchmark +, glibcLocales , gtest , libpng , nlohmann_json @@ -24,7 +28,7 @@ let - version = "1.16.3"; + version = "1.18.1"; stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; @@ -34,15 +38,15 @@ let howard-hinnant-date = fetchFromGitHub { owner = "HowardHinnant"; repo = "date"; - rev = "v2.4.1"; - sha256 = "sha256-BYL7wxsYRI45l8C3VwxYIIocn5TzJnBtU0UZ9pHwwZw="; + rev = "v3.0.1"; + sha256 = "sha256-ZSjeJKAcT7mPym/4ViDvIR9nFMQEBCSUtPEuMO27Z+I="; }; mp11 = fetchFromGitHub { owner = "boostorg"; repo = "mp11"; - rev = "boost-1.79.0"; - hash = "sha256-ZxgPDLvpISrjpEHKpLGBowRKGfSwTf6TBfJD18yw+LM="; + rev = "boost-1.82.0"; + hash = "sha256-cLPvjkf2Au+B19PJNrUkTW/VPxybi1MpPxnIl4oo4/o="; }; safeint = fetchFromGitHub { @@ -52,34 +56,34 @@ let hash = "sha256-PK1ce4C0uCR4TzLFg+elZdSk5DdPCRhhwT3LvEwWnPU="; }; - pytorch_cpuinfo = fetchFromGitHub { - owner = "pytorch"; - repo = "cpuinfo"; - # There are no tags in the repository - rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; - hash = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; - }; + pytorch_clog = effectiveStdenv.mkDerivation { + pname = "clog"; + version = "3c8b153"; + src = "${cpuinfo.src}/deps/clog"; - flatbuffers = fetchFromGitHub { - owner = "google"; - repo = "flatbuffers"; - rev = "v1.12.0"; - hash = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg="; + nativeBuildInputs = [ cmake gbenchmark gtest ]; + cmakeFlags = [ + "-DUSE_SYSTEM_GOOGLEBENCHMARK=ON" + "-DUSE_SYSTEM_GOOGLETEST=ON" + "-DUSE_SYSTEM_LIBS=ON" + # 'clog' tests set 'CXX_STANDARD 11'; this conflicts with our 'gtest'. + "-DCLOG_BUILD_TESTS=OFF" + ]; }; onnx = fetchFromGitHub { owner = "onnx"; repo = "onnx"; - rev = "refs/tags/v1.14.1"; - hash = "sha256-ZVSdk6LeAiZpQrrzLxphMbc1b3rNUMpcxcXPP8s/5tE="; + rev = "refs/tags/v1.16.1"; + hash = "sha256-I1wwfn91hdH3jORIKny0Xc73qW2P04MjkVCgcaNnQUE="; }; cutlass = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; - rev = "v3.0.0"; - sha256 = "sha256-YPD5Sy6SvByjIcGtgeGH80TEKg2BtqJWSg46RvnJChY="; - }; + rev = "v3.1.0"; + hash = "sha256-mpaiCxiYR1WaSSkcEPTzvcREenJWklD+HRdTT5/pD54="; + }; in effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; @@ -89,7 +93,7 @@ effectiveStdenv.mkDerivation rec { owner = "microsoft"; repo = "onnxruntime"; rev = "refs/tags/v${version}"; - hash = "sha256-bTW9Pc3rvH+c8VIlDDEtAXyA3sajVyY5Aqr6+SxaMF4="; + hash = "sha256-+zWtbLKekGhwdBU3bm1u2F7rYejQ62epE+HcHj05/8A="; fetchSubmodules = true; }; @@ -102,6 +106,13 @@ effectiveStdenv.mkDerivation rec { # - use MakeAvailable instead of the low-level Populate, # - use Eigen3::Eigen as the target name (as declared by libeigen/eigen). ./0001-eigen-allow-dependency-injection.patch + # Incorporate a patch that has landed upstream which exposes new + # 'abseil-cpp' libraries & modifies the 're2' CMakeLists to fix a + # configuration error that around missing 'gmock' exports. + # + # TODO: Check if it can be dropped after 1.19.0 + # https://github.com/microsoft/onnxruntime/commit/b522df0ae477e59f60acbe6c92c8a64eda96cace + ./update-re2.patch ] ++ lib.optionals cudaSupport [ # We apply the referenced 1064.patch ourselves to our nix dependency. # FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0 @@ -124,11 +135,14 @@ effectiveStdenv.mkDerivation rec { ]; buildInputs = [ + cpuinfo eigen + glibcLocales libpng - zlib nlohmann_json microsoft-gsl + pytorch_clog + zlib ] ++ lib.optionals pythonSupport (with python3Packages; [ numpy pybind11 @@ -144,6 +158,7 @@ effectiveStdenv.mkDerivation rec { libcufft # cufft.h cudnn # cudnn.h cuda_cudart + nccl ]); nativeCheckInputs = [ @@ -168,11 +183,11 @@ effectiveStdenv.mkDerivation rec { "-DFETCHCONTENT_QUIET=OFF" "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" "-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}" - "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers}" + "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers_23.src}" + "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=${gtest.src}" "-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}" "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" "-DFETCHCONTENT_SOURCE_DIR_ONNX=${onnx}" - "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}" "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}" "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" @@ -194,11 +209,13 @@ effectiveStdenv.mkDerivation rec { env = lib.optionalAttrs effectiveStdenv.cc.isClang { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" + "-Wno-error=deprecated-pragma" "-Wno-error=unused-but-set-variable" ]; }; - doCheck = !cudaSupport; + # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox + doCheck = !(cudaSupport || effectiveStdenv.buildPlatform.system == "aarch64-linux"); requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ]; diff --git a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch index 948de62e7e75a..ca94faab93942 100644 --- a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch +++ b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch @@ -1,8 +1,8 @@ diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake -index 9effd1a2db..faff5e8de7 100644 +index 775576a..ccea13c 100644 --- a/cmake/external/onnxruntime_external_deps.cmake +++ b/cmake/external/onnxruntime_external_deps.cmake -@@ -280,21 +280,12 @@ if (NOT WIN32) +@@ -367,22 +367,12 @@ if (NOT WIN32) endif() endif() @@ -12,6 +12,7 @@ index 9effd1a2db..faff5e8de7 100644 - URL ${DEP_URL_microsoft_gsl} - URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} - PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/gsl/1064.patch +- FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL - ) -else() - FetchContent_Declare( diff --git a/pkgs/development/libraries/onnxruntime/update-re2.patch b/pkgs/development/libraries/onnxruntime/update-re2.patch new file mode 100644 index 0000000000000..7996721f8e111 --- /dev/null +++ b/pkgs/development/libraries/onnxruntime/update-re2.patch @@ -0,0 +1,132 @@ +From 0d1e631c365944d54e87bdce39beb13b225ba8f8 Mon Sep 17 00:00:00 2001 +From: Changming Sun <chasun@microsoft.com> +Date: Thu, 23 May 2024 14:30:15 -0700 +Subject: [PATCH] Update RE2 to the latest (#20775) + +Update RE2 to the latest. + +To keep the components up to date. + +(cherry picked from commit b522df0ae477e59f60acbe6c92c8a64eda96cace) +--- + cgmanifests/generated/cgmanifest.json | 2 +- + cmake/deps.txt | 4 +-- + cmake/external/abseil-cpp.cmake | 35 ++++++++++++++++++++++----- + cmake/external/helper_functions.cmake | 6 +++++ + 4 files changed, 38 insertions(+), 9 deletions(-) + +diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json +index eb74178b3e..e3e9be67ae 100644 +--- a/cgmanifests/generated/cgmanifest.json ++++ b/cgmanifests/generated/cgmanifest.json +@@ -276,7 +276,7 @@ + "component": { + "type": "git", + "git": { +- "commitHash": "5723bb8950318135ed9cf4fc76bed988a087f536", ++ "commitHash": "2b354c6ad0d0479dcff68dab23fb0d1143a482c2", + "repositoryUrl": "https://github.com/google/re2.git" + }, + "comments": "re2" +diff --git a/cmake/deps.txt b/cmake/deps.txt +index d213b09034..d4d19dea08 100644 +--- a/cmake/deps.txt ++++ b/cmake/deps.txt +@@ -50,11 +50,11 @@ psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e9 + pthreadpool;https://github.com/Maratyszcza/pthreadpool/archive/4fe0e1e183925bf8cfa6aae24237e724a96479b8.zip;07a0aa91dd9bf86f31b95497e00f31d8a261a4bd + pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.zip;769b6aa67a77f17a770960f604b727645b6f6a13 + pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/959002f82d7962a473d8bf301845f2af720e0aa4.zip;85da3caa60eb2b148613b443fbc2bfdc30689965 +-re2;https://github.com/google/re2/archive/refs/tags/2022-06-01.zip;aa77313b76e91b531ee7f3e45f004c6a502a5374 ++re2;https://github.com/google/re2/archive/refs/tags/2024-05-01.tar.gz;206cfee5ee0b4c6844680ba66275e9e8faa77405 + safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac + tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381 + cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.1.0.zip;757f90a795034a89d4f48a79d1f009f7a04c8dee + utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156 + extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c + composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/5356c4a943a35e74d7cdc69486afcb8703b9a59a.zip;522382c2af437e09124287e5879ab64af5b2e299 +-directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e +\ No newline at end of file ++directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e +diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake +index 57cfbee464..c01195c99e 100644 +--- a/cmake/external/abseil-cpp.cmake ++++ b/cmake/external/abseil-cpp.cmake +@@ -45,10 +45,8 @@ endif() + + # TODO: since multiple ORT's dependencies depend on Abseil, the list below would vary from version to version. + # We'd better to not manually manage the list. +-set(ABSEIL_LIBS absl::base ++set(ABSEIL_LIBS + absl::city +-absl::core_headers +-absl::fixed_array + absl::flags + absl::flat_hash_map + absl::flat_hash_set +@@ -60,9 +58,34 @@ absl::node_hash_set + absl::optional + absl::raw_hash_set + absl::raw_logging_internal +-absl::span + absl::str_format +-absl::strings ++absl::str_format_internal ++absl::bits ++absl::fixed_array ++absl::numeric_representation ++absl::utility ++absl::type_traits ++absl::string_view ++absl::core_headers ++absl::nullability ++absl::span ++absl::config + absl::synchronization ++absl::base ++absl::civil_time ++absl::debugging_internal ++absl::demangle_internal ++absl::graphcycles_internal ++absl::int128 ++absl::kernel_timeout_internal ++absl::log_severity ++absl::malloc_internal ++absl::spinlock_wait ++absl::stacktrace ++absl::string_view ++absl::strings ++absl::strings_internal ++absl::symbolize + absl::throw_delegate +-absl::time) ++absl::time ++absl::time_zone) +\ No newline at end of file +diff --git a/cmake/external/helper_functions.cmake b/cmake/external/helper_functions.cmake +index 768e807b40..eefb3ba2e8 100644 +--- a/cmake/external/helper_functions.cmake ++++ b/cmake/external/helper_functions.cmake +@@ -159,7 +159,12 @@ macro(onnxruntime_fetchcontent_makeavailable) + endif() + + if(EXISTS ${__cmake_srcdir}/CMakeLists.txt) ++ set(CMAKE_SKIP_INSTALL_RULES TRUE) ++ if (__cmake_arg_SYSTEM) ++ add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} SYSTEM) ++ else() + add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} EXCLUDE_FROM_ALL) ++ endif() + get_property(subdir_import_targets DIRECTORY "${__cmake_srcdir}" PROPERTY BUILDSYSTEM_TARGETS) + foreach(subdir_target ${subdir_import_targets}) + if(TARGET ${subdir_target}) +@@ -176,6 +181,7 @@ macro(onnxruntime_fetchcontent_makeavailable) + set_target_properties(${subdir_target} PROPERTIES COMPILE_WARNING_AS_ERROR OFF) + endif() + endforeach() ++ set(CMAKE_SKIP_INSTALL_RULES FALSE) + endif() + + unset(__cmake_srcdir) +-- +2.45.2 + diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 0030b1cfa1713..c08053d6786b6 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,4 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake, perl, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, perl +, zlib +, libxml2 +, eigen +, python +, cairo +, pcre +, pkg-config +, swig +, rapidjson +, boost +, maeparser +, coordgenlibs +}: stdenv.mkDerivation rec { pname = "openbabel"; @@ -15,22 +32,23 @@ stdenv.mkDerivation rec { sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12 ''; - buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson ]; + buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson boost maeparser coordgenlibs ]; nativeBuildInputs = [ cmake pkg-config ]; - pythonMajorMinor = "${python.sourceVersion.major}.${python.sourceVersion.minor}"; - - cmakeFlags = [ - "-DRUN_SWIG=ON" - "-DPYTHON_BINDINGS=ON" - ]; + preConfigure = '' + cmakeFlagsArray+=( + "-DRUN_SWIG=ON" + "-DPYTHON_BINDINGS=ON" + "-DPYTHON_INSTDIR=$out/${python.sitePackages}" + ) + ''; # Setuptools only accepts PEP 440 version strings. The "unstable" identifier # can not be used. Instead we pretend to be the 3.2 beta release. postFixup = '' - cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py - from distutils.core import setup + cat << EOF > $out/${python.sitePackages}/setup.py + from setuptools import setup setup( name = 'pyopenbabel', diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 1c90cc386733f..b906be979f572 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -2,7 +2,6 @@ , stdenv , applyPatches , fetchFromGitHub -, fetchpatch , cmake , git , llvmPackages_14 @@ -54,26 +53,20 @@ let }; }; - version = "unstable-2023-06-12"; + version = "unstable-2024-06-06"; src = applyPatches { src = fetchFromGitHub { owner = "intel"; repo = "opencl-clang"; # https://github.com/intel/opencl-clang/compare/ocl-open-140 - rev = "cf95b338d14685e4f3402ab1828bef31d48f1fd6"; - hash = "sha256-To1RlQX9IJ+1zAwEXaW7ua3VNfjK9mu7pgsRPsfa8g8="; + rev = "66a54cbef6726c4e791986779a60d7a45b09c9c9"; + hash = "sha256-vM2IlF/e3b2GIXMaHYre+iQn4WKsFIU3x90Ee5KVHtI="; }; patches = [ # Build script tries to find Clang OpenCL headers under ${llvm} # Work around it by specifying that directory manually. ./opencl-headers-dir.patch - - # fix CMake throwing errors - (fetchpatch { - url = "https://github.com/intel/opencl-clang/commit/321e3b99c1a8d54c8475f5ae998452069cc5eb71.patch"; - hash = "sha256-cATbH+AMVtcabhl3EkzAH7w3wGreUV53hQYHVUUEP4g="; - }) ]; postPatch = '' @@ -111,7 +104,7 @@ stdenv.mkDerivation { homepage = "https://github.com/intel/opencl-clang/"; description = "Clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; license = licenses.ncsa; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; # error: invalid value 'CL3.0' in '-cl-std=CL3.0' broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 61ce9cff661ae..63098028fc64e 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://opencolorio.org"; description = "Color management framework for visual effects and animation"; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 06cc02c47c948..d59e6a6342d72 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config unzip ]; + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ @@ -78,7 +80,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = if enableUnfree then licenses.unfree else licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 3d2dc9b8f0e73..c179488464072 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://openimageio.org"; description = "Library and tools for reading and writing images"; license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 12b05df234d83..25b43b3600e95 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer +, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server , jdk diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 266b6900934ea..e25f0a8c172d8 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.6.7"; + version = "2.6.8"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-zXdfYlyUTteKPaGKA7A7CO6nPIqryXtBuzNumhCVSTA="; + hash = "sha256-SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4="; }; # TODO: separate "out" and "bin" diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 59f2d21d4c482..c695571ff1f81 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,136 +1,270 @@ -{ lib, stdenv, fetchurl, removeReferencesTo, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric, pmix, ucx, ucc, makeWrapper -, config -# Enable CUDA support -, cudaSupport ? config.cudaSupport, cudaPackages - -# Enable the Sun Grid Engine bindings -, enableSGE ? false - -# Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default -, enablePrefix ? false - -# Enable libfabric support (necessary for Omnipath networks) on x86_64 linux -, fabricSupport ? stdenv.isLinux && stdenv.isx86_64 - -# Enable Fortran support -, fortranSupport ? true +{ + lib, + stdenv, + fetchurl, + removeReferencesTo, + gfortran, + perl, + libnl, + rdma-core, + zlib, + numactl, + libevent, + hwloc, + targetPackages, + libpsm2, + libfabric, + pmix, + ucx, + ucc, + prrte, + makeWrapper, + python3, + config, + # Enable CUDA support + cudaSupport ? config.cudaSupport, + cudaPackages, + # Enable the Sun Grid Engine bindings + enableSGE ? false, + # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default + enablePrefix ? false, + # Enable libfabric support (necessary for Omnipath networks) on x86_64 linux + fabricSupport ? stdenv.isLinux && stdenv.isx86_64, + # Enable Fortran support + fortranSupport ? true, + # AVX/SSE options. See passthru.defaultAvxOptions for the available options. + # note that opempi fails to build with AVX disabled, meaning that everything + # up to AVX is enabled by default. + avxOptions ? { }, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openmpi"; - version = "4.1.6"; + version = "5.0.3"; - src = with lib.versions; fetchurl { - url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-90CZRIVRbetjtTEa8SLCZRefUyig2FelZ7hdsAsR5BU="; + src = fetchurl { + url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2"; + sha256 = "sha256-mQWC8gazqzLpOKoxu/B8Y5No5EBdyhlvq+fw927tqQs="; }; postPatch = '' patchShebangs ./ - # Ensure build is reproducible - ts=`date -d @$SOURCE_DATE_EPOCH` - sed -i 's/OPAL_CONFIGURE_USER=.*/OPAL_CONFIGURE_USER="nixbld"/' configure - sed -i 's/OPAL_CONFIGURE_HOST=.*/OPAL_CONFIGURE_HOST="localhost"/' configure - sed -i "s/OPAL_CONFIGURE_DATE=.*/OPAL_CONFIGURE_DATE=\"$ts\"/" configure - find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \; + # This is dynamically detected. Configure does not provide fine grained options + # We just disable the check in the configure script for now + ${lib.pipe (finalAttrs.passthru.defaultAvxOptions // avxOptions) [ + (lib.mapAttrsToList ( + option: val: '' + substituteInPlace configure \ + --replace-fail \ + ompi_cv_op_avx_check_${option}=yes \ + ompi_cv_op_avx_check_${option}=${if val then "yes" else "no"} + '' + )) + (lib.concatStringsSep "\n") + ]} ''; - outputs = [ "out" "man" "dev" ]; + # Ensure build is reproducible according to manual + # https://docs.open-mpi.org/en/v5.0.x/release-notes/general.html#general-notes + env = { + USER = "nixbld"; + HOSTNAME = "localhost"; + SOURCE_DATE_EPOCH = "0"; + }; + + outputs = + [ "out" ] + ++ lib.optionals stdenv.isLinux [ + "man" + "dev" + ]; - buildInputs = [ zlib ] - ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] + buildInputs = + [ + zlib + libevent + hwloc + ] + ++ lib.optionals stdenv.isLinux [ + libnl + numactl + pmix + ucx + ucc + prrte + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ [ libevent hwloc ] - ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core - ++ lib.optionals fabricSupport [ libpsm2 libfabric ]; + ++ lib.optionals (stdenv.isLinux || stdenv.isFreeBSD) [ rdma-core ] + # needed for internal pmix + ++ lib.optionals (!stdenv.isLinux) [ python3 ] + ++ lib.optionals fabricSupport [ + libpsm2 + libfabric + ]; - nativeBuildInputs = [ perl removeReferencesTo makeWrapper ] + nativeBuildInputs = + [ + perl + removeReferencesTo + makeWrapper + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals fortranSupport [ gfortran ]; - configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" - ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" - ++ lib.optionals stdenv.isLinux [ - "--with-libnl=${lib.getDev libnl}" - "--with-pmix=${lib.getDev pmix}" - "--with-pmix-libdir=${pmix}/lib" - "--enable-mpi-cxx" - ] ++ lib.optional enableSGE "--with-sge" - ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" + configureFlags = [ + (lib.enableFeature cudaSupport "mca-dso") + (lib.enableFeature fortranSupport "mpi-fortran") + (lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl)) + "--with-pmix=${if stdenv.isLinux then (lib.getDev pmix) else "internal"}" + (lib.withFeatureAs stdenv.isLinux "pmix-libdir" "${lib.getLib pmix}/lib") + # Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables + (lib.withFeatureAs stdenv.isLinux "prrte" (lib.getBin prrte)) + (lib.withFeature enableSGE "sge") + (lib.enableFeature enablePrefix "mpirun-prefix-by-default") # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda - ++ lib.optionals cudaSupport [ "--with-cuda=${lib.getDev cudaPackages.cuda_cudart}" "--enable-dlopen" ] - ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] - ; + (lib.withFeatureAs cudaSupport "cuda" (lib.getDev cudaPackages.cuda_cudart)) + (lib.enableFeature cudaSupport "dlopen") + (lib.withFeatureAs fabricSupport "psm2" (lib.getDev libpsm2)) + (lib.withFeatureAs fabricSupport "ofi" (lib.getDev libfabric)) + # The flag --without-ofi-libdir is not supported from some reason, so we + # don't use lib.withFeatureAs + ] ++ lib.optionals fabricSupport [ "--with-ofi-libdir=${lib.getLib libfabric}/lib" ]; enableParallelBuilding = true; - postInstall = '' - find $out/lib/ -name "*.la" -exec rm -f \{} \; - - for f in mpi shmem osh; do - for i in f77 f90 CC c++ cxx cc fort; do - moveToOutput "bin/$f$i" "''${!outputDev}" - echo "move $fi$i" - moveToOutput "share/openmpi/$f$i-wrapper-data.txt" "''${!outputDev}" - done - done - - for i in ortecc orte-info ompi_info oshmem_info opal_wrapper; do - moveToOutput "bin/$i" "''${!outputDev}" - done - - moveToOutput "share/openmpi/ortecc-wrapper-data.txt" "''${!outputDev}" - ''; - - postFixup = '' - remove-references-to -t $dev $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) - remove-references-to -t $man $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) - - # The path to the wrapper is hard coded in libopen-pal.so, which we just cleared. - wrapProgram $dev/bin/opal_wrapper \ - --set OPAL_INCLUDEDIR $dev/include \ - --set OPAL_PKGDATADIR $dev/share/openmpi + postInstall = + let + # The file names we need to iterate are a combination of ${p}${s}, and there + # are 7x3 such options. We use lib.mapCartesianProduct to iterate them all. + fileNamesToIterate = { + p = [ + "mpi" + "shmem" + "osh" + ]; + s = + [ + "CC" + "c++" + "cxx" + "cc" + ] + ++ lib.optionals fortranSupport [ + "f77" + "f90" + "fort" + ]; + }; + wrapperDataSubstitutions = + { + # The attr key is the filename prefix. The list's 1st value is the + # compiler=_ line that should be replaced by a compiler=#2 string, where + # #2 is the 2nd value in the list. + "cc" = [ + "gcc" + "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" + ]; + "c++" = [ + "g++" + "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" + ]; + } + // lib.optionalAttrs fortranSupport { + "fort" = [ + "gfortran" + "${targetPackages.gfortran}/bin/${targetPackages.gfortran.targetPrefix}gfortran" + ]; + }; + # The -wrapper-data.txt files that are not symlinks, need to be iterated as + # well, here they start withw ${part1}${part2}, and we use + # lib.mapCartesianProduct as well. + wrapperDataFileNames = { + part1 = [ + "mpi" + "shmem" + ]; + part2 = builtins.attrNames wrapperDataSubstitutions; + }; + in + '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; - # default compilers should be indentical to the - # compilers at build time + # The main wrapper that all the rest of the commonly used binaries are + # symlinked to + moveToOutput "bin/opal_wrapper" "''${!outputDev}" + # All of the following files are symlinks to opal_wrapper + ${lib.pipe fileNamesToIterate [ + (lib.mapCartesianProduct ( + { p, s }: + '' + echo "handling ${p}${s}" + moveToOutput "bin/${p}${s}" "''${!outputDev}" + moveToOutput "share/openmpi/${p}${s}-wrapper-data.txt" "''${!outputDev}" + '' + )) + (lib.concatStringsSep "\n") + ]} + # default compilers should be indentical to the + # compilers at build time + ${lib.pipe wrapperDataFileNames [ + (lib.mapCartesianProduct ( + { part1, part2 }: + '' + substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \ + --replace-fail \ + compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \ + compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 1} + '' + )) + (lib.concatStringsSep "\n") + ]} + # A symlink to ${lib.getDev pmix}/bin/pmixcc upstreeam puts here as well + # from some reason. + moveToOutput "bin/pcc" "''${!outputDev}" - echo "$dev/share/openmpi/mpicc-wrapper-data.txt" - sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ - $dev/share/openmpi/mpicc-wrapper-data.txt - - echo "$dev/share/openmpi/ortecc-wrapper-data.txt" - sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ - $dev/share/openmpi/ortecc-wrapper-data.txt - - echo "$dev/share/openmpi/mpic++-wrapper-data.txt" - sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \ - $dev/share/openmpi/mpic++-wrapper-data.txt - '' + lib.optionalString fortranSupport '' + # Handle informative binaries about the compilation + for i in {prte,ompi,oshmem}_info; do + moveToOutput "bin/$i" "''${!outputDev}" + done + ''; - echo "$dev/share/openmpi/mpifort-wrapper-data.txt" - sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \ - $dev/share/openmpi/mpifort-wrapper-data.txt + postFixup = + lib.optionalString (lib.elem "man" finalAttrs.outputs) '' + remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + '' + + lib.optionalString (lib.elem "dev" finalAttrs.outputs) '' + remove-references-to -t "''${!outputDev}" $out/bin/mpirun + remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) - ''; + # The path to the wrapper is hard coded in libopen-pal.so, which we just cleared. + wrapProgram "''${!outputDev}/bin/opal_wrapper" \ + --set OPAL_INCLUDEDIR "''${!outputDev}/include" \ + --set OPAL_PKGDATADIR "''${!outputDev}/share/openmpi" + ''; doCheck = true; passthru = { + defaultAvxOptions = { + sse3 = true; + sse41 = true; + avx = true; + avx2 = stdenv.hostPlatform.avx2Support; + avx512 = stdenv.hostPlatform.avx512Support; + }; inherit cudaSupport; cudatoolkit = cudaPackages.cudatoolkit; # For backward compatibility only }; - meta = with lib; { + meta = { homepage = "https://www.open-mpi.org/"; description = "Open source MPI-3 implementation"; longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; - maintainers = with maintainers; [ markuskowa ]; - license = licenses.bsd3; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ markuskowa ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix deleted file mode 100644 index 9f7f1b7bf4153..0000000000000 --- a/pkgs/development/libraries/openpam/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "openpam"; - version = "20170430"; - - src = fetchurl { - url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz"; - sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2"; - }; - - meta = with lib; { - homepage = "https://www.openpam.org"; - description = "Open source PAM library that focuses on simplicity, correctness, and cleanliness"; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch b/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch new file mode 100644 index 0000000000000..2d0f822b25eea --- /dev/null +++ b/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch @@ -0,0 +1,108 @@ +From e86ac436f0bd54d4517745483e2315650fae7b2c Mon Sep 17 00:00:00 2001 +From: Matt Caswell <matt@openssl.org> +Date: Fri, 31 May 2024 11:14:33 +0100 +Subject: [PATCH] Fix SSL_select_next_proto + +Ensure that the provided client list is non-NULL and starts with a valid +entry. When called from the ALPN callback the client list should already +have been validated by OpenSSL so this should not cause a problem. When +called from the NPN callback the client list is locally configured and +will not have already been validated. Therefore SSL_select_next_proto +should not assume that it is correctly formatted. + +We implement stricter checking of the client protocol list. We also do the +same for the server list while we are about it. + +CVE-2024-5535 + +Reviewed-by: Tomas Mraz <tomas@openssl.org> +Reviewed-by: Neil Horman <nhorman@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/24716) + +(cherry picked from commit 2ebbe2d7ca8551c4cb5fbb391ab9af411708090e) +--- + ssl/ssl_lib.c | 63 ++++++++++++++++++++++++++++++++------------------- + 1 file changed, 40 insertions(+), 23 deletions(-) + +diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c +index 5ec6ac4b63dc5..4c20ac4bf1fe7 100644 +--- a/ssl/ssl_lib.c ++++ b/ssl/ssl_lib.c +@@ -3530,37 +3530,54 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, + unsigned int server_len, + const unsigned char *client, unsigned int client_len) + { +- unsigned int i, j; +- const unsigned char *result; +- int status = OPENSSL_NPN_UNSUPPORTED; ++ PACKET cpkt, csubpkt, spkt, ssubpkt; ++ ++ if (!PACKET_buf_init(&cpkt, client, client_len) ++ || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt) ++ || PACKET_remaining(&csubpkt) == 0) { ++ *out = NULL; ++ *outlen = 0; ++ return OPENSSL_NPN_NO_OVERLAP; ++ } ++ ++ /* ++ * Set the default opportunistic protocol. Will be overwritten if we find ++ * a match. ++ */ ++ *out = (unsigned char *)PACKET_data(&csubpkt); ++ *outlen = (unsigned char)PACKET_remaining(&csubpkt); + + /* + * For each protocol in server preference order, see if we support it. + */ +- for (i = 0; i < server_len;) { +- for (j = 0; j < client_len;) { +- if (server[i] == client[j] && +- memcmp(&server[i + 1], &client[j + 1], server[i]) == 0) { +- /* We found a match */ +- result = &server[i]; +- status = OPENSSL_NPN_NEGOTIATED; +- goto found; ++ if (PACKET_buf_init(&spkt, server, server_len)) { ++ while (PACKET_get_length_prefixed_1(&spkt, &ssubpkt)) { ++ if (PACKET_remaining(&ssubpkt) == 0) ++ continue; /* Invalid - ignore it */ ++ if (PACKET_buf_init(&cpkt, client, client_len)) { ++ while (PACKET_get_length_prefixed_1(&cpkt, &csubpkt)) { ++ if (PACKET_equal(&csubpkt, PACKET_data(&ssubpkt), ++ PACKET_remaining(&ssubpkt))) { ++ /* We found a match */ ++ *out = (unsigned char *)PACKET_data(&ssubpkt); ++ *outlen = (unsigned char)PACKET_remaining(&ssubpkt); ++ return OPENSSL_NPN_NEGOTIATED; ++ } ++ } ++ /* Ignore spurious trailing bytes in the client list */ ++ } else { ++ /* This should never happen */ ++ return OPENSSL_NPN_NO_OVERLAP; + } +- j += client[j]; +- j++; + } +- i += server[i]; +- i++; ++ /* Ignore spurious trailing bytes in the server list */ + } + +- /* There's no overlap between our protocols and the server's list. */ +- result = client; +- status = OPENSSL_NPN_NO_OVERLAP; +- +- found: +- *out = (unsigned char *)result + 1; +- *outlen = result[0]; +- return status; ++ /* ++ * There's no overlap between our protocols and the server's list. We use ++ * the default opportunistic protocol selected earlier ++ */ ++ return OPENSSL_NPN_NO_OVERLAP; + } + + #ifndef OPENSSL_NO_NEXTPROTONEG diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 6c87feaab8825..94934c489e527 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -24,7 +24,7 @@ let inherit version; src = fetchurl { - url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; + url = "https://www.openssl.org/source/openssl-${version}.tar.gz"; inherit hash; }; @@ -233,7 +233,7 @@ let description = "Cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; - maintainers = with maintainers; [ thillux ]; + maintainers = with maintainers; [ thillux ] ++ lib.teams.stridtech.members; pkgConfigModules = [ "libcrypto" "libssl" @@ -286,6 +286,8 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + ./3.3/CVE-2024-5535.patch + (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) @@ -309,6 +311,8 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + ./3.3/CVE-2024-5535.patch + (if stdenv.hostPlatform.isDarwin then ./3.2/use-etc-ssl-certs-darwin.patch else ./3.2/use-etc-ssl-certs.patch) @@ -332,6 +336,8 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch + ./3.3/CVE-2024-5535.patch + (if stdenv.hostPlatform.isDarwin then ./3.2/use-etc-ssl-certs-darwin.patch else ./3.2/use-etc-ssl-certs.patch) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 14ad6c166e551..a1f30277151b2 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -6,7 +6,7 @@ # build , scons -, addOpenGLRunpath +, addDriverRunpath , autoPatchelfHook , cmake , git @@ -38,7 +38,7 @@ let stdenv = gcc12Stdenv; # prevent scons from leaking in the default python version - scons' = scons.override { python3 = python3Packages.python; }; + scons' = scons.override { inherit python3Packages; }; tbbbind_version = "2_5"; tbbbind = fetchurl { @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - addOpenGLRunpath + addDriverRunpath autoPatchelfHook cmake git @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { postFixup = '' # Link to OpenCL find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" done ''; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index f45eacfd157f8..ae9e63619a802 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; homepage = "http://www.openzwave.net/"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 32ee1dced38e8..b520c7087ba74 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.25.3"; + version = "0.25.5"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - hash = "sha256-zIbkw0pwt4TdyjncnSDeTN6Gsx7cc+x7Un4rnagZxQk="; + hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index 3ee5c73290a19..4bdee532eea84 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ meson ninja ]; - meta = with lib; { + meta = { description = "Lightweight JSON library written in C"; homepage = "https://github.com/kgabis/parson"; - license = licenses.mit; - platforms = platforms.all; + license = lib.licenses.mit; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index a567612fae4fb..05c8abfafb2a6 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { unzip cmake doxygen + python3 ]; buildInputs = [ @@ -38,7 +39,6 @@ stdenv.mkDerivation rec { swig xorg.libXi xorg.libXmu - python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.GLUT diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index c6e67d39c1956..347e8b5cdf2c1 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "espeak-ng"; - repo = finalAttrs.pname; + repo = "pcaudiolib"; rev = finalAttrs.version; hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE="; }; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 624ca4aa66724..36e54f873cc7c 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://pointclouds.org/"; description = "Open project for 2D/3D image and point cloud processing"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 52a4ba32315ee..5b86dc223087c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; pkgConfigModules = [ "libpcre" "libpcreposix" diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index c035460fafae7..c85459c244c91 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -19,6 +19,7 @@ , pkg-config , postgresql , proj +, sqlite , tiledb , xercesc , zlib @@ -27,15 +28,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-JoHBxJ0hCWH7ZhmeJk4huT2k0AK5CzIV58NWCjWj5T0="; + sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps="; }; + patches = [ + ./pdal.pc.in.patch + ]; + nativeBuildInputs = [ cmake pkg-config @@ -48,10 +53,11 @@ stdenv.mkDerivation (finalAttrs: { laszip libgeotiff libtiff - libxml2 + (libxml2.override { enableHttp = true; }) openscenegraph postgresql proj + sqlite tiledb xercesc zlib @@ -87,12 +93,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; disabledTests = [ - # Failing due to GDAL 3.9 change in coordinates precision. - # See: https://github.com/PDAL/PDAL/issues/4403 - # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411 - # is merged ! - "pdal_io_ogr_writer_test" - # Tests failing due to TileDB library implementation, disabled also # by upstream CI. # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 @@ -128,7 +128,9 @@ stdenv.mkDerivation (finalAttrs: { version = "pdal ${finalAttrs.finalPackage.version}"; }; pdal = callPackage ./tests.nix { pdal = finalAttrs.finalPackage; }; - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/pdal/pdal.pc.in.patch b/pkgs/development/libraries/pdal/pdal.pc.in.patch new file mode 100644 index 0000000000000..1d981c0f6a975 --- /dev/null +++ b/pkgs/development/libraries/pdal/pdal.pc.in.patch @@ -0,0 +1,12 @@ +diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in +index 6885221cacc8..a07ee82cea68 100644 +--- a/apps/pdal.pc.in ++++ b/apps/pdal.pc.in +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@/bin +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: PDAL diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index cd860c3629f01..0e702510823b9 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -1,21 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, -stdenv.mkDerivation rec { + # Options + + # The submodules in the pico-sdk contain important additional functionality + # such as tinyusb, but not all these libraries might be bsd3. + # Off by default. + withSubmodules ? false, +}: + +stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; version = "1.5.1"; src = fetchFromGitHub { owner = "raspberrypi"; - repo = pname; - rev = version; - sha256 = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU="; + repo = "pico-sdk"; + rev = finalAttrs.version; + fetchSubmodules = withSubmodules; + hash = if (withSubmodules) then + "sha256-GY5jjJzaENL3ftuU5KpEZAmEZgyFRtLwGVg3W1e/4Ho=" + else + "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU="; }; nativeBuildInputs = [ cmake ]; # SDK contains libraries and build-system to develop projects for RP2040 chip # We only need to compile pioasm binary - sourceRoot = "${src.name}/tools/pioasm"; + sourceRoot = "${finalAttrs.src.name}/tools/pioasm"; installPhase = '' runHook preInstall @@ -32,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ muscaln ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 470668bb1eb23..d922a7b3ce4dc 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -1,11 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, casadi , cmake , boost , eigen , example-robot-data -, collisionSupport ? !stdenv.isDarwin +, casadiSupport ? !stdenv.isDarwin +, collisionSupport ? true , console-bridge , jrl-cmakemodules , hpp-fcl @@ -16,33 +19,45 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; - repo = finalAttrs.pname; + repo = "pinocchio"; rev = "v${finalAttrs.version}"; - hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4="; + hash = "sha256-WgMqb+NHnaxW9/qSZ0UGI4zGxGjh12a5DwtdX9byBiw="; }; - prePatch = '' - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 - substituteInPlace unittest/CMakeLists.txt \ - --replace-fail "add_pinocchio_unit_test(contact-cholesky)" "" - '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 - substituteInPlace unittest/CMakeLists.txt \ - --replace-fail "add_pinocchio_unit_test(contact-models)" "" - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 + prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" "" ''; - # example-robot-data models are used in checks. - # Upstream provide them as git submodule, but we can use our own version instead. + patches = [ + # fix urdf & collision support on aarch64-darwin + (fetchpatch { + name = "static-pointer_cast.patch"; + url = "https://github.com/stack-of-tasks/pinocchio/pull/2339/commits/ead869e8f3cce757851b9a011c4a2f55fb66582b.patch"; + hash = "sha256-CkrWQJP/pPNs6B3a1FclfM7JWwkmsPzRumS46KQHv0s="; + }) + ]; + postPatch = '' + # example-robot-data models are used in checks. + # Upstream provide them as git submodule, but we can use our own version instead. rmdir models/example-robot-data ln -s ${example-robot-data.src} models/example-robot-data + + # allow package:// uri use in examples + export ROS_PACKAGE_PATH=${example-robot-data}/share + ''; + + # CMAKE_BUILD_TYPE defaults to Release in this package, + # which enable -O3, which break some tests + # ref. https://github.com/stack-of-tasks/pinocchio/issues/2304#issuecomment-2231018300 + postConfigure = '' + substituteInPlace CMakeCache.txt --replace-fail '-O3' '-O2' ''; strictDeps = true; @@ -65,15 +80,19 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.eigenpy ] ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.hpp-fcl + ] ++ lib.optionals (!pythonSupport && casadiSupport) [ + casadi + ] ++ lib.optionals (pythonSupport && casadiSupport) [ + python3Packages.casadi ]; + checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport) + (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport) (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport) - ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [ - # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.7.0.drv/sou[84 chars].dae' - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'" ]; doCheck = true; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix deleted file mode 100644 index cf2448bddfcbc..0000000000000 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz -, glib, dbus, gst_all_1, alsa-lib, ffmpeg_4, libjack2, udev, libva, xorg -, sbc, SDL2, makeFontsConf -}: - -let - fontsConf = makeFontsConf { - fontDirectories = [ ]; - }; -in stdenv.mkDerivation rec { - pname = "pipewire"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "PipeWire"; - repo = "pipewire"; - rev = version; - sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; - }; - - outputs = [ "out" "lib" "dev" "doc" ]; - - nativeBuildInputs = [ - meson ninja pkg-config doxygen graphviz - ]; - buildInputs = [ - glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 - ]; - - # Workaround build on gcc-10+ and clang11+: - # spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): - # multiple definition of `spa_a2dp_sink_factory' - env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dgstreamer=enabled" - ]; - - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - - doCheck = true; - - meta = with lib; { - description = "Server and user space API to deal with multimedia pipelines"; - homepage = "https://pipewire.org/"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 49dc2f4dd5d2c..c0540e4080fe9 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.0"; + version = "1.2.1"; outputs = [ "out" @@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-hjjiH7+JoyRTcdbPDvkUEpO72b5p8CbTD6Un/vZrHL8="; + sha256 = "sha256-CkxsVD813LbWpuZhJkNLJnqjLF6jmEn+CajXb2XTCsY="; }; patches = [ diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index b0791a2400a85..71c0b7d470377 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -12,7 +12,8 @@ , qemu , scribus , tigervnc -, wlroots +, wlroots_0_17 +, wlroots_0_18 , xwayland , gitUpdater @@ -66,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit cairo qemu scribus tigervnc wlroots xwayland; + inherit cairo qemu scribus tigervnc wlroots_0_17 wlroots_0_18 xwayland; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index f2047c82f0519..37895fbeed65b 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + description = "Embed static files in Go binaries (replacement for gobuffalo/packr)"; mainProgram = "pkger"; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 3a9780a960eb2..27f4446891bd0 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 78605179f710f..31325bd4ba0a3 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pmix"; - version = "5.0.1"; + version = "5.0.3"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - hash = "sha256-ZuuzQ8j5zqQ/9mBFEODAaoX9/doWB9Nt9Sl75JkJyqU="; + hash = "sha256-5qBZj4L0Qu/RvNj8meL0OlLCdfGvBP0D916Mr+0XOCQ="; fetchSubmodules = true; }; @@ -71,8 +71,9 @@ stdenv.mkDerivation rec { # Pin the compiler to the current version in a cross compiler friendly way. # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). - sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ - $dev/share/pmix/pmixcc-wrapper-data.txt + substituteInPlace $dev/share/pmix/pmixcc-wrapper-data.txt \ + --replace-fail compiler=gcc \ + compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index f4bf9e7741788..0916c2f9e9a09 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Library to work with the PDF file format"; platforms = lib.platforms.all; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; - maintainers = []; + maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 5b41fbdf6dfd4..dd3c6aaea354d 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -19,6 +19,7 @@ , docbook_xml_dtd_412 , gtk-doc , coreutils +, fetchpatch , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , elogind @@ -55,6 +56,13 @@ stdenv.mkDerivation rec { ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch ./elogind.patch + + # FIXME: remove in the next release + # https://github.com/NixOS/nixpkgs/issues/18012 + (fetchpatch { + url = "https://github.com/polkit-org/polkit/commit/f93c7466039ea3403e0576928aeb620b806d0cce.patch"; + sha256 = "sha256-cF0nNovYmyr+XixpBgQFF0A+oJeSPGZgTkgDQkQuof8="; + }) ]; depsBuildBuild = [ diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 8eeb31e96c483..2893b5e1b0441 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -6,11 +6,9 @@ , cairo , cmake , boost -, cups-filters , curl , fontconfig , freetype -, inkscape , lcms , libiconv , libintl @@ -19,7 +17,6 @@ , openjpeg , pkg-config , python3 -, scribus , zlib , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null @@ -28,6 +25,15 @@ , utils ? false, nss ? null , minimal ? false , suffix ? "glib" + +# for passthru.tests +, cups-filters +, gdal +, gegl +, inkscape +, pdfslicer +, scribus +, vips }: let @@ -141,7 +147,19 @@ stdenv.mkDerivation (finalAttrs: rec { inherit testData; tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters scribus; + inherit + cups-filters + inkscape + scribus + ; + + inherit + gegl + pdfslicer + vips + ; + gdal = gdal.override { usePoppler = true; }; + python-poppler-qt5 = python3.pkgs.poppler-qt5; }; }; diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 2fa5a4d268cc1..cfc75ce0c51aa 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Repository for proj datum grids"; homepage = "https://proj4.org"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "nad2bin"; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/protobuf/27.nix b/pkgs/development/libraries/protobuf/27.nix index 03336c2a0b143..258ae10bd83da 100644 --- a/pkgs/development/libraries/protobuf/27.nix +++ b/pkgs/development/libraries/protobuf/27.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "27.2"; - hash = "sha256-9avetEoB51WblGRy/7FTmhCb06Vi1JfwWv2dxJvna2U="; + version = "27.3"; + hash = "sha256-JZtRNGjAns1VJ+0831AzgOaBQkHAnnLxeXs4SoXlXpE="; } // args) diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index e29cbe6d73d36..71f8e90b774a2 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; platforms = lib.platforms.all; homepage = "https://protobuf.dev/"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; mainProgram = "protoc"; }; }) diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index f91f55530aed7..02a8fcde91efc 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "pslib"; - version = "0.4.6"; + version = "0.4.8"; src = fetchurl { name = "${pname}-snixource-${version}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4"; + sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index d8c2b3dec1a4d..946cb50359359 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix index 9605b5875ec30..0db185b20b707 100644 --- a/pkgs/development/libraries/pulseaudio-qt/default.nix +++ b/pkgs/development/libraries/pulseaudio-qt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.3.0"; src = fetchurl { - url = "mirror://kde/stable/${finalAttrs.pname}/${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}.tar.xz"; + url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${lib.versions.majorMinor finalAttrs.version}.tar.xz"; sha256 = "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw"; }; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 404aa4921c4ef..10db26a039849 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "python-qt"; - version = "3.5.2"; + version = "3.5.4"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; rev = "v${finalAttrs.version}"; - hash = "sha256-Mpi1pAPS/UuzaBK7I1kI0HlS3dphcKiVXIPuJwdEDXM="; + hash = "sha256-uzOSm1Zcm5La0mDAbJko5YtxJ4WesPr9lRas+cwhNH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qca/default.nix b/pkgs/development/libraries/qca/default.nix index 66cdfe28eb311..a8651c9c2a5f3 100644 --- a/pkgs/development/libraries/qca/default.nix +++ b/pkgs/development/libraries/qca/default.nix @@ -4,11 +4,11 @@ let isQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation rec { pname = "qca"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-SHWcqGoCAkYdkIumYTQ4DMO7fSD+08AxufwCiXlqgmQ="; + sha256 = "sha256-xVXVKYzde2uv4rH5YQbzDPpUOiPUWdUMipHqwzxHbk4="; }; buildInputs = [ openssl qtbase qt5compat ]; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 4c75b475c17cb..6e489f69b72c6 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -10,7 +10,6 @@ , gtk3 , qtbase , qtwayland -, pantheon , substituteAll , gsettings-desktop-schemas , useQt6 ? false @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = "https://github.com/FedoraQt/QGnomePlatform"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 95827b630f1a7..7f7613d7f05fa 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -12,7 +12,7 @@ let rev = "v${version}"; hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; }; - sourceRoot = "source/Box2D"; + sourceRoot = "${src.name}/Box2D"; cmakeFlags = old.cmakeFlags or [ ] ++ [ (cmakeBool "BOX2D_INSTALL" true) (cmakeBool "BOX2D_BUILD_SHARED" true) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index b2858944ef7c6..4a9e520f2a979 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -11,23 +11,36 @@ , pdfmixtool , pdfslicer , python3 +, testers +, versionCheckHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qpdf"; version = "11.9.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s="; }; + outputs = [ + "bin" + "doc" + "lib" + "man" + "out" + ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ zlib libjpeg ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + preConfigure = '' patchShebangs qtest/bin/qtest-driver patchShebangs run-qtest @@ -38,6 +51,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru.tests = { + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; inherit (python3.pkgs) pikepdf; inherit cups-filters @@ -46,12 +60,14 @@ stdenv.mkDerivation rec { ; }; - meta = with lib; { + meta = { homepage = "https://qpdf.sourceforge.io/"; description = "C++ library and set of programs that inspect and manipulate the structure of PDF files"; - license = licenses.asl20; # as of 7.0.0, people may stay at artistic2 - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.all; - changelog = "https://github.com/qpdf/qpdf/blob/v${version}/ChangeLog"; + license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2 + maintainers = with lib.maintainers; [ abbradar ]; + mainProgram = "qpdf"; + platforms = lib.platforms.all; + changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog"; + pkgConfigModules = [ "libqpdf" ]; }; -} +}) diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 83c20fcd51207..237751c6f8f2d 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: rec { such as a mobile phone with CCD. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ adolfogc yana ]; + maintainers = [ ]; platforms = platforms.all; mainProgram = "qrencode"; }; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 12531286d33d3..282b926b2e772 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { ])}" ]; + # https://github.com/mpimd-csc/qrupdate-ng/issues/4 + patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ./disable-zch1dn-test.patch + ]; + doCheck = true; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch b/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch new file mode 100644 index 0000000000000..9953f7b43d7a4 --- /dev/null +++ b/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch @@ -0,0 +1,13 @@ +diff --git i/test/tch1dn.f w/test/tch1dn.f +index 25ec990..3f83e7e 100644 +--- i/test/tch1dn.f ++++ w/test/tch1dn.f +@@ -34,8 +34,6 @@ c + call dtest(n) + write (*,*) 'cch1dn test:' + call ctest(n) +- write (*,*) 'zch1dn test:' +- call ztest(n) + + call pstats + end program diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 9073bcb6f9e58..af2f431dfb402 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -23,7 +23,7 @@ Check for any minor version changes. let - srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; } // { __attrsFailEvaluation = true; }; + srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; }; qtCompatVersion = srcs.qtbase.version; @@ -314,7 +314,7 @@ let in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; - inherit (darwin) cctools xnu; + inherit (darwin) xnu; inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f4249b7f9505a..39a6b84bf2383 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -, qtModule, python3, qtbase, qtsvg }: +{ qtModule, python3, qtbase, qtsvg }: qtModule { pname = "qtdeclarative"; diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 4775bb0b0383f..ae9b62ddc35d9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,5 +1,4 @@ { lib -, stdenv , qtModule , qtbase , libwebp diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 94e66cf400447..17bc16dab4fc0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -1,9 +1,9 @@ -{ lib, qtModule, stdenv, speechd, pkg-config }: +{ lib, qtModule, stdenv, speechd-minimal, pkg-config }: qtModule { pname = "qtspeech"; propagatedBuildInputs = [ ]; - buildInputs = lib.optionals stdenv.isLinux [ speechd ]; + buildInputs = lib.optionals stdenv.isLinux [ speechd-minimal ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 73920c1646b9b..68f3772a9976c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,6 +1,7 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel , fetchpatch +, fetchpatch2 , bison, flex, git, gperf, ninja, pkg-config, python, which , nodejs, perl @@ -24,12 +25,12 @@ , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate , cups, openbsm, xcbuild, writeScriptBin -, ffmpeg_4 ? null +, ffmpeg_7 ? null , lib, stdenv , version ? null , qtCompatVersion , pipewireSupport ? stdenv.isLinux -, pipewire_0_2 +, pipewire , postPatch ? "" , nspr , lndir @@ -77,6 +78,32 @@ qtModule ({ # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; + patches = [ + # Support FFmpeg 5 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/14074e4d789167bd776939037fe6df8d4d7dc0b3/qt5-webengine-ffmpeg5.patch"; + hash = "sha256-jTbJFXBPwRMzr8IeTxrv9dtS+/xDS/zR4dysV/bRg3I="; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + + # Support FFmpeg 7 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/e8fb4f86104243b90966b69cdfaa967273d834b6/qt5-webengine-ffmpeg7.patch"; + hash = "sha256-YNeHmOVp0M5HB+b91AOxxJxl+ktBtLYVdHlq13F7xtY="; + stripLen = 1; + extraPrefix = "src/3rdparty/chromium/"; + }) + + # Support PipeWire ≥ 0.3 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/c9db2cd9e144bd7a5e9246f5f7a01fe52fd089ba/qt5-webengine-pipewire-0.3.patch"; + hash = "sha256-mGexRfVDF3yjNzSi9BjavhzPtsXI0BooSr/rZ1z/BDo="; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ]; + postPatch = '' # Patch Chromium build tools ( @@ -201,7 +228,7 @@ qtModule ({ harfbuzz icu libevent - ffmpeg_4 + ffmpeg_7 ] ++ lib.optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp @@ -221,7 +248,7 @@ qtModule ({ ] ++ lib.optionals pipewireSupport [ # Pipewire - pipewire_0_2 + pipewire ] # FIXME These dependencies shouldn't be needed but can't find a way diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index c724bd21d11ff..83f9268624cc2 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -152,7 +152,7 @@ let qtwayland = callPackage ./modules/qtwayland.nix { }; qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { - inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds cctools xnu; + inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu; inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 43c2c88ecd799..e738aba60560f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -3,11 +3,8 @@ , src , patches ? [ ] , version -, coreutils -, buildPackages , bison , flex -, gdb , gperf , lndir , perl @@ -36,7 +33,6 @@ , libdatrie , lttng-ust , libepoxy -, libiconv , dbus , fontconfig , freetype diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 39ac1245118a8..83bcb4c2a0d4a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ , gst-plugins-good , gst-libav , gst-vaapi -, ffmpeg_6 +, ffmpeg_7 , libva , libpulseaudio , wayland @@ -28,7 +28,7 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_6 ] + buildInputs = [ ffmpeg_7 ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index 15672de8b9806..3fbfa6e5d90d7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -6,14 +6,14 @@ , pkg-config , flite , alsa-lib -, speechd +, speechd-minimal , Cocoa }: qtModule { pname = "qtspeech"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd-minimal ]; propagatedBuildInputs = [ qtbase qtmultimedia ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index b5f1c71fdd757..512b084a0bf58 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,6 +4,7 @@ , wayland , pkg-config , libdrm +, fetchpatch }: qtModule { @@ -11,4 +12,27 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + + patches = [ + # Included in qtwayland 6.7.3 + # Fixes https://bugs.kde.org/show_bug.cgi?id=489259 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/92bcb8f6b7a852c7a5d662fc34de561692a7a454.diff"; + sha256 = "sha256-XgGO8VnmQHLhUxTGf9CniwkCr5FsFiuUbnVP0NLNekI="; + }) + + # Included in qtwayland 6.7.3 + # Fixes https://bugs.kde.org/show_bug.cgi?id=489072 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c4f91b479303dda2e49499de249018d7c66c5f99.diff"; + sha256 = "sha256-4rUdl6WuJHONW0Uy2wjTvyvDY3bJWeRvhk3tCkaOOro="; + }) + + # Included in qtwayland 6.7.3 + # Fixes https://bugs.kde.org/show_bug.cgi?id=489180 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/632127d7f1d86cba4dd17361f24f9fd70a0ae44c.diff"; + sha256 = "sha256-1EIcMj6+yIpqXAGZB3ZbrwRkl4n1o7TVP2SC1Nu1t78="; + }) + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 997fe0394fa25..8da3b7b628427 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -3,6 +3,7 @@ , qtwebchannel , qtpositioning , qtwebsockets +, fetchpatch2 , buildPackages , bison , coreutils @@ -49,7 +50,7 @@ , systemd , pipewire , gn -, ffmpeg_4 +, ffmpeg_7 , lib , stdenv , glib @@ -131,6 +132,14 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch + + # Support FFmpeg 7 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/raw/6bee5464ac6340e925e08c7ed023026e727ae9d5/qtwebengine-ffmpeg-7.patch"; + hash = "sha256-OdCIu1KMW3YcpCnfUP1uD7OJRl6Iwap9X4aJhGpoaNs="; + stripLen = 1; + extraPrefix = "src/3rdparty/chromium/"; + }) ]; postPatch = '' @@ -228,7 +237,7 @@ qtModule { lcms2 libevent - ffmpeg_4 + ffmpeg_7 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus zlib diff --git a/pkgs/development/libraries/qtfeedback/default.nix b/pkgs/development/libraries/qtfeedback/default.nix index a329ece074baa..285a81ae1ac46 100644 --- a/pkgs/development/libraries/qtfeedback/default.nix +++ b/pkgs/development/libraries/qtfeedback/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , perl , qmake -, qtbase , qtdeclarative }: diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index e9deed9d8ac18..07c332ba1d948 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.14.1"; + version = "6.14.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-WUrxBlSS1Z3+tQGmAi+d3wpqutqNjPrVOxmpUy01aqU="; + hash = "sha256-Ugnnebts9+fUlxwjT9qpxV558PcJiHHhY5BzburR+EI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index e90f7f8f4b5aa..1cf1d80b4ff0f 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.5.53"; + version = "1.5.56"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-6/gq1yD4almO+CUY5xVnhWCjmu3teiJEGE7ONE1Zk8A="; + sha256 = "sha256-sq7/Jfwo//yMiK0JSN99HMnXswNP4vPElZIRmSb+R8g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 68da796aa0a5e..c3de383980841 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = "quick-der"; rev = "v${version}"; - sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; + hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quickmem/default.nix b/pkgs/development/libraries/quickmem/default.nix index 60ea330dc014d..91b170030aaf9 100644 --- a/pkgs/development/libraries/quickmem/default.nix +++ b/pkgs/development/libraries/quickmem/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = "Quick-MEM"; rev = "v${version}"; - sha256 = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; + hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 7ea5d6a4e72d7..d8509d7be73da 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8AF+deDRxipN+YMHE9vUyTaUbSJIckMkB7t3YVtupQs="; + sha256 = "sha256-QUIHowMl3YTDQlo58OHXXNaYLI4vuIozYbZnz4EQUmQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 9b9c2bd39d648..3ef599887eb4d 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/ericniebler/range-v3/releases/tag/${version}"; license = licenses.boost; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index ad8252f48e8cb..ce369eb6ff3fd 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ framework for property based testing inspired by QuickCheck"; inherit (finalAttrs.src.meta) homepage; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd2; pkgConfigModules = [ "rapidcheck" diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index edd427da725de..9aa2394585020 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,65 +1,79 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, pkg-config , cmake +, doxygen +, graphviz , gtest , valgrind }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rapidjson"; - version = "1.1.0"; + version = "unstable-2024-04-09"; + + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "Tencent"; repo = "rapidjson"; - rev = "v${version}"; - sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; + rev = "ab1842a2dae061284c0a62dca1cc6d5e7e37e346"; + hash = "sha256-kAGVJfDHEUV2qNR1LpnWq3XKBJy4hD3Swh6LX5shJpM="; }; patches = [ - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch"; - sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82"; - }) - (fetchpatch { - name = "do-not-include-gtest-src-dir.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; - hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; - }) - # One of these three tests reports memcpy overlap after update to glibc-2.38 - ./test-skip-valgrind.diff + ./use-nixpkgs-gtest.patch + # https://github.com/Tencent/rapidjson/issues/2214 + ./suppress-valgrind-failures.patch ]; postPatch = '' - find -name CMakeLists.txt | xargs \ - sed -i -e "s/-Werror//g" -e "s/-march=native//g" + for f in doc/Doxyfile.*; do + substituteInPlace $f \ + --replace-fail "WARN_IF_UNDOCUMENTED = YES" "WARN_IF_UNDOCUMENTED = NO" + done ''; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + doxygen + graphviz + ]; - # for tests, adding gtest to checkInputs does not work - # https://github.com/NixOS/nixpkgs/pull/212200 - buildInputs = [ gtest ]; - cmakeFlags = [ - "-DGTEST_SOURCE_DIR=${gtest.dev}/include" + buildInputs = [ + gtest + ]; - # Build rapidjson with std=c++17 so gtest 1.13.0+ works - # https://github.com/NixOS/nixpkgs/pull/282245#issuecomment-1951796902 - "-DRAPIDJSON_BUILD_CXX11=OFF" - "-DRAPIDJSON_BUILD_CXX17=ON" + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "RAPIDJSON_BUILD_DOC" true) + (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" true) + (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" true) + # gtest 1.13+ requires C++14 or later. + (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true) + # Prevent -march=native + (lib.cmakeBool "RAPIDJSON_ENABLE_INSTRUMENTATION_OPT" false) + # Disable -Werror by using build type specific flags, which are + # added after general CMAKE_CXX_FLAGS. + (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error") ]; - nativeCheckInputs = [ valgrind ]; - doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin; + doCheck = !(stdenv.hostPlatform.isStatic || stdenv.isDarwin); + + nativeCheckInputs = [ + valgrind + ]; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda Madouura tobim ]; }; -} +}) diff --git a/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch b/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch index dd06ba6a69711..dd06ba6a69711 100644 --- a/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch +++ b/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch diff --git a/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff b/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff deleted file mode 100644 index a791d88699ff3..0000000000000 --- a/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff +++ /dev/null @@ -1,7 +0,0 @@ ---- a/test/unittest/CMakeLists.txt -+++ b/test/unittest/CMakeLists.txt -@@ -82,3 +81,0 @@ -- add_test(NAME valgrind_unittest -- COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) - diff --git a/pkgs/development/libraries/rapidjson/unstable.nix b/pkgs/development/libraries/rapidjson/unstable.nix deleted file mode 100644 index fd7ffe61ba394..0000000000000 --- a/pkgs/development/libraries/rapidjson/unstable.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, graphviz -, gtest -, valgrind -, buildDocs ? true -, buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin -, buildExamples ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rapidjson"; - version = "unstable-2023-09-28"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals buildExamples [ - "example" - ]; - - src = fetchFromGitHub { - owner = "Tencent"; - repo = "rapidjson"; - rev = "f9d53419e912910fd8fa57d5705fa41425428c35"; - hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY="; - }; - - patches = lib.optionals buildTests [ - ./0000-unstable-use-nixpkgs-gtest.patch - # https://github.com/Tencent/rapidjson/issues/2214 - ./0001-unstable-valgrind-suppress-failures.patch - ]; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals buildDocs [ - doxygen - graphviz - ]; - - cmakeFlags = [ - (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs) - (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests) - (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples) - # gtest 1.13+ requires C++14 or later. - (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false) - (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true) - ] ++ lib.optionals buildTests [ - (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}") - ]; - - doCheck = buildTests; - - nativeCheckInputs = [ - gtest - valgrind - ]; - - postInstall = lib.optionalString buildExamples '' - mkdir -p $example/bin - - find bin -type f -executable \ - -not -name "perftest" \ - -not -name "unittest" \ - -exec cp -a {} $example/bin \; - ''; - - meta = with lib; { - description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; - homepage = "http://rapidjson.org/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ Madouura ]; - }; -}) diff --git a/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch b/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch index df334cc912642..878182ea5a5fc 100644 --- a/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch +++ b/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch @@ -1,28 +1,33 @@ +From b9206d360c19412d185263795d67c884feab281a Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Mon, 29 Jul 2024 07:26:50 +0200 +Subject: [PATCH] Use nixpkgs gtest + +--- + test/CMakeLists.txt | 24 ++++++------------------ + 1 file changed, 6 insertions(+), 18 deletions(-) + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 11c1b04c..762eaa75 100644 +index 11c1b04c..3d02d475 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -1,20 +1,14 @@ +@@ -1,20 +1,8 @@ -find_package(GTestSrc) ++find_package(GTest REQUIRED) +enable_testing() -IF(GTESTSRC_FOUND) - enable_testing() -+if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) -+ set(gtest_disable_pthreads ON) -+ set(gtest_force_shared_crt ON) -+endif() ++set(TEST_LIBRARIES GTest::gtest GTest::gtest_main) - if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) - set(gtest_disable_pthreads ON) - set(gtest_force_shared_crt ON) - endif() -+include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) - +- - add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) - include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) -+set(TEST_LIBRARIES gtest gtest_main) - +- - set(TEST_LIBRARIES gtest gtest_main) - - add_custom_target(tests ALL) @@ -33,3 +38,6 @@ index 11c1b04c..762eaa75 100644 +add_custom_target(tests ALL) +add_subdirectory(perftest) +add_subdirectory(unittest) +-- +2.45.2 + diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/development/libraries/rapidxml/default.nix index 3a353b7a2bda8..c433f32728e1c 100644 --- a/pkgs/development/libraries/rapidxml/default.nix +++ b/pkgs/development/libraries/rapidxml/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://rapidxml.sourceforge.net/"; license = licenses.boost; platforms = platforms.unix; - maintainers = with maintainers; [ cpages ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index 2af9968c842c4..0ba51a86893ac 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-VpREG75d+Rmfu8B2VTWueJtfEZwKxGUFb8E3OwVy1L4="; + hash = "sha256-VpREG75d+Rmfu8B2VTWueJtfEZwKxGUFb8E3OwVy1L4="; }; nativeBuildInputs = [ cmake git ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Library to parse and emit YAML, and do it fast"; homepage = "https://github.com/biojppm/rapidyaml"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 64e327ec34afd..944896d1cf57e 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -19,6 +19,7 @@ , includeEverything ? true , raylib-games , darwin +, autoPatchelfHook }: let inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL; @@ -34,7 +35,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gEstNs3huQ1uikVXOW4uoYnIDr5l8O9jgZRTX1mkRww="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + autoPatchelfHook + cmake + ]; buildInputs = [ glfw ] ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] @@ -58,20 +62,24 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Patch version in CMakeLists.txt to 5.0.0 # The library author doesn't use cmake, so when updating this package please - # check that the resulting library extension matches the version - # and remove/update this patch (resulting library name should match - # libraylib.so.${finalAttrs.version} + # check that the resulting library extension matches the package version + # and remove/update this patch (fetchpatch { url = "https://github.com/raysan5/raylib/commit/032cc497ca5aaca862dc926a93c2a45ed8017737.patch"; hash = "sha256-qsX5AwyQaGoRsbdszOO7tUF9dR+AkEFi4ebNkBVHNEY="; }) ]; + # fix libasound.so/libpulse.so not being found + appendRunpaths = [ + (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio)) + ]; + meta = with lib; { description = "Simple and easy-to-use library to enjoy videogames programming"; homepage = "https://www.raylib.com/"; license = licenses.zlib; - maintainers = with maintainers; [ adamlwgriffiths ]; + maintainers = [ ]; platforms = platforms.all; changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 09d2f7539f15a..278d63702ed2f 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "re2"; - version = "2024-06-01"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = finalAttrs.version; - hash = "sha256-iQETsjdIFcYM5I/W8ytvV3z/4va6TaZ/+KkSjb8CtF0="; + hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc="; }; outputs = [ @@ -36,20 +36,19 @@ stdenv.mkDerivation (finalAttrs: { ninja ]; - buildInputs = lib.optionals finalAttrs.doCheck [ + buildInputs = [ gbenchmark gtest ]; - propagatedBuildInputs = [ - abseil-cpp - icu - ]; + propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ]; - cmakeFlags = [ - (lib.cmakeBool "RE2_BUILD_TESTING" finalAttrs.doCheck) - (lib.cmakeBool "RE2_USE_ICU" true) - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) (lib.cmakeBool "BUILD_SHARED_LIBS" true); + cmakeFlags = + [ (lib.cmakeBool "RE2_BUILD_TESTING" true) ] + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + (lib.cmakeBool "RE2_USE_ICU" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ]; doCheck = true; diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 7387e69130730..69eb4b0cd12d5 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchpatch -, cmake , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix index ccc4df86ecd12..45b9f299aa2d5 100644 --- a/pkgs/development/libraries/rinutils/default.nix +++ b/pkgs/development/libraries/rinutils/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "rinutils"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2H/hGZcit/qb1QjhNTg/8HiPvX1lXL75dXwjIS+MIXs="; + sha256 = "sha256-+eUn03psyMe4hwraY8qiTzKrDSn9ERbfPrtoZYMDCVU="; }; nativeBuildInputs = [ cmake perl ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shlomif/rinutils"; changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index ad7ba8a5a5497..d41459e25eadb 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -4,12 +4,10 @@ , fetchFromGitHub , freetype , gtk3-x11 -, mount , pcre , pkg-config , webkitgtk , xorg -, llvmPackages , WebKit , MetalKit , CoreAudioKit diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 6a593ec070dc3..d15bada3e813c 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tessil/robin-map"; changelog = "https://github.com/Tessil/robin-map/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 2c70046108dab..b8b30e585f6e2 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -11,7 +11,7 @@ , windows , enableJemalloc ? false , jemalloc -, enableLiburing ? true +, enableLiburing ? stdenv.isLinux , liburing , enableShared ? !stdenv.hostPlatform.isStatic , sse42Support ? stdenv.hostPlatform.sse4_2Support @@ -19,16 +19,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "facebook"; - repo = finalAttrs.pname; + repo = "rocksdb"; rev = "v${finalAttrs.version}"; - hash = "sha256-bTUzh7ch14TDcm6GkfhA5I/qUVmUm+RE5d2HMZ3zaNc="; + hash = "sha256-eABOzOuaSMAipX8yuXDfZPTHDyIInyPzreE42MwAcYg="; }; - patches = [ ./fix-findliburing.patch ]; + patches = lib.optional (lib.versionAtLeast finalAttrs.version "6.29.3" && enableLiburing) ./fix-findliburing.patch; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/rtlcss/default.nix b/pkgs/development/libraries/rtlcss/default.nix index 327e7b2626dae..4143e649ea5c7 100644 --- a/pkgs/development/libraries/rtlcss/default.nix +++ b/pkgs/development/libraries/rtlcss/default.nix @@ -20,6 +20,6 @@ buildNpmPackage rec { mainProgram = "rtlcss"; homepage = "https://rtlcss.com"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 66b3dbbea3fb1..861de40a5b551 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://breakfastquay.com/rubberband/"; # commercial license available as well, see homepage. You'll get some more optimized routines license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index a5ba9527382e5..9984478e480f5 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -4,30 +4,30 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rure" diff --git a/pkgs/development/libraries/rure/pin.json b/pkgs/development/libraries/rure/pin.json index 7e6b1101702e8..9825f6e29ab99 100644 --- a/pkgs/development/libraries/rure/pin.json +++ b/pkgs/development/libraries/rure/pin.json @@ -1,5 +1,5 @@ { "pname": "rure", "version": "0.2.2", - "sha256": "0n2c9b8arfgcq1l7gr8dfcmdvdbggvfd0msy6sbx3bln74wwbr06" + "hash": "sha256-BuTFOTmWrtGXNl5X0Nx+b7XdKnMN5XdowOy5rNBKTFg=" } diff --git a/pkgs/development/libraries/rure/update.sh b/pkgs/development/libraries/rure/update.sh index 6e85d7cf03a73..d9a31cf68a80c 100755 --- a/pkgs/development/libraries/rure/update.sh +++ b/pkgs/development/libraries/rure/update.sh @@ -27,7 +27,7 @@ cat > pin.json <<EOF { "pname": "$crate", "version": "$version", - "sha256": "$(printf '%s' "$prefetch" | head -n1)" + "hash": "$(nix hash to-sri --type sha256 "$(printf '%s' "$prefetch" | head -n1)")" } EOF diff --git a/pkgs/development/libraries/rustls-ffi/Cargo.lock b/pkgs/development/libraries/rustls-ffi/Cargo.lock deleted file mode 100644 index 6cf2c532f33b4..0000000000000 --- a/pkgs/development/libraries/rustls-ffi/Cargo.lock +++ /dev/null @@ -1,369 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro2" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustls" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "rustversion", - "sct", -] - -[[package]] -name = "rustls-ffi" -version = "0.10.0" -dependencies = [ - "libc", - "log", - "num_enum", - "rustls", - "rustls-pemfile", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" - -[[package]] -name = "toml_edit" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.25", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.25", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winnow" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" -dependencies = [ - "memchr", -] diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix index 380405217e3da..d5d736dd2225a 100644 --- a/pkgs/development/libraries/rustls-ffi/default.nix +++ b/pkgs/development/libraries/rustls-ffi/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, apacheHttpd, curl }: +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + Security, + apacheHttpd, +}: rustPlatform.buildRustPackage rec { pname = "rustls-ffi"; @@ -35,7 +42,11 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "C-to-rustls bindings"; homepage = "https://github.com/rustls/rustls-ffi/"; - license = with lib.licenses; [ mit asl20 isc ]; + license = with lib.licenses; [ + mit + asl20 + isc + ]; maintainers = [ maintainers.lesuisse ]; }; } diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index d4a440e587c12..73148c5069afe 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.4.16"; + version = "1.4.17"; src = fetchFromGitHub { owner = "aws"; - repo = pname; + repo = "s2n-tls"; rev = "v${version}"; - hash = "sha256-HkpOd05/5YIDsBm4L3hLuI0obm7uAwsV1dC2/e2f5aw="; + hash = "sha256-Go6p+6VidsoN7IMfBp7BMGnIcttaEA0q3CRAKDO5b+c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 1f49afbacff29..279ce4356b691 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, path, runtimeShell }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "safefile"; version = "1.0.5"; diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index 8c6eb60d1d2b0..3591a86dbb701 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-0bFGHlkZnAZlnxlj8tY3s9yTWgkNtSsPFfudB3uvyOA="; + sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index e50bde243e85e..f0d23b7e2e257 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, doxygen, spglib +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, spglib , mmtf-cpp, glew, python3, libarchive, libmsym, msgpack, qttools, wrapQtAppsHook }: diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 723ced8b2a590..35aa46d270c24 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -14,18 +14,18 @@ , config , enableCuda ? config.cudaSupport , cudaPackages -, addOpenGLRunpath +, addDriverRunpath }: stdenv.mkDerivation rec { pname = "openmm"; - version = "8.1.1"; + version = "8.1.2"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-pYWBniV1J+UZBOPPjuUxVevONHaclo+GvGBEpr7Zmxg="; + hash = "sha256-2UFccB+xXAw3uRw0G1TKlqTVl9tUl1sRPFG4H05vq04="; }; # "This test is stochastic and may occassionally fail". It does. @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { python3Packages.build python3Packages.installer python3Packages.wheel - ] ++ lib.optional enableCuda addOpenGLRunpath; + ] ++ lib.optional enableCuda addDriverRunpath; buildInputs = [ fftwSinglePrec ] ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ] @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { postFixup = '' for lib in $out/lib/plugins/*CUDA.so $out/lib/plugins/*Cuda*.so; do - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" done ''; diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index eb8fa56455e41..08f303581c99d 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -15,13 +15,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "simple-dftd3"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; rev = "v${version}"; - hash = "sha256-dfXiKKCGJ69aExSKpVC3Bp//COy256R9PDyxCNmDsfo="; + hash = "sha256-XeLf5v/GraDGcTsVIEBnS4AL8tMeO11YTuPHlNt5Ap8="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix index 74f24e10f55f2..267ac53d75d1b 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix @@ -1,6 +1,4 @@ { buildPythonPackage -, pkg-config -, meson , simple-dftd3 , cffi , numpy diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index e5ad0e3e63d9c..910c40a4e0c03 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -42,10 +42,9 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ cmake gfortran python3 ]; buildInputs = [ blas - python3 boost ] ++ lib.optionals (!stdenv.isDarwin) [ ocl-icd diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix index 2c576a1900267..a99f673700c43 100644 --- a/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "dbcsr"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "cp2k"; repo = "dbcsr"; rev = "v${version}"; - hash = "sha256-+xSxfrzsxBdb424F/3mIETleEPoETxU0LB0OBJrR7gw="; + hash = "sha256-QEO7f27DLsCvKXgFJnneHs1kO+5V9xiURpbQuGg1P0M="; }; postPatch = '' diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 1dfe814427889..9d0dea3ff6a12 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -1,33 +1,33 @@ -{ lib -, config -, fetchFromGitHub -, symlinkJoin -, stdenv -, cmake -, cudaPackages ? { } -, cudaSupport ? config.cudaSupport -, pythonSupport ? true -, pythonPackages -, llvmPackages -, boost -, blas -, swig -, addOpenGLRunpath -, optLevel ? let - optLevels = - lib.optionals stdenv.hostPlatform.avx2Support [ "avx2" ] - ++ lib.optionals stdenv.hostPlatform.sse4_1Support [ "sse4" ] - ++ [ "generic" ]; - in - # Choose the maximum available optimization level - builtins.head optLevels -, faiss # To run demos in the tests -, runCommand +{ + lib, + config, + fetchFromGitHub, + stdenv, + cmake, + cudaPackages ? { }, + cudaSupport ? config.cudaSupport, + pythonSupport ? true, + pythonPackages, + llvmPackages, + blas, + swig, + autoAddDriverRunpath, + optLevel ? + let + optLevels = + lib.optionals stdenv.hostPlatform.avx2Support [ "avx2" ] + ++ lib.optionals stdenv.hostPlatform.sse4_1Support [ "sse4" ] + ++ [ "generic" ]; + in + # Choose the maximum available optimization level + builtins.head optLevels, + faiss, # To run demos in the tests + runCommand, }@inputs: let pname = "faiss"; - version = "1.7.4"; + version = "1.8.0"; inherit (cudaPackages) flags backendStdenv; @@ -46,55 +46,67 @@ in stdenv.mkDerivation { inherit pname version; - outputs = [ "out" "demos" ]; + outputs = [ + "out" + "demos" + "dist" + ]; src = fetchFromGitHub { owner = "facebookresearch"; repo = pname; rev = "v${version}"; - hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M="; + hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I="; }; - buildInputs = [ - blas - swig - ] ++ lib.optionals pythonSupport [ - pythonPackages.setuptools - pythonPackages.pip - pythonPackages.wheel - ] ++ lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - ] ++ lib.optionals cudaSupport cudaComponents; - - propagatedBuildInputs = lib.optionals pythonSupport [ - pythonPackages.numpy - ]; - - nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_nvcc - addOpenGLRunpath - ] ++ lib.optionals pythonSupport [ - pythonPackages.python - ]; - - passthru.extra-requires.all = [ - pythonPackages.numpy - ]; - - cmakeFlags = [ - "-DFAISS_ENABLE_GPU=${if cudaSupport then "ON" else "OFF"}" - "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}" - "-DFAISS_OPT_LEVEL=${optLevel}" - ] ++ lib.optionals cudaSupport [ - "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}" - ]; + # Remove the following substituteInPlace when updating + # to a release that contains change from PR + # https://github.com/facebookresearch/faiss/issues/3239 + # that fixes building faiss with swig 4.2.x + postPatch = '' + substituteInPlace faiss/python/swigfaiss.swig \ + --replace-fail '#ifdef SWIGWORDSIZE64' '#if (__SIZEOF_LONG__ == 8)' + ''; - buildFlags = [ - "faiss" - "demo_ivfpq_indexing" - ] ++ lib.optionals pythonSupport [ - "swigfaiss" - ]; + nativeBuildInputs = + [ cmake ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + autoAddDriverRunpath + ] + ++ lib.optionals pythonSupport [ + pythonPackages.python + pythonPackages.setuptools + pythonPackages.pip + pythonPackages.wheel + ]; + + buildInputs = + [ + blas + swig + ] + ++ lib.optionals pythonSupport [ pythonPackages.numpy ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ] + ++ lib.optionals cudaSupport cudaComponents; + + cmakeFlags = + [ + (lib.cmakeBool "FAISS_ENABLE_GPU" cudaSupport) + (lib.cmakeBool "FAISS_ENABLE_PYTHON" pythonSupport) + (lib.cmakeFeature "FAISS_OPT_LEVEL" optLevel) + ] + ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) + ]; + + buildFlags = + [ "faiss" ] + # This is just a demo app used as a test. + # Disabled because linkage fails: + # https://github.com/facebookresearch/faiss/issues/3484 + ++ lib.optionals (!cudaSupport) [ "demo_ivfpq_indexing" ] + ++ lib.optionals pythonSupport [ "swigfaiss" ]; # pip wheel->pip install commands copied over from opencv4 @@ -103,36 +115,30 @@ stdenv.mkDerivation { python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - postInstall = '' - mkdir -p $demos/bin - cp ./demos/demo_ivfpq_indexing $demos/bin/ - '' + lib.optionalString pythonSupport '' - mkdir -p $out/${pythonPackages.python.sitePackages} - (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache) - ''; - - postFixup = lib.optionalString (pythonSupport && cudaSupport) '' - addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so - addOpenGLRunpath $demos/bin/* - ''; - - # Need buildPythonPackage for this one - # pythonImportsCheck = [ - # "faiss" - # ]; + postInstall = + '' + mkdir -p $demos/bin + if [[ "$buildInputs" == *demo_ivfpq_indexing* ]] ; then + cp ./demos/demo_ivfpq_indexing $demos/bin/ + fi + '' + + lib.optionalString pythonSupport '' + mkdir "$dist" + cp faiss/python/dist/*.whl "$dist/" + ''; passthru = { inherit cudaSupport cudaPackages pythonSupport; tests = { - runDemos = runCommand "${pname}-run-demos" - { buildInputs = [ faiss.demos ]; } - # There are more demos, we run just the one that documentation mentions - '' - demo_ivfpq_indexing && touch $out - ''; - } // lib.optionalAttrs pythonSupport { - pytest = pythonPackages.callPackage ./tests.nix { }; + runDemos = + runCommand "${pname}-run-demos" { buildInputs = [ faiss.demos ]; } + # There are more demos, we run just the one that documentation mentions + '' + demo_ivfpq_indexing && touch $out + ''; + pythonFaiss = pythonPackages.faiss; + pytest = pythonPackages.faiss.tests.pytest; }; }; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index ac04711ff71f8..22879067a9246 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -6,6 +6,8 @@ , lapack , gfortran , enableAMPL ? true, libamplsolver +, enableMUMPS ? !stdenv.isDarwin, mumps, mpi +, enableSPRAL ? true, spral }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -23,21 +25,30 @@ stdenv.mkDerivation rec { CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; - configureFlags = [ + configureFlags = lib.optionals enableAMPL [ "--with-asl-cflags=-I${libamplsolver}/include" "--with-asl-lflags=-lamplsolver" + ] ++ lib.optionals enableMUMPS [ + "--with-mumps-cflags=-I${mumps}/include" + "--with-mumps-lflags=-ldmumps" + ] ++ lib.optionals enableSPRAL [ + "--with-spral-cflags=-I${spral}/include" + "--with-spral-lflags=-lspral" ]; nativeBuildInputs = [ pkg-config gfortran ]; - buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ]; + buildInputs = [ blas lapack ] + ++ lib.optionals enableAMPL [ libamplsolver ] + ++ lib.optionals enableMUMPS [ mumps mpi ] + ++ lib.optionals enableSPRAL [ spral ]; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Software package for large-scale nonlinear optimization"; homepage = "https://projects.coin-or.org/Ipopt"; - license = licenses.epl10; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.epl10; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index d2f6b1ee8aec4..a1a1ed8a69bc0 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin }; } diff --git a/pkgs/development/libraries/science/math/latte-integrale/default.nix b/pkgs/development/libraries/science/math/latte-integrale/default.nix deleted file mode 100644 index 7eb485974ff21..0000000000000 --- a/pkgs/development/libraries/science/math/latte-integrale/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, gmp -, ntl -, cddlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "latte-integrale"; - version = "1.7.6"; - - src = fetchurl { - url = "https://github.com/latte-int/latte/releases/download/version_${lib.replaceStrings ["."] ["_"] finalAttrs.version}/latte-int-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-AGwQ6+XVv9ybFZy6YmSkQyhh/nY84F/oIWJKt9P8IXA="; - }; - - patches = [ - # C++17 compat - (fetchpatch { - url = "https://github.com/latte-int/latte/commit/6dbf7f07d5c9e1f3afe793f782d191d4465088ae.patch"; - excludes = [ "code/latte/sqlite/IntegrationDB.h" ]; - sha256 = "sha256-i7c11y54OLuJ0m7PBnhEoAzJzxC842JU7A6TOtTz06k="; - }) - ]; - - buildInputs = [ - gmp - ntl - cddlib - ]; - - meta = { - description = "Software for counting lattice points and integration over convex polytopes"; - homepage = "https://www.math.ucdavis.edu/~latte/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ amesgen ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index ebab7c00809ad..6ea1ca8f8e6c0 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "sagemath"; repo = pname; rev = version; - sha256 = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; + hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index 5b08cfa7dcf07..92050cd172834 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -4,12 +4,13 @@ , lib , libcxx , llvmPackages +, config -, addOpenGLRunpath +, addDriverRunpath , patchelf , fixDarwinDylibNames -, cudaSupport +, cudaSupport ? config.cudaSupport }: let @@ -31,7 +32,7 @@ in stdenv.mkDerivation { nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] - else [ patchelf ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; + else [ patchelf ] ++ lib.optionals cudaSupport [ addDriverRunpath ]; dontBuild = true; dontConfigure = true; @@ -64,7 +65,7 @@ in stdenv.mkDerivation { echo "setting rpath for $lib..." patchelf --set-rpath "${rpath}:$out/lib" "$lib" ${lib.optionalString cudaSupport '' - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" ''} done '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 90e6c05da77d0..607b6c89e40d1 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -5,7 +5,7 @@ , fetchurl , rpmextract , _7zz -, darwin +, cctools , validatePkgConfig , enableStatic ? stdenv.hostPlatform.isStatic }: @@ -72,7 +72,7 @@ in stdenvNoCC.mkDerivation ({ nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then - [ _7zz darwin.cctools ] + [ _7zz cctools ] else [ rpmextract ]); diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/development/libraries/science/math/mkl/test/default.nix index cb3355260d127..1717e11e43d86 100644 --- a/pkgs/development/libraries/science/math/mkl/test/default.nix +++ b/pkgs/development/libraries/science/math/mkl/test/default.nix @@ -12,7 +12,9 @@ in stdenv.mkDerivation { pname = "mkl-test"; version = mkl.version; - src = ./.; + unpackPhase = '' + cp ${./test.c} test.c + ''; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index acb0ece75463c..cb4670204d112 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -6,7 +6,7 @@ , eigen , ensureNewerSourcesForZipFilesHook , fetchFromGitHub -, fetchpatch +, substituteAll , glpk , lib , pkg-config @@ -19,53 +19,57 @@ , zlib }: +let + pybind11_protobuf = fetchFromGitHub { + owner = "pybind"; + repo = "pybind11_protobuf"; + rev = "b713501f1da56d9b76c42f89efd00b97c26c9eac"; + hash = "sha256-f6pzRWextH+7lm1xzyhx98wCIWH3lbhn59gSCcjsBVw="; + }; +in stdenv.mkDerivation rec { pname = "or-tools"; - version = "9.4"; + version = "9.7"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "sha256-joWonJGuxlgHhXLznRhC1MDltQulXzpo4Do9dec1bLY="; + hash = "sha256-eHukf6TbY2dx7iEf8WfwfWsjDEubPtRO02ju0kHtASo="; }; + patches = [ - # Disable test that requires external input: https://github.com/google/or-tools/issues/3429 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/7072ae92ec204afcbfce17d5360a5884c136ce90.patch"; - hash = "sha256-iWE+atp308q7pC1L1FD6sK8LvWchZ3ofxvXssguozbM="; - }) - # Fix test that broke in parallel builds: https://github.com/google/or-tools/issues/3461 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch"; - hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc="; + (substituteAll { + src = ./offline.patch; + pybind11_protobuf = "../../pybind11_protobuf"; }) - # Backport fix in cmake test configuration where pip installs newer version from PyPi over local build, - # breaking checkPhase: https://github.com/google/or-tools/issues/3260 - (fetchpatch { - url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch"; - hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM="; - }) - # Don't use non-existent member of string_view. Partial patch from commit - # https://github.com/google/or-tools/commit/c5a2fa1eb673bf652cb9ad4f5049d054b8166e17.patch - ./fix-stringview-compile.patch ]; # or-tools normally attempts to build Protobuf for the build platform when # cross-compiling. Instead, just tell it where to find protoc. postPatch = '' echo "set(PROTOC_PRG $(type -p protoc))" > cmake/host.cmake + + cp -R ${pybind11_protobuf} pybind11_protobuf + chmod -R u+w pybind11_protobuf ''; cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DBUILD_PYTHON=ON" "-DBUILD_pybind11=OFF" + "-DBUILD_pybind11_protobuf=ON" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; + + strictDeps = true; + nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook @@ -78,14 +82,18 @@ stdenv.mkDerivation rec { ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf + mypy ]); buildInputs = [ + abseil-cpp bzip2 cbc eigen glpk python.pkgs.absl-py python.pkgs.pybind11 + python.pkgs.pytest + python.pkgs.scipy python.pkgs.setuptools python.pkgs.wheel re2 @@ -103,7 +111,19 @@ stdenv.mkDerivation rec { python.pkgs.virtualenv ]; - doCheck = true; + env.NIX_CFLAGS_COMPILE = toString [ + # fatal error: 'python/google/protobuf/proto_api.h' file not found + "-I${protobuf.src}" + # fatal error: 'pybind11_protobuf/native_proto_caster.h' file not found + "-I${pybind11_protobuf}" + ]; + + # some tests fail on linux and hang on darwin + doCheck = false; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; # This extra configure step prevents the installer from littering # $out/bin with sample programs that only really function as tests, diff --git a/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch b/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch deleted file mode 100644 index 760ab80a38e4d..0000000000000 --- a/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc -index 58286306e5..bd26c019ab 100644 ---- a/ortools/lp_data/lp_parser.cc -+++ b/ortools/lp_data/lp_parser.cc -@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) { - - bool LPParser::ParseConstraint(StringPiece constraint) { - const StatusOr<ParsedConstraint> parsed_constraint_or_status = -- ::operations_research::glop::ParseConstraint(constraint.as_string()); -+ ::operations_research::glop::ParseConstraint(constraint); - if (!parsed_constraint_or_status.ok()) return false; - const ParsedConstraint& parsed_constraint = - parsed_constraint_or_status.value(); -@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) { - - } // namespace - --StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) { -+StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint) { - ParsedConstraint parsed_constraint; - // Get the name, if present. -- StringPiece constraint{constraint_view}; - StringPiece constraint_copy{constraint}; - std::string consumed_name; - Fractional consumed_coeff; -@@ -413,8 +412,8 @@ StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) { - right_bound = consumed_coeff; - if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) != - TokenType::END) { -- return absl::InvalidArgumentError(absl::StrCat( -- "End of input was expected, found: ", constraint.as_string())); -+ return absl::InvalidArgumentError( -+ absl::StrCat("End of input was expected, found: ", constraint)); - } - } - diff --git a/pkgs/development/libraries/science/math/or-tools/offline.patch b/pkgs/development/libraries/science/math/or-tools/offline.patch new file mode 100644 index 0000000000000..1a2a4dbe3631b --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/offline.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt +index af3a28c113..ba92c3c55e 100644 +--- a/cmake/dependencies/CMakeLists.txt ++++ b/cmake/dependencies/CMakeLists.txt +@@ -177,9 +177,8 @@ if(BUILD_PYTHON AND BUILD_pybind11_protobuf) + list(APPEND CMAKE_MESSAGE_INDENT " ") + FetchContent_Declare( + pybind11_protobuf +- GIT_REPOSITORY "https://github.com/pybind/pybind11_protobuf.git" +- GIT_TAG "main" +- PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" ++ SOURCE_DIR @pybind11_protobuf@ ++ PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch" + ) + FetchContent_MakeAvailable(pybind11_protobuf) + list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix index d308302e2c9f3..55f00d01636a2 100644 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { owner = "oxfordcontrol"; repo = "osqp"; rev = "v${version}"; - sha256 = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c="; + hash = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c="; fetchSubmodules = true; }; + # ref https://github.com/osqp/osqp/pull/481 + # but this patch does not apply directly on v0.6.3 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + "$<INSTALL_PREFIX>/\''${CMAKE_INSTALL_INCLUDEDIR}" \ + "\''${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 2f8d3dbe15de3..f1e0f6cf5a128 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -52,10 +52,11 @@ stdenv.mkDerivation rec { -DLAPACK_LIBRARIES="-llapack" -DBLAS_LIBRARIES="-lblas" -DCMAKE_Fortran_COMPILER=${lib.getDev mpi}/bin/mpif90 - ${lib.optionalString passthru.isILP64 '' - -DCMAKE_Fortran_FLAGS="-fdefault-integer-8" - -DCMAKE_C_FLAGS="-DInt=long" - ''} + -DCMAKE_C_FLAGS="${lib.concatStringsSep " " [ + "-Wno-implicit-function-declaration" + (lib.optionalString passthru.isILP64 "-DInt=long") + ]}" + ${lib.optionalString passthru.isILP64 ''-DCMAKE_Fortran_FLAGS="-fdefault-integer-8"''} ) ''; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 6ace83fd043d9..3dd08a239ee74 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -1,21 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gnum4 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gnum4, }: stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.2.0"; + version = "9.3.0"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchFromGitHub { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-UtJ5AXbmoUA1NokgXDUDnhCZzOT1bTen6C89bsCWEIo="; + hash = "sha256-/ubvds/mg5SW8kEfnEuPyHCM/P8+ETT1Uus2ESj50Og="; }; nativeBuildInputs = [ @@ -27,6 +31,8 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ''; + cmakeFlags = [ (lib.cmakeBool "GRAPHBLAS_USE_JIT" (!(stdenv.isLinux && stdenv.isAarch64))) ]; + meta = with lib; { description = "Graph algorithms in the language of linear algebra"; homepage = "https://people.engr.tamu.edu/davis/GraphBLAS.html"; diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 4ecd08d103fac..9f9405dec3180 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -1,5 +1,4 @@ { stdenv -, bash , buildPackages , buildBazelPackage , fetchFromGitHub diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index e20365b215dcc..bea271b0cef15 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -46,7 +46,7 @@ in src = fetchFromGitHub { owner = "NVlabs"; - repo = finalAttrs.pname; + repo = "tiny-cuda-nn"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-qW6Fk2GB71fvZSsfu+mykabSxEKvaikZ/pQQZUycOy0="; diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 6e63520031c14..2e2e2a871f7a6 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - sha256 = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; + hash = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; }; nativeBuildInputs = [ cmake pkg-config pythonEnv ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index daa861b31ea7c..73fb6a6dcf6e4 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 38ebc3f42a096..acda15495bd46 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.6"; + version = "0.7.8"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-yriFV6OLk+miaKKWQKd08MmwDx0blkiiyq6gQHUaNWE="; + hash = "sha256-S9fkxLCeQdHOt1FUa8CcZMmORNcxwQSuchng/dNq4g8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 707a77006acbe..51e1f0264805f 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; mainProgram = "serdi"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 60a4af6d0a730..7f4b73c793789 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,5 +1,6 @@ { lib , stdenv +, llvmPackages , fetchurl , pkg-config , freetype @@ -20,7 +21,11 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ freetype ]; + buildInputs = [ freetype ] + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) + (llvmPackages.compiler-rt.override { + doFakeLibgcc = true; + }); patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 8ef7308764b37..5f2c020c30f6b 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.9.5"; + version = "3.10.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-OCEHfjyWLxjThe1nrXIexMa4rI7RWt+3qnQErxHc7CU="; + sha256 = "sha256-MKaYThfAbQiUHBFPAWJatKdLJdmJfsR3o8gp81RE3SI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index f8f1af00fe66b..89372fca3f639 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -59,6 +59,6 @@ gnustep.stdenv.mkDerivation rec { license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; platforms = platforms.linux; - maintainers = with maintainers; []; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index fe7901bddd582..14ff1ee1356fe 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "soqt"; # rev = "SoQt-${version}"; rev = "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d"; - sha256 = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs="; + hash = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs="; fetchSubmodules = true; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/coin3d/soqt"; license = licenses.bsd3; description = "Glue between Coin high-level 3D visualization library and Qt"; - maintainers = with maintainers; [ gebner viric ]; + maintainers = with maintainers; [ gebner ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index b04e1fbbf001f..f762fbc3931ec 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://drobilla.net/software/sord"; description = "Lightweight C library for storing RDF data in memory"; license = with licenses; [ bsd0 isc ]; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 40179b269efd9..606fda594d918 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "soundtouch"; repo = "soundtouch"; rev = version; - sha256 = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; + hash = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 4541042ed5c5f..abd87c03b1a82 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; + hash = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 9b44c8e46d0cb..b0472e1b004ab 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -21,6 +21,7 @@ , withEspeak ? true, espeak, sonic, pcaudiolib , mbrola , withPico ? true, svox +, libsOnly ? false }: let @@ -101,14 +102,16 @@ in stdenv.mkDerivation rec { substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang" ''; - postInstall = '' + postInstall = if libsOnly then '' + rm -rf $out/{bin,etc,lib/speech-dispatcher,lib/systemd,libexec,share} + '' else '' wrapPythonPrograms ''; enableParallelBuilding = true; meta = with lib; { - description = "Common interface to speech synthesis"; + description = "Common interface to speech synthesis" + lib.optionalString libsOnly " - client libraries only"; homepage = "https://devel.freebsoft.org/speechd"; license = licenses.gpl2Plus; maintainers = with maintainers; [ @@ -116,5 +119,6 @@ in stdenv.mkDerivation rec { jtojnar ]; platforms = platforms.linux; + mainProgram = "speech-dispatcher"; }; } diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index fe585e9d6ea22..1d3f8b489f211 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "2.4.0"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.5.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-Y6WkN3Q1q4h2TqrlKSKFmFxQZQWKmleRHV74PmYyw2A="; + hash = "sha256-/PG+ewlxIyf5Au2kVvsAYCfGZgUOOEpA1uATu15ut+M="; }; nativeBuildInputs = [ cmake gfortran gtest ]; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index af7848cdf85f2..c5dc183dd1432 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { mainProgram = "sqlcipher"; homepage = "https://www.zetetic.net/sqlcipher/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f7a870e276209..f2de9320ce857 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.45.3"; + version = "3.46.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-soCcpTEkwZxg9Cv2J3NurgEa/cwgW7SCcKXumjgZFTE="; + hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 0f6fe766a3de3..2b843c0b22e0b 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.45.3"; + version = "3.46.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-7AyVnkLLXxgEE10FVfjqMr5v8gSOsYG8zTZ8j1PxhdE="; + hash = "sha256-BwNiEJvraJn2V5dXG5i4gkyPQ39bKSb4juBo2Y7zaOw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/development/libraries/sregex/default.nix index f69e09c8873b5..58ef91c31908b 100644 --- a/pkgs/development/libraries/sregex/default.nix +++ b/pkgs/development/libraries/sregex/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams"; mainProgram = "sregex-cli"; license = licenses.bsd3; - maintainers = with maintainers; []; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index f96bb0724bf28..5e3cc62ea41b8 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index a11544dd78930..5d58212d70c62 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Implementation of the C++ standard template library STL for external memory (out-of-core) computations"; homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "stxxl_tool"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 36564110d2833..3d6a3653d2672 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: +{ lib, stdenv, fetchgit, python3, cmake, jq }: stdenv.mkDerivation rec { pname = "swiftshader"; diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix index 5d70bed4dd0fe..e0c4296cb2773 100644 --- a/pkgs/development/libraries/sycl-info/default.nix +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, installShellFiles , cmake , ninja , ocl-icd diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 3c60ca5fc2a24..3b341cb2eae03 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.31"; + version = "1.8.34"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "8f19c751dc296cedb9a921badb7a02a8c0cb1aeb"; - hash = "sha256-M9EFNgWIpBz276moCG3qJ1WDIEP5j24vuYHio9jc8W0="; + rev = "1fa2a372a88c26369dcac2ce476166531df74a77"; + hash = "sha256-7I2hm3KFtiJwz1tOxh+kSPItFnUcE4ALT865wAyASCA="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix index e59e5858eaacd..85470f606f28e 100644 --- a/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "tezos"; repo = "tezos-rust-libs"; rev = "v${version}"; - sha256 = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw="; + hash = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw="; }; nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 0a6adbb5882a0..67cee0140de04 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , fetchpatch , tcl diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index c5317a8545dd5..c8f4efa7f7aca 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -, callPackage +{ callPackage , fetchurl , tcl , ... diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 540f5d5d7e367..4978f8b96f58a 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -69,6 +69,6 @@ tcl.mkTclDerivation { homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index 68550b5ab4743..078ae201ea2a2 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html"; license = licenses.cc0; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index d17ef6c8fd7ce..0477b6ca6d116 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; + configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version"; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libogg ]; diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 1a2ec33dae5f9..09c7ff795d3d7 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-eVMlepthJuy9BQnR2u8PFSfuWNg8QxDOJyV5qzcztOE="; + sha256 = "sha256-7MXMbqksHqcyvwJsW8+wPWfnKTbQhUlGa4GcidpiBFw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 09e6e2d6a03ca..4ee7a90dd3108 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "C++ library to facilitate using C++ design patterns"; homepage = "https://www.gnu.org/software/commoncpp/"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index d22ff81c2530a..710979057d439 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Project for mocking web service APIs which use HTTP or HTTPS"; homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index b7926eecb4f24..38b36267ef34c 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.18.2"; + version = "0.18.3"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-1HKV6IA8bWfgdgMcIlgeP470aIAj1I925ed2qM7IkHM="; + hash = "sha256-q6lcMjA3yELxYXkxJgIxuFV9EZqiiRy8qLgR/MVZKUo="; }; patches = [ diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 6a6407eb32ff0..04d33b66e5a99 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/unittest-cpp/unittest-cpp"; description = "Lightweight unit testing framework for C++"; license = lib.licenses.mit; - maintainers = []; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 7e4a8b4f6cced..641d051c1c32a 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -214,10 +214,10 @@ src = fetchurl { url = { - x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb"; - aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb"; - x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz"; - aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz"; + x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_amd64.deb"; + aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_arm64.deb"; + x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-amd64.tar.gz"; + aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-arm64.tar.gz"; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hash = { x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52"; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index e4a8c7628bc8b..55feb41bec8a4 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, cmake , fetchFromGitLab , pkg-config , meson diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 9320fe34bb64a..3ea2d075602a0 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit , gn, ninja, python3, glib, pkg-config, icu -, xcbuild, darwin +, xcbuild , fetchpatch , llvmPackages , symlinkJoin diff --git a/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch deleted file mode 100644 index 72ec48f020b2e..0000000000000 --- a/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 439e2effe1cc372925daf6d5c28569663ffb93ed Mon Sep 17 00:00:00 2001 -From: Tadeo Kondrak <me@tadeo.ca> -Date: Mon, 25 Jan 2021 11:17:44 -0700 -Subject: [PATCH] Call weak function to allow adding preloaded plugins after - compile - ---- - src/core/vscore.cpp | 19 +++++++++++++++++++ - src/core/vscore.h | 5 +++++ - 2 files changed, 24 insertions(+) - -diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp -index f8e69062..4ce4c623 100644 ---- a/src/core/vscore.cpp -+++ b/src/core/vscore.cpp -@@ -1791,6 +1791,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { - freeDepth--; - } - -+extern "C" { -+void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data); -+ -+struct VSLoadPluginsNixCallbackData { -+ VSCore *core; -+ const char *filter; -+}; -+ -+static void VSLoadPluginsNixCallback(void *data, const char *path) { -+ auto callbackData = static_cast<VSLoadPluginsNixCallbackData *>(data); -+ callbackData->core->loadAllPluginsInPath(path, callbackData->filter); -+} -+} -+ - VSCore::VSCore(int flags) : - numFilterInstances(1), - numFunctionInstances(0), -@@ -1918,6 +1932,11 @@ VSCore::VSCore(int flags) : - } // If neither exists, an empty string will do. - #endif - -+ if (VSLoadPluginsNix != nullptr) { -+ VSLoadPluginsNixCallbackData data{this, filter.c_str()}; -+ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data); -+ } -+ - VSMap *settings = readSettings(configFile); - const char *error = vs_internal_vsapi.mapGetError(settings); - if (error) { -diff --git a/src/core/vscore.h b/src/core/vscore.h -index 2ce0f56b..2982b133 100644 ---- a/src/core/vscore.h -+++ b/src/core/vscore.h -@@ -985,6 +985,9 @@ public: - std::string getV3ArgString() const; - }; - -+extern "C" { -+static void VSLoadPluginsNixCallback(void *data, const char *path); -+} - - struct VSPlugin { - friend struct VSPluginFunction; -@@ -1140,6 +1143,8 @@ public: - - explicit VSCore(int flags); - void freeCore(); -+ -+ friend void VSLoadPluginsNixCallback(void *data, const char *path); - }; - - #endif // VSCORE_H --- -2.32.0 - diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix deleted file mode 100644 index 79d3feca52455..0000000000000 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper -, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv -, zimg, libass, python3, libiconv, testers -, ApplicationServices -}: - -stdenv.mkDerivation rec { - pname = "vapoursynth"; - version = "65"; - - src = fetchFromGitHub { - owner = "vapoursynth"; - repo = "vapoursynth"; - rev = "R${version}"; - sha256 = "sha256-HrTXhRoKSFeLXYQM7W2FvYf7yCD1diSZGtPop9urrSk="; - }; - - patches = [ - ./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; - buildInputs = [ - zimg libass - (python3.withPackages (ps: with ps; [ sphinx cython ])) - ] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; - - enableParallelBuilding = true; - - passthru = rec { - # If vapoursynth is added to the build inputs of mpv and then - # used in the wrapping of it, we want to know once inside the - # wrapper, what python3 version was used to build vapoursynth so - # the right python3.sitePackages will be used there. - inherit python3; - - withPlugins = import ./plugin-interface.nix { - inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand - vapoursynth makeWrapper withPlugins; - }; - - tests.version = testers.testVersion { - package = vapoursynth; - # Check Core version to prevent false positive with API version - version = "Core R${version}"; - }; - }; - - postInstall = '' - wrapProgram $out/bin/vspipe \ - --prefix PYTHONPATH : $out/${python3.sitePackages} - - # VapourSynth does not include any plugins by default - # and emits a warning when the system plugin directory does not exist. - mkdir $out/lib/vapoursynth - ''; - - meta = with lib; { - broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix - description = "Video processing framework with the future in mind"; - homepage = "http://www.vapoursynth.com/"; - license = licenses.lgpl21; - platforms = platforms.x86_64; - maintainers = with maintainers; [ rnhmjoj sbruder ]; - mainProgram = "vspipe"; - }; -} diff --git a/pkgs/development/libraries/vapoursynth/editor.nix b/pkgs/development/libraries/vapoursynth/editor.nix deleted file mode 100644 index 88fa1d763f01f..0000000000000 --- a/pkgs/development/libraries/vapoursynth/editor.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, makeWrapper, runCommand -, python3, vapoursynth -, qmake, qtbase, qtwebsockets -}: - -let - unwrapped = mkDerivation rec { - pname = "vapoursynth-editor"; - version = "R19-mod-4"; - - src = fetchFromGitHub { - owner = "YomikoR"; - repo = pname; - rev = lib.toLower version; - sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg="; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase vapoursynth qtwebsockets ]; - - dontWrapQtApps = true; - - preConfigure = "cd pro"; - - preFixup = '' - cd ../build/release* - mkdir -p $out/bin - for bin in vsedit{,-job-server{,-watcher}}; do - mv $bin $out/bin - wrapQtApp $out/bin/$bin - done - ''; - - passthru = { inherit withPlugins; }; - - meta = with lib; { - description = "Cross-platform editor for VapourSynth scripts"; - homepage = "https://github.com/YomikoR/VapourSynth-Editor"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.all; - }; - }; - - withPlugins = plugins: let - vapoursynthWithPlugins = vapoursynth.withPlugins plugins; - in runCommand "${unwrapped.name}-with-plugins" { - nativeBuildInputs = [ makeWrapper ]; - passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); }; - } '' - mkdir -p $out/bin - for bin in vsedit{,-job-server{,-watcher}}; do - makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \ - --prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \ - --prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib - done - ''; -in - withPlugins [] diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix deleted file mode 100644 index f962634b131e7..0000000000000 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand -, vapoursynth, makeWrapper, withPlugins }: - -plugins: let - pythonEnvironment = python3.buildEnv.override { - extraLibs = plugins; - }; - - getRecursivePropagatedBuildInputs = pkgs: lib.flatten - (map - (pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs; - in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs)) - pkgs); - - deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins)); - - pluginsEnv = buildEnv { - name = "vapoursynth-plugins-env"; - pathsToLink = [ "/lib/vapoursynth" ]; - paths = deepPlugins; - }; - - pluginLoader = let - source = writeText "vapoursynth-nix-plugins.c" '' - void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) { - ${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins} - } - ''; - in - runCommandCC "vapoursynth-plugin-loader" { - executable = true; - preferLocalBuild = true; - allowSubstitutes = false; - } '' - mkdir -p $out/lib - $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" - ''; - - ext = stdenv.hostPlatform.extensions.sharedLibrary; -in -runCommand "${vapoursynth.name}-with-plugins" { - nativeBuildInputs = [ makeWrapper ]; - passthru = { - inherit python3; - inherit (vapoursynth) src version; - withPlugins = plugins': withPlugins (plugins ++ plugins'); - }; -} '' - mkdir -p \ - $out/bin \ - $out/lib/pkgconfig \ - $out/lib/vapoursynth \ - $out/${python3.sitePackages} - - for textFile in \ - lib/pkgconfig/vapoursynth{,-script}.pc \ - lib/libvapoursynth.la \ - lib/libvapoursynth-script.la \ - ${python3.sitePackages}/vapoursynth.la - do - substitute ${vapoursynth}/$textFile $out/$textFile \ - --replace "${vapoursynth}" "$out" - done - - for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do - ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"} - done - - for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do - ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"} - done - - for binaryFile in \ - lib/libvapoursynth${ext} \ - lib/libvapoursynth-script${ext}.0.0.0 - do - old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) - new_rpath="$old_rpath:$out/lib" - patchelf \ - --set-rpath "$new_rpath" \ - --output $out/$binaryFile \ - ${vapoursynth}/$binaryFile - patchelf \ - --add-needed libvapoursynth-nix-plugins${ext} \ - $out/$binaryFile - done - - for binaryFile in \ - ${python3.sitePackages}/vapoursynth${ext} \ - bin/.vspipe-wrapped - do - old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) - new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}" - patchelf \ - --set-rpath "$new_rpath" \ - --output $out/$binaryFile \ - ${vapoursynth}/$binaryFile - done - - ln -s \ - ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \ - $out/lib/libvapoursynth-nix-plugins${ext} - ln -s ${vapoursynth}/include $out/include - ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth - ln -s \ - libvapoursynth-script${ext}.0.0.0 \ - $out/lib/libvapoursynth-script${ext} - ln -s \ - libvapoursynth-script${ext}.0.0.0 \ - $out/lib/libvapoursynth-script${ext}.0 - - makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \ - --prefix PYTHONPATH : $out/${python3.sitePackages} -'' diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 4e3aab9a5532c..7db1d0d49195f 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { mainProgram = "vigra-config"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; - maintainers = [ maintainers.viric ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/vkd3d-proton/default.nix b/pkgs/development/libraries/vkd3d-proton/default.nix index 7616db1e021ee..e930d19ba4233 100644 --- a/pkgs/development/libraries/vkd3d-proton/default.nix +++ b/pkgs/development/libraries/vkd3d-proton/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "HansKristian-Work"; repo = pname; inherit rev; - sha256 = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU="; + hash = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index c2b585965b058..909a9fcbab3b4 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://www.vmime.org/"; description = "Free mail library for C++"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/volk/2.5.0.nix b/pkgs/development/libraries/volk/2.5.0.nix deleted file mode 100644 index 3e15993efc39f..0000000000000 --- a/pkgs/development/libraries/volk/2.5.0.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, python3 -, enableModTool ? true -, removeReferencesTo -, fetchpatch -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "volk"; - # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: - # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "gnuradio"; - repo = "volk"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; - fetchSubmodules = true; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; - sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; - extraPrefix = ""; - }) - ]; - - cmakeFlags = lib.optionals (!enableModTool) [ - "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" - ]; - - postInstall = lib.optionalString (!stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - ''; - - nativeBuildInputs = [ - cmake - python3 - python3.pkgs.mako - ]; - - doCheck = true; - - meta = with lib; { - homepage = "http://libvolk.org/"; - description = "Vector Optimized Library of Kernels"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix deleted file mode 100644 index caf3c848a1ed8..0000000000000 --- a/pkgs/development/libraries/volk/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, python3 -, enableModTool ? true -, removeReferencesTo -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "volk"; - version = "3.0.0"; - - src = fetchFromGitHub { - owner = "gnuradio"; - repo = "volk"; - rev = "v${finalAttrs.version}"; - hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; - fetchSubmodules = true; - }; - patches = [ - # Remove a failing test - (fetchpatch { - url = "https://github.com/gnuradio/volk/commit/fe2e4a73480bf2ac2e566052ea682817dddaf61f.patch"; - hash = "sha256-Vko/Plk7u6UAr32lieU+T9G34Dkg9EW3Noi/NArpRL4="; - }) - ]; - - cmakeFlags = lib.optionals (!enableModTool) [ - "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "-DVOLK_CPU_FEATURES=OFF" - # offset 17912 in1: -0.0366274 in2: -0.0366173 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" - ]; - - postInstall = lib.optionalString (!stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - ''; - - nativeBuildInputs = [ - cmake - python3 - python3.pkgs.mako - ]; - - doCheck = true; - - meta = with lib; { - homepage = "http://libvolk.org/"; - description = "Vector Optimized Library of Kernels"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index ea40b8a27da63..1991f2d6d7f99 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme -, autoconf, automake, libtool , buildPackages }: @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { mainProgram = "volume_key"; homepage = "https://pagure.io/volume_key/"; license = licenses.gpl2; - maintainers = with maintainers; []; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 5ad312c1b8658..d131fe173ab80 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -3,6 +3,7 @@ , fetchpatch , enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." +, enableEgl ? false # Darwin support , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc @@ -15,7 +16,9 @@ let pythonMajor = lib.substring 0 1 python.pythonVersion; in stdenv.mkDerivation { - pname = "vtk${optionalString enableQt "-qvtk"}"; + pname = "vtk" + + optionalString enableEgl "-egl" + + optionalString enableQt "-qvtk"; inherit version; src = fetchurl { @@ -82,7 +85,7 @@ in stdenv.mkDerivation { "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" - "-DVTK_OPENGL_HAS_EGL=ON" + (lib.cmakeBool "VTK_OPENGL_HAS_EGL" enableEgl) ] ++ [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -113,6 +116,7 @@ in stdenv.mkDerivation { homepage = "https://www.vtk.org/"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp tfmoraes ]; - platforms = with platforms; unix; + platforms = platforms.unix; + badPlatforms = optionals enableEgl platforms.darwin; }; } diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 023bba6ee8e87..97e5131078256 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath +, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath , testers }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" - ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 48b075add0b2d..b7173ed93701b 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # license appears contradictory; see https://github.com/vxl/vxl/issues/752 # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch) license = [ lib.licenses.unfree ]; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; }) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 9f8d4e914b71e..361c1e17336a1 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "waffle"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "sha256-GVULv/TkCS9CgSFWlskIamw5Z402n684G6jeTLMCPNc="; + sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U="; }; buildInputs = [ diff --git a/pkgs/development/libraries/wayland/darwin.patch b/pkgs/development/libraries/wayland/darwin.patch index 965294dfa5fff..8300307398cf3 100644 --- a/pkgs/development/libraries/wayland/darwin.patch +++ b/pkgs/development/libraries/wayland/darwin.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index 35c3b95..f27e472 100644 +index 8e28f2a..c8d1dc9 100644 --- a/meson.build +++ b/meson.build @@ -16,7 +16,7 @@ config_h.set_quoted('PACKAGE', meson.project_name()) config_h.set_quoted('PACKAGE_VERSION', meson.project_version()) cc_args = [] --if host_machine.system() != 'freebsd' -+if host_machine.system() not in ['darwin', 'freebsd'] +-if host_machine.system() not in ['freebsd', 'openbsd'] ++if host_machine.system() not in ['darwin', 'freebsd', 'openbsd'] cc_args += ['-D_POSIX_C_SOURCE=200809L'] endif add_project_arguments(cc_args, language: 'c') @@ -24,16 +24,16 @@ index 35c3b95..f27e472 100644 config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec) if get_option('libraries') -- if host_machine.system() == 'freebsd' -+ if host_machine.system() in ['darwin', 'freebsd'] +- if host_machine.system() in ['freebsd', 'openbsd'] ++ if host_machine.system() in ['darwin', 'freebsd', 'openbsd'] # When building for FreeBSD, epoll(7) is provided by a userspace # wrapper around kqueue(2). epoll_dep = dependency('epoll-shim') diff --git a/src/event-loop.c b/src/event-loop.c -index 37cf95d..49a38cb 100644 +index 45222f7..fb3b464 100644 --- a/src/event-loop.c +++ b/src/event-loop.c -@@ -48,6 +48,13 @@ +@@ -49,6 +49,13 @@ #define TIMER_REMOVED -2 @@ -48,22 +48,22 @@ index 37cf95d..49a38cb 100644 struct wl_event_source_interface; struct wl_event_source_timer; diff --git a/src/wayland-os.c b/src/wayland-os.c -index a9066ca..483fe64 100644 +index f00ead4..4dc01d0 100644 --- a/src/wayland-os.c +++ b/src/wayland-os.c -@@ -69,17 +69,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol) +@@ -75,17 +75,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol) { int fd; +#ifdef SOCK_CLOEXEC - fd = socket(domain, type | SOCK_CLOEXEC, protocol); + fd = wl_socket(domain, type | SOCK_CLOEXEC, protocol); if (fd >= 0) return fd; if (errno != EINVAL) return -1; +#endif - fd = socket(domain, type, protocol); + fd = wl_socket(domain, type, protocol); return set_cloexec_or_close(fd); } diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8bc53de162f79..5a78a5c993ef0 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wayland"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = with finalAttrs; "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-FUCvHqaYpHHC2OnSiDMsfg/TYMjx0Sk267fny8JCWEI="; + hash = "sha256-BbPhV00+Z2JrWXT4YvNrW0J8fO65Zcs2pObC00LkWrI="; }; patches = [ diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index a260b2b63b92d..ca1e84b1c6096 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.35"; + version = "1.36"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-N6JxaigTPcgZNBxWiinSHoy3ITDlwSah/PyfQsI9las="; + hash = "sha256-cf1N4F55+aHKVZ+sMMH4Nl+hA0ZCL5/nlfdNd7nvfpI="; }; postPatch = lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 98c28ca67997d..b1fb3231a2b65 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -62,7 +62,7 @@ , substituteAll , glib , unifdef -, addOpenGLRunpath +, addDriverRunpath , enableGeoLocation ? true , enableExperimental ? false , withLibsecret ? true @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; - inherit (addOpenGLRunpath) driverLink; + inherit (addDriverRunpath) driverLink; }) ]; @@ -151,7 +151,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ libedit readline - ] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) ( + ] ++ lib.optional (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ( + # this can likely be removed as: + # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one." + # but the package is marked broken on darwin so unable to test + # Pull a header that contains a definition of proc_pid_rusage(). # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/development/libraries/wfa2-lib/default.nix index 49db133382b01..519343ff5a207 100644 --- a/pkgs/development/libraries/wfa2-lib/default.nix +++ b/pkgs/development/libraries/wfa2-lib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Wavefront alignment algorithm library v2"; homepage = "https://github.com/smarco/WFA2-lib"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 687a51832f96a..236865bae163b 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -15,7 +15,6 @@ , mesa , xorg , libpng -, ffmpeg_4 , ffmpeg , hwdata , seatd @@ -23,6 +22,7 @@ , glslang , libliftoff , libdisplay-info +, lcms2 , nixosTests , enableXWayland ? true @@ -112,21 +112,22 @@ let in rec { - wlroots_0_16 = generic { - version = "0.16.2"; - hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; - postPatch = '' - substituteInPlace backend/drm/meson.build \ - --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ - ''; + wlroots_0_17 = generic { + version = "0.17.4"; + hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo="; + extraNativeBuildInputs = [ + hwdata + ]; extraBuildInputs = [ - ffmpeg_4 + ffmpeg + libliftoff + libdisplay-info ]; }; - wlroots_0_17 = generic { - version = "0.17.4"; - hash = "sha256-AzmXf+HMX/6VAr0LpfHwfmDB9dRrrLQHt7l35K98MVo="; + wlroots_0_18 = generic { + version = "0.18.0"; + hash = "sha256-LiRnvu7qCbfSg+ONWVCtWwdzxxFZHfbgmy7zApCIW40="; extraNativeBuildInputs = [ hwdata ]; @@ -134,8 +135,9 @@ rec { ffmpeg libliftoff libdisplay-info + lcms2 ]; }; - wlroots = wlroots_0_17; + wlroots = wlroots_0_18; } diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 23970be58d086..c55ad0010d534 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -10,17 +10,17 @@ # requiring to build a special variant for that software. Example: 'haproxy' , variant ? "all" , extraConfigureFlags ? [] -, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang) +, enableLto ? !(stdenv.hostPlatform.isStatic || stdenv.cc.isClang) }: stdenv.mkDerivation (finalAttrs: { pname = "wolfssl-${variant}"; - version = "5.7.0"; + version = "5.7.2"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "refs/tags/v${finalAttrs.version}-stable"; - hash = "sha256-4j1GqeZJn5UWx56DjGjge05jlzBbIGn4IXxcaIBxON4="; + hash = "sha256-VTMVgBSDL6pw1eEKnxGzTdyQYWVbMd3mAnOnpAOKVhk="; }; postPatch = '' diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index b968af23c0dad..e986ab87fface 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://utelle.github.io/wxsqlite3/"; description = "C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; license = with licenses; [ lgpl3Plus gpl3Plus ]; }; } diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index aece1eb09cfff..0775dca688b4b 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mainProgram = "wxsqliteplus"; homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 1eb1ede66cb09..a77dedb0c6eed 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -32,7 +32,6 @@ , AVFoundation , AVKit , WebKit -, fetchpatch }: let catch = fetchFromGitHub { diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index e46599634d174..2be8ea48b8e2e 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2Plus; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 7f44834d48672..9d485f7d6d2ed 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,4 +1,5 @@ { lib +, gccStdenv , stdenv , fetchurl , fetchpatch @@ -66,7 +67,11 @@ stdenv.mkDerivation rec { }) # Fix detection of NEON (and armv6 build) : ./fix-neon-detection.patch - ]; + ] + # CMake files require a bit of patching to support CMAKE_ASM_COMPILER. + # Made by @RossComputerGuy for x265 v3.5. + # https://mailman.videolan.org/pipermail/x265-devel/2024-July/013734.html + ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-clang-asm.patch; postPatch = '' substituteInPlace cmake/Version.cmake \ @@ -89,7 +94,9 @@ stdenv.mkDerivation rec { (mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ]; + ] + # Clang does not support the endfunc directive so use GCC. + ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"; cmakeStaticLibFlags = [ "-DHIGH_BIT_DEPTH=ON" diff --git a/pkgs/development/libraries/x265/fix-clang-asm.patch b/pkgs/development/libraries/x265/fix-clang-asm.patch new file mode 100644 index 0000000000000..6aa5fe2f0a0e1 --- /dev/null +++ b/pkgs/development/libraries/x265/fix-clang-asm.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a407271b4..593628e0f 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -310,7 +310,7 @@ if(GCC) + endif() + check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) + if (CC_HAS_STACK_REALIGN) +- add_definitions(-mstackrealign) ++ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-mstackrealign>) + endif() + # Disable exceptions. Reduce executable size, increase compability. + check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG) +@@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) + list(APPEND ASM_OBJS ${ASM}.${SUFFIX}) + add_custom_command( + OUTPUT ${ASM}.${SUFFIX} +- COMMAND ${CMAKE_CXX_COMPILER} ++ COMMAND ${CMAKE_ASM_COMPILER} + ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX} + DEPENDS ${ASM_SRC}) + endforeach() +diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt +index 12b643ad5..876f3543d 100644 +--- a/common/CMakeLists.txt ++++ b/common/CMakeLists.txt +@@ -16,6 +16,7 @@ endif(EXTRA_LIB) + if(ENABLE_ASSEMBLY) + set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1) + list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1") ++ enable_language(ASM) + endif(ENABLE_ASSEMBLY) + + if(ENABLE_ASSEMBLY AND X86) diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 8675bab269c08..7180e6992e91c 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -4,38 +4,36 @@ , meson , ninja , pkg-config -, wrapGAppsHook3 -, cinnamon +, wrapGAppsNoGuiHook +, cinnamon-desktop , glib , gsettings-desktop-schemas -, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-1Q00aEWl/mk37NcBJPgg443V1IXmNaJcSlilzvAJ1QQ="; + hash = "sha256-4U8d9lQxMHQ2XYXnNCQjrNup8z14Q8Ke1Bkf09AVM6k="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook3 + wrapGAppsNoGuiHook ]; buildInputs = [ - cinnamon.cinnamon-desktop # org.cinnamon.desktop.background + cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location - gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index e5432430cac3e..2b96bede313d0 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -22,7 +22,7 @@ assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported); # 2) the R package creates a different binary shared # object that isn't compatible with the regular CLI # tests. -assert rLibrary -> doCheck != true; +assert rLibrary -> !doCheck; let # This ensures xgboost gets the correct libstdc++ when diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 2cf0cc3ef8df9..c0194ed8435d7 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { downloadPage = "https://www.aleksey.com/xmlsec/download.html"; license = licenses.mit; mainProgram = "xmlsec1"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index da85a37ab5bc0..03ac854187101 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doctest , enableAssertions ? false diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix index 87f480ea29fe2..208aceb3e35b4 100644 --- a/pkgs/development/libraries/xtl/default.nix +++ b/pkgs/development/libraries/xtl/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , doctest -, gtest }: stdenv.mkDerivation rec { pname = "xtl"; diff --git a/pkgs/development/libraries/yas/default.nix b/pkgs/development/libraries/yas/default.nix index b06d995007fa2..0dad3fbf76dd0 100644 --- a/pkgs/development/libraries/yas/default.nix +++ b/pkgs/development/libraries/yas/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/niXman/yas"; description = "Yet Another Serialization"; license = licenses.boost; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index bcd6a245bb4f7..3af451ec84e06 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { mainProgram = "ykpamcfg"; homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index 96e075c02f4b9..f60329028ead5 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yyjson"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; rev = finalAttrs.version; - hash = "sha256-iRMjiaVnsTclcdzHjlFOTmJvX3VP4omJLC8AWA/EOZk="; + hash = "sha256-mp9Oz08qTyhj3P6F1d81SX96vamUY/JWpD2DTYR+v04="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index c6fa9cb2a2ac2..6abb1b160cc6b 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.7"; + version = "2.2.1"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-fNebnLeME0HXUx8M7YfTT0aMJQggEmMs9EbJFWL1zC4="; + hash = "sha256-XTu4Wo9wQOvXrjDxo3KTpCiy0NsqVnYtCuYsCHP5LFc="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix index e950c6ed3d7f8..1b504515f9e6e 100644 --- a/pkgs/development/libraries/zmusic/default.nix +++ b/pkgs/development/libraries/zmusic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "zmusic"; - version = "1.1.12"; + version = "1.1.13"; src = fetchFromGitHub { owner = "ZDoom"; repo = "ZMusic"; rev = version; - hash = "sha256-waxgn4Dg8One2Hv7J2efMoYo5mmaMSMiPQSNq57kbvE="; + hash = "sha256-rvvMS5KciHEvoY4hSfgAEyWJiDMqBto4o09oIpQIGTQ="; }; outputs = [ "out" "dev" ]; @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "system-fluidsynth.patch"; - url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0"; + url = "https://git.alpinelinux.org/aports/plain/community/zmusic/system-fluidsynth.patch?id=ca353107ef4f2e5c55c3cc824b0840e2838fb894"; hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI="; }) ]; postPatch = '' substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ - --replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ - --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + --replace-fail "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ + --replace-fail "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" ''; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { lgpl21Plus lgpl3Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ azahi lassulus ]; }; } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 6abc3b9c0fffb..8a7f139c45de9 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -171,6 +171,30 @@ buildLuarocksPackage { }; }) {}; +busted-htest = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: +buildLuarocksPackage { + pname = "busted-htest"; + version = "1.0.0-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/busted-htest-1.0.0-2.rockspec"; + sha256 = "10d2pbh2rfy4ygp40h8br4w5j1z5syq5pn6knd4bbnacmswnmcdl"; + }).outPath; + src = fetchFromGitHub { + owner = "hishamhm"; + repo = "busted-htest"; + rev = "1.0.0"; + hash = "sha256-tGAQUSeDt+OV/TBAJo/JFdyeBRRZaIQEJG+SKcCaQhs="; + }; + + + meta = { + homepage = "https://github.com/hishamhm/busted-htest"; + description = "A pretty output handler for Busted"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + cassowary = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; @@ -226,14 +250,14 @@ buildLuarocksPackage { commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "commons.nvim"; - version = "18.0.0-1"; + version = "19.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/commons.nvim-18.0.0-1.rockspec"; - sha256 = "073cmh0a1kqzw71ckir8rk6nrhi14rc96vmxzhl4zbfyr3ji05r7"; + url = "mirror://luarocks/commons.nvim-19.0.0-1.rockspec"; + sha256 = "0ispimmwx2zh8jpdhdqk0r837y6959l9r2y8iri6l67dnfy7j4ky"; }).outPath; src = fetchzip { - url = "https://github.com/linrongbin16/commons.nvim/archive/75407685b543cdb2263e92366bc4f3c828f4ad69.zip"; - sha256 = "0zm0kjch5rzdkv6faksw16lmhxkil2sdhfl7xvdyc0z830d1k2km"; + url = "https://github.com/linrongbin16/commons.nvim/archive/ab59d5ab57d02bcb2b29234637c79ff74d7693b6.zip"; + sha256 = "0n7dpwhs1f6rmxvjhqj1vs29apmmcbdwcifjjxi13vdxmx1zn2dq"; }; disabled = luaOlder "5.1"; @@ -339,22 +363,22 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem, tl }: +cyan = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem, luasystem, tl }: buildLuarocksPackage { pname = "cyan"; - version = "0.3.0-1"; + version = "0.3.1-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/cyan-0.3.0-1.rockspec"; - sha256 = "1bs5gwgdhibj2gm8y3810b0hh6s9n00fgij8nnjag9kpqrd80vsj"; + url = "mirror://luarocks/cyan-0.3.1-2.rockspec"; + sha256 = "1fsz3a05blm45qv690w51fa7scqc7l7f3fcj8s8isax89gjbqvgy"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "cyan"; - rev = "992e573ca58e55ae33c420ea0f620b2daf5fa9c0"; - hash = "sha256-vuRB+0gmwUmFnt+A6m6aa0c54dPZSY4EohHjTcRQRZs="; + rev = "v0.3.1"; + hash = "sha256-cqQoWR4lIvYAWp5o9jivpjiILO1ECFhCyXG1+vc2yIM="; }; - propagatedBuildInputs = [ argparse luafilesystem tl ]; + propagatedBuildInputs = [ argparse luafilesystem luasystem tl ]; meta = { homepage = "https://github.com/teal-language/cyan"; @@ -394,7 +418,7 @@ buildLuarocksPackage { version = "2.8-1"; knownRockspec = (fetchurl { url = "mirror://luarocks/dkjson-2.8-1.rockspec"; - sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka"; + hash = "sha256-arasJeX7yQ2Rg70RyepiGNvLdiyQz8Wn4HXrdTEIBBg="; }).outPath; src = fetchurl { url = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz"; @@ -410,23 +434,25 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }: +fennel = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.4.2-1"; + version = "1.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.4.2-1.rockspec"; - sha256 = "17ygacyqdvplyz3046ay3xr4z83sdjrxkcl21mklpxx29j8p0bv1"; + url = "mirror://luarocks/fennel-1.5.0-1.rockspec"; + sha256 = "0h3a8pinazcp3r3pwkm5inh0aynq9iizljhpk6sj8zhhp0s0bi4g"; }).outPath; - src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.4.2.tar.gz"; - sha256 = "1inhy8rrywx8svdzhy1yaaa0cfyrmi21ckj7h8xmd7yqaw66ma86"; + src = fetchFromGitHub { + owner = "bakpakin"; + repo = "Fennel"; + rev = "1.5.0"; + hash = "sha256-4jF22lpfapxQvwH/vQh/ePiEfOc8pP2b7roOzPXZRTQ="; }; disabled = luaOlder "5.1"; meta = { - homepage = "https://fennel-lang.org/"; + homepage = "https://fennel-lang.org"; description = "A lisp that compiles to Lua"; maintainers = with lib.maintainers; [ misterio77 ]; license.fullName = "MIT"; @@ -529,14 +555,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1349-1"; + version = "0.0.1415-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1349-1.rockspec"; - sha256 = "0v9frrq896d3k3xvz0ch51r2chrw4kalp5d2jb365wpnk4zda1lj"; + url = "mirror://luarocks/fzf-lua-0.0.1415-1.rockspec"; + sha256 = "039hy10ml25z2kvm5xiayvswx42rj4di119vgl2ncrfvlr5lnxdf"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/1ec6eeda11c3a3dcd544e1c61ad4b8c9b49903c4.zip"; - sha256 = "0iw3khl164qvypm7v591gyncjfpmwx6wy45a80zz922iiifgjfgd"; + url = "https://github.com/ibhagwan/fzf-lua/archive/e9413dc2b6e8ab7f62385c972df1dceba483492d.zip"; + sha256 = "09bh0rjx9g96vz0zfnpi4ych64qawrj1rgrpznkjn1cph8qayj35"; }; disabled = luaOlder "5.1"; @@ -580,8 +606,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "17e8fd66182c9ad79dc129451ad015af3d27529c"; - hash = "sha256-Mq3NC/DpEEOZlgKctjQqa1RMJHVSAy6jfL4IitObgzs="; + rev = "562dc47189ad3c8696dbf460d38603a74d544849"; + hash = "sha256-NNoqXn24Fzkopx1/Xwcv41EpqHwpcMPrQWLfXcPtha4="; }; disabled = lua.luaversion != "5.1"; @@ -596,21 +622,21 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.1.10-1"; + version = "4.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec"; - sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q"; + url = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec"; + sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip"; - sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip"; + sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9"; }; disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/mrcjkb/haskell-tools.nvim"; - description = "Supercharge your Haskell experience in neovim!"; + description = " 🦥 Supercharge your Haskell experience in neovim!"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-2.0"; }; @@ -824,6 +850,32 @@ buildLuarocksPackage { }; }) {}; +llscheck = callPackage({ ansicolors, argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-cjson, luaOlder, luafilesystem, penlight }: +buildLuarocksPackage { + pname = "llscheck"; + version = "0.5.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/llscheck-0.5.0-1.rockspec"; + sha256 = "1bcyg1gphlgwmra8l1503yaw6wfihs1fksdvvp1y38zryhkvj0dy"; + }).outPath; + src = fetchFromGitHub { + owner = "jeffzi"; + repo = "llscheck"; + rev = "v0.5.0"; + hash = "sha256-cG/FNzOwvLvrAEut4OvXI8WWSVzNEl4r3OgiSnp3S5c="; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ ansicolors argparse lua-cjson luafilesystem penlight ]; + + meta = { + homepage = "https://github.com/jeffzi/llscheck"; + description = "Human-friendly Lua code analysis powered by Lua Language Server"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + lmathx = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lmathx"; @@ -1298,16 +1350,16 @@ buildLuarocksPackage { lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "1.4.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-1.4.0-1.rockspec"; - sha256 = "027fqpbhq0ygh9z7za2hv7wm6ylll8km4czvjfclscm4p55bj10q"; + url = "mirror://luarocks/lua-resty-openssl-1.5.1-1.rockspec"; + sha256 = "1xqwsh3r9dmasc46c3dwili7g9p427yh7xdvcpiz7pr25y35saps"; }).outPath; src = fetchFromGitHub { owner = "fffonion"; repo = "lua-resty-openssl"; - rev = "1.4.0"; - hash = "sha256-gmsKpt42hgjqhzibYXbdWyj2MqOyC8FlhMY7xiXdtFQ="; + rev = "1.5.1"; + hash = "sha256-wkc/9t2jXM2yPEd9ozAMcNe3WsS3MbN01OQ/9sI37Eg="; }; @@ -1989,21 +2041,21 @@ buildLuarocksPackage { luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks-build-rust-mlua"; - version = "0.2.0-1"; + version = "0.2.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.0-1.rockspec"; - sha256 = "0mpxj2wpzgqffic1j6agisaawbfhh16gis29x6y60kyjq446mv0z"; + url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.2-1.rockspec"; + sha256 = "0y9ms0cf0jp4b26m6qbxsj4s4ng4z112qq4wc79q7xm7zw9dha4p"; }).outPath; src = fetchFromGitHub { - owner = "khvzak"; + owner = "mlua-rs"; repo = "luarocks-build-rust-mlua"; - rev = "0.2.0"; - hash = "sha256-f6trXv2/gzbitLXwHHrZnowEA/V5Yjb3Q9YlYr+9NBw="; + rev = "0.2.2"; + hash = "sha256-vyFX5LFGrC+RXjmwLgBdmVawOCNatJva53MFvKa7ozM="; }; meta = { - homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; + homepage = "https://github.com/mlua-rs/luarocks-build-rust-mlua"; description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; @@ -2016,11 +2068,11 @@ buildLuarocksPackage { version = "4.1.0-1"; knownRockspec = (fetchurl { url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; - sha256 = "0r3r8dvjn9zvpj06932ijqwypq636zv2vpq5pcj83xfvvi3fd2rw"; + sha256 = "sha256-PIvmRtzb9YEkuwXfLfY3w+DrOZZRjGSAvPsnK3dDeWQ="; }).outPath; src = fetchzip { url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; - sha256 = "1838q30n2xjb8cmhlzxax0kzvxhsdrskkk4715kkca8zk6i3zm98"; + sha256 = "sha256-KNU/opkfKTZnCYfMOXVuGvb9J+iqfworQ0t2YcHAaKA="; }; disabled = luaOlder "5.1"; @@ -2034,6 +2086,30 @@ buildLuarocksPackage { }; }) {}; +luarocks-build-treesitter-parser-cpp = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: +buildLuarocksPackage { + pname = "luarocks-build-treesitter-parser-cpp"; + version = "1.0.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luarocks-build-treesitter-parser-cpp-1.0.0-1.rockspec"; + sha256 = "0vvw3ai42jif2z2ir6l14jkjq138djbn04wnjblm3vilaz5k0sfv"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp/archive/v1.0.0.zip"; + sha256 = "0j1f3wq19zng8ay6pniphb7m0xp131i9alqpdf0szpyq8y00w2s1"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luafilesystem ]; + + meta = { + homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser-cpp"; + description = "A luarocks build backend for tree-sitter parsers written in C++."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + luasec = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luasocket }: buildLuarocksPackage { pname = "luasec"; @@ -2160,16 +2236,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.4.0-1"; + version = "0.4.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.4.0-1.rockspec"; - sha256 = "0brvqqxfz1w4l4nzaxds1d17flq7rx6lw8pjb565fyb2jhg39qc9"; + url = "mirror://luarocks/luasystem-0.4.2-1.rockspec"; + sha256 = "15z4n7pbggg1wy397k9mx0jls31snvw0dgr9yklwi4sayfcva3ip"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.4.0"; - hash = "sha256-I1dG6ccOQAwpe18DjiYijKjerk+yDRic6fEERSte2Ks="; + rev = "v0.4.2"; + hash = "sha256-xYfHK/OtOFtGHAZTPDp/BTywAcCqJIx8+zt3/HPon0w="; }; disabled = luaOlder "5.1"; @@ -2308,8 +2384,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; - hash = "sha256-GVGIZPBrunaWexwdnkbc0LxM3xMHslrwON2FunN3TDE="; + rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; + hash = "sha256-gutr36WJRktDxmRjNo0v5tn030nMsAe8vRWx/vKFa2o="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2354,7 +2430,7 @@ buildLuarocksPackage { }).outPath; src = fetchurl { url = "https://github.com/luvit/luv/releases/download/1.48.0-2/luv-1.48.0-2.tar.gz"; - sha256 = "2c3a1ddfebb4f6550293a40ee789f7122e97647eede51511f57203de48c03b7a"; + sha256 = "0yivq14dw0vjyl8ibrgdgrj9fbhjyy4yf3m4jc15bxmlxggisfic"; }; disabled = luaOlder "5.1"; @@ -2393,14 +2469,14 @@ buildLuarocksPackage { lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lz.n"; - version = "1.4.2-1"; + version = "1.4.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-1.4.2-1.rockspec"; - sha256 = "1jvmp35c5n43frk0bkpgfd9p76p9f5zy094ybzanydz9d6p5d7c4"; + url = "mirror://luarocks/lz.n-1.4.4-1.rockspec"; + sha256 = "15sslyvzwkfj3mz6z9by7slj063vxj52pyx9y7xqjsrrq1s54446"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/lz.n/archive/v1.4.2.zip"; - sha256 = "0g2gghw7i71sm9szw772pwhwy73nfx4lx1x0393hjl7cx95r885b"; + url = "https://github.com/nvim-neorocks/lz.n/archive/v1.4.4.zip"; + sha256 = "0aiqyybjhn2y4zzgr8lqvlvky2sr7fgp8nw4sh65pwki139ky2qh"; }; disabled = luaOlder "5.1"; @@ -2575,14 +2651,14 @@ buildLuarocksPackage { neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.3.3-1"; + version = "5.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.3.3-1.rockspec"; - sha256 = "0bji9bfh129l9find3asakr97pxq76gdjp96gyibv02m4j0hgqjz"; + url = "mirror://luarocks/neotest-5.4.0-1.rockspec"; + sha256 = "0bk5z3p2v6m2nwxh82xk0xsqb23xa9i13vfgnd9h9qy3r42jqmmj"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/f30bab1faef13d47f3905e065215c96a42d075ad.zip"; - sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; + url = "https://github.com/nvim-neotest/neotest/archive/32ff2ac21135a372a42b38ae131e531e64833bd3.zip"; + sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; }; disabled = luaOlder "5.1"; @@ -2651,8 +2727,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac"; - hash = "sha256-7tEfEjWH5pneI10jLYpenoysRQPa2zPGLTNcbMX3x2I="; + rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30"; + hash = "sha256-NcodgUp8obTsjgc+5j2dKr0f3FelYikQTJngfZXRZzo="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2667,14 +2743,14 @@ buildLuarocksPackage { nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nvim-nio"; - version = "1.9.4-1"; + version = "1.10.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-nio-1.9.4-1.rockspec"; - sha256 = "05xccwawl82xjwxmpihb6v4l7sp0msc6hhgs8mgzbsclznf78052"; + url = "mirror://luarocks/nvim-nio-1.10.0-1.rockspec"; + sha256 = "1dkspn96vvk38l809c7bl2gnjxkj8yj4aj6s5859pz4pxvxzs8p6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/nvim-nio/archive/7969e0a8ffabdf210edd7978ec954a47a737bbcc.zip"; - sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0"; + url = "https://github.com/nvim-neotest/nvim-nio/archive/a428f309119086dc78dd4b19306d2d67be884eee.zip"; + sha256 = "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b"; }; disabled = luaOlder "5.1"; @@ -2830,14 +2906,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "2.0.0-1"; + version = "2.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-2.0.0-1.rockspec"; - sha256 = "0vkzhz6szbm6cy4301c103kck36zgk8ig2ssipclca392cq36716"; + url = "mirror://luarocks/rocks-config.nvim-2.2.0-1.rockspec"; + sha256 = "129zvspn6ln9yzsxfcgai8vyz7jysxvdf08yy19zdqj0q7swh1iq"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.0.0.zip"; - sha256 = "1gzpcvb79s8a0mxq331fhwgik4bkaj254avri50wm1y5qxb4n3nx"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.2.0.zip"; + sha256 = "0vchi7274j4yhs0mv1j2na8k1240xj42kz6787s0vf05xcnywbh6"; }; disabled = luaOlder "5.1"; @@ -2854,14 +2930,14 @@ buildLuarocksPackage { rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.2.3-1"; + version = "1.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.2.3-1.rockspec"; - sha256 = "0xhl0rmklhhlcsn268brj7hhl5lk2djhkllzna2rnjaq80cwsh5j"; + url = "mirror://luarocks/rocks-dev.nvim-1.3.0-1.rockspec"; + sha256 = "0s8k4kvd7j72ja6qwwxdsqjffkja8pdp95vml5wy9mqwxgvcb5c6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.2.3.zip"; - sha256 = "17sv49wl366jxriy0cxy3b1z8vans58jmjg4ap5dc9fmg6687jgs"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.3.0.zip"; + sha256 = "1fhd4mjbwizszxq3wrcdsczljgssgswqi4ibi8kdmnd9biyvbx65"; }; disabled = luaOlder "5.1"; @@ -2878,14 +2954,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "1.5.1-1"; + version = "2.0.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-1.5.1-1.rockspec"; - sha256 = "0if5vaxggf4ryik5szm1p5dv324sybm9h3jbpl78ydd1kf0702m6"; + url = "mirror://luarocks/rocks-git.nvim-2.0.1-1.rockspec"; + sha256 = "0r341vg7x49lnmx77smab5hpjpzwih7jmchfh24xhnv6319d70yx"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.5.1.zip"; - sha256 = "05g31js2k2jjrz0a633vdfz21ji1a2by79yrfhi6wdmp167a5w99"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.0.1.zip"; + sha256 = "121x32915sr8il95jjpza2awvh4jknhgb99c091sb4vmdkg3pj24"; }; disabled = luaOlder "5.1"; @@ -2902,14 +2978,14 @@ buildLuarocksPackage { rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.31.3-1"; + version = "2.36.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.31.3-1.rockspec"; - sha256 = "1rrsshsi6c5njcyaibz1mdvhyjl4kf2973kwahyk84j52fmwzwjv"; + url = "mirror://luarocks/rocks.nvim-2.36.1-1.rockspec"; + sha256 = "165kij3rk0inh9g3d3jpczhji9bjc7biz5r30xgw9q5xnafy4q38"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.31.3.zip"; - sha256 = "07500g0jvicbxqmsqdb3dcjpmvd6wgwk8g34649f94nhqk3lglx5"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.36.1.zip"; + sha256 = "0zsrvngwwj9qxsxfbfgfin73aacs763sygixgiibq8rrl6gannxs"; }; disabled = luaOlder "5.1"; @@ -2949,21 +3025,21 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "4.25.1-1"; + version = "5.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec"; - sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0"; + url = "mirror://luarocks/rustaceanvim-5.2.0-1.rockspec"; + sha256 = "15pz9m5livp0n2bhal8wmg8hbhvyb6195ayzjcm3xsivplc4drns"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip"; - sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/5.2.0.zip"; + sha256 = "1mswi4fy0ggikl3cpwhx1lar5pb8zcfp9az8zb9cn00cmzf749s4"; }; disabled = luaOlder "5.1"; meta = { homepage = "https://github.com/mrcjkb/rustaceanvim"; - description = "Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; + description = "🦀 Supercharge your Rust experience in Neovim! A heavily modified fork of rust-tools.nvim"; maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-2.0"; }; @@ -3168,8 +3244,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed"; - hash = "sha256-0fS3RYO/9gwmdK2H9Y/4Z/P++4aEHTHJqR2mH0vWAFY="; + rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; + hash = "sha256-F5TGzfPSDQY+AOzaDXStswHjkGQvnLeTWW5/xdBalpo="; }; disabled = lua.luaversion != "5.1"; @@ -3236,14 +3312,14 @@ buildLuarocksPackage { toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; - version = "0.3.6-1"; + version = "0.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-edit-0.3.6-1.rockspec"; - sha256 = "18fw256vzvfavfwrnzm507k4h3x2lx9l93ghr1ggsi4mhsnjki46"; + url = "mirror://luarocks/toml-edit-0.4.1-1.rockspec"; + sha256 = "180zdqrzffr7jr9xls895gj5hrx6pfs98rlxwzg71382jy1n79qi"; }).outPath; src = fetchzip { - url = "https://github.com/vhyrro/toml-edit.lua/archive/v0.3.6.zip"; - sha256 = "19v6axraj2n22lmilfr4x9nr40kcjb6wnpsfhf1mh2zy9nsd6ji6"; + url = "https://github.com/vhyrro/toml-edit.lua/archive/v0.4.1.zip"; + sha256 = "1322p490p6yza3lczfzmwf5nkfj4ra6m9g6hvr2qgay405wnpgy7"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index dc7cbcc5f76e7..a527b2e1189fb 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -93,7 +93,6 @@ rec { externalDeps ? [] # a list of lua derivations , requiredLuaRocks ? [] - , rocksSubdir ? "rocks-subdir" , ... }@args: let rocksTrees = lib.imap0 @@ -125,9 +124,6 @@ rec { generatedConfig = ({ - # To prevent collisions when creating environments, we install the rock - # files into per-package subdirectories - rocks_subdir = rocksSubdir; # first tree is the default target where new rocks are installed, # any other trees in the list are treated as additional sources of installed rocks for matching dependencies. diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 1cc8d66044c70..0bd421ede7ce2 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua51Packages, lua, pkg-config, lib, substituteAll, zenity, AppKit}: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib, substituteAll, zenity, AppKit}: buildLuarocksPackage { pname = "nfd"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 99fe9217c9602..fa83ee0e57ff9 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -35,6 +35,7 @@ , libxcrypt , libyaml , luajitPackages +, lua-language-server , mariadb , magic-enum , mpfr @@ -142,15 +143,6 @@ in ''; }); - fennel = prev.fennel.overrideAttrs(oa: { - nativeBuildInputs = oa.nativeBuildInputs ++ [ - installShellFiles - ]; - postInstall = '' - installManPage fennel.1 - ''; - }); - # Until https://github.com/swarn/fzy-lua/pull/8 is merged, # we have to invoke busted manually fzy = prev.fzy.overrideAttrs(oa: { @@ -246,6 +238,10 @@ in meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); + llscheck = prev.llscheck.overrideAttrs (oa: { + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ lua-language-server ]; + }); + lmathx = prev.luaLib.overrideLuarocks prev.lmathx (drv: if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; @@ -506,6 +502,9 @@ in propagatedBuildInputs = oa.propagatedBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; + # ld: symbol(s) not found for architecture arm64 + # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) + meta.broken = stdenv.isDarwin; }); lush-nvim = prev.lush-nvim.overrideAttrs (drv: { @@ -745,6 +744,16 @@ in }; })) {}; + rustaceanvim = prev.rustaceanvim.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); sqlite = prev.sqlite.overrideAttrs (drv: { @@ -795,7 +804,7 @@ in cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-2P+mokkjdj2PccQG/kAGnIoUPVnK2FqNfYpHPhsp8kw="; + hash = "sha256-PLihirhJshcUQI3L1eTcnQiZvocDl29eQHhdBwJQRU8="; }; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/lua-modules/updater/updater.py b/pkgs/development/lua-modules/updater/updater.py index f0a91a313919a..335e15c444276 100755 --- a/pkgs/development/lua-modules/updater/updater.py +++ b/pkgs/development/lua-modules/updater/updater.py @@ -177,7 +177,7 @@ def generate_pkg_nix(plug: LuaPlugin): "'version' and 'ref' will be ignored as the rockspec is hardcoded for package %s" % plug.name ) - log.warn(msg) + log.warning(msg) log.debug("Updating from rockspec %s", plug.rockspec) cmd.append(plug.rockspec) diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index 23453e92e7f8f..113bf9e76da59 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "1qfqhqimp56g34bir30zgl273yssrbmwf1h8h8yvdpzkybpd92gx"; + cargoHash = "sha256-/YnU7vLz37Y9gggGx+vKWvtxBH0fjBwXGc+UWyOG2OE="; - meta = with lib; { + meta = { homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; mainProgram = "loc"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/misc/or1k/newlib.nix b/pkgs/development/misc/or1k/newlib.nix index 92829896a27c8..39ddf063eacb5 100644 --- a/pkgs/development/misc/or1k/newlib.nix +++ b/pkgs/development/misc/or1k/newlib.nix @@ -1,4 +1,4 @@ -{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }: +{ stdenv, fetchFromGitHub, crossLibcStdenv, buildPackages }: crossLibcStdenv.mkDerivation { name = "newlib"; diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 13fd7a9adecc4..5b68631e344de 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , pkgsBuildHost , ... }: diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 5c7984b66d223..9b2d0ad78100d 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,5 +1,4 @@ { lib -, stdenv , callPackage , python27 , fetchFromGitHub diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 3d0f43258a056..4ad4b4e806ffb 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , libxml2 , libxslt diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix index 11ad37453f2a8..0279b948a7ab0 100644 --- a/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, postInstall}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, stdenv, postInstall}: deployAndroidPackage { name = "androidsdk"; diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 1315b1ff98a2b..637dbc58f4ddc 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -2,7 +2,7 @@ # To test your changes in androidEnv run `nix-shell android-sdk-with-emulator-shell.nix` # If you copy this example out of nixpkgs, use these lines instead of the next. - # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index ec7020a0c9a90..a1308a9c10885 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -2,7 +2,7 @@ # To test your changes in androidEnv run `nix-shell android-sdk-with-emulator-shell.nix` # If you copy this example out of nixpkgs, use these lines instead of the next. - # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 88c1f7049ec3d..0f4c0589adb01 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -1,6 +1,6 @@ { # If you copy this example out of nixpkgs, use these lines instead of the next. - # This example pins nixpkgs: https://nix.dev/tutorials/towards-reproducibility-pinning-nixpkgs.html + # This example pins nixpkgs: https://nix.dev/tutorials/first-steps/towards-reproducibility-pinning-nixpkgs.html /*nixpkgsSource ? (builtins.fetchTarball { name = "nixpkgs-20.09"; url = "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz"; diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix index 9fd112063cb86..c0252839cf23f 100644 --- a/pkgs/development/mobile/androidenv/patcher.nix +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, stdenv}: deployAndroidPackage { inherit package os; diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index f5725054bb5e6..737457a646508 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/erfanoabdi/imgpatchtools"; license = licenses.gpl3; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch b/pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch deleted file mode 100644 index 2ab6554d9ac49..0000000000000 --- a/pkgs/development/mobile/ios-webkit-debug-proxy/0001-Don-t-compile-examples.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 52dc7a8..407c056 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,4 +2,4 @@ - # Copyright 2012 Google Inc. wrightt@google.com - - AUTOMAKE_OPTIONS = foreign --SUBDIRS = src include examples -+SUBDIRS = src include -diff --git a/configure.ac b/configure.ac -index ac2a278..a4104b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -82,7 +82,7 @@ fi - - AC_CHECK_FUNCS([memmove memset regcomp select socket strcasecmp strncasecmp strchr strdup strndup strrchr strstr strtol strcasestr getline]) - --AC_CONFIG_FILES([Makefile src/Makefile include/Makefile examples/Makefile]) -+AC_CONFIG_FILES([Makefile src/Makefile include/Makefile]) - - CFLAGS="${CFLAGS} -Wall -Werror" - diff --git a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix b/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix deleted file mode 100644 index 3b32a1bb9a313..0000000000000 --- a/pkgs/development/mobile/ios-webkit-debug-proxy/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv -, autoconf -, automake -, fetchFromGitHub -, fetchpatch -, lib -, libimobiledevice -, libusb1 -, libplist -, libtool -, openssl -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "ios-webkit-debug-proxy"; - version = "1.9.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = pname; - rev = "v${version}"; - hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo="; - }; - - patches = [ - # OpenSSL 3.0 compatibility - (fetchpatch { - url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch"; - hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s="; - }) - (fetchpatch { - name = "libplist-2.3.0-compatibility.patch"; - url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch"; - hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg="; - }) - # Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399 - ./0001-Don-t-compile-examples.patch - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - buildInputs = [ libimobiledevice libusb1 libplist openssl ]; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)"; - mainProgram = "ios_webkit_debug_proxy"; - longDescription = '' - The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd - daemon over a websocket connection, allowing developers to send commands - to MobileSafari and UIWebViews on real and simulated iOS devices. - ''; - homepage = "https://github.com/google/ios-webkit-debug-proxy"; - license = licenses.bsd3; - maintainers = [ maintainers.abustany ]; - }; -} diff --git a/pkgs/development/mobile/titanium-alloy/default.nix b/pkgs/development/mobile/titanium-alloy/default.nix index bb45289e3f40a..e0e534db5d53b 100644 --- a/pkgs/development/mobile/titanium-alloy/default.nix +++ b/pkgs/development/mobile/titanium-alloy/default.nix @@ -24,6 +24,6 @@ buildNpmPackage rec { homepage = "https://github.com/tidev/alloy"; license = lib.licenses.asl20; mainProgram = "alloy"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/mobile/titanium/default.nix b/pkgs/development/mobile/titanium/default.nix index 0318ceeb18eb0..28a92af107d18 100644 --- a/pkgs/development/mobile/titanium/default.nix +++ b/pkgs/development/mobile/titanium/default.nix @@ -24,6 +24,6 @@ buildNpmPackage rec { homepage = "https://github.com/tidev/titanium-cli"; license = lib.licenses.asl20; mainProgram = "titanium"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix index 0f73646c76913..81ea134dd29c1 100644 --- a/pkgs/development/mobile/webos/cmake-modules.nix +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CMake modules needed to build Open WebOS components"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index eca29dd2fabdc..e62808ee9b7e6 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for communicating with WebOS devices"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 34559354c2755..390b201d93c63 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Daemon for communicating with WebOS devices"; mainProgram = "novacomd"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 5c16b623d2d05..abea586975153 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -6,8 +6,6 @@ pkgs: lib: self: super: ### Use `./remove-attr.py [attrname]` in this directory to remove your alias ### from the `nodePackages` set without regenerating the entire file. -with self; - let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. @@ -39,6 +37,7 @@ in mapAliases { "@antora/cli" = pkgs.antora; # Added 2023-05-06 + "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12 "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25 "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17 "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20 @@ -70,9 +69,11 @@ mapAliases { castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 inherit (pkgs) clubhouse-cli; # added 2023-08-18 + inherit (pkgs) coc-diagnostic; # added 2024-06-29 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19 coffee-script = pkgs.coffeescript; # added 2023-08-18 + inherit (pkgs) concurrently; # added 2024-08-05 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 inherit (pkgs) cordova; # added 2023-08-18 inherit (pkgs) create-react-app; # added 2023-09-25 @@ -96,6 +97,7 @@ mapAliases { inherit (pkgs) get-graphql-schema; # added 2024-06-26 inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) gramma; # added 2024-06-26 + grammarly-languageserver = throw "grammarly-languageserver was removed because it requires EOL Node.js 16"; # added 2024-07-15 inherit (pkgs) graphite-cli; # added 2024-01-25 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 @@ -112,7 +114,7 @@ mapAliases { inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 karma = pkgs.karma-runner; # added 2023-07-29 - leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 + leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31 inherit (pkgs) lv_font_conv; # added 2024-06-28 manta = pkgs.node-manta; # Added 2023-05-06 inherit (pkgs) markdown-link-check; # added 2024-06-28 @@ -124,10 +126,11 @@ mapAliases { musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) node-pre-gyp; # added 2024-08-05 inherit (pkgs) nodemon; # added 2024-06-28 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 - parcel-bundler = parcel; # added 2023-09-04 + parcel-bundler = self.parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 @@ -182,9 +185,10 @@ mapAliases { vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 - vue-cli = self."@vue/cli"; # added 2023-08-18 vue-language-server = self.vls; # added 2023-08-20 + vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12 inherit (pkgs) web-ext; # added 2023-08-20 + inherit (pkgs) wrangler; # added 2024-07-01 inherit (pkgs) write-good; # added 2023-08-20 inherit (pkgs) yaml-language-server; # added 2023-09-05 inherit (pkgs) yo; # added 2023-08-20 diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index d9c0daef7834c..2e54104d7dce4 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 5983d3d099dfb..b2425ac52962b 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -8,13 +8,11 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@astrojs/language-server" = "astro-ls"; "@babel/cli" = "babel"; "@commitlint/cli" = "commitlint"; "@gitbeaker/cli" = "gitbeaker"; "@prisma/language-server" = "prisma-language-server"; "@uppy/companion" = "companion"; - "@vue/cli" = "vue"; "@webassemblyjs/repl-1.11.1" = "wasm"; "@webassemblyjs/wasm-strip" = "wasm-strip"; "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6b884b8109bf8..f3e45e80c7161 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,7 +1,6 @@ [ "@angular/cli" , "@antfu/ni" -, "@astrojs/language-server" , "@babel/cli" , "@commitlint/cli" , "@commitlint/config-conventional" @@ -12,7 +11,6 @@ , "@tailwindcss/line-clamp" , "@tailwindcss/typography" , "@uppy/companion" -, "@vue/cli" , {"@webassemblyjs/cli": "1.11.1"} , {"@webassemblyjs/repl": "1.11.1"} , "@webassemblyjs/wasm-strip" @@ -32,7 +30,6 @@ , "coc-clangd" , "coc-cmake" , "coc-css" -, "coc-diagnostic" , "coc-docker" , "coc-emmet" , "coc-eslint" @@ -79,7 +76,6 @@ , "coc-yaml" , "coc-yank" , "code-theme-converter" -, "concurrently" , "conventional-changelog-cli" , "cpy-cli" , "create-cycle-app" @@ -108,7 +104,6 @@ , "ganache" , "gatsby-cli" , "@gitbeaker/cli" -, "grammarly-languageserver" , "graphql" , "graphql-cli" , "graphql-language-service-cli" @@ -157,7 +152,6 @@ , "nijs" , "node-gyp" , "node-gyp-build" -, "node-pre-gyp" , "node-red" , "node2nix" , "np" @@ -259,7 +253,6 @@ , "webpack-dev-server" , "copy-webpack-plugin" , "webtorrent-cli" -, "wrangler" , "wring" , "@yaegassy/coc-nginx" , "yalc" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index d54cc8f11c939..add29d5b90dc7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -13,31 +13,13 @@ let sha512 = "E3Qku4mTzdrlwVWGPxklDnME5ANrEGetvYw4i2GCRlppWXXE4QD66j7pwb8HelZwS6LnqEChhrSOGCXpbiu6MQ=="; }; }; - "@achrinza/node-ipc-9.2.9" = { - name = "_at_achrinza_slash_node-ipc"; - packageName = "@achrinza/node-ipc"; - version = "9.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz"; - sha512 = "7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ=="; - }; - }; - "@adobe/css-tools-4.3.2" = { + "@adobe/css-tools-4.3.3" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz"; - sha512 = "DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw=="; - }; - }; - "@akryum/winattr-3.0.0" = { - name = "_at_akryum_slash_winattr"; - packageName = "@akryum/winattr"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@akryum/winattr/-/winattr-3.0.0.tgz"; - sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz"; + sha512 = "rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ=="; }; }; "@alcalzone/ansi-tokenize-0.1.3" = { @@ -67,31 +49,31 @@ let sha512 = "30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw=="; }; }; - "@angular-devkit/architect-0.1800.4" = { + "@angular-devkit/architect-0.1801.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1800.4"; + version = "0.1801.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1800.4.tgz"; - sha512 = "82TKhYnSO8aGIBo5TxPtyUQnZFcbV+qB2bIIYOAKsJgxAVxLeFD6QA6gTmHOZPXw5pBEPUO/+PUwq+Uk5xesgw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1801.2.tgz"; + sha512 = "y2rV8wRwTnmCH/dUo632wHi6r41Gs9XucyGm/ybzB/5tN3x6dS+O3c3zajRpdqTUr8YcD6os6sT+Ay6zS31tOw=="; }; }; - "@angular-devkit/core-18.0.4" = { + "@angular-devkit/core-18.1.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "18.0.4"; + version = "18.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.0.4.tgz"; - sha512 = "8vYvJ5FF2NjFUia00hv8KWakOjOZ+09PbnNqd+lntJBekIg1lHDOF/vNMlVHtU5LiE1aNi9P/69/VXTckPfU9g=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.1.2.tgz"; + sha512 = "WYkdKT/Ime5seBX7S7S4aWQbgCG5U3otCvAg/XiMn6scexTo3EZe2jrJl8nxGGFHNWrePoD86LvJOxhnCkEKEA=="; }; }; - "@angular-devkit/schematics-18.0.4" = { + "@angular-devkit/schematics-18.1.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "18.0.4"; + version = "18.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.0.4.tgz"; - sha512 = "hCHmuu/Z1teOQPx1AMJa/gcK6depk+XgU5dIpEvflC+ApW3hglNe2QKaqajDZ+34s+PKAVWa86M8IOV7o/mHuA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.1.2.tgz"; + sha512 = "v8aCJ1tPPzXsdiCoZxkc6YzLGhzJgC/6QauT03/Z6wWo8uI6DKibQQwQBawRE5FN5lKDpuGlNDv40EDtVYkQSA=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -130,123 +112,6 @@ let sha512 = "9Kt7EuS/7WbMAUv2gSziqjvxwDbFSg3Xeyfuj5laUODX8o/k/CpsAKiQ8W7/R88eXFTMbJYg6+7uAmOWNKmwnw=="; }; }; - "@apollo/protobufjs-1.2.6" = { - name = "_at_apollo_slash_protobufjs"; - packageName = "@apollo/protobufjs"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.6.tgz"; - sha512 = "Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw=="; - }; - }; - "@apollo/protobufjs-1.2.7" = { - name = "_at_apollo_slash_protobufjs"; - packageName = "@apollo/protobufjs"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.7.tgz"; - sha512 = "Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg=="; - }; - }; - "@apollo/usage-reporting-protobuf-4.1.1" = { - name = "_at_apollo_slash_usage-reporting-protobuf"; - packageName = "@apollo/usage-reporting-protobuf"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.1.tgz"; - sha512 = "u40dIUePHaSKVshcedO7Wp+mPiZsaU6xjv9J+VyxpoU/zL6Jle+9zWeG98tr/+SZ0nZ4OXhrbb8SNr0rAPpIDA=="; - }; - }; - "@apollo/utils.dropunuseddefinitions-1.1.0" = { - name = "_at_apollo_slash_utils.dropunuseddefinitions"; - packageName = "@apollo/utils.dropunuseddefinitions"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz"; - sha512 = "jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg=="; - }; - }; - "@apollo/utils.keyvaluecache-1.0.2" = { - name = "_at_apollo_slash_utils.keyvaluecache"; - packageName = "@apollo/utils.keyvaluecache"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz"; - sha512 = "p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg=="; - }; - }; - "@apollo/utils.logger-1.0.1" = { - name = "_at_apollo_slash_utils.logger"; - packageName = "@apollo/utils.logger"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-1.0.1.tgz"; - sha512 = "XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA=="; - }; - }; - "@apollo/utils.printwithreducedwhitespace-1.1.0" = { - name = "_at_apollo_slash_utils.printwithreducedwhitespace"; - packageName = "@apollo/utils.printwithreducedwhitespace"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz"; - sha512 = "GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q=="; - }; - }; - "@apollo/utils.removealiases-1.0.0" = { - name = "_at_apollo_slash_utils.removealiases"; - packageName = "@apollo/utils.removealiases"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz"; - sha512 = "6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A=="; - }; - }; - "@apollo/utils.sortast-1.1.0" = { - name = "_at_apollo_slash_utils.sortast"; - packageName = "@apollo/utils.sortast"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz"; - sha512 = "VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA=="; - }; - }; - "@apollo/utils.stripsensitiveliterals-1.2.0" = { - name = "_at_apollo_slash_utils.stripsensitiveliterals"; - packageName = "@apollo/utils.stripsensitiveliterals"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz"; - sha512 = "E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w=="; - }; - }; - "@apollo/utils.usagereporting-1.0.1" = { - name = "_at_apollo_slash_utils.usagereporting"; - packageName = "@apollo/utils.usagereporting"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz"; - sha512 = "6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ=="; - }; - }; - "@apollographql/apollo-tools-0.5.4" = { - name = "_at_apollographql_slash_apollo-tools"; - packageName = "@apollographql/apollo-tools"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz"; - sha512 = "shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw=="; - }; - }; - "@apollographql/graphql-playground-html-1.6.29" = { - name = "_at_apollographql_slash_graphql-playground-html"; - packageName = "@apollographql/graphql-playground-html"; - version = "1.6.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz"; - sha512 = "xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA=="; - }; - }; "@ardatan/aggregate-error-0.0.6" = { name = "_at_ardatan_slash_aggregate-error"; packageName = "@ardatan/aggregate-error"; @@ -328,22 +193,13 @@ let sha512 = "qrXI4+S8W7IF6e1nlDYX2KfdzxGHyAOj5kGvWk+TqBuAnA0rWQ513hJzdviiGpbB5VPnJkEhOVsDets8acKd6w=="; }; }; - "@astrojs/compiler-1.8.2" = { - name = "_at_astrojs_slash_compiler"; - packageName = "@astrojs/compiler"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.8.2.tgz"; - sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw=="; - }; - }; - "@astrojs/compiler-2.8.0" = { + "@astrojs/compiler-2.9.2" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "2.8.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.8.0.tgz"; - sha512 = "yrpD1WRGqsJwANaDIdtHo+YVjvIOFAjC83lu5qENIgrafwZcJgSXDuwVMXOgok4tFzpeKLsFQ6c3FoUdloLWBQ=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.9.2.tgz"; + sha512 = "Vpu0Ffsj8SoV+N0DFHlxxOMKHwSC9059Xy/OlG1t6uFYSoJXxkBC2WyF6igO7x10V+8uJrhOxaXr3nA90kJXow=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -526,13 +382,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.598.0" = { + "@aws-sdk/client-s3-3.617.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.598.0.tgz"; - sha512 = "UMxftsgF6j1vzm4Qd9vQJHs2he1NQCWWV8esZfmNFq23OpUC2BPMxkqi13ZQ9tnTAZUNs7yFT/x4Zsi/wpRZEw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.617.0.tgz"; + sha512 = "0f954CU42BhPFVRQCCBc1jAvV9N4XW9I3D4h7tJ8tzxft7fS62MSJkgxRIXNKgWKLeGR7DUbz+XGZ1R5e7pyjA=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -544,13 +400,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.598.0" = { + "@aws-sdk/client-sso-3.616.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz"; - sha512 = "nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.616.0.tgz"; + sha512 = "hwW0u1f8U4dSloAe61/eupUiGd5Q13B72BuzGxvRk0cIpYX/2m0KBG8DDl7jW1b2QQ+CflTLpG2XUf2+vRJxGA=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -562,13 +418,13 @@ let sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw=="; }; }; - "@aws-sdk/client-sso-oidc-3.598.0" = { + "@aws-sdk/client-sso-oidc-3.616.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz"; - sha512 = "jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.616.0.tgz"; + sha512 = "YY1hpYS/G1uRGjQf88dL8VLHkP/IjGxKeXdhy+JnzMdCkAWl3V9j0fEALw40NZe0x79gr6R2KUOUH/IKYQfUmg=="; }; }; "@aws-sdk/client-sts-3.296.0" = { @@ -580,13 +436,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.598.0" = { + "@aws-sdk/client-sts-3.616.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz"; - sha512 = "bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.616.0.tgz"; + sha512 = "FP7i7hS5FpReqnysQP1ukQF1OUWy8lkomaOnbu15H415YUrfCp947SIx6+BItjmx+esKxPkEjh/fbCVzw2D6hQ=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -598,13 +454,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.598.0" = { + "@aws-sdk/core-3.616.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.598.0.tgz"; - sha512 = "HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.616.0.tgz"; + sha512 = "O/urkh2kECs/IqZIVZxyeyHZ7OR2ZWhLNK7btsVQBQvJKrEspLrk/Fp20Qfg5JDerQfBN83ZbyRXLJOOucdZpw=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -616,22 +472,22 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.598.0" = { + "@aws-sdk/credential-provider-env-3.609.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz"; - sha512 = "vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz"; + sha512 = "v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ=="; }; }; - "@aws-sdk/credential-provider-http-3.598.0" = { + "@aws-sdk/credential-provider-http-3.616.0" = { name = "_at_aws-sdk_slash_credential-provider-http"; packageName = "@aws-sdk/credential-provider-http"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz"; - sha512 = "N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.616.0.tgz"; + sha512 = "1rgCkr7XvEMBl7qWCo5BKu3yAxJs71dRaZ55Xnjte/0ZHH6Oc93ZrHzyYy6UH6t0nZrH+FAuw7Yko2YtDDwDeg=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -652,13 +508,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.598.0" = { + "@aws-sdk/credential-provider-ini-3.616.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz"; - sha512 = "/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.616.0.tgz"; + sha512 = "5gQdMr9cca3xV7FF2SxpxWGH2t6+t4o+XBGiwsHm8muEjf4nUmw7Ij863x25Tjt2viPYV0UStczSb5Sihp7bkA=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -670,13 +526,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.598.0" = { + "@aws-sdk/credential-provider-node-3.616.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz"; - sha512 = "sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.616.0.tgz"; + sha512 = "Se+u6DAxjDPjKE3vX1X2uxjkWgGq69BTo0uTB0vDUiWwBVgh16s9BsBhSAlKEH1CCbbJHvOg4YdTrzjwzqyClg=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -688,13 +544,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.598.0" = { + "@aws-sdk/credential-provider-process-3.614.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.598.0"; + version = "3.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz"; - sha512 = "rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.614.0.tgz"; + sha512 = "Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -706,13 +562,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.598.0" = { + "@aws-sdk/credential-provider-sso-3.616.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz"; - sha512 = "5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.616.0.tgz"; + sha512 = "3rsWs9GBi8Z8Gps5ROwqguxtw+J6OIg1vawZMLRNMqqZoBvbOToe9wEnpid8ylU+27+oG8uibJNlNuRyXApUjw=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -724,13 +580,13 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.598.0" = { + "@aws-sdk/credential-provider-web-identity-3.609.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz"; - sha512 = "GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz"; + sha512 = "U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -832,13 +688,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.598.0" = { + "@aws-sdk/lib-storage-3.617.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.598.0.tgz"; - sha512 = "la1ZY8MHH6oGUZ6nocl+2ebGNhkzgE15dB5iC0ZPHjfW0aNEfcrF2crGVxnkJQFv0LeDPQN26drajlmLnq86UA=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.617.0.tgz"; + sha512 = "bR+3E66Dp3CyuSGywxMSwrYQCfwuFu7gRJxOpk1i2AKV1Wh7g0y1eANXHVKnk+UbVRz4S53UCD8LEiKp2KYShA=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -859,13 +715,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.598.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.616.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.598.0.tgz"; - sha512 = "PM7BcFfGUSkmkT6+LU9TyJiB4S8yI7dfuKQDwK5ZR3P7MKaK4Uj4yyDiv0oe5xvkF6+O2+rShj+eh8YuWkOZ/Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.616.0.tgz"; + sha512 = "KZv78s8UE7+s3qZCfG3pE9U9XV5WTP478aNWis5gDXmsb5LF7QWzEeR8kve5dnjNlK6qVQ33v+mUZa6lR5PwMw=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -895,13 +751,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.598.0" = { + "@aws-sdk/middleware-expect-continue-3.616.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.598.0.tgz"; - sha512 = "ZuHW18kaeHR8TQyhEOYMr8VwiIh0bMvF7J1OTqXHxDteQIavJWA3CbfZ9sgS4XGtrBZDyHJhjZKeCfLhN2rq3w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.616.0.tgz"; + sha512 = "IM1pfJPm7pDUXa55js9bnGjS8o3ldzDwf95mL9ZAYdEsm10q6i0ZxZbbro2gTq25Ap5ykdeeS34lOSzIqPiW1A=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -913,13 +769,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.598.0" = { + "@aws-sdk/middleware-flexible-checksums-3.616.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.598.0.tgz"; - sha512 = "xukAzds0GQXvMEY9G6qt+CzwVzTx8NyKKh04O2Q+nOch6QQ8Rs+2kTRy3Z4wQmXq2pK9hlOWb5nXA7HWpmz6Ng=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.616.0.tgz"; + sha512 = "Mrco/dURoTXVqwcnYRcyrFaPTIg36ifg2PK0kUYfSVTGEOClZOQXlVG5zYCZoo3yEMgy/gLT907FjUQxwoifIw=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -931,13 +787,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.598.0" = { + "@aws-sdk/middleware-host-header-3.616.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz"; - sha512 = "WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.616.0.tgz"; + sha512 = "mhNfHuGhCDZwYCABebaOvTgOM44UCZZRq2cBpgPZLVKP0ydAv5aFHXv01goexxXHqgHoEGx0uXWxlw0s2EpFDg=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -949,13 +805,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.598.0" = { + "@aws-sdk/middleware-location-constraint-3.609.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.598.0.tgz"; - sha512 = "8oybQxN3F1ISOMULk7JKJz5DuAm5hCUcxMW9noWShbxTJuStNvuHf/WLUzXrf8oSITyYzIHPtf8VPlKR7I3orQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz"; + sha512 = "xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -967,13 +823,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.598.0" = { + "@aws-sdk/middleware-logger-3.609.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz"; - sha512 = "bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz"; + sha512 = "S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -985,13 +841,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.598.0" = { + "@aws-sdk/middleware-recursion-detection-3.616.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz"; - sha512 = "vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.616.0.tgz"; + sha512 = "LQKAcrZRrR9EGez4fdCIVjdn0Ot2HMN12ChnoMGEU6oIxnQ2aSC7iASFFCV39IYfeMh7iSCPj7Wopqw8rAouzg=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -1012,13 +868,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.598.0" = { + "@aws-sdk/middleware-sdk-s3-3.617.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.598.0.tgz"; - sha512 = "5AGtLAh9wyK6ANPYfaKTqJY1IFJyePIxsEbxa7zS6REheAqyVmgJFaGu3oQ5XlxfGr5Uq59tFTRkyx26G1HkHA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.617.0.tgz"; + sha512 = "zVOS6sNGcLGhq7i+5POmVqmSPNmrQYDFsynpnWMSLsNaej+xvkdSOnytLrUvag3Du4kAxfO5NNIC0GuNj9lcCg=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -1048,13 +904,13 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.598.0" = { + "@aws-sdk/middleware-signing-3.616.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.598.0.tgz"; - sha512 = "XKb05DYx/aBPqz6iCapsCbIl8aD8EihTuPCs51p75QsVfbQoVr4TlFfIl5AooMSITzojdAQqxt021YtvxjtxIQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.616.0.tgz"; + sha512 = "wwzZFlXyURwo40oz1NmufreQa5DqwnCF8hR8tIP5+oKCyhbkmlmv8xG4Wn51bzY2WEbQhvFebgZSFTEvelCoCg=="; }; }; "@aws-sdk/middleware-ssec-3.296.0" = { @@ -1066,13 +922,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.598.0" = { + "@aws-sdk/middleware-ssec-3.609.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.598.0.tgz"; - sha512 = "f0p2xP8IC1uJ5e/tND1l81QxRtRFywEdnbtKCE0H6RSn4UIt2W3Dohe1qQDbnh27okF0PkNW6BJGdSAz3p7qbA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz"; + sha512 = "GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -1093,13 +949,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.598.0" = { + "@aws-sdk/middleware-user-agent-3.616.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.598.0"; + version = "3.616.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz"; - sha512 = "4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.616.0.tgz"; + sha512 = "iMcAb4E+Z3vuEcrDsG6T2OBNiqWAquwahP9qepHqfmnmJqHr1mSHtXDYTGBNid31+621sUQmneUQ+fagpGAe4w=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1156,22 +1012,22 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/region-config-resolver-3.598.0" = { + "@aws-sdk/region-config-resolver-3.614.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.598.0"; + version = "3.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz"; - sha512 = "oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz"; + sha512 = "vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g=="; }; }; - "@aws-sdk/s3-presigned-post-3.598.0" = { + "@aws-sdk/s3-presigned-post-3.617.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.598.0.tgz"; - sha512 = "FH4htNIfh+wyYP0nKPCGOboFnSGe98xhipf0Uu9FZkMonxqMwUMj8tVhYE9YlrFxwhgUVY9Mca0/z4o0rgoWSw=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.617.0.tgz"; + sha512 = "5PCjZ3vux7FvlJYtVbXQZCO6J4yGPaZlWxgt1XdX43wcXe2GNWhxHB9OvCmKOJR2N379Ihw/ABq8UWze6LIzxA=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1183,13 +1039,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.598.0" = { + "@aws-sdk/s3-request-presigner-3.617.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.598.0.tgz"; - sha512 = "IC06/HrZNlYxdyKH5+4A9B98NwcxJjgXOSUV581X7GpqHHspZ0T6tih8shBus3zzW8WfVqRAhJVwZtfMY55hdw=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.617.0.tgz"; + sha512 = "zszOwBmu3Ei5rRgddcQ3sbKFCtzLtUNDcmeybh4OhxENfgzHZHOeTOt8C+C16DD5YDQqeP4JYPRUp0LPuybkvg=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1219,13 +1075,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.598.0" = { + "@aws-sdk/signature-v4-crt-3.617.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.598.0.tgz"; - sha512 = "laxTj/Ieq13nLHCcIl983ySD0lzIxWVaAik90zcXFH8nLNWwuR4V/Yfz9pcrnWZxF4taUi0CPwZbij9FKftPXg=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.617.0.tgz"; + sha512 = "mTZ438M8VYQhupltwKXOJCBA/WFdd9PCYjRwmbFv3b1QpOMWr5VQYldbz6lwKqOcv0N93PJkNFZnHBC//DTw5A=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1237,13 +1093,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.598.0" = { + "@aws-sdk/signature-v4-multi-region-3.617.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.598.0"; + version = "3.617.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.598.0.tgz"; - sha512 = "1r/EyTrO1gSa1FirnR8V7mabr7gk+l+HkyTI0fcTSr8ucB7gmYyW6WjkY8JCz13VYHFK62usCEDS7yoJoJOzTA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.617.0.tgz"; + sha512 = "kGbLs9q0/ziuzA1huf0BBh05ChxDeZ8ZWc/kedb80ocq6izOLaGgeqqUR8oB0ianwjel4AQq/iv1fsOIt3wmAA=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1264,13 +1120,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.598.0" = { + "@aws-sdk/token-providers-3.614.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.598.0"; + version = "3.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz"; - sha512 = "TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz"; + sha512 = "okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1282,13 +1138,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.598.0" = { + "@aws-sdk/types-3.609.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.598.0.tgz"; - sha512 = "742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz"; + sha512 = "+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1399,13 +1255,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.598.0" = { + "@aws-sdk/util-endpoints-3.614.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.598.0"; + version = "3.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz"; - sha512 = "Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz"; + sha512 = "wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1417,13 +1273,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.598.0" = { + "@aws-sdk/util-format-url-3.609.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.598.0.tgz"; - sha512 = "1X0PlREk5K6tQg8rFZOjoKVtDyI1WgbKJNCymHhMye6STryY6fhuuayKstiDThkqDYxqahjUJz/Tl2p5W3rbcw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.609.0.tgz"; + sha512 = "fuk29BI/oLQlJ7pfm6iJ4gkEpHdavffAALZwXh9eaY1vQ0ip0aKfRTiNudPoJjyyahnz5yJ1HkmlcDitlzsOrQ=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1498,13 +1354,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.598.0" = { + "@aws-sdk/util-user-agent-browser-3.609.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz"; - sha512 = "36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz"; + sha512 = "fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1516,13 +1372,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.598.0" = { + "@aws-sdk/util-user-agent-node-3.614.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.598.0"; + version = "3.614.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz"; - sha512 = "oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz"; + sha512 = "15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1561,13 +1417,13 @@ let sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow=="; }; }; - "@aws-sdk/xml-builder-3.598.0" = { + "@aws-sdk/xml-builder-3.609.0" = { name = "_at_aws-sdk_slash_xml-builder"; packageName = "@aws-sdk/xml-builder"; - version = "3.598.0"; + version = "3.609.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.598.0.tgz"; - sha512 = "ZIa2RK7CHFTZ4gwK77WRtsZ6vF7xwRXxJ8KQIxK2duhoTVcn0xYxpFLdW9WZZZvdP9GIF3Loqvf8DRdeU5Jc7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz"; + sha512 = "l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA=="; }; }; "@azure/abort-controller-1.1.0" = { @@ -1642,13 +1498,13 @@ let sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; }; }; - "@azure/core-rest-pipeline-1.16.0" = { + "@azure/core-rest-pipeline-1.16.2" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.16.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.0.tgz"; - sha512 = "CeuTvsXxCUmEuxH5g/aceuSl6w2EugvNHKAtKKVdiX915EjJJxAwfzNNWZreNnbxHZ2fi0zaM6wwS23x2JVqSQ=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.2.tgz"; + sha512 = "Hnhm/PG9/SQ07JJyLDv3l9Qr8V3xgAe1hFoBYzt6LaalMxfL/ZqFaZf/bz5VN3pMcleCPwl8ivlS2Fjxq/iC8Q=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -1678,67 +1534,67 @@ let sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; }; }; - "@azure/core-util-1.9.0" = { + "@azure/core-util-1.9.1" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz"; - sha512 = "AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.1.tgz"; + sha512 = "OLsq0etbHO1MA7j6FouXFghuHrAFGk+5C1imcpQ2e+0oZhYF07WLA+NW2Vqs70R7d+zOAWiWM3tbE1sXcDN66g=="; }; }; - "@azure/identity-4.0.1" = { + "@azure/identity-4.2.1" = { name = "_at_azure_slash_identity"; packageName = "@azure/identity"; - version = "4.0.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-4.0.1.tgz"; - sha512 = "yRdgF03SFLqUMZZ1gKWt0cs0fvrDIkq2bJ6Oidqcoo5uM85YMBnXWMzYKK30XqIT76lkFyAaoAAy5knXhrG4Lw=="; + url = "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz"; + sha512 = "U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q=="; }; }; - "@azure/identity-4.2.1" = { + "@azure/identity-4.4.0" = { name = "_at_azure_slash_identity"; packageName = "@azure/identity"; - version = "4.2.1"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz"; - sha512 = "U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q=="; + url = "https://registry.npmjs.org/@azure/identity/-/identity-4.4.0.tgz"; + sha512 = "oG6oFNMxUuoivYg/ElyZWVSZfw42JQyHbrp+lR7VJ1BYWsGzt34NwyDw3miPp1QI7Qm5+4KAd76wGsbHQmkpkg=="; }; }; - "@azure/logger-1.1.2" = { + "@azure/logger-1.1.3" = { name = "_at_azure_slash_logger"; packageName = "@azure/logger"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.1.2.tgz"; - sha512 = "l170uE7bsKpIU6B/giRc9i4NI0Mj+tANMMMxf7Zi/5cKzEqPayP7+X1WPrG7e+91JgY8N+7K7nF2WOi7iVhXvg=="; + url = "https://registry.npmjs.org/@azure/logger/-/logger-1.1.3.tgz"; + sha512 = "J8/cIKNQB1Fc9fuYqBVnrppiUtW+5WWJPCj/tAokC5LdSTwkWWttN+jsRgw9BLYD7JDBx7PceiqOBxJJ1tQz3Q=="; }; }; - "@azure/msal-browser-3.17.0" = { + "@azure/msal-browser-3.20.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "3.17.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.17.0.tgz"; - sha512 = "csccKXmW2z7EkZ0I3yAoW/offQt+JECdTIV/KrnRoZyM7wCSsQWODpwod8ZhYy7iOyamcHApR9uCh0oD1M+0/A=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.20.0.tgz"; + sha512 = "ErsxbfCGIwdqD8jipqdxpfAGiUEQS7MWUe39Rjhl0ZVPsb1JEe9bZCe2+0g23HDH6DGyCAtnTNN9scPtievrMQ=="; }; }; - "@azure/msal-common-14.12.0" = { + "@azure/msal-common-14.14.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "14.12.0"; + version = "14.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz"; - sha512 = "IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz"; + sha512 = "OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ=="; }; }; - "@azure/msal-node-2.9.2" = { + "@azure/msal-node-2.12.0" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "2.9.2"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz"; - sha512 = "8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz"; + sha512 = "jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg=="; }; }; "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { @@ -1759,13 +1615,13 @@ let sha512 = "sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ=="; }; }; - "@babel/cli-7.24.7" = { + "@babel/cli-7.24.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.7.tgz"; - sha512 = "8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.8.tgz"; + sha512 = "isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1804,22 +1660,22 @@ let sha512 = "BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA=="; }; }; - "@babel/compat-data-7.24.7" = { + "@babel/compat-data-7.24.9" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.24.7"; + version = "7.24.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz"; - sha512 = "qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz"; + sha512 = "e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng=="; }; }; - "@babel/core-7.24.7" = { + "@babel/core-7.24.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.24.7"; + version = "7.24.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz"; - sha512 = "nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz"; + sha512 = "5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg=="; }; }; "@babel/generator-7.18.2" = { @@ -1831,13 +1687,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.24.4" = { + "@babel/generator-7.24.10" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.24.4"; + version = "7.24.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz"; - sha512 = "Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz"; + sha512 = "o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg=="; }; }; "@babel/generator-7.24.7" = { @@ -1867,22 +1723,22 @@ let sha512 = "xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA=="; }; }; - "@babel/helper-compilation-targets-7.24.7" = { + "@babel/helper-compilation-targets-7.24.8" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz"; - sha512 = "ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz"; + sha512 = "oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw=="; }; }; - "@babel/helper-create-class-features-plugin-7.24.7" = { + "@babel/helper-create-class-features-plugin-7.24.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz"; - sha512 = "kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz"; + sha512 = "4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA=="; }; }; "@babel/helper-create-regexp-features-plugin-7.24.7" = { @@ -1930,13 +1786,13 @@ let sha512 = "MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.24.7" = { + "@babel/helper-member-expression-to-functions-7.24.8" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz"; - sha512 = "LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz"; + sha512 = "LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA=="; }; }; "@babel/helper-module-imports-7.24.7" = { @@ -1948,13 +1804,13 @@ let sha512 = "8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA=="; }; }; - "@babel/helper-module-transforms-7.24.7" = { + "@babel/helper-module-transforms-7.24.9" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.24.7"; + version = "7.24.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz"; - sha512 = "1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz"; + sha512 = "oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw=="; }; }; "@babel/helper-optimise-call-expression-7.24.7" = { @@ -1966,13 +1822,13 @@ let sha512 = "jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A=="; }; }; - "@babel/helper-plugin-utils-7.24.7" = { + "@babel/helper-plugin-utils-7.24.8" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz"; - sha512 = "Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz"; + sha512 = "FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg=="; }; }; "@babel/helper-remap-async-to-generator-7.24.7" = { @@ -2020,13 +1876,13 @@ let sha512 = "oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA=="; }; }; - "@babel/helper-string-parser-7.24.7" = { + "@babel/helper-string-parser-7.24.8" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz"; - sha512 = "7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz"; + sha512 = "pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ=="; }; }; "@babel/helper-validator-identifier-7.24.7" = { @@ -2038,13 +1894,13 @@ let sha512 = "rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="; }; }; - "@babel/helper-validator-option-7.24.7" = { + "@babel/helper-validator-option-7.24.8" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz"; - sha512 = "yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz"; + sha512 = "xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q=="; }; }; "@babel/helper-wrap-function-7.24.7" = { @@ -2056,13 +1912,13 @@ let sha512 = "N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw=="; }; }; - "@babel/helpers-7.24.7" = { + "@babel/helpers-7.24.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz"; - sha512 = "NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz"; + sha512 = "gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ=="; }; }; "@babel/highlight-7.24.7" = { @@ -2074,13 +1930,13 @@ let sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw=="; }; }; - "@babel/node-7.24.7" = { + "@babel/node-7.24.8" = { name = "_at_babel_slash_node"; packageName = "@babel/node"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/node/-/node-7.24.7.tgz"; - sha512 = "BCYNLxUQjGTgy8bAq12jy+Lt8soGWa/5u3s7U3aTVXxviIp0YVS+/Wm0b4eaitLVvetYrEoAiRF0QOk4WKsHAQ=="; + url = "https://registry.npmjs.org/@babel/node/-/node-7.24.8.tgz"; + sha512 = "4JgQZJOVDrMCe2OwP7g4nBEvv0kbTkWYVvkEhFdq8JdEhsy9J5E5ChibbIchTrntKB62lx2I7fVTdM+Se7KVFg=="; }; }; "@babel/parser-7.18.4" = { @@ -2092,13 +1948,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.24.7" = { + "@babel/parser-7.24.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz"; - sha512 = "9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz"; + sha512 = "WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w=="; }; }; "@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" = { @@ -2488,13 +2344,13 @@ let sha512 = "HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ=="; }; }; - "@babel/plugin-transform-classes-7.24.7" = { + "@babel/plugin-transform-classes-7.24.8" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz"; - sha512 = "CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz"; + sha512 = "VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA=="; }; }; "@babel/plugin-transform-computed-properties-7.24.7" = { @@ -2506,13 +2362,13 @@ let sha512 = "25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ=="; }; }; - "@babel/plugin-transform-destructuring-7.24.7" = { + "@babel/plugin-transform-destructuring-7.24.8" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz"; - sha512 = "19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz"; + sha512 = "36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ=="; }; }; "@babel/plugin-transform-dotall-regex-7.24.7" = { @@ -2632,13 +2488,13 @@ let sha512 = "9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.24.7" = { + "@babel/plugin-transform-modules-commonjs-7.24.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz"; - sha512 = "iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz"; + sha512 = "WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA=="; }; }; "@babel/plugin-transform-modules-systemjs-7.24.7" = { @@ -2722,13 +2578,13 @@ let sha512 = "uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA=="; }; }; - "@babel/plugin-transform-optional-chaining-7.24.7" = { + "@babel/plugin-transform-optional-chaining-7.24.8" = { name = "_at_babel_slash_plugin-transform-optional-chaining"; packageName = "@babel/plugin-transform-optional-chaining"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz"; - sha512 = "tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz"; + sha512 = "5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw=="; }; }; "@babel/plugin-transform-parameters-7.24.7" = { @@ -2866,22 +2722,22 @@ let sha512 = "AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.24.7" = { + "@babel/plugin-transform-typeof-symbol-7.24.8" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz"; - sha512 = "VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz"; + sha512 = "adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw=="; }; }; - "@babel/plugin-transform-typescript-7.24.7" = { + "@babel/plugin-transform-typescript-7.24.8" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz"; - sha512 = "iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.8.tgz"; + sha512 = "CgFgtN61BbdOGCP4fLaAMOPkzWUh6yQZNMr5YSt8uz2cZSSiQONCQFWqsE4NeVfOIhqDOlS9CR3WD91FzMeB2Q=="; }; }; "@babel/plugin-transform-unicode-escapes-7.24.7" = { @@ -2929,22 +2785,13 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.24.7" = { + "@babel/preset-env-7.24.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz"; - sha512 = "1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ=="; - }; - }; - "@babel/preset-flow-7.24.7" = { - name = "_at_babel_slash_preset-flow"; - packageName = "@babel/preset-flow"; - version = "7.24.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.7.tgz"; - sha512 = "NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz"; + sha512 = "vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ=="; }; }; "@babel/preset-modules-0.1.6-no-external-plugins" = { @@ -2983,13 +2830,13 @@ let sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="; }; }; - "@babel/runtime-7.24.7" = { + "@babel/runtime-7.24.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz"; - sha512 = "UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz"; + sha512 = "5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA=="; }; }; "@babel/runtime-7.9.0" = { @@ -3001,15 +2848,6 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/template-7.24.0" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz"; - sha512 = "Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA=="; - }; - }; "@babel/template-7.24.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -3019,13 +2857,13 @@ let sha512 = "jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig=="; }; }; - "@babel/traverse-7.24.7" = { + "@babel/traverse-7.24.8" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz"; - sha512 = "yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz"; + sha512 = "t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ=="; }; }; "@babel/types-7.19.0" = { @@ -3037,40 +2875,40 @@ let sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; }; - "@babel/types-7.24.0" = { + "@babel/types-7.24.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.24.0"; + version = "7.24.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz"; - sha512 = "+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz"; + sha512 = "XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q=="; }; }; - "@babel/types-7.24.7" = { + "@babel/types-7.24.9" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.24.7"; + version = "7.24.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz"; - sha512 = "XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz"; + sha512 = "xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ=="; }; }; - "@bmewburn/js-beautify-1.14.9" = { + "@bmewburn/js-beautify-1.15.2" = { name = "_at_bmewburn_slash_js-beautify"; packageName = "@bmewburn/js-beautify"; - version = "1.14.9"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.9.tgz"; - sha512 = "PNz0Y8TElejGkQ3N6aiqoBLLa+kaIAQAgu6KFn/PN625W/t2LZVyoL68df5gRSvbpelrsczvQlVLsNp0mcJFgA=="; + url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.15.2.tgz"; + sha512 = "TGLBQLYEow0ncfCap5ZSTeU7z/LlUemNvwirys5la3A44P+NZVIvuJSFCbo8+Sjsau/nthTLuwe76oiSthvm7Q=="; }; }; - "@bmewburn/vscode-html-languageserver-1.10.0" = { + "@bmewburn/vscode-html-languageserver-1.11.0" = { name = "_at_bmewburn_slash_vscode-html-languageserver"; packageName = "@bmewburn/vscode-html-languageserver"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.10.0.tgz"; - sha512 = "0lHL4Y1EJKHdRIEpXPZHnlIoxCKNglADDPloOYFcIoRj/O7zfRDrdPWPJgr2LeJDgXHklX6ltH6wp0Ywxa98AQ=="; + url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.11.0.tgz"; + sha512 = "9uyCkXlu5eHyQB4Knux5mHJzuAglJXoix7B8i8xxurM+03lhSJz3QJ9LeBTP2YSSCnE/vTu4vCXDGDzANA4R7g=="; }; }; "@braintree/sanitize-url-6.0.4" = { @@ -3082,49 +2920,49 @@ let sha512 = "s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A=="; }; }; - "@cdktf/cli-core-0.20.7" = { + "@cdktf/cli-core-0.20.8" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.20.7.tgz"; - sha512 = "KGTRZ68PHUfiW75GkwOIetp2N9tjIdmTHwmt773jwlNFbi+OMaOEm07XQjtIz2AcuvLpx9u4N0u/uI4T+JfwSg=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.20.8.tgz"; + sha512 = "ZMMedejI0ITMwKecsg9+Z7IqX7VH0y8DYx2kr9DciyCDuvbE6gYlo/pYRbgpdC5ObpnNYg39rFY4x0yKRytCzw=="; }; }; - "@cdktf/commons-0.20.7" = { + "@cdktf/commons-0.20.8" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.20.7.tgz"; - sha512 = "X1HnLlJjKyOfoWTOIoUbm5cRxWIqKw2gtHs4QgDlTGZm9kc5lW1IbwMuEOv7B1IHFXFFRFwnYg03V56TuoEvqQ=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.20.8.tgz"; + sha512 = "VkAz/9b070fceB7d/yk9LasIG7viHq6sqBi9+/4VSU1ZkY9Eyvq99I/OluWD9lRQdiho7OkxZtR+LGhmrhu3XA=="; }; }; - "@cdktf/hcl-tools-0.20.7" = { + "@cdktf/hcl-tools-0.20.8" = { name = "_at_cdktf_slash_hcl-tools"; packageName = "@cdktf/hcl-tools"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl-tools/-/hcl-tools-0.20.7.tgz"; - sha512 = "B/1/UqoCu9V40oV/qLsBRwqp/Q+0wQOcm7WtgZEKNEvNb+5y01E7UbWLoIvs3k7TX8pzHU9Bl1gACXtHbezpsw=="; + url = "https://registry.npmjs.org/@cdktf/hcl-tools/-/hcl-tools-0.20.8.tgz"; + sha512 = "eS8h0Vjs1lO3twH5NEPpJv57A+lFAMZry2vM/VBKJaIemeuJll9cICFeonsluQ42f8YCuEGQiHhIAxgfoaTY4g=="; }; }; - "@cdktf/hcl2cdk-0.20.7" = { + "@cdktf/hcl2cdk-0.20.8" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.20.7.tgz"; - sha512 = "xGrVa/SxnLrYM8pSwRfvvAFaj7ak3B3xvuwhj9xTWKZ39f89sX4vPkTuJgoiwIG83iAIlNapUcqMQ0PeqogeBw=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.20.8.tgz"; + sha512 = "p+bju8Qj84COvDLuCQlDmp1iPlIwWoqcW6QpuHNmip3HWLnJuUipO0BMxRcVofcsaljJQmkIbE6We0DZOooG9g=="; }; }; - "@cdktf/hcl2json-0.20.7" = { + "@cdktf/hcl2json-0.20.8" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.20.7.tgz"; - sha512 = "325Swm3ySUEbscSIXrtrNOt0mJCyVTheD5SNuDTcMYLyTPQNgu/6LgKu36YQt0AKK3zUp+f56pEYMitpR9FmLQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.20.8.tgz"; + sha512 = "MOt5HHZYmHiRleaS8YwhEz913H4xzDCOO6MF1GO5RNZ74DYl6Bv6Y+JY4196E0THtiJ1Ibo9IvLfTIlTUrQ+Bw=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" = { @@ -3136,22 +2974,22 @@ let sha512 = "qvga/nzEtdCJMu/6jJfDqpzbRejvXtNhWFnbubfuYyN5nMNORNXX+POT4j+mQSDQar5bIQ1a812szw/zr47cfw=="; }; }; - "@cdktf/provider-generator-0.20.7" = { + "@cdktf/provider-generator-0.20.8" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.20.7.tgz"; - sha512 = "O3ZyDp/q73Kg2zn/axA4V62c3QvaGEO44G94eiyi4z6GRokTVQ4eOlkpoqp3spejizhMkA8Lzq+OQ2cvsQygeA=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.20.8.tgz"; + sha512 = "ZD3A3IVMp5RKsA83NjRj1pYhBoSiCnXKVGmXLaORhoitzrg/uxoi2bEegNWpgHIt1BXthoKS33bZ23xZ7fK9Pg=="; }; }; - "@cdktf/provider-schema-0.20.7" = { + "@cdktf/provider-schema-0.20.8" = { name = "_at_cdktf_slash_provider-schema"; packageName = "@cdktf/provider-schema"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.20.7.tgz"; - sha512 = "KVV5YMaMoXgrmT+AsU1y3vCLfyie5/XbSKVVrUnVp5sCrwhsFMl6U59HTDQ52QX3aHWxwTAqEZbljdg6ZUbk9A=="; + url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.20.8.tgz"; + sha512 = "beQuJgjN/7zLS0zVv0d5VyErbBjx61/CI77qg7LFa6KZHRd/OWegkSQ/8DayhLzYfaW8GEYvP7WXbJLl86jIgg=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3172,24 +3010,6 @@ let sha512 = "m7lZj00lP1fNMzXITOV1uNdsYXjsmMbFB7Sl8OXfhRWYDQuBr6EPNzIzAonzIcmvTA2JNs8WMq0ZU76XXzpP6w=="; }; }; - "@cloudflare/kv-asset-handler-0.3.2" = { - name = "_at_cloudflare_slash_kv-asset-handler"; - packageName = "@cloudflare/kv-asset-handler"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.2.tgz"; - sha512 = "EeEjMobfuJrwoctj7FA1y1KEbM0+Q1xSjobIEyie9k4haVEBB7vkDvsasw1pM3rO39mL2akxIAzLMUAtrMHZhA=="; - }; - }; - "@cloudflare/workers-types-4.20240605.0" = { - name = "_at_cloudflare_slash_workers-types"; - packageName = "@cloudflare/workers-types"; - version = "4.20240605.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240605.0.tgz"; - sha512 = "zJw4Q6CnkaQ5JZmHRkNiSs5GfiRgUIUL8BIHPQkd2XUHZkIBv9M9yc0LKEwMYGpCFC+oSOltet6c9RjP9uQ99g=="; - }; - }; "@colors/colors-1.6.0" = { name = "_at_colors_slash_colors"; packageName = "@colors/colors"; @@ -3352,58 +3172,58 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-8.8.4" = { + "@cspell/cspell-bundled-dicts-8.12.1" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.8.4.tgz"; - sha512 = "k9ZMO2kayQFXB3B45b1xXze3MceAMNy9U+D7NTnWB1i3S0y8LhN53U9JWWgqHGPQaHaLHzizL7/w1aGHTA149Q=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.12.1.tgz"; + sha512 = "55wCxlKwRsYCt8uWB65C0xiJ4bP43UE3b/GK01ekyz2fZ11mudMWGMrX/pdKwGIOXFfFqDz3DCRxFs+fHS58oA=="; }; }; - "@cspell/cspell-json-reporter-8.8.4" = { + "@cspell/cspell-json-reporter-8.12.1" = { name = "_at_cspell_slash_cspell-json-reporter"; packageName = "@cspell/cspell-json-reporter"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.8.4.tgz"; - sha512 = "ITpOeNyDHD+4B9QmLJx6YYtrB1saRsrCLluZ34YaICemNLuumVRP1vSjcdoBtefvGugCOn5nPK7igw0r/vdAvA=="; + url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.12.1.tgz"; + sha512 = "nO/3GTk3rBpLRBzkmcKFxbtEDd3FKXfQ5uTCpJ27XYVHYjlU+d4McOYYMClMhpFianVol2JCyberpGAj6bVgLg=="; }; }; - "@cspell/cspell-pipe-8.8.4" = { + "@cspell/cspell-pipe-8.12.1" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.8.4.tgz"; - sha512 = "Uis9iIEcv1zOogXiDVSegm9nzo5NRmsRDsW8CteLRg6PhyZ0nnCY1PZIUy3SbGF0vIcb/M+XsdLSh2wOPqTXww=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.12.1.tgz"; + sha512 = "lh0zIm43r/Fj3sQWXc68msKnXNrfPOo8VvzL1hOP0v/j2eH61fvELH08/K+nQJ8cCutNZ4zhk9+KMDU4KmsMtw=="; }; }; - "@cspell/cspell-resolver-8.8.4" = { + "@cspell/cspell-resolver-8.12.1" = { name = "_at_cspell_slash_cspell-resolver"; packageName = "@cspell/cspell-resolver"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.8.4.tgz"; - sha512 = "eZVw31nSeh6xKl7TzzkZVMTX/mgwhUw40/q1Sqo7CTPurIBg66oelEqKRclX898jzd2/qSK+ZFwBDxvV7QH38A=="; + url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.12.1.tgz"; + sha512 = "3HE04m7DS/6xYpWPN2QBGCHr26pvxHa78xYk+PjiPD2Q49ceqTNdFcZOYd+Wba8HbRXSukchSLhrTujmPEzqpw=="; }; }; - "@cspell/cspell-service-bus-8.8.4" = { + "@cspell/cspell-service-bus-8.12.1" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.8.4.tgz"; - sha512 = "KtwJ38uPLrm2Q8osmMIAl2NToA/CMyZCxck4msQJnskdo30IPSdA1Rh0w6zXinmh1eVe0zNEVCeJ2+x23HqW+g=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.12.1.tgz"; + sha512 = "UQPddS38dQ/FG00y2wginCzdS6yxryiGrWXSD/P59idCrYYDCYnI9pPsx4u10tmRkW1zJ+O7gGCsXw7xa5DAJQ=="; }; }; - "@cspell/cspell-types-8.8.4" = { + "@cspell/cspell-types-8.12.1" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.8.4.tgz"; - sha512 = "ya9Jl4+lghx2eUuZNY6pcbbrnResgEAomvglhdbEGqy+B5MPEqY5Jt45APEmGqHzTNks7oFFaiTIbXYJAFBR7A=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.12.1.tgz"; + sha512 = "17POyyRgl7m7mMuv1qk2xX6E5bdT0F3247vloBCdUMyaVtmtN4uEiQ/jqU5vtW02vxlKjKS0HcTvKz4EVfSlzQ=="; }; }; "@cspell/dict-ada-4.0.2" = { @@ -3424,13 +3244,13 @@ let sha512 = "K21CfB4ZpKYwwDQiPfic2zJA/uxkbsd4IQGejEvDAhE3z8wBs6g6BwwqdVO767M9NgZqc021yAVpr79N5pWe3w=="; }; }; - "@cspell/dict-aws-4.0.2" = { + "@cspell/dict-aws-4.0.3" = { name = "_at_cspell_slash_dict-aws"; packageName = "@cspell/dict-aws"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.2.tgz"; - sha512 = "aNGHWSV7dRLTIn8WJemzLoMF62qOaiUQlgnsCwH5fRCD/00gsWCwg106pnbkmK4AyabyxzneOV4dfecDJWkSxw=="; + url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.3.tgz"; + sha512 = "0C0RQ4EM29fH0tIYv+EgDQEum0QI6OrmjENC9u98pB8UcnYxGG/SqinuPxo+TgcEuInj0Q73MsBpJ1l5xUnrsw=="; }; }; "@cspell/dict-bash-1.0.18" = { @@ -3460,13 +3280,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.1.2" = { + "@cspell/dict-companies-3.1.3" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.2.tgz"; - sha512 = "OwR5i1xbYuJX7FtHQySmTy3iJtPV1rZQ3jFCxFGwrA1xRQ4rtRcDQ+sTXBCIAoJHkXa84f9J3zsngOKmMGyS/w=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.3.tgz"; + sha512 = "qaAmfKtQLA7Sbe9zfFVpcwyG92cx6+EiWIpPURv11Ng2QMv2PKhYcterUJBooAvgqD0/qq+AsLN8MREloY5Mdw=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3478,13 +3298,13 @@ let sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; }; }; - "@cspell/dict-cpp-5.1.9" = { + "@cspell/dict-cpp-5.1.12" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "5.1.9"; + version = "5.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.9.tgz"; - sha512 = "lZmPKn3qfkWQ7tr+yw6JhuhscsyRgRHEOpOd0fhtPt0N154FNsGebGGLW0SOZUuGgW7Nk3lCCwHP85GIemnlqQ=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.12.tgz"; + sha512 = "6lXLOFIa+k/qBcu0bjaE/Kc6v3sh9VhsDOXD1Dalm3zgd0QIMjp5XBmkpSdCAK3pWCPV0Se7ysVLDfCea1BuXg=="; }; }; "@cspell/dict-cryptocurrencies-1.0.10" = { @@ -3622,13 +3442,13 @@ let sha512 = "g+uKLWvOp9IEZvrIvBPTr/oaO6619uH/wyqypqvwpmnmpjcfi8+/hqZH8YNKt15oviK8k4CkINIqNhyndG9d9Q=="; }; }; - "@cspell/dict-en-common-misspellings-2.0.1" = { + "@cspell/dict-en-common-misspellings-2.0.3" = { name = "_at_cspell_slash_dict-en-common-misspellings"; packageName = "@cspell/dict-en-common-misspellings"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.1.tgz"; - sha512 = "uWaP8UG4uvcPyqaG0FzPKCm5kfmhsiiQ45Fs6b3/AEAqfq7Fj1JW0+S3qRt85FQA9SoU6gUJCz9wkK/Ylh7m5A=="; + url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.3.tgz"; + sha512 = "8nF1z9nUiSgMyikL66HTbDO7jCGtB24TxKBasXIBwkBKMDZgA2M883iXdeByy6m1JJUcCGFkSftVYp2W0bUgjw=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -3649,13 +3469,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.3.21" = { + "@cspell/dict-en_us-4.3.23" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.3.21"; + version = "4.3.23"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.21.tgz"; - sha512 = "Bzoo2aS4Pej/MGIFlATpp0wMt9IzVHrhDjdV7FgkAIXbjrOn67ojbTxCgWs8AuCNVfK8lBYGEvs5+ElH1msF8w=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.23.tgz"; + sha512 = "l0SoEQBsi3zDSl3OuL4/apBkxjuj4hLIg/oy6+gZ7LWh03rKdF6VNtSZNXWAmMY+pmb1cGA3ouleTiJIglbsIg=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3712,13 +3532,13 @@ let sha512 = "Mbi+zWdiP9yzL+X4YD9Tgcm5YQ95Ql+Y3vF2LRnOY6g2QWaijTRN1rgksVuxzpFqHi//+bx2uoUb0XEKBYDi8g=="; }; }; - "@cspell/dict-fullstack-3.1.8" = { + "@cspell/dict-fullstack-3.2.0" = { name = "_at_cspell_slash_dict-fullstack"; packageName = "@cspell/dict-fullstack"; - version = "3.1.8"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.8.tgz"; - sha512 = "YRlZupL7uqMCtEBK0bDP9BrcPnjDhz7m4GBqCc1EYqfXauHbLmDT8ELha7T/E7wsFKniHSjzwDZzhNXo2lusRQ=="; + url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.0.tgz"; + sha512 = "sIGQwU6G3rLTo+nx0GKyirR5dQSFeTIzFTOrURw51ISf+jKG9a3OmvsVtc2OANfvEAOLOC9Wfd8WYhmsO8KRDQ=="; }; }; "@cspell/dict-gaming-terms-1.0.5" = { @@ -3847,13 +3667,13 @@ let sha512 = "4JsCLCRhhLMLiaHpmR7zHFjj1qOauzDI5ZzCNQS31TUMfsOo26jAKDfo0jljFAKgw5M2fEG7sKr8IlPpQAYrmQ=="; }; }; - "@cspell/dict-k8s-1.0.5" = { + "@cspell/dict-k8s-1.0.6" = { name = "_at_cspell_slash_dict-k8s"; packageName = "@cspell/dict-k8s"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.5.tgz"; - sha512 = "Cj+/ZV4S+MKlwfocSJZqe/2UAd/sY8YtlZjbK25VN1nCnrsKrBjfkX29vclwSj1U9aJg4Z9jw/uMjoaKu9ZrpQ=="; + url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.6.tgz"; + sha512 = "srhVDtwrd799uxMpsPOQqeDJY+gEocgZpoK06EFrb4GRYGhv7lXo9Fb+xQMyQytzOW9dw4DNOEck++nacDuymg=="; }; }; "@cspell/dict-latex-1.0.25" = { @@ -3955,13 +3775,13 @@ let sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; }; }; - "@cspell/dict-npm-5.0.16" = { + "@cspell/dict-npm-5.0.18" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "5.0.16"; + version = "5.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.16.tgz"; - sha512 = "ZWPnLAziEcSCvV0c8k9Qj88pfMu+wZwM5Qks87ShsfBgI8uLZ9tGHravA7gmjH1Gd7Bgxy2ulvXtSqIWPh1lew=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.18.tgz"; + sha512 = "weMTyxWpzz19q4wv9n183BtFvdD5fCjtze+bFKpl+4rO/YlPhHL2cXLAeexJz/VDSBecwX4ybTZYoknd1h2J4w=="; }; }; "@cspell/dict-php-1.0.25" = { @@ -3991,13 +3811,13 @@ let sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A=="; }; }; - "@cspell/dict-powershell-5.0.4" = { + "@cspell/dict-powershell-5.0.5" = { name = "_at_cspell_slash_dict-powershell"; packageName = "@cspell/dict-powershell"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.4.tgz"; - sha512 = "eosDShapDgBWN9ULF7+sRNdUtzRnUdsfEdBSchDm8FZA4HOqxUSZy3b/cX/Rdw0Fnw0AKgk0kzgXw7tS6vwJMQ=="; + url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.5.tgz"; + sha512 = "3JVyvMoDJesAATYGOxcUWPbQPUvpZmkinV3m8HL1w1RrjeMVXXuK7U1jhopSneBtLhkU+9HKFwgh9l9xL9mY2Q=="; }; }; "@cspell/dict-public-licenses-2.0.7" = { @@ -4018,13 +3838,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.2.1" = { + "@cspell/dict-python-4.2.3" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.2.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.1.tgz"; - sha512 = "9X2jRgyM0cxBoFQRo4Zc8oacyWnXi+0/bMI5FGibZNZV4y/o9UoFEr6agjU260/cXHTjIdkX233nN7eb7dtyRg=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.3.tgz"; + sha512 = "C1CPX9wwEGgcHv/p7KfjuIOp1G6KNyx5gWYweAd6/KPv+ZpeM1v572zFUTmpO8WDuAfKFf00nqYL8/GmCENWBw=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -4063,13 +3883,13 @@ let sha512 = "lR4boDzs79YD6+30mmiSGAMMdwh7HTBAPUFSB0obR3Kidibfc3GZ+MHWZXay5dxZ4nBKM06vyjtanF9VJ8q1Iw=="; }; }; - "@cspell/dict-rust-4.0.4" = { + "@cspell/dict-rust-4.0.5" = { name = "_at_cspell_slash_dict-rust"; packageName = "@cspell/dict-rust"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.4.tgz"; - sha512 = "v9/LcZknt/Xq7m1jdTWiQEtmkVVKdE1etAfGL2sgcWpZYewEa459HeWndNA0gfzQrpWX9sYay18mt7pqClJEdA=="; + url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.5.tgz"; + sha512 = "DIvlPRDemjKQy8rCqftAgGNZxY5Bg+Ps7qAIJjxkSjmMETyDgl0KTVuaJPt7EK4jJt6uCZ4ILy96npsHDPwoXA=="; }; }; "@cspell/dict-scala-1.0.21" = { @@ -4081,13 +3901,13 @@ let sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA=="; }; }; - "@cspell/dict-scala-5.0.2" = { + "@cspell/dict-scala-5.0.3" = { name = "_at_cspell_slash_dict-scala"; packageName = "@cspell/dict-scala"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.2.tgz"; - sha512 = "v97ClgidZt99JUm7OjhQugDHmhx4U8fcgunHvD/BsXWjXNj4cTr0m0YjofyZoL44WpICsNuFV9F/sv9OM5HUEw=="; + url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.3.tgz"; + sha512 = "4yGb4AInT99rqprxVNT9TYb1YSpq58Owzq7zi3ZS5T0u899Y4VsxsBiOgHnQ/4W+ygi+sp+oqef8w8nABR2lkg=="; }; }; "@cspell/dict-software-terms-1.0.48" = { @@ -4099,13 +3919,13 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.4.6" = { + "@cspell/dict-software-terms-4.0.3" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.4.6"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.4.6.tgz"; - sha512 = "Cap+WL4iM9NgwxdVIa93aDEGKGNm1t+DLJTnjoWkGHXxSBPG8Kcbnlss6mTtwLv9/NYPmQsmJi5qHXruuHx2ow=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.0.3.tgz"; + sha512 = "65QAVMc3YlcI7PcqWRY5ox53tTWC8aktUZdJYCVs4VDBPUCTSDnTSmSreeg4F5Z468clv9KF/S0PkxbLjgW72A=="; }; }; "@cspell/dict-sql-2.1.3" = { @@ -4153,13 +3973,13 @@ let sha512 = "yIuGeeZtQA2gqpGefGjZqBl8iGJpIYWz0QzDqsscNi2qfSnLsbjM0RkRbTehM8y9gGGe7xfgUP5adxceJa5Krg=="; }; }; - "@cspell/dict-typescript-3.1.5" = { + "@cspell/dict-typescript-3.1.6" = { name = "_at_cspell_slash_dict-typescript"; packageName = "@cspell/dict-typescript"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.5.tgz"; - sha512 = "EkIwwNV/xqEoBPJml2S16RXj65h1kvly8dfDLgXerrKw6puybZdvAHerAph6/uPTYdtLcsPyJYkPt5ISOJYrtw=="; + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.6.tgz"; + sha512 = "1beC6O4P/j23VuxX+i0+F7XqPVc3hhiAzGJHEKqnWf5cWAXQtg0xz3xQJ5MvYx2a7iLaSa+lu7+05vG9UHyu9Q=="; }; }; "@cspell/dict-vue-3.0.0" = { @@ -4171,22 +3991,31 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-8.8.4" = { + "@cspell/dynamic-import-8.12.1" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.8.4.tgz"; - sha512 = "tseSxrybznkmsmPaAB4aoHB9wr8Q2fOMIy3dm+yQv+U1xj+JHTN9OnUvy9sKiq0p3DQGWm/VylgSgsYaXrEHKQ=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.12.1.tgz"; + sha512 = "18faXHALiMsXtG3v67qeyDhNRZVtkhX5Je2qw8iZQB/i61y0Mfm22iiZeXsKImrXbwP0acyhRkRA1sp1NaQmOw=="; }; }; - "@cspell/strong-weak-map-8.8.4" = { + "@cspell/strong-weak-map-8.12.1" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "8.8.4"; + version = "8.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.12.1.tgz"; + sha512 = "0O5qGHRXoKl0+hXGdelox2awrCMr8LXObUcWwYbSih7HIm4DwhxMO4qjDFye1NdjW0P88yhpQ23J2ceSto9C5Q=="; + }; + }; + "@cspell/url-8.12.1" = { + name = "_at_cspell_slash_url"; + packageName = "@cspell/url"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.8.4.tgz"; - sha512 = "gticEJGR6yyGeLjf+mJ0jZotWYRLVQ+J0v1VpsR1nKnXTRJY15BWXgEA/ifbU/+clpyCek79NiCIXCvmP1WT4A=="; + url = "https://registry.npmjs.org/@cspell/url/-/url-8.12.1.tgz"; + sha512 = "mUYaDniHVLw0YXn2egT2e21MYubMAf+1LDeC0kkbg4VWNxSlC1Ksyv6pqhos495esaa8OCjizdIdnGSF6al9Rw=="; }; }; "@cspotcode/source-map-support-0.8.1" = { @@ -4441,13 +4270,13 @@ let sha512 = "mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw=="; }; }; - "@electron/get-3.0.0" = { + "@electron/get-3.1.0" = { name = "_at_electron_slash_get"; packageName = "@electron/get"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/get/-/get-3.0.0.tgz"; - sha512 = "hLv4BYFiyrNRI+U0Mm2X7RxCCdJLkDUn8GCEp9QJzbLpZRko+UaLlCjOMkj6TEtirNLPyBA7y1SeGfnpOB21aQ=="; + url = "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz"; + sha512 = "F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ=="; }; }; "@electron/notarize-2.3.2" = { @@ -4459,22 +4288,22 @@ let sha512 = "zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg=="; }; }; - "@electron/osx-sign-1.3.0" = { + "@electron/osx-sign-1.3.1" = { name = "_at_electron_slash_osx-sign"; packageName = "@electron/osx-sign"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.0.tgz"; - sha512 = "TEXhxlYSDRr9JWK5nWdOv5MtuUdaZ412uxIIEQ0hLt80o0HYWtQJBlW5QmrQDMtebzATaOjKG9UfCzLyA90zWQ=="; + url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz"; + sha512 = "BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw=="; }; }; - "@electron/packager-18.3.2" = { + "@electron/packager-18.3.3" = { name = "_at_electron_slash_packager"; packageName = "@electron/packager"; - version = "18.3.2"; + version = "18.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.2.tgz"; - sha512 = "orjylavppgIh24qkNpWm2B/LQUpCS/YLOoKoU+eMK/hJgIhShLDsusPIQzgUGVwNCichu8/zPAGfdQZXHG0gtw=="; + url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.3.tgz"; + sha512 = "hGXzwbUdxv49XvlYwlVPC6W6j6WaXUAzKkYyyTeiwdhxvHFMfQSEJxVHsQpqMFzZZ7wrr7iqiokOFZ/qkgEzUQ=="; }; }; "@electron/rebuild-3.6.0" = { @@ -4495,13 +4324,13 @@ let sha512 = "fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA=="; }; }; - "@electron/windows-sign-1.1.2" = { + "@electron/windows-sign-1.1.3" = { name = "_at_electron_slash_windows-sign"; packageName = "@electron/windows-sign"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.2.tgz"; - sha512 = "eXEiZjDtxW3QORCWfRUarANPRTlH9B6At4jqBZJ0NzokSGutXQUVLPA6WmGpIhDW6w2yCMdHW1EJd1HrXtU5sg=="; + url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.3.tgz"; + sha512 = "OqVSdAe+/88fIjvTDWiy+5Ho1nXsiBhE5RTsIQ6M/zcxcDAEP2TlQCkOyusItnmzXRN+XTFaK9gKhiZ6KGyXQw=="; }; }; "@emmetio/abbreviation-2.3.3" = { @@ -4576,31 +4405,31 @@ let sha512 = "ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="; }; }; - "@esbuild-plugins/node-globals-polyfill-0.2.3" = { - name = "_at_esbuild-plugins_slash_node-globals-polyfill"; - packageName = "@esbuild-plugins/node-globals-polyfill"; - version = "0.2.3"; + "@emnapi/core-1.2.0" = { + name = "_at_emnapi_slash_core"; + packageName = "@emnapi/core"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.2.3.tgz"; - sha512 = "r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw=="; + url = "https://registry.npmjs.org/@emnapi/core/-/core-1.2.0.tgz"; + sha512 = "E7Vgw78I93we4ZWdYCb4DGAwRROGkMIXk7/y87UmANR+J6qsWusmC3gLt0H+O0KOt5e6O38U8oJamgbudrES/w=="; }; }; - "@esbuild-plugins/node-modules-polyfill-0.2.2" = { - name = "_at_esbuild-plugins_slash_node-modules-polyfill"; - packageName = "@esbuild-plugins/node-modules-polyfill"; - version = "0.2.2"; + "@emnapi/runtime-1.2.0" = { + name = "_at_emnapi_slash_runtime"; + packageName = "@emnapi/runtime"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild-plugins/node-modules-polyfill/-/node-modules-polyfill-0.2.2.tgz"; - sha512 = "LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA=="; + url = "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.2.0.tgz"; + sha512 = "bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ=="; }; }; - "@esbuild/android-arm-0.17.19" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.17.19"; + "@emnapi/wasi-threads-1.0.1" = { + name = "_at_emnapi_slash_wasi-threads"; + packageName = "@emnapi/wasi-threads"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz"; - sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="; + url = "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz"; + sha512 = "iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw=="; }; }; "@esbuild/android-arm-0.19.8" = { @@ -4612,15 +4441,6 @@ let sha512 = "31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA=="; }; }; - "@esbuild/android-arm64-0.17.19" = { - name = "_at_esbuild_slash_android-arm64"; - packageName = "@esbuild/android-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz"; - sha512 = "KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA=="; - }; - }; "@esbuild/android-arm64-0.19.8" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4630,15 +4450,6 @@ let sha512 = "B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA=="; }; }; - "@esbuild/android-x64-0.17.19" = { - name = "_at_esbuild_slash_android-x64"; - packageName = "@esbuild/android-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz"; - sha512 = "uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww=="; - }; - }; "@esbuild/android-x64-0.19.8" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4648,15 +4459,6 @@ let sha512 = "rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A=="; }; }; - "@esbuild/darwin-arm64-0.17.19" = { - name = "_at_esbuild_slash_darwin-arm64"; - packageName = "@esbuild/darwin-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz"; - sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="; - }; - }; "@esbuild/darwin-arm64-0.19.8" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4666,15 +4468,6 @@ let sha512 = "RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw=="; }; }; - "@esbuild/darwin-x64-0.17.19" = { - name = "_at_esbuild_slash_darwin-x64"; - packageName = "@esbuild/darwin-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz"; - sha512 = "IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw=="; - }; - }; "@esbuild/darwin-x64-0.19.8" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4684,15 +4477,6 @@ let sha512 = "3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q=="; }; }; - "@esbuild/freebsd-arm64-0.17.19" = { - name = "_at_esbuild_slash_freebsd-arm64"; - packageName = "@esbuild/freebsd-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz"; - sha512 = "pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ=="; - }; - }; "@esbuild/freebsd-arm64-0.19.8" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4702,15 +4486,6 @@ let sha512 = "WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw=="; }; }; - "@esbuild/freebsd-x64-0.17.19" = { - name = "_at_esbuild_slash_freebsd-x64"; - packageName = "@esbuild/freebsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz"; - sha512 = "4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ=="; - }; - }; "@esbuild/freebsd-x64-0.19.8" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4720,15 +4495,6 @@ let sha512 = "ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg=="; }; }; - "@esbuild/linux-arm-0.17.19" = { - name = "_at_esbuild_slash_linux-arm"; - packageName = "@esbuild/linux-arm"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz"; - sha512 = "cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA=="; - }; - }; "@esbuild/linux-arm-0.19.8" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4738,15 +4504,6 @@ let sha512 = "H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ=="; }; }; - "@esbuild/linux-arm64-0.17.19" = { - name = "_at_esbuild_slash_linux-arm64"; - packageName = "@esbuild/linux-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz"; - sha512 = "ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg=="; - }; - }; "@esbuild/linux-arm64-0.19.8" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4756,15 +4513,6 @@ let sha512 = "z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ=="; }; }; - "@esbuild/linux-ia32-0.17.19" = { - name = "_at_esbuild_slash_linux-ia32"; - packageName = "@esbuild/linux-ia32"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz"; - sha512 = "w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ=="; - }; - }; "@esbuild/linux-ia32-0.19.8" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4774,15 +4522,6 @@ let sha512 = "1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ=="; }; }; - "@esbuild/linux-loong64-0.17.19" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz"; - sha512 = "2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ=="; - }; - }; "@esbuild/linux-loong64-0.19.8" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4792,15 +4531,6 @@ let sha512 = "fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ=="; }; }; - "@esbuild/linux-mips64el-0.17.19" = { - name = "_at_esbuild_slash_linux-mips64el"; - packageName = "@esbuild/linux-mips64el"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz"; - sha512 = "LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A=="; - }; - }; "@esbuild/linux-mips64el-0.19.8" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4810,15 +4540,6 @@ let sha512 = "Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q=="; }; }; - "@esbuild/linux-ppc64-0.17.19" = { - name = "_at_esbuild_slash_linux-ppc64"; - packageName = "@esbuild/linux-ppc64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz"; - sha512 = "/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg=="; - }; - }; "@esbuild/linux-ppc64-0.19.8" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4828,15 +4549,6 @@ let sha512 = "ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg=="; }; }; - "@esbuild/linux-riscv64-0.17.19" = { - name = "_at_esbuild_slash_linux-riscv64"; - packageName = "@esbuild/linux-riscv64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz"; - sha512 = "FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA=="; - }; - }; "@esbuild/linux-riscv64-0.19.8" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4846,15 +4558,6 @@ let sha512 = "T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg=="; }; }; - "@esbuild/linux-s390x-0.17.19" = { - name = "_at_esbuild_slash_linux-s390x"; - packageName = "@esbuild/linux-s390x"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz"; - sha512 = "IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q=="; - }; - }; "@esbuild/linux-s390x-0.19.8" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4864,15 +4567,6 @@ let sha512 = "NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg=="; }; }; - "@esbuild/linux-x64-0.17.19" = { - name = "_at_esbuild_slash_linux-x64"; - packageName = "@esbuild/linux-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz"; - sha512 = "68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw=="; - }; - }; "@esbuild/linux-x64-0.19.8" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -4882,15 +4576,6 @@ let sha512 = "lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg=="; }; }; - "@esbuild/netbsd-x64-0.17.19" = { - name = "_at_esbuild_slash_netbsd-x64"; - packageName = "@esbuild/netbsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz"; - sha512 = "CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q=="; - }; - }; "@esbuild/netbsd-x64-0.19.8" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -4900,15 +4585,6 @@ let sha512 = "hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw=="; }; }; - "@esbuild/openbsd-x64-0.17.19" = { - name = "_at_esbuild_slash_openbsd-x64"; - packageName = "@esbuild/openbsd-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz"; - sha512 = "cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g=="; - }; - }; "@esbuild/openbsd-x64-0.19.8" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -4918,15 +4594,6 @@ let sha512 = "/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ=="; }; }; - "@esbuild/sunos-x64-0.17.19" = { - name = "_at_esbuild_slash_sunos-x64"; - packageName = "@esbuild/sunos-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz"; - sha512 = "vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg=="; - }; - }; "@esbuild/sunos-x64-0.19.8" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -4936,15 +4603,6 @@ let sha512 = "9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w=="; }; }; - "@esbuild/win32-arm64-0.17.19" = { - name = "_at_esbuild_slash_win32-arm64"; - packageName = "@esbuild/win32-arm64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz"; - sha512 = "yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag=="; - }; - }; "@esbuild/win32-arm64-0.19.8" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -4954,15 +4612,6 @@ let sha512 = "rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg=="; }; }; - "@esbuild/win32-ia32-0.17.19" = { - name = "_at_esbuild_slash_win32-ia32"; - packageName = "@esbuild/win32-ia32"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz"; - sha512 = "eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw=="; - }; - }; "@esbuild/win32-ia32-0.19.8" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -4972,15 +4621,6 @@ let sha512 = "AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw=="; }; }; - "@esbuild/win32-x64-0.17.19" = { - name = "_at_esbuild_slash_win32-x64"; - packageName = "@esbuild/win32-x64"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"; - sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="; - }; - }; "@esbuild/win32-x64-0.19.8" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -4999,22 +4639,22 @@ let sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; }; }; - "@eslint-community/regexpp-4.10.1" = { + "@eslint-community/regexpp-4.11.0" = { name = "_at_eslint-community_slash_regexpp"; packageName = "@eslint-community/regexpp"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz"; - sha512 = "Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA=="; + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz"; + sha512 = "G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A=="; }; }; - "@eslint/config-array-0.16.0" = { + "@eslint/config-array-0.17.1" = { name = "_at_eslint_slash_config-array"; packageName = "@eslint/config-array"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.16.0.tgz"; - sha512 = "/jmuSd74i4Czf1XXn7wGRWZCuyaUZ330NH1Bek0Pplatt4Sy1S5haN21SCLLdbeKslQ+S0wEJ+++v5YibSi+Lg=="; + url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz"; + sha512 = "BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -5053,13 +4693,13 @@ let sha512 = "Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g=="; }; }; - "@eslint/js-9.5.0" = { + "@eslint/js-9.7.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz"; - sha512 = "A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz"; + sha512 = "ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng=="; }; }; "@eslint/object-schema-2.1.4" = { @@ -5116,13 +4756,13 @@ let sha512 = "V8gMy1C63oAYlvkSjhfGYOET7sOmRIUAYv/wVcKJZiVAMZ5MQ2geeXCpLGC4+vuOQe2Hs3+qAgl4y0/b8OUO+A=="; }; }; - "@expo/apple-utils-1.7.0" = { + "@expo/apple-utils-1.7.1" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.7.0.tgz"; - sha512 = "RVzZTiOeuNT04fE5V4f536XmIyxbRFOJ3m/rE6kImbIZ65upOS7xdIQpihEdYOiHB5uZAcD3JClUEsMfFhTv4w=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.7.1.tgz"; + sha512 = "oKHKRMfpPsVIlMSwHsartqrFhxKR1PnwGzaM3i+d4/g9XE9A+bKMu5YIUT4IXX561E0YYoaeaRHuxiIzcmEmRw=="; }; }; "@expo/bunyan-4.0.0" = { @@ -5260,22 +4900,22 @@ let sha512 = "FyWghLu7rUaZEZSTLt/XNRukm0c9GFfwP0iFaswoDWpV6alvVg+zRAfCLdIVQEz1SVcQ3zo1hMZFDrnKGvkCuQ=="; }; }; - "@expo/eas-build-job-1.0.117" = { + "@expo/eas-build-job-1.0.119" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.117"; + version = "1.0.119"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.117.tgz"; - sha512 = "l1EBpRH4lqRg0uPKl4/xn3V77dzWDrSAIU0r88aNq+Slznpu8U8HCkEZSh2YyF/BFhhs5lG7v8yQclVaflVBrQ=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.119.tgz"; + sha512 = "uWgriDXF/cKSKl62lqD0OnoCTtX8+s00te2KQ54S/tz3/LYfiE4JBRsLazQq9hIfz8JPEXwmfKN713BDeV/TOg=="; }; }; - "@expo/eas-json-10.0.0" = { + "@expo/eas-json-10.0.3" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "10.0.0"; + version = "10.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-10.0.0.tgz"; - sha512 = "3RIzqeNGhiWLfU8IGH9sxgI8OaWAAjEMprDuec1//C2QARylA6agx2knqLEi5BmSCZDPiw7QwUN3+XskHKq85w=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-10.0.3.tgz"; + sha512 = "eMgV1YuGP9bmGzB8+8tiJMcIiH2aEfwFwpqd1CqPs1gs5YPAQT/VmnkRIuC4DjWLuqhFr/fX9rO+yvOpr2MsIw=="; }; }; "@expo/fingerprint-0.6.1" = { @@ -5566,13 +5206,13 @@ let sha512 = "QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew=="; }; }; - "@expo/steps-1.0.117" = { + "@expo/steps-1.0.119" = { name = "_at_expo_slash_steps"; packageName = "@expo/steps"; - version = "1.0.117"; + version = "1.0.119"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.117.tgz"; - sha512 = "MjBYD5/F4tLB1TERyBCk8jF9bmhh99b2lgC6NHGD3J4QrFYSyct9CxIHJixdgaEo0QLMe0ltf3zQsJQSM+kWDw=="; + url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.119.tgz"; + sha512 = "raPlBDsMkRO5pOlGDa9PnjgCIJdiDTgU92GtTML0UZ+hPiy5H7Vbx2JxqtqMiZcl21mxQ7V60toqdbo7DF5iJQ=="; }; }; "@expo/timeago.js-1.0.0" = { @@ -5656,40 +5296,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-40.0.3" = { + "@gitbeaker/core-40.1.2" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "40.0.3"; + version = "40.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-40.0.3.tgz"; - sha512 = "MzeY4oCtoa9zmPIkQIdC2KU8cGmHIXwnAi0L6jjjouqjy6kcA4BydZf8W5Xsj27Rw5iiyhfj8YC1/O3CgrzvCQ=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-40.1.2.tgz"; + sha512 = "KjP40EIdPWDX2w+GZUjgc5f9L/a0VsA6A2dkiKdH27m5BUpVrH3eHC3M0h1SsIA5edO3BiebqWFO2ipkGJCBZA=="; }; }; - "@gitbeaker/requester-utils-40.0.3" = { + "@gitbeaker/requester-utils-40.1.2" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "40.0.3"; + version = "40.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-40.0.3.tgz"; - sha512 = "L8JpuMIsvXTHfu/2wXzkc5QyfQJSWg4XyEPStHq1ig5SAcbxxqbBoe8ed27eUXLah+PcGrPInMK4cCMxhQm41g=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-40.1.2.tgz"; + sha512 = "s3c2TzJpBk3VGujEo/57+TAntg36kEhdob28i2kAEDztFWlNp0sfDT/jlDwUywKF6AbmYIJYe3FikLNyAiv+iA=="; }; }; - "@gitbeaker/rest-40.0.3" = { + "@gitbeaker/rest-40.1.2" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "40.0.3"; + version = "40.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-40.0.3.tgz"; - sha512 = "ihaA0GX3yCo4oUWbISkcjFMIw+WxDAC9L+bEYq2irz4wpv/0EpAU/0jKjggPzY4cGWL9VAyPhew77VeACv4YWw=="; - }; - }; - "@grammarly/sdk-1.11.0" = { - name = "_at_grammarly_slash_sdk"; - packageName = "@grammarly/sdk"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grammarly/sdk/-/sdk-1.11.0.tgz"; - sha512 = "/LDNozZ+6qTS0yqMXo/ki6yJqTVx2s6ncOM/m/t4PjqeXrN8ejTwoiNDoDVZq18bsHjZBPP4o03M2goFYWJCHA=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-40.1.2.tgz"; + sha512 = "q9FYEC0SQcEbj1Hu+EOVFGRBjxbUFciK/iVD3BhBx+ZUGIPfHYS32EWL4uqVSBLq/zSUEd2gWjLy7LRVq/Pz3A=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -5737,13 +5368,13 @@ let sha512 = "gVnnlWs0Ua+5FkuHHEriFUOI3OIbHv6DS1utxf28n6NkfGMJldC4j0xlJRY0LS6dWK34IGYgD4HelKYz2l8KiA=="; }; }; - "@graphql-tools/delegate-10.0.11" = { + "@graphql-tools/delegate-10.0.16" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "10.0.11"; + version = "10.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.11.tgz"; - sha512 = "+sKeecdIVXhFB/66e5yjeKYZ3Lpn52yNG637ElVhciuLGgFc153rC6l6zcuNd9yx5wMrNx35U/h3HsMIEI3xNw=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.16.tgz"; + sha512 = "no4jIdHsTrHzR6Vv1YlwbxFeBnHBwPhBpemvLVnQ7CHhAviwIUWkCOHs4Uyzc5GYuHFyKJOZEXqhOz+da3hR3A=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -5755,40 +5386,40 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/executor-1.2.6" = { + "@graphql-tools/executor-1.3.0" = { name = "_at_graphql-tools_slash_executor"; packageName = "@graphql-tools/executor"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.2.6.tgz"; - sha512 = "+1kjfqzM5T2R+dCw7F4vdJ3CqG+fY/LYJyhNiWEFtq0ToLwYzR/KKyD8YuzTirEjSxWTVlcBh7endkx5n5F6ew=="; + url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.3.0.tgz"; + sha512 = "e+rmEf/2EO4hDnbkO8mTS2FI+jGUNmYkSDKw5TgPVlO8VOKS+TXmJBK6E9v4Gc/39yVkZsffYfW/R8obJrA0mg=="; }; }; - "@graphql-tools/executor-graphql-ws-1.1.2" = { + "@graphql-tools/executor-graphql-ws-1.2.0" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.2.tgz"; - sha512 = "+9ZK0rychTH1LUv4iZqJ4ESbmULJMTsv3XlFooPUngpxZkk00q6LqHKJRrsLErmQrVaC7cwQCaRBJa0teK17Lg=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.2.0.tgz"; + sha512 = "tSYC1QdrabWexLrYV0UI3uRGbde9WCY/bRhq6Jc+VXMZcfq6ea6pP5NEAVTfwbhUQ4xZvJABVVbKXtKb9uTg1w=="; }; }; - "@graphql-tools/executor-http-1.0.9" = { + "@graphql-tools/executor-http-1.1.5" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "1.0.9"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.9.tgz"; - sha512 = "+NXaZd2MWbbrWHqU4EhXcrDbogeiCDmEbrAN+rMn4Nu2okDjn2MTFDbTIab87oEubQCH4Te1wDkWPKrzXup7+Q=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.1.5.tgz"; + sha512 = "ZAsVGUwafPc1GapLA1yoJuRx7ihpVdAv7JDHmlI2eHRQsJnMVQwcxHnjfUb/id9YAEBrP86/s4pgEoRyad3Zng=="; }; }; - "@graphql-tools/executor-legacy-ws-1.0.6" = { + "@graphql-tools/executor-legacy-ws-1.1.0" = { name = "_at_graphql-tools_slash_executor-legacy-ws"; packageName = "@graphql-tools/executor-legacy-ws"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.6.tgz"; - sha512 = "lDSxz9VyyquOrvSuCCnld3256Hmd+QI2lkmkEv7d4mdzkxkK4ddAWW1geQiWrQvWmdsmcnGGlZ7gDGbhEExwqg=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.1.0.tgz"; + sha512 = "k+6ZyiaAd8SmwuzbEOfA/LVkuI1nqidhoMw+CJ7c41QGOjSMzc0VS0UZbJyeitI0n7a+uP/Meln1wjzJ2ReDtQ=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -5899,15 +5530,6 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.4.2" = { - name = "_at_graphql-tools_slash_merge"; - packageName = "@graphql-tools/merge"; - version = "8.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.4.2.tgz"; - sha512 = "XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw=="; - }; - }; "@graphql-tools/merge-9.0.4" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; @@ -5917,15 +5539,6 @@ let sha512 = "MivbDLUQ+4Q8G/Hp/9V72hbn810IJDEZQ57F01sHnlrrijyadibfVhaQfW/pNH+9T/l8ySZpaR/DpL5i+ruZ+g=="; }; }; - "@graphql-tools/mock-8.7.20" = { - name = "_at_graphql-tools_slash_mock"; - packageName = "@graphql-tools/mock"; - version = "8.7.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.20.tgz"; - sha512 = "ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ=="; - }; - }; "@graphql-tools/schema-10.0.4" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; @@ -5953,15 +5566,6 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.19" = { - name = "_at_graphql-tools_slash_schema"; - packageName = "@graphql-tools/schema"; - version = "9.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.19.tgz"; - sha512 = "oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w=="; - }; - }; "@graphql-tools/url-loader-6.10.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; @@ -5980,13 +5584,13 @@ let sha512 = "1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ=="; }; }; - "@graphql-tools/utils-10.2.2" = { + "@graphql-tools/utils-10.3.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "10.2.2"; + version = "10.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.2.2.tgz"; - sha512 = "ueoplzHIgFfxhFrF4Mf/niU/tYHuO6Uekm2nCYU72qpI+7Hn9dA2/o5XOBvFXDk27Lp5VSvQY5WfmRbqwVxaYQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.3.2.tgz"; + sha512 = "iaqOHS4f90KNADBHqVsRBjKpM6iSvsUg1q5GhWMK03loYLaDzftrEwcsl0OkSSnRhJvAsT7q4q3r3YzRoV0v1g=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -6097,13 +5701,13 @@ let sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; - "@hpcc-js/wasm-2.16.2" = { + "@hpcc-js/wasm-2.18.0" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "2.16.2"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.16.2.tgz"; - sha512 = "THiidUMYR8/cIfFT3MVcWuRE7bQKh295nrFBxGvUNc4Nq8e2uU1LtiplHs7AUkJ0GxgvZoR+8TQ1/E3Qb/uE2g=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.18.0.tgz"; + sha512 = "M9XVIvAXGH4Xcyb5UoiohWcn6fil89pcos/gClNdBZG2v+W48xSf2bjcA8BW131X/AFHUerVY28n1P1Jw81/9A=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -6196,13 +5800,13 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-1.17.1" = { + "@ibm-cloud/openapi-ruleset-1.18.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "1.17.1"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.17.1.tgz"; - sha512 = "LtmPscvla4FuCwkX7SSFpKUriIrbmh/MgHJDp1B5yNe656/uDvNgCppi87eXdTg1fjwalj400Ldk2Di1sVks6w=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.18.2.tgz"; + sha512 = "Nbdp0Bsadpx2zvwbFadukmtN5QvL8kC/a6V/OxTk9yEDQytfVOssnboZ76IA+OC+IpAehxwjj1EpEirBWIdQKw=="; }; }; "@ibm-cloud/openapi-ruleset-utilities-1.3.2" = { @@ -6223,6 +5827,15 @@ let sha512 = "CifrkgQjDkUkWexmgYYNyB5603HhTHI91vLFeQXh6qrTKiCMVASol01Rs1cv6LP/A2WccZSRlJKZhbaBIs/9ZA=="; }; }; + "@inquirer/checkbox-2.4.2" = { + name = "_at_inquirer_slash_checkbox"; + packageName = "@inquirer/checkbox"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.2.tgz"; + sha512 = "iZRNbTlSB9xXt/+jdMFViBdxw1ILWu3365rzfM5OLwAyOScbDFFGSH7LEUwoq1uOIo48ymOEwYSqP5y8hQMlmA=="; + }; + }; "@inquirer/confirm-2.0.17" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; @@ -6232,6 +5845,15 @@ let sha512 = "EqzhGryzmGpy2aJf6LxJVhndxYmFs+m8cxXzf8nejb1DE3sabf6mUgBcp4J0jAUEiAcYzqmkqRr7LPFh/WdnXA=="; }; }; + "@inquirer/confirm-3.1.17" = { + name = "_at_inquirer_slash_confirm"; + packageName = "@inquirer/confirm"; + version = "3.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.17.tgz"; + sha512 = "qCpt/AABzPynz8tr69VDvhcjwmzAryipWXtW8Vi6m651da4H/d0Bdn55LkxXD7Rp2gfgxvxzTdb66AhIA8gzBA=="; + }; + }; "@inquirer/core-2.3.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; @@ -6250,6 +5872,15 @@ let sha512 = "fKi63Khkisgda3ohnskNf5uZJj+zXOaBvOllHsOkdsXRA/ubQLJQrZchFFi57NKbZzkTunXiBMdvWOv71alonw=="; }; }; + "@inquirer/core-9.0.5" = { + name = "_at_inquirer_slash_core"; + packageName = "@inquirer/core"; + version = "9.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/core/-/core-9.0.5.tgz"; + sha512 = "QWG41I7vn62O9stYKg/juKXt1PEbr/4ZZCPb4KgXDQGwgA9M5NBTQ7FnOvT1ridbxkm/wTxLCNraUs7y47pIRQ=="; + }; + }; "@inquirer/editor-1.2.15" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; @@ -6259,6 +5890,15 @@ let sha512 = "gQ77Ls09x5vKLVNMH9q/7xvYPT6sIs5f7URksw+a2iJZ0j48tVS6crLqm2ugG33tgXHIwiEqkytY60Zyh5GkJQ=="; }; }; + "@inquirer/editor-2.1.17" = { + name = "_at_inquirer_slash_editor"; + packageName = "@inquirer/editor"; + version = "2.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.17.tgz"; + sha512 = "hwx3VpFQzOY2hFWnY+XPsUGCIUVQ5kYxH6+CExv/RbMiAoN3zXtzj8DyrWBOHami0vBrrnPS8CTq3uQWc7N2BA=="; + }; + }; "@inquirer/expand-1.1.16" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; @@ -6268,13 +5908,22 @@ let sha512 = "TGLU9egcuo+s7PxphKUCnJnpCIVY32/EwPCLLuu+gTvYiD8hZgx8Z2niNQD36sa6xcfpdLY6xXDBiL/+g1r2XQ=="; }; }; - "@inquirer/figures-1.0.3" = { + "@inquirer/expand-2.1.17" = { + name = "_at_inquirer_slash_expand"; + packageName = "@inquirer/expand"; + version = "2.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.17.tgz"; + sha512 = "s4V/dC+GeE5s97xoTtZSmC440uNKePKqZgzqEf0XM63ciilnXAtKGvoAWOePFdlK+oGTz0d8bhbPKwpKGvRYfg=="; + }; + }; + "@inquirer/figures-1.0.5" = { name = "_at_inquirer_slash_figures"; packageName = "@inquirer/figures"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.3.tgz"; - sha512 = "ErXXzENMH5pJt5/ssXV0DfWUZqly8nGzf0UcBV9xTnP+KyffE2mqyxIMBrZ8ijQck2nU0TQm40EQB53YreyWHw=="; + url = "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz"; + sha512 = "79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA=="; }; }; "@inquirer/input-1.2.16" = { @@ -6286,6 +5935,15 @@ let sha512 = "Ou0LaSWvj1ni+egnyQ+NBtfM1885UwhRCMtsRt2bBO47DoC1dwtCa+ZUNgrxlnCHHF0IXsbQHYtIIjFGAavI4g=="; }; }; + "@inquirer/input-2.2.4" = { + name = "_at_inquirer_slash_input"; + packageName = "@inquirer/input"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/input/-/input-2.2.4.tgz"; + sha512 = "wvYnDITPQn+ltktj/O9kQjPxOvpmwcpxLWh8brAyD+jlEbihxtrx9cZdZcxqaCVQj3caw4eZa2Uq5xELo4yXkA=="; + }; + }; "@inquirer/password-1.1.16" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; @@ -6295,6 +5953,15 @@ let sha512 = "aZYZVHLUXZ2gbBot+i+zOJrks1WaiI95lvZCn1sKfcw6MtSSlYC8uDX8sTzQvAsQ8epHoP84UNvAIT0KVGOGqw=="; }; }; + "@inquirer/password-2.1.17" = { + name = "_at_inquirer_slash_password"; + packageName = "@inquirer/password"; + version = "2.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/password/-/password-2.1.17.tgz"; + sha512 = "/u6DM/fDHXoBWyA+9aRhghkeo5smE7wO9k4E2UoJbgiRCkt3JjBEuBqLOJNrz8E16M0ez4UM1vd5cXrmICHW+A=="; + }; + }; "@inquirer/prompts-2.3.1" = { name = "_at_inquirer_slash_prompts"; packageName = "@inquirer/prompts"; @@ -6313,6 +5980,15 @@ let sha512 = "k52mOMRvTUejrqyF1h8Z07chC+sbaoaUYzzr1KrJXyj7yaX7Nrh0a9vktv8TuocRwIJOQMaj5oZEmkspEcJFYQ=="; }; }; + "@inquirer/prompts-5.0.7" = { + name = "_at_inquirer_slash_prompts"; + packageName = "@inquirer/prompts"; + version = "5.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.0.7.tgz"; + sha512 = "GFcigCxJTKCH3aECzMIu4FhgLJWnFvMXzpI4CCSoELWFtkOOU2P+goYA61+OKpGrB8fPE7q6n8zAXBSlZRrHjQ=="; + }; + }; "@inquirer/rawlist-1.2.16" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; @@ -6322,6 +5998,15 @@ let sha512 = "pZ6TRg2qMwZAOZAV6TvghCtkr53dGnK29GMNQ3vMZXSNguvGqtOVc4j/h1T8kqGJFagjyfBZhUPGwNS55O5qPQ=="; }; }; + "@inquirer/rawlist-2.1.17" = { + name = "_at_inquirer_slash_rawlist"; + packageName = "@inquirer/rawlist"; + version = "2.1.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.1.17.tgz"; + sha512 = "RFrw34xU5aVlMA3ZJCaeKGxYjhu3j4i46O2GMmaRRGeLObCRM1yOKQOsRclSTzjd4A7+M5QleR2iuW/68J9Kwg=="; + }; + }; "@inquirer/select-1.3.3" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; @@ -6331,13 +6016,31 @@ let sha512 = "RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg=="; }; }; - "@inquirer/type-1.3.3" = { + "@inquirer/select-2.4.2" = { + name = "_at_inquirer_slash_select"; + packageName = "@inquirer/select"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@inquirer/select/-/select-2.4.2.tgz"; + sha512 = "r78JlgShqRxyAtBDeBHSDtfrOhSQwm2ecWGGaxe7kD9JwgL3UN563G1ncVRYdsWD7/tigflcskfipVeoDLhLJg=="; + }; + }; + "@inquirer/type-1.5.1" = { name = "_at_inquirer_slash_type"; packageName = "@inquirer/type"; - version = "1.3.3"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/type/-/type-1.3.3.tgz"; - sha512 = "xTUt0NulylX27/zMx04ZYar/kr1raaiFTVvQ5feljQsiAgdm0WPj4S73/ye0fbslh+15QrIuDvfCXTek7pMY5A=="; + url = "https://registry.npmjs.org/@inquirer/type/-/type-1.5.1.tgz"; + sha512 = "m3YgGQlKNS0BM+8AFiJkCsTqHEFCWn6s/Rqye3mYwvqY6LdfUv12eSwbsgNzrYyrLXiy7IrrjDLPysaSBwEfhw=="; + }; + }; + "@ioredis/commands-1.2.0" = { + name = "_at_ioredis_slash_commands"; + packageName = "@ioredis/commands"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"; + sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg=="; }; }; "@isaacs/cliui-8.0.2" = { @@ -6349,6 +6052,24 @@ let sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; + "@isaacs/fs-minipass-4.0.1" = { + name = "_at_isaacs_slash_fs-minipass"; + packageName = "@isaacs/fs-minipass"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz"; + sha512 = "wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w=="; + }; + }; + "@isaacs/string-locale-compare-1.1.0" = { + name = "_at_isaacs_slash_string-locale-compare"; + packageName = "@isaacs/string-locale-compare"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz"; + sha512 = "SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ=="; + }; + }; "@jcubic/lily-0.3.0" = { name = "_at_jcubic_slash_lily"; packageName = "@jcubic/lily"; @@ -6655,94 +6376,85 @@ let sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA=="; }; }; - "@joplin/fork-htmlparser2-4.1.51" = { + "@joplin/fork-htmlparser2-4.1.52" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.51"; + version = "4.1.52"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.51.tgz"; - sha512 = "IaZAttfsyppAo1q1KwI/ln0U/+bpUYpX0AWm7M/gWNYorWU6g/EakQwZIkmVRIcAD+6gji4T+xR4oF8fBxJ8HA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.52.tgz"; + sha512 = "QXapybOIiEE7WVxuejgScVkx+Z+gcMdQt5lcD41/l2f1XnvKOEzd2QRmwjl/6V+g6pHkwg43uStTGsm4y64Y4g=="; }; }; - "@joplin/fork-sax-1.2.55" = { + "@joplin/fork-sax-1.2.56" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.55"; + version = "1.2.56"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.55.tgz"; - sha512 = "FgwqhVEZfN3yrArhDdkjMQJ9CG2V/9ed8NPFsDIK/QR6CK+vzWTPuAKFq57CN76ydvr6c0kX8nOSDpxJatzhpw=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.56.tgz"; + sha512 = "TZx71MLGjjbCToOCvYBimIzDtqn4xROMrsnKon+DJ+wrhOfBRmebwrGVVs/tC06MMAuj3k1MLBLtixnKnqV+FQ=="; }; }; - "@joplin/fork-uslug-1.0.16" = { + "@joplin/fork-uslug-1.0.17" = { name = "_at_joplin_slash_fork-uslug"; packageName = "@joplin/fork-uslug"; - version = "1.0.16"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.16.tgz"; - sha512 = "N3UyuqUG+t67YXH37HPS9qSr7Z+GdciZ1FfHHZ7FjgVElR+Ch049OWrI+NX/ruHFkfofmQKHLNRKVmNrPnclNA=="; + url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.17.tgz"; + sha512 = "N893VhVBchv8Q+9HqK0ycJW5noYIb2gyiw+SCLg5lCnZefb8VT51KmKcDUdDU60RLVkdv92YsYxJ3JKqdwE5LA=="; }; }; - "@joplin/htmlpack-2.14.1" = { + "@joplin/htmlpack-3.0.1" = { name = "_at_joplin_slash_htmlpack"; packageName = "@joplin/htmlpack"; - version = "2.14.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-2.14.1.tgz"; - sha512 = "ZIQBkfVffFbFURT+lLoB9oYSkDFcE3KJ5IE434Rd3i6BCSXn4qYQyVF8K6t0oVPHGJAmTnnM5RpTVhRx+mBERw=="; + url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-3.0.1.tgz"; + sha512 = "pQgr2DS6/pR3mrtQyOQyTp9MHB3JUQO3S+DZ+NZJADcDx23ajnVFXlYR9lbpyyIBCZAObqVUyRCisOjBKcn8eg=="; }; }; - "@joplin/lib-2.14.1" = { + "@joplin/lib-3.0.1" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "2.14.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.14.1.tgz"; - sha512 = "EnvOoj4b8vG/oq58QFWSyyoAiQ/BnMyffw58iacmPAG9jGIwbPPDA4HP3RLCirwwdgrdtTlRxl7WaLHnSO3h6A=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-3.0.1.tgz"; + sha512 = "agvscTfUaxkFS6dWg0ijGrH7ZET2x3A16OPXdBy+ym9wI4YFZ0jQuIQiUlms48hLdlw300ZOnR5OIP2IJm1ufw=="; }; }; - "@joplin/renderer-2.14.1" = { + "@joplin/renderer-3.0.1" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "2.14.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.14.1.tgz"; - sha512 = "AbnE1g976pNrx3rjdKOR6JYWgowdmH3kTN8yWmSYnU2OD8qPhTovMROClxF6m7fLc3N49fxEBZwCjbRFLv35iA=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-3.0.1.tgz"; + sha512 = "YTsrp2Ib41B6p67LZBgln0prfWKV38TEFh0yOChqA559rujI125pYmxVKTPRjia2vjplIiyycsXua+/ke9oATw=="; }; }; - "@joplin/turndown-4.0.73" = { + "@joplin/turndown-4.0.74" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.73"; + version = "4.0.74"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.73.tgz"; - sha512 = "5u5CUih9otHMkWpvH1VtHLyF0VMYnl2FVxv+/QvAX7PfwvGdmfMQISzC/wwb3MueMb/yhemv5c+6oiN4RCNlWw=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.74.tgz"; + sha512 = "yISsLt6wQCVtJHWf6XaSQv3hw4FxzmL8jLa7GJNZAIpFSg9cWBp9f9+tIbEwT6fzCFt1Vs9dQJSVujUYP/hTzA=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.55" = { + "@joplin/turndown-plugin-gfm-1.0.56" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.55"; + version = "1.0.56"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.55.tgz"; - sha512 = "ij5DquSAWnu1fVM02N2m32uMxslJZcdMuTsLJfTHYEVs96R8MKFaHtWjbQycpx9PRYdlL5jW4SaW9A92OCccxA=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.56.tgz"; + sha512 = "q9Pul+xfmjXNHgNgB+ksRkwcBf13X7C89CDxT4sShrh17dmGsc7AUy+GbnwlmavauMDvsdiDIG8pvGqa1L002g=="; }; }; - "@joplin/utils-2.14.1" = { + "@joplin/utils-3.0.1" = { name = "_at_joplin_slash_utils"; packageName = "@joplin/utils"; - version = "2.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@joplin/utils/-/utils-2.14.1.tgz"; - sha512 = "HOR9UOivlbFiANAVPeK5TNYRE5KQ3dCxVC7Sus8bcA+ZIrJxM0P73Ng1p96HkzsZAE71OEqVKn6HMd67gZOy4Q=="; - }; - }; - "@josephg/resolvable-1.0.1" = { - name = "_at_josephg_slash_resolvable"; - packageName = "@josephg/resolvable"; - version = "1.0.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz"; - sha512 = "CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="; + url = "https://registry.npmjs.org/@joplin/utils/-/utils-3.0.1.tgz"; + sha512 = "rvHU/8iesDo6pPovjh9F/4Sv4adm/OuaOiNYTqbfT8Y2fn7eaDQBK8UbgABXg2ZIBToD5Tto+D3YCiO1PWGJMg=="; }; }; "@jridgewell/gen-mapping-0.3.5" = { @@ -6781,13 +6493,13 @@ let sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ=="; }; }; - "@jridgewell/sourcemap-codec-1.4.15" = { + "@jridgewell/sourcemap-codec-1.5.0" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.15"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; - sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz"; + sha512 = "gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="; }; }; "@jridgewell/trace-mapping-0.3.25" = { @@ -6844,22 +6556,13 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.100.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.100.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.100.0.tgz"; - sha512 = "4bsO7Y6YyekBk4v4iatAl5E7QQs2UUPtHoP9gfT3UnpbKzyMjH8XholSVCjfcNSKBwFobPMb8iA7NCMIMqFKsQ=="; - }; - }; - "@jsii/check-node-1.95.0" = { + "@jsii/check-node-1.101.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.95.0"; + version = "1.101.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.95.0.tgz"; - sha512 = "E5njkBk6X4WrQHtGeO0ed+cvkMxqinQZY83TJZ9RFEIwrndDfj7asMgWkRkYQRF05AlQXks+Eh8wza7ErIl85Q=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.101.0.tgz"; + sha512 = "io8u1GAF9XGp2crx0C/WGiJeUnHGw5X0du4fisbrNJHmVVFwcJbBMjbfXKWq+JSzl8fo/JV3F1LqtjsnawKA2A=="; }; }; "@jsii/check-node-1.98.0" = { @@ -6871,22 +6574,13 @@ let sha512 = "hI53TMW/fylHyY3CrJvqWvfSPJvBL82GSAB1m2CKNC0yHb0pZHCdBZnLrrr4rgTCQx8kIJjcUc0rQ/Ba3w+GaA=="; }; }; - "@jsii/check-node-1.99.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.99.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.99.0.tgz"; - sha512 = "RJeVopU3U+/ZxGj//KKJgXmDM8N7uP5QIqypb0QFVJPtIcQMM9nuEQWp4hOB3ajhk4VNaXGrG6PwlqFtFsqbbQ=="; - }; - }; - "@jsii/spec-1.100.0" = { + "@jsii/spec-1.101.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.100.0"; + version = "1.101.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.100.0.tgz"; - sha512 = "4LJCpSkmi3Hfcbmbchv+2JPIquV+cgrkhQcwglBAWqS4liLGbWPwgfHRL22sMXEKXiyXeHfitVwkP+IoGIyJ8g=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.101.0.tgz"; + sha512 = "855OnjKm4RTzRA78GGTNBG/GLe6X/vHJYD58zg7Rw8rWS7sU6iB65TM/7P7R3cufVew8umjjPjvW7ygS6ZqITQ=="; }; }; "@jsonjoy.com/base64-1.1.2" = { @@ -6907,13 +6601,13 @@ let sha512 = "aOcSN4MeAtFROysrbqG137b7gaDDSmVrl5mpo6sT/w+kcXpWnzhMjmY/Fh/sDx26NBxyIE7MB1seqLeCAzy9Sg=="; }; }; - "@jsonjoy.com/util-1.1.3" = { + "@jsonjoy.com/util-1.2.0" = { name = "_at_jsonjoy.com_slash_util"; packageName = "@jsonjoy.com/util"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.1.3.tgz"; - sha512 = "g//kkF4kOwUjemValCtOc/xiYzmwMRmWq3Bn+YnzOzuZLHq2PpMOxxIayN3cKbo7Ko2Np65t6D9H81IvXbXhqg=="; + url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.2.0.tgz"; + sha512 = "4B8B+3vFsY4eo33DMKyJPlQ3sBMpPFUZK2dr3O3rXrOGKKbYG44J0XSFkDo1VOQiri5HFEhIeVvItjR2xcazmg=="; }; }; "@kamilkisiela/fast-url-parser-1.1.4" = { @@ -6952,13 +6646,13 @@ let sha512 = "Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="; }; }; - "@lerna/create-8.1.3" = { + "@lerna/create-8.1.7" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "8.1.3"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.3.tgz"; - sha512 = "JFvIYrlvR8Txa8h7VZx8VIQDltukEKOKaZL/muGO7Q/5aE2vjOKHsD/jkWYe/2uFy1xv37ubdx17O1UXQNadPg=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.7.tgz"; + sha512 = "ch81CgU5pBNOiUCQx44F/ZtN4DxxJjUQtuytYRBFWJSHAJ+XPJtiC/yQ9zjr1I1yaUlmNYYblkopoOyziOdJ1w=="; }; }; "@lezer/common-1.2.1" = { @@ -6979,13 +6673,13 @@ let sha512 = "CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw=="; }; }; - "@ljharb/through-2.3.13" = { - name = "_at_ljharb_slash_through"; - packageName = "@ljharb/through"; - version = "2.3.13"; + "@listr2/prompt-adapter-inquirer-2.0.13" = { + name = "_at_listr2_slash_prompt-adapter-inquirer"; + packageName = "@listr2/prompt-adapter-inquirer"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz"; - sha512 = "/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ=="; + url = "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.13.tgz"; + sha512 = "nAl6teTt7EWSjttNavAnv3uFR3w3vPP3OTYmHyPNHzKhAj2NoBDHmbS3MGpvvO8KXXPASnHjEGrrKrdKTMKPnQ=="; }; }; "@lmdb/lmdb-darwin-arm64-2.5.3" = { @@ -7114,13 +6808,13 @@ let sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; }; }; - "@microsoft/applicationinsights-web-snippet-1.1.2" = { + "@microsoft/applicationinsights-web-snippet-1.2.1" = { name = "_at_microsoft_slash_applicationinsights-web-snippet"; packageName = "@microsoft/applicationinsights-web-snippet"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.1.2.tgz"; - sha512 = "qPoOk3MmEx3gS6hTc1/x8JWQG5g4BvRdH7iqZMENBsKCL927b7D7Mvl19bh3sW9Ucrg1fVrF+4hqShwQNdqLxQ=="; + url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.2.1.tgz"; + sha512 = "+Cy9zFqdQgdAbMK1dpm7B+3DUnrByai0Tq6XG9v737HJpW6G1EiNNbTuFeXdPWyGaq6FIx9jxm/SUcxA6/Rxxg=="; }; }; "@microsoft/fetch-event-source-2.0.1" = { @@ -7132,13 +6826,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.128.1" = { + "@microsoft/rush-lib-5.130.2" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.128.1"; + version = "5.130.2"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.128.1.tgz"; - sha512 = "8U1c3puDh10ZVNHR+Fk/juAQCwNdxRUNEVjRNkyoxDeAznca8Uo7ix7RoWOOQChh43JkeewRXmaHwmY4yiiL+g=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.130.2.tgz"; + sha512 = "8QgiqTh9osfqbweaZFikkaQx4Malve8sIGZhEfoPsHJw4bYPjjU7wA2NhQoeQu+0scdVOOL02kPvL7srWkGqFA=="; }; }; "@mischnic/json-sourcemap-0.1.1" = { @@ -7150,6 +6844,15 @@ let sha512 = "iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w=="; }; }; + "@mixmark-io/domino-2.2.0" = { + name = "_at_mixmark-io_slash_domino"; + packageName = "@mixmark-io/domino"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz"; + sha512 = "Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="; + }; + }; "@module-federation/runtime-0.1.6" = { name = "_at_module-federation_slash_runtime"; packageName = "@module-federation/runtime"; @@ -7195,13 +6898,22 @@ let sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="; }; }; - "@noble/curves-1.4.0" = { + "@napi-rs/wasm-runtime-0.2.4" = { + name = "_at_napi-rs_slash_wasm-runtime"; + packageName = "@napi-rs/wasm-runtime"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz"; + sha512 = "9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ=="; + }; + }; + "@noble/curves-1.4.2" = { name = "_at_noble_slash_curves"; packageName = "@noble/curves"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz"; - sha512 = "p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg=="; + url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz"; + sha512 = "TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw=="; }; }; "@noble/hashes-1.4.0" = { @@ -7213,67 +6925,193 @@ let sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="; }; }; - "@node-ipc/js-queue-2.0.3" = { - name = "_at_node-ipc_slash_js-queue"; - packageName = "@node-ipc/js-queue"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"; - sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; - }; - }; - "@node-red/editor-api-3.1.10" = { + "@node-red/editor-api-4.0.2" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "3.1.10"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.1.10.tgz"; - sha512 = "6W9W3CHOVIG4UC1YescfNqGhW04XDWg9UJQSMGSbRMoiMRhk+X3K1If1xtU7oE18pHKTH1+69oJELH7yh4msGw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-4.0.2.tgz"; + sha512 = "ZG0n1fpwAP5qhwa1vXdhHGhtVm6flmQKp1N++RPxqmF8uZlkI5wI0FzDrF3V/En7+gUD+o5ylcca4kq+I8GIdA=="; }; }; - "@node-red/editor-client-3.1.10" = { + "@node-red/editor-client-4.0.2" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "3.1.10"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.1.10.tgz"; - sha512 = "l5ircZrEL8PzP7RHA49H7AVdSQY+vGJIoy57YaL6G0vHuCYO6u9Bh6chJ9s+6RWIRCqcU6HorTdSS3gzVspGdA=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-4.0.2.tgz"; + sha512 = "B8UsqaxnTeIshgUFhMKj7hk/ddyxSXFTcRnuSw0uC39+ki3UUQ3pWJT8FLOr0NVypCFD4jq8qDzMundD0FVLFw=="; }; }; - "@node-red/nodes-3.1.10" = { + "@node-red/nodes-4.0.2" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "3.1.10"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.1.10.tgz"; - sha512 = "e7NvnF/gdM6HnqR6NwMz5M9I3vW6RWqfEvu8aIkNVNj3ojJnTzxKXLVs5pSaC56M/Q309McrGSuyG0ysI9fXDA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-4.0.2.tgz"; + sha512 = "dK+S6WJ2S8RQ/WMH1kSzYKvubM0+5zyRq7oEvrAyjk3xqQCwkf7Mfb48zdtHh6zW73/qv1pquY0iikIyZOkU6Q=="; }; }; - "@node-red/registry-3.1.10" = { + "@node-red/registry-4.0.2" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "3.1.10"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.1.10.tgz"; - sha512 = "iy2GP5AyArOTHnAKXJ0FBIrllfexQOA1LE43hbAZtZWtsgckuTxMWTW1m1U7hYzFvYJNKfAEPz3DNP5pVadd7g=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-4.0.2.tgz"; + sha512 = "1R9DBH4EhWOH5UJffNZ8Wdemch1onc7ZwRPoylnCD0aFpRWT2q1nEqHJDthtBF2l9x9CZejB31/LBAmU1KCkTQ=="; }; }; - "@node-red/runtime-3.1.10" = { + "@node-red/runtime-4.0.2" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "3.1.10"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.1.10.tgz"; - sha512 = "pFTY/khvBX3wZQ9ibDFVKL1raCvgJ018idBQ7WxcjemYIUTk096iWNofsje08tsR904KNwC1ZZ437cf+s6Xt7Q=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-4.0.2.tgz"; + sha512 = "wW1l8ZIeaLvSB8rKj/g7RsGBLq8Q6ladbCm3Zv4tTbuLmx61t04FZo2DNYTrVlMIR3O5R+vmc5UbzJco7WpVxA=="; }; }; - "@node-red/util-3.1.10" = { + "@node-red/util-4.0.2" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "3.1.10"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/util/-/util-4.0.2.tgz"; + sha512 = "pnAyC3N0JeORyvQQBpW4WQjBJU8iFNC5eG6W6LLfzhW3FvXndOUr85rx4fFtpWXZs8wMtWG4dBw7J4F4QLNJAQ=="; + }; + }; + "@node-rs/bcrypt-1.10.4" = { + name = "_at_node-rs_slash_bcrypt"; + packageName = "@node-rs/bcrypt"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.10.4.tgz"; + sha512 = "Kzs8HKt2eBeT5VnkeKgiz/QKTjOO3URcvSNEQZahNwZnL6dBeeJQTxxYisc/6969+5n6c3+gNwKvqJsZzmGe7g=="; + }; + }; + "@node-rs/bcrypt-android-arm-eabi-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-android-arm-eabi"; + packageName = "@node-rs/bcrypt-android-arm-eabi"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-android-arm-eabi/-/bcrypt-android-arm-eabi-1.10.4.tgz"; + sha512 = "55ajutuTdfK1hKseyliflnxzNtxszQQ/EoLtgJlgCe7rI24vGP9EEEZDznB/u9OaJ14/AYzZtIhkEOYdbIdw0A=="; + }; + }; + "@node-rs/bcrypt-android-arm64-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-android-arm64"; + packageName = "@node-rs/bcrypt-android-arm64"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-android-arm64/-/bcrypt-android-arm64-1.10.4.tgz"; + sha512 = "dCgQT7nH65tORmJw2hQ6zQgFmmC+/JBYZUWtf7pPZI76AVAn5tc7cIUrxYoV4OT1+uD63b9Av+mS1fT2EPzWEg=="; + }; + }; + "@node-rs/bcrypt-darwin-arm64-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-darwin-arm64"; + packageName = "@node-rs/bcrypt-darwin-arm64"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-darwin-arm64/-/bcrypt-darwin-arm64-1.10.4.tgz"; + sha512 = "gmHdWikHL3YVZgqXAHT+X/PG+kqIyNlPeFAWKdby83RkDI8FUiPV4qqGilgNnBmVWKkobRae9/I1HDbc4Sbhyg=="; + }; + }; + "@node-rs/bcrypt-darwin-x64-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-darwin-x64"; + packageName = "@node-rs/bcrypt-darwin-x64"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-darwin-x64/-/bcrypt-darwin-x64-1.10.4.tgz"; + sha512 = "WDzL1WKRtoyTkH6IMPx95Mkd6XaeN0VWJbSDMqQY6AFBOk03yJEj7YYXshCcF+Ur6KBBVSwRf6sdFJ15NI1Z3g=="; + }; + }; + "@node-rs/bcrypt-freebsd-x64-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-freebsd-x64"; + packageName = "@node-rs/bcrypt-freebsd-x64"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-freebsd-x64/-/bcrypt-freebsd-x64-1.10.4.tgz"; + sha512 = "seSPJi+4MIUd1faL/n/wmDdDwaynd/FTkvTnb7qzCk8LBT+/dxi7MTz+uaD8KYDREcB9Wmhv+lwr0S9/jBTcjg=="; + }; + }; + "@node-rs/bcrypt-linux-arm-gnueabihf-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-linux-arm-gnueabihf"; + packageName = "@node-rs/bcrypt-linux-arm-gnueabihf"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm-gnueabihf/-/bcrypt-linux-arm-gnueabihf-1.10.4.tgz"; + sha512 = "YcMLUtN9cGNTWKnaXslxGO1M0S5b4QN9KYhuyG6Kju27RfqvU5UbmpKElCsEUO2EIjxGwzvPu59T+Fyh6sVbwg=="; + }; + }; + "@node-rs/bcrypt-linux-arm64-gnu-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-linux-arm64-gnu"; + packageName = "@node-rs/bcrypt-linux-arm64-gnu"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-gnu/-/bcrypt-linux-arm64-gnu-1.10.4.tgz"; + sha512 = "uYGUK/mO8SiftqmVSAePWxgK82vg+X/gtrVRJi95yq2iwp1+fYJX3ndxCyYPmeplBbd3NJ/F5lPT3FC/IHTTGw=="; + }; + }; + "@node-rs/bcrypt-linux-arm64-musl-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-linux-arm64-musl"; + packageName = "@node-rs/bcrypt-linux-arm64-musl"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-musl/-/bcrypt-linux-arm64-musl-1.10.4.tgz"; + sha512 = "rLvSMW/gVUBd2k2gAqQfuOReHWd9+jvz58E3i1TbkRE3a5ChvjOFc9qKPEmXuXuD9Mdj7gUwcYwpq8MdB5MtNw=="; + }; + }; + "@node-rs/bcrypt-linux-x64-gnu-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-linux-x64-gnu"; + packageName = "@node-rs/bcrypt-linux-x64-gnu"; + version = "1.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-3.1.10.tgz"; - sha512 = "1wL5HS+F0w48QkmHeIy5/II+CJdoW30P2zdm53JlvrE8OG0887mTapjGqmEG+djkJAfDIO/0El+8Q8U2qt9W5A=="; + url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-gnu/-/bcrypt-linux-x64-gnu-1.10.4.tgz"; + sha512 = "I++6bh+BIp70X/D/crlSgCq8K0s9nGvzmvAGFkqSG4h3LBtjJx4RKbygnoWvcBV9ErK1rvcjfMyjwZt1ukueFA=="; + }; + }; + "@node-rs/bcrypt-linux-x64-musl-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-linux-x64-musl"; + packageName = "@node-rs/bcrypt-linux-x64-musl"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-musl/-/bcrypt-linux-x64-musl-1.10.4.tgz"; + sha512 = "f9RPl/5n2NS0mMJXB4IYbodKnq5HzOK5x1b9eKbcjsY0rw3mJC3K0XRFc8iaw1a5chA+xV1TPXz5mkykmr2CQQ=="; + }; + }; + "@node-rs/bcrypt-wasm32-wasi-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-wasm32-wasi"; + packageName = "@node-rs/bcrypt-wasm32-wasi"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-wasm32-wasi/-/bcrypt-wasm32-wasi-1.10.4.tgz"; + sha512 = "VaDOf+wic0yoHFimMkC5VMa/33BNqg6ieD+C/ibb7Av3NnVW4/W9YpDpqAWMR2w3fA40uTLWZ7FZSrcFck27oA=="; + }; + }; + "@node-rs/bcrypt-win32-arm64-msvc-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-win32-arm64-msvc"; + packageName = "@node-rs/bcrypt-win32-arm64-msvc"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-win32-arm64-msvc/-/bcrypt-win32-arm64-msvc-1.10.4.tgz"; + sha512 = "M7sGnbKPvhYJ5b76ywXiEwR4mIs/JSDHjRrhm9fshKAvltQrwc3Mou22TJggvDN3gKOF1W85uPiM2OgGX/jxMg=="; + }; + }; + "@node-rs/bcrypt-win32-ia32-msvc-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-win32-ia32-msvc"; + packageName = "@node-rs/bcrypt-win32-ia32-msvc"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-win32-ia32-msvc/-/bcrypt-win32-ia32-msvc-1.10.4.tgz"; + sha512 = "zn/n4DYnuOfC2JgmVDa0JHP+5DUqAOTl2jmV3yrMrmN+StDT4Om5wtvWxvEmgv3CkeZAuAU3Y/fwjSXIpZ0Fhg=="; + }; + }; + "@node-rs/bcrypt-win32-x64-msvc-1.10.4" = { + name = "_at_node-rs_slash_bcrypt-win32-x64-msvc"; + packageName = "@node-rs/bcrypt-win32-x64-msvc"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/bcrypt-win32-x64-msvc/-/bcrypt-win32-x64-msvc-1.10.4.tgz"; + sha512 = "ynQokTTGbuLu/cckaD8dNcE+Zsfam1zElE+teNol8AxcL7Jv+ghJItSnRthPRV/vLxuycDF2DIICgpXG/p9jrQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -7312,6 +7150,15 @@ let sha512 = "OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og=="; }; }; + "@npmcli/arborist-7.5.3" = { + name = "_at_npmcli_slash_arborist"; + packageName = "@npmcli/arborist"; + version = "7.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.3.tgz"; + sha512 = "7gbMdDNSYUzi0j2mpb6FoXRg3BxXWplMQZH1MZlvNjSdWFObaUz2Ssvo0Nlh2xmWks1OPo+gpsE6qxpT/5M7lQ=="; + }; + }; "@npmcli/config-6.4.1" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; @@ -7321,13 +7168,13 @@ let sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g=="; }; }; - "@npmcli/config-8.3.3" = { + "@npmcli/config-8.3.4" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "8.3.3"; + version = "8.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-8.3.3.tgz"; - sha512 = "sIMKHiiYr91ALiHjhPq64F5P/SCaiSyDfpNmgYHtlIJtLY445+3+r3VoREzpdDrOwIqwQ6iEHinbTfaocL0UgA=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-8.3.4.tgz"; + sha512 = "01rtHedemDNhUXdicU7s+QYz/3JyV5Naj84cvdXGH4mgCdL+agmSYaLF4LUG4vMCLzhBO8YtS0gPpH1FGvbgAw=="; }; }; "@npmcli/fs-1.1.1" = { @@ -7357,13 +7204,13 @@ let sha512 = "q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg=="; }; }; - "@npmcli/git-5.0.7" = { + "@npmcli/git-5.0.8" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz"; - sha512 = "WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz"; + sha512 = "liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ=="; }; }; "@npmcli/installed-package-contents-2.1.0" = { @@ -7384,6 +7231,15 @@ let sha512 = "tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA=="; }; }; + "@npmcli/metavuln-calculator-7.1.1" = { + name = "_at_npmcli_slash_metavuln-calculator"; + packageName = "@npmcli/metavuln-calculator"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz"; + sha512 = "Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g=="; + }; + }; "@npmcli/move-file-1.1.2" = { name = "_at_npmcli_slash_move-file"; packageName = "@npmcli/move-file"; @@ -7438,13 +7294,13 @@ let sha512 = "xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ=="; }; }; - "@npmcli/redact-1.1.0" = { - name = "_at_npmcli_slash_redact"; - packageName = "@npmcli/redact"; - version = "1.1.0"; + "@npmcli/query-3.1.0" = { + name = "_at_npmcli_slash_query"; + packageName = "@npmcli/query"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz"; - sha512 = "PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ=="; + url = "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz"; + sha512 = "C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ=="; }; }; "@npmcli/redact-2.0.1" = { @@ -7456,15 +7312,6 @@ let sha512 = "YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw=="; }; }; - "@npmcli/run-script-7.0.2" = { - name = "_at_npmcli_slash_run-script"; - packageName = "@npmcli/run-script"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz"; - sha512 = "Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w=="; - }; - }; "@npmcli/run-script-8.1.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; @@ -7474,31 +7321,31 @@ let sha512 = "y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg=="; }; }; - "@nrwl/devkit-19.3.0" = { + "@nrwl/devkit-19.5.3" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "19.3.0"; + version = "19.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.3.0.tgz"; - sha512 = "WRcph/7U37HkTLIRzQ2oburZVfEFkPHJUn7vmo46gCq+N2cAKy3qwONO0RbthhjFIsG94YPXqFWFlV6k4nXpxA=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.5.3.tgz"; + sha512 = "kd6eIQjWuFHdO14wVu0rzGtoPbO3EdYM/3gATOupxBzlqD+7dmkvv1Olbri9v598mDApXQNo8q81L2masTAhvg=="; }; }; - "@nrwl/tao-19.3.0" = { + "@nrwl/tao-19.5.3" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "19.3.0"; + version = "19.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.3.0.tgz"; - sha512 = "MyGYeHbh9O4Tv9xmz3Du+/leY5sKUHaPy4ancfNyShHgYi21hemX0/YYjzzoYHi44D8GzSc1XG2rAuwba7Kilw=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.5.3.tgz"; + sha512 = "SHtPlQi7zofDdbFjqcrTb/A0Mo9tT8S88H8nJa1+GzhKpGUB9rykHtq0qoYdiRBnQfmfR5LoKfe/jft61Ktvdg=="; }; }; - "@nx/devkit-19.3.0" = { + "@nx/devkit-19.5.3" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "19.3.0"; + version = "19.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.3.0.tgz"; - sha512 = "Natya5nzvHH0qTOIL1w/EZtwMgDx87Dgz0LgeY7te2fULaNFcj5fVrP+mUKEJZR+NccO7GPumT2RPhuEl9rPnQ=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.5.3.tgz"; + sha512 = "OUi8OJkoT+y3LwXACO6ugF9l6QppUyHrBIZYOTffBa1ZrnkpJrw03smy+GhAt+BDoeNGEuOPHGvOSV4AmRxnmg=="; }; }; "@oclif/color-1.0.13" = { @@ -7960,13 +7807,13 @@ let sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="; }; }; - "@opentelemetry/core-1.25.0" = { + "@opentelemetry/core-1.25.1" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.0.tgz"; - sha512 = "n0B3s8rrqGrasTgNkXLKXzN0fXo+6IYP7M5b7AMsrZM33f/y6DS6kJ0Btd7SespASWq8bgL3taLo0oe0vB52IQ=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.1.tgz"; + sha512 = "GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ=="; }; }; "@opentelemetry/instrumentation-0.41.2" = { @@ -7978,112 +7825,112 @@ let sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw=="; }; }; - "@opentelemetry/resources-1.25.0" = { + "@opentelemetry/resources-1.25.1" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.0.tgz"; - sha512 = "iHjydPMYJ+Li1auveJCq2rp5U2h6Mhq8BidiyE0jfVlDTFyR1ny8AfJHfmFzJ/RAM8vT8L7T21kcmGybxZC7lQ=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.1.tgz"; + sha512 = "pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ=="; }; }; - "@opentelemetry/sdk-trace-base-1.25.0" = { + "@opentelemetry/sdk-trace-base-1.25.1" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.0.tgz"; - sha512 = "6+g2fiRQUG39guCsKVeY8ToeuUf3YUnPkN6DXRA1qDmFLprlLvZm9cS6+chgbW70cZJ406FTtSCDnJwxDC5sGQ=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz"; + sha512 = "C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw=="; }; }; - "@opentelemetry/semantic-conventions-1.25.0" = { + "@opentelemetry/semantic-conventions-1.25.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.0.tgz"; - sha512 = "M+kkXKRAIAiAP6qYyesfrC5TOmDpDVtsxuGfPcqd9B/iBrac+E14jYwrgm0yZBUIbIP2OnqC3j+UgkXLm1vxUQ=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz"; + sha512 = "ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ=="; }; }; - "@orval/angular-6.30.2" = { + "@orval/angular-6.31.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.30.2.tgz"; - sha512 = "EzIhuCEDJQIjiaBePI9CA8aU27diKZOb2xp1htX/81TAM9fDu1kKhLKA40i9z3ZcABgfGupm9f+ILIrmk7LDEg=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.31.0.tgz"; + sha512 = "cVV/vh6biGUe5FMR0kaOL+pYkD5lM/oHpyHVU19d2eY/hxKCG58/CagUNVDxbowcSalzGpt7NbZOqpauc2cNOA=="; }; }; - "@orval/axios-6.30.2" = { + "@orval/axios-6.31.0" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.30.2.tgz"; - sha512 = "BGwxqpZembRoM77vd47k/b4LC/prPprK//nEiEvxW2WMmfIdA81UkLHk9IM3EqBjcWD8w5kawwGB13aNlID3Bw=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.31.0.tgz"; + sha512 = "OqWFJ6bDKftsSW3VI7Ouqcb3W4hDhkk8XzDkb/iisn3Dn1rkSE/wafdlHCm+62VQps4esYXaP1+7/HSk/2+Y8A=="; }; }; - "@orval/core-6.30.2" = { + "@orval/core-6.31.0" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.30.2.tgz"; - sha512 = "+OipnBdCHAKLNvMUAGo8yOrfB1yhk0vsUI44pinL9SlChL+2K48oSl1VZy++O31xFnjXTbtUQWEDlj6pNi4gqg=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.31.0.tgz"; + sha512 = "ubOPpxzLgOCGbAQsq/dzfe/MIgB4LYWRyuwgnkV2GkL8Zq7cIWfmZU09GTJZQ6cO35OclFfbbyNve0cRMfSBeA=="; }; }; - "@orval/fetch-6.30.2" = { + "@orval/fetch-6.31.0" = { name = "_at_orval_slash_fetch"; packageName = "@orval/fetch"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/fetch/-/fetch-6.30.2.tgz"; - sha512 = "YO7L+SRR9AfLvfMkuA4WXWAvXNWecQ+mlQe7S5wvQjZpobxaFAmNwMUEQ51quP3FEHOzzK2Can0Qrb1yY4XxfA=="; + url = "https://registry.npmjs.org/@orval/fetch/-/fetch-6.31.0.tgz"; + sha512 = "K4pD0TqRX3n1QgsfdzcCLxZPj4WFr4xd51VS5PhtK7wewy+EwaTp5AZeeMT+o8dL4HQcwLsKaXA1HH1YiAuOrA=="; }; }; - "@orval/hono-6.30.2" = { + "@orval/hono-6.31.0" = { name = "_at_orval_slash_hono"; packageName = "@orval/hono"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/hono/-/hono-6.30.2.tgz"; - sha512 = "9exEMziYJcgB8l43zpI2R/S9+xBd2G3oc71dGHP8qUossfqWf0l5m7eEbF1Eyy5UrEB2YIwNfKRaUCTSYFlD9Q=="; + url = "https://registry.npmjs.org/@orval/hono/-/hono-6.31.0.tgz"; + sha512 = "mM5WISLugu1quNkNUqYwp+StV/Z5/STm33VdPTWkoZyPJtV4NmEUZKPsowk0EN7sBF2kW+aYcp8lsNMXxXfHaw=="; }; }; - "@orval/mock-6.30.2" = { + "@orval/mock-6.31.0" = { name = "_at_orval_slash_mock"; packageName = "@orval/mock"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/mock/-/mock-6.30.2.tgz"; - sha512 = "zWsoLTwNl2x5hto1yEUgdzweaFqpSJ/ZaLIYpkymt7k26oJzDW1UUnmxFAQSHOz26UzzsKFr9/+2bfJjLtQaHw=="; + url = "https://registry.npmjs.org/@orval/mock/-/mock-6.31.0.tgz"; + sha512 = "UBag0IyL0eDVdXWgIMS/YxDF57Q3XC4VRDqcuZ1lB77rfBZ4UiVqTJleczQoIqMGkdtJJlBABgWzRRts1K4img=="; }; }; - "@orval/query-6.30.2" = { + "@orval/query-6.31.0" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.30.2.tgz"; - sha512 = "tOHAhVsgkxw2Hy/tFu/VREsnsg+r0IWq6txI4wQac7uJz3AK1SDUD71eNx7tW56noiHT6NnGjODFZdb5s2Cgqg=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.31.0.tgz"; + sha512 = "aVyvSU5IbpRQnVbhChNlLX2XDnmoT1cDJ59NEFS3byhiJf1EG5XlzVve98je/BHAsVROrUC8+o6XoIjCtYbW5Q=="; }; }; - "@orval/swr-6.30.2" = { + "@orval/swr-6.31.0" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.30.2.tgz"; - sha512 = "GFouUCSVerVIKMM+EilNqlHfUyBkq3RhhGQf6fQHlDvUPoVEYRp8PYTKNCQGxyM0Ae0KhZ+g9Uy3faBaXFCxfg=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.31.0.tgz"; + sha512 = "J9W/kym9jc94GizbTozpuY76yaZRN98rf3ahj+2+eW8+NRW1dVFui32Gew1qj9rcCSA54BwRMONgEn3Xqx6W6A=="; }; }; - "@orval/zod-6.30.2" = { + "@orval/zod-6.31.0" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.30.2.tgz"; - sha512 = "nLDjEcuVwIMVfIo6Ku4OYzYmML8ECPPfY1fJ7HV30mp8MGFOnSCVyLZGrVZw5InSwepO1wvh04nHRlAZYoykoA=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.31.0.tgz"; + sha512 = "v6wqGZf4s3tpWrnmMHlEBfhTLeebu5W3HmhP8vQ5BPkm8AB2asiZqzK3Ne9Y19Rvyx6X4FGnhnalKYkz+XxJ8Q=="; }; }; "@parcel/bundler-default-2.12.0" = { @@ -8860,67 +8707,67 @@ let sha512 = "j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="; }; }; - "@prisma/debug-5.15.0" = { + "@prisma/debug-5.17.0" = { name = "_at_prisma_slash_debug"; packageName = "@prisma/debug"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.15.0.tgz"; - sha512 = "QpEAOjieLPc/4sMny/WrWqtpIAmBYsgqwWlWwIctqZO0AbhQ9QcT6x2Ut3ojbDo/pFRCCA1Z1+xm2MUy7fAkZA=="; + url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.17.0.tgz"; + sha512 = "l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg=="; }; }; - "@prisma/engines-5.15.0" = { + "@prisma/engines-5.17.0" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.15.0.tgz"; - sha512 = "hXL5Sn9hh/ZpRKWiyPA5GbvF3laqBHKt6Vo70hYqqOhh5e0ZXDzHcdmxNvOefEFeqxra2DMz2hNbFoPvqrVe1w=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.17.0.tgz"; + sha512 = "+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg=="; }; }; - "@prisma/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" = { + "@prisma/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" = { name = "_at_prisma_slash_engines-version"; packageName = "@prisma/engines-version"; - version = "5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022"; + version = "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022.tgz"; - sha512 = "3BEgZ41Qb4oWHz9kZNofToRvNeS4LZYaT9pienR1gWkjhky6t6K1NyeWNBkqSj2llgraUNbgMOCQPY4f7Qp5wA=="; + url = "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz"; + sha512 = "tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg=="; }; }; - "@prisma/fetch-engine-5.15.0" = { + "@prisma/fetch-engine-5.17.0" = { name = "_at_prisma_slash_fetch-engine"; packageName = "@prisma/fetch-engine"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.15.0.tgz"; - sha512 = "z6AY5yyXxc20Klj7wwnfGP0iIUkVKzybqapT02zLYR/nf9ynaeN8bq73WRmi1TkLYn+DJ5Qy+JGu7hBf1pE78A=="; + url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.17.0.tgz"; + sha512 = "ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q=="; }; }; - "@prisma/get-platform-5.15.0" = { + "@prisma/get-platform-5.17.0" = { name = "_at_prisma_slash_get-platform"; packageName = "@prisma/get-platform"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.15.0.tgz"; - sha512 = "1GULDkW4+/VQb73vihxCBSc4Chc2x88MA+O40tcZFjmBzG4/fF44PaXFxUqKSFltxU9L9GIMLhh0Gfkk/pUbtg=="; + url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.17.0.tgz"; + sha512 = "UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w=="; }; }; - "@prisma/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" = { + "@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" = { name = "_at_prisma_slash_prisma-schema-wasm"; packageName = "@prisma/prisma-schema-wasm"; - version = "5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022"; + version = "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022.tgz"; - sha512 = "bZYtXnHSP6nkZf20QZm4A/vzz3Psh+u6pMld4t6cdcZlQW0ZOZQ3/WWTOf5Pe+cqS/k4kciEM5urtH2SE01GCg=="; + url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz"; + sha512 = "mlmuu0/IPSjMlMKsqdaVVAbGTJwp5sDMFd3ZFQxl4/K8FvH7tb2uy/lTHF0KyAJbveTiV+1yW9MBWspltXZZtg=="; }; }; - "@prisma/schema-files-loader-5.15.0" = { + "@prisma/schema-files-loader-5.17.0" = { name = "_at_prisma_slash_schema-files-loader"; packageName = "@prisma/schema-files-loader"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.15.0.tgz"; - sha512 = "ZDIX4Gr5MdGOiik23DSYQ8cOd/Bkat+6yo5TbAF8UlKor9tJsrEVyGRo6DFu1AEvedjSeiwS88jD1dn03sxvyA=="; + url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.17.0.tgz"; + sha512 = "rmbJZEvY9nOlLduVQww4fGmYM3aU7BYAw/st0K9QNq9dQoLONgQP7t8dhcOVZbBLyNNQu2k2gJdVXSHSY96b4A=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -9013,13 +8860,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@puppeteer/browsers-2.2.3" = { + "@puppeteer/browsers-2.3.0" = { name = "_at_puppeteer_slash_browsers"; packageName = "@puppeteer/browsers"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.2.3.tgz"; - sha512 = "bJ0UBsk0ESOs6RFcLXOt99a3yTDcOKlzfjad+rhFwdaG1Lu/Wzq58GHYCDTlZ9z6mldf4g+NTb+TXEfe0PpnsQ=="; + url = "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz"; + sha512 = "ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA=="; }; }; "@putdotio/api-client-8.49.0" = { @@ -9040,60 +8887,6 @@ let sha512 = "Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA=="; }; }; - "@redis/bloom-1.2.0" = { - name = "_at_redis_slash_bloom"; - packageName = "@redis/bloom"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; - sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; - }; - }; - "@redis/client-1.5.16" = { - name = "_at_redis_slash_client"; - packageName = "@redis/client"; - version = "1.5.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.16.tgz"; - sha512 = "X1a3xQ5kEMvTib5fBrHKh6Y+pXbeKXqziYuxOUo1ojQNECg4M5Etd1qqyhMap+lFUOAh8S7UYevgJHOm4A+NOg=="; - }; - }; - "@redis/graph-1.1.1" = { - name = "_at_redis_slash_graph"; - packageName = "@redis/graph"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz"; - sha512 = "FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw=="; - }; - }; - "@redis/json-1.0.6" = { - name = "_at_redis_slash_json"; - packageName = "@redis/json"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/json/-/json-1.0.6.tgz"; - sha512 = "rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw=="; - }; - }; - "@redis/search-1.1.6" = { - name = "_at_redis_slash_search"; - packageName = "@redis/search"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/search/-/search-1.1.6.tgz"; - sha512 = "mZXCxbTYKBQ3M2lZnEddwEAks0Kc7nauire8q20oA0oA/LoA+E/b5Y5KZn232ztPb1FkIGqo12vh3Lf+Vw5iTw=="; - }; - }; - "@redis/time-series-1.0.5" = { - name = "_at_redis_slash_time-series"; - packageName = "@redis/time-series"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.5.tgz"; - sha512 = "IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg=="; - }; - }; "@repeaterjs/repeater-3.0.6" = { name = "_at_repeaterjs_slash_repeater"; packageName = "@repeaterjs/repeater"; @@ -9121,58 +8914,58 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rspack/binding-0.7.3" = { + "@rspack/binding-0.7.5" = { name = "_at_rspack_slash_binding"; packageName = "@rspack/binding"; - version = "0.7.3"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.3.tgz"; - sha512 = "VYPOtaCb1lphNrHozZXy9L5ODGU76kp7ozCpYbF/CTFq8xaSkvkhNHwWMGXE2TIOvWZImMBRBuYX8/kjz/HiSA=="; + url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.5.tgz"; + sha512 = "XcdOvaCz1mWWwr5vmEY9zncdInrjINEh60EWkYdqtCA67v7X7rB1fe6n4BeAI1+YLS2Eacj+lytlr+n7I+DYVg=="; }; }; - "@rspack/core-0.7.3" = { + "@rspack/core-0.7.5" = { name = "_at_rspack_slash_core"; packageName = "@rspack/core"; - version = "0.7.3"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.3.tgz"; - sha512 = "SUvt4P1nMML3Int2YE1Z2+noDIxjT/hzNtcKMXXqeFp4yFys37s7vC+BnCyzonvIbpxUg2gH+bCMCgav7+xR4A=="; + url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.5.tgz"; + sha512 = "zVTe4WCyc3qsLPattosiDYZFeOzaJ32/BYukPP2I1VJtCVFa+PxGVRPVZhSoN6fXw5oy48yHg9W9v1T8CaEFhw=="; }; }; - "@rushstack/heft-config-file-0.14.25" = { + "@rushstack/heft-config-file-0.15.2" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.14.25"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.14.25.tgz"; - sha512 = "b/7w7aRM7bgeVe0tNFwmbf2dF5jbTC3gD8zkakztNMwqt4pjXbU2o/0OpGwVBRFfVhwd8JnQjhYfFM632CdWYA=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.15.2.tgz"; + sha512 = "1xHQLuWeXglFoVPxOpSb7EbjCduihFd9FXoW/awlFBfIfSMq85PAoErdCOfZBe7pUeGZ5ymwyiF7Am6hR4AAwA=="; }; }; - "@rushstack/node-core-library-5.4.1" = { + "@rushstack/node-core-library-5.5.0" = { name = "_at_rushstack_slash_node-core-library"; packageName = "@rushstack/node-core-library"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.4.1.tgz"; - sha512 = "WNnwdS8r9NZ/2K3u29tNoSRldscFa7SxU0RT+82B6Dy2I4Hl2MeCSKm4EXLXPKeNzLGvJ1cqbUhTLviSF8E6iA=="; + url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.5.0.tgz"; + sha512 = "Cl3MYQ74Je5Y/EngMxcA3SpHjGZ/022nKbAO1aycGfQ+7eKyNCBu0oywj5B1f367GCzuHBgy+3BlVLKysHkXZw=="; }; }; - "@rushstack/package-deps-hash-4.1.57" = { + "@rushstack/package-deps-hash-4.1.61" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.1.57"; + version = "4.1.61"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.57.tgz"; - sha512 = "mI0tKuBPiTO2pBzAO+M2aHZVlje0Oz37iEtuycOUMUvsy2igv6T6XWNrRs/kPfQ5lhZ8XGTZOEEZ4Gbb7UESgw=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.61.tgz"; + sha512 = "Qhl4AxZ1TYQ/rAxaU6yD16aKVOAyFAQKd/2zolcLPSwgk/01Iqu6K3Rhwlj9acO9PMOMTDKlQVDoy4FPzQQgww=="; }; }; - "@rushstack/package-extractor-0.7.16" = { + "@rushstack/package-extractor-0.7.20" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.7.16"; + version = "0.7.20"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.16.tgz"; - sha512 = "QQfjc84Gdvqq0k08852orNFIaAj1N7310H/r8KMYyjXfVRWgVlP55QIGzps7KQWDfjlq72UDPu85kEGrav2ekw=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.20.tgz"; + sha512 = "wZwn/bRWfin5xr1+EdVmrXtLI8W939HV3wvdJT9NbJrYh5G20bdXtsykDp10+S0QKrH33Rwb0zTu/JIa5JGLmw=="; }; }; "@rushstack/rig-package-0.5.2" = { @@ -9184,67 +8977,67 @@ let sha512 = "mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.128.1" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.130.2" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.128.1"; + version = "5.130.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.128.1.tgz"; - sha512 = "RWlix06urImT73M2rZmM4Yi8T2gHufiQ2ghLMLaz5m/5FwwUavppXeTkiTXSIsIv42nzdu/MKtVknXNfjfQBAg=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.130.2.tgz"; + sha512 = "1KMBKBQIXHcvX0vOcVGHWwJXBQkSA+IOXeWawoU0GO42XMLif4dFGEIFWZP+L+wFSvVSPu1Hs12ZH6dWYPVXGg=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.128.1" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.130.2" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.128.1"; + version = "5.130.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.128.1.tgz"; - sha512 = "J8k9ZH8GlJTtkZT0W9D/nvi4kQX1bUM/8PyQyA0/MUYoCNxWEImGjR0IHOXn30WC1m/DrU7J73NHh3d+2p3XSg=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.130.2.tgz"; + sha512 = "naS9nrYOGs1KmIgoKpaT1jQEv7hRSS8AMkpeN/rkbY1/OnKCr0+z4aEgRuPEBiOObyFQaT/uxrsrpsgqSVQh3A=="; }; }; - "@rushstack/rush-http-build-cache-plugin-5.128.1" = { + "@rushstack/rush-http-build-cache-plugin-5.130.2" = { name = "_at_rushstack_slash_rush-http-build-cache-plugin"; packageName = "@rushstack/rush-http-build-cache-plugin"; - version = "5.128.1"; + version = "5.130.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.128.1.tgz"; - sha512 = "LlCJo3BYcIsoO85qgHtXtIpEriKc0gnoSkkkH30wy5N1AKIqIL3iUvQtxDl6WmcwtlBmHqYem4W4nw2B2Vh1wg=="; + url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.130.2.tgz"; + sha512 = "VaKNAKJ2jnBiDutQiakj90TKW2PyBu4HOtlB4ran7WHKXGQHxriepMh+UTQt2dGhESw8eJ294ZR7YTOwtuT2kg=="; }; }; - "@rushstack/rush-sdk-5.128.1" = { + "@rushstack/rush-sdk-5.130.2" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.128.1"; + version = "5.130.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.128.1.tgz"; - sha512 = "oYrKFX54FsXpbsA03fRp/3gLAgVXWXYMIOxgi4zHb4XBs4+6p4OGa3fLAjNY4SNWaQIv6AiokU7pPCAt9bJHDg=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.130.2.tgz"; + sha512 = "f9ZC/NnT7AVTkd5gxVcS4Hi3qZcA/8RbXCt7F08y7HJ4mlmojVdZTfsuHhwiDhX3dLd4b1AflU8A7joZE9tYhQ=="; }; }; - "@rushstack/stream-collator-4.1.56" = { + "@rushstack/stream-collator-4.1.60" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.1.56"; + version = "4.1.60"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.56.tgz"; - sha512 = "INfovUzy7sJg0fdZP/zQknnGdiPf4yb6pbnMLvHYARdXJLSZDcU9sjCpLg3DxYDx0K5PnHAnRSvgATJWbbpMww=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.60.tgz"; + sha512 = "qebgAhqkzmV0h0HgImOCLSVUhJq2nA/qTLXae9auWWy5XHRFS41pwQdeajyht04aYGtrxEQELSHRq7PqMtQfaA=="; }; }; - "@rushstack/terminal-0.13.0" = { + "@rushstack/terminal-0.13.2" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.13.0"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.13.0.tgz"; - sha512 = "Ou44Q2s81BqJu3dpYedAX54am9vn245F0HzqVrfJCMQk5pGgoKKOBOjkbfZC9QKcGNaECh6pwH2s5noJt7X6ew=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.13.2.tgz"; + sha512 = "t8i0PsGvBHmFBY8pryO3badqFlxQsm2rw3KYrzjcmVkG/WGklKg1qVkr9beAS1Oe8XWDRgj6SkoHkpNjs7aaNw=="; }; }; - "@rushstack/ts-command-line-4.22.0" = { + "@rushstack/ts-command-line-4.22.2" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.22.0"; + version = "4.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.0.tgz"; - sha512 = "Qj28t6MO3HRgAZ72FDeFsrpdE6wBWxF3VENgvrXh7JF2qIT+CrXiOJIesW80VFZB9QwObSpkB1ilx794fGQg6g=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.2.tgz"; + sha512 = "xkvrGd6D9dPlI3I401Thc640WNsEPB1sGEmy12a2VJaPQPwhE6Ik0gEVPZJ/2G1w213eaCAdxUY1xpiTulsmpA=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -9256,13 +9049,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-18.0.4" = { + "@schematics/angular-18.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "18.0.4"; + version = "18.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.0.4.tgz"; - sha512 = "fN4whuym9ZmcQFdTfwLZr4j+NcZ4LzbdLk8XYrYdxt1z8c9ujs5LqJYn0LYc3UWiYl7z2RVc9NOxzNrkiXdwlw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.1.2.tgz"; + sha512 = "lTY9twQ30vEm3hjArUKQjKiYlbDUOHqbyY7MlynY5+T8XtYreMo20KHofxv5t5xZfPwj1z6/ppcMU2xZ4WbGUA=="; }; }; "@scure/base-1.1.7" = { @@ -9301,13 +9094,13 @@ let sha512 = "831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg=="; }; }; - "@segment/ajv-human-errors-2.12.0" = { + "@segment/ajv-human-errors-2.13.0" = { name = "_at_segment_slash_ajv-human-errors"; packageName = "@segment/ajv-human-errors"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.12.0.tgz"; - sha512 = "wgQpYRaPMlgaJvxhd7gCRUQcLbrgYwwbtqXnCfpT6Vv+al5OP2pqPj27WAXNq/3OBzbwsn0NXm0m1U8ygHeybg=="; + url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.13.0.tgz"; + sha512 = "rubuhyhxCHmVdTmA5G3aMiWoN8Yutp+LG/AGUSiIKJVs1r7EEE/yjqSzSqyANGj5ZkqGUP802Ur9s19MuWelZQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -9328,94 +9121,58 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.109.0" = { - name = "_at_sentry-internal_slash_tracing"; - packageName = "@sentry-internal/tracing"; - version = "7.109.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.109.0.tgz"; - sha512 = "PzK/joC5tCuh2R/PRh+7dp+uuZl7pTsBIjPhVZHMTtb9+ls65WkdZJ1/uKXPouyz8NOo9Xok7aEvEo9seongyw=="; - }; - }; - "@sentry-internal/tracing-7.110.0" = { + "@sentry-internal/tracing-7.116.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.110.0"; + version = "7.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.110.0.tgz"; - sha512 = "IIHHa9e/mE7uOMJfNELI8adyoELxOy6u6TNCn5t6fphmq84w8FTc9adXkG/FY2AQpglkIvlILojfMROFB2aaAQ=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.116.0.tgz"; + sha512 = "y5ppEmoOlfr77c/HqsEXR72092qmGYS4QE5gSz5UZFn9CiinEwGfEorcg2xIrrCuU7Ry/ZU2VLz9q3xd04drRA=="; }; }; - "@sentry/core-7.109.0" = { + "@sentry/core-7.116.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.109.0"; + version = "7.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.109.0.tgz"; - sha512 = "xwD4U0IlvvlE/x/g/W1I8b4Cfb16SsCMmiEuBf6XxvAa3OfWBxKoqLifb3GyrbxMC4LbIIZCN/SvLlnGJPgszA=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.116.0.tgz"; + sha512 = "J6Wmjjx+o7RwST0weTU1KaKUAlzbc8MGkJV1rcHM9xjNTWTva+nrcCM3vFBagnk2Gm/zhwv3h0PvWEqVyp3U1Q=="; }; }; - "@sentry/core-7.110.0" = { - name = "_at_sentry_slash_core"; - packageName = "@sentry/core"; - version = "7.110.0"; + "@sentry/integrations-7.116.0" = { + name = "_at_sentry_slash_integrations"; + packageName = "@sentry/integrations"; + version = "7.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.110.0.tgz"; - sha512 = "g4suCQO94mZsKVaAbyD1zLFC5YSuBQCIPHXx9fdgtfoPib7BWjWWePkllkrvsKAv4u8Oq05RfnKOhOMRHpOKqg=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.116.0.tgz"; + sha512 = "UZb60gaF+7veh1Yv79RiGvgGYOnU6xA97H+hI6tKgc1uT20YpItO4X56Vhp0lvyEyUGFZzBRRH1jpMDPNGPkqw=="; }; }; - "@sentry/node-7.109.0" = { + "@sentry/node-7.116.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.109.0"; + version = "7.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.109.0.tgz"; - sha512 = "tqMNAES4X/iBl1eZRCmc29p//0id01FBLEiesNo5nk6ECl6/SaGMFAEwu1gsn90h/Bjgr04slwFOS4cR45V2PQ=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.116.0.tgz"; + sha512 = "HB/4TrJWbnu6swNzkid+MlwzLwY/D/klGt3R0aatgrgWPo2jJm6bSl4LUT39Cr2eg5I1gsREQtXE2mAlC6gm8w=="; }; }; - "@sentry/node-7.110.0" = { - name = "_at_sentry_slash_node"; - packageName = "@sentry/node"; - version = "7.110.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.110.0.tgz"; - sha512 = "YPfweCSzo/omnx5q1xOEZfI8Em3jnPqj7OM4ObXmoSKEK+kM1oUF3BTRzw5BJOaOCSTBFY1RAsGyfVIyrwxWnA=="; - }; - }; - "@sentry/types-7.109.0" = { + "@sentry/types-7.116.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.109.0"; + version = "7.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.109.0.tgz"; - sha512 = "egCBnDv3YpVFoNzRLdP0soVrxVLCQ+rovREKJ1sw3rA2/MFH9WJ+DZZexsX89yeAFzy1IFsCp7/dEqudusml6g=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.116.0.tgz"; + sha512 = "QCCvG5QuQrwgKzV11lolNQPP2k67Q6HHD9vllZ/C4dkxkjoIym8Gy+1OgAN3wjsR0f/kG9o5iZyglgNpUVRapQ=="; }; }; - "@sentry/types-7.110.0" = { - name = "_at_sentry_slash_types"; - packageName = "@sentry/types"; - version = "7.110.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.110.0.tgz"; - sha512 = "DqYBLyE8thC5P5MuPn+sj8tL60nCd/f5cerFFPcudn5nJ4Zs1eI6lKlwwyHYTEu5c4KFjCB0qql6kXfwAHmTyA=="; - }; - }; - "@sentry/utils-7.109.0" = { + "@sentry/utils-7.116.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.109.0"; + version = "7.116.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.109.0.tgz"; - sha512 = "3RjxMOLMBwZ5VSiH84+o/3NY2An4Zldjz0EbfEQNRY9yffRiCPJSQiCJID8EoylCFOh/PAhPimBhqbtWJxX6iw=="; - }; - }; - "@sentry/utils-7.110.0" = { - name = "_at_sentry_slash_utils"; - packageName = "@sentry/utils"; - version = "7.110.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.110.0.tgz"; - sha512 = "VBsdLLN+5tf73fhf/Cm7JIsUJ6y9DkJj8h4I6Mxx0rszrvOyH6S5px40K+V4jdLBzMEvVinC7q2Cbf1YM18BSw=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.116.0.tgz"; + sha512 = "Vn9fcvwTq91wJvCd7WTMWozimqMi+dEZ3ie3EICELC2diONcN16ADFdzn65CQQbYwmUzRjN9EjDN2k41pKZWhQ=="; }; }; "@sideway/address-4.1.5" = { @@ -9445,15 +9202,6 @@ let sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="; }; }; - "@sigstore/bundle-1.1.0" = { - name = "_at_sigstore_slash_bundle"; - packageName = "@sigstore/bundle"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz"; - sha512 = "PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog=="; - }; - }; "@sigstore/bundle-2.3.2" = { name = "_at_sigstore_slash_bundle"; packageName = "@sigstore/bundle"; @@ -9472,15 +9220,6 @@ let sha512 = "JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg=="; }; }; - "@sigstore/protobuf-specs-0.2.1" = { - name = "_at_sigstore_slash_protobuf-specs"; - packageName = "@sigstore/protobuf-specs"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz"; - sha512 = "XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A=="; - }; - }; "@sigstore/protobuf-specs-0.3.2" = { name = "_at_sigstore_slash_protobuf-specs"; packageName = "@sigstore/protobuf-specs"; @@ -9490,15 +9229,6 @@ let sha512 = "c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw=="; }; }; - "@sigstore/sign-1.0.0" = { - name = "_at_sigstore_slash_sign"; - packageName = "@sigstore/sign"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz"; - sha512 = "INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA=="; - }; - }; "@sigstore/sign-2.3.2" = { name = "_at_sigstore_slash_sign"; packageName = "@sigstore/sign"; @@ -9508,15 +9238,6 @@ let sha512 = "5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA=="; }; }; - "@sigstore/tuf-1.0.3" = { - name = "_at_sigstore_slash_tuf"; - packageName = "@sigstore/tuf"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz"; - sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg=="; - }; - }; "@sigstore/tuf-2.3.4" = { name = "_at_sigstore_slash_tuf"; packageName = "@sigstore/tuf"; @@ -9598,15 +9319,6 @@ let sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; }; - "@sindresorhus/is-0.7.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; - }; - }; "@sindresorhus/is-3.1.2" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -9652,13 +9364,13 @@ let sha512 = "tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ=="; }; }; - "@smithy/abort-controller-3.0.1" = { + "@smithy/abort-controller-3.1.1" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.0.1.tgz"; - sha512 = "Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz"; + sha512 = "MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ=="; }; }; "@smithy/chunked-blob-reader-3.0.0" = { @@ -9679,121 +9391,121 @@ let sha512 = "VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg=="; }; }; - "@smithy/config-resolver-3.0.2" = { + "@smithy/config-resolver-3.0.5" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "3.0.2"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.2.tgz"; - sha512 = "wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz"; + sha512 = "SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA=="; }; }; - "@smithy/core-2.2.1" = { + "@smithy/core-2.3.0" = { name = "_at_smithy_slash_core"; packageName = "@smithy/core"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/core/-/core-2.2.1.tgz"; - sha512 = "R8Pzrr2v2oGUoj4CTZtKPr87lVtBsz7IUBGhSwS1kc6Cj0yPwNdYbkzhFsxhoDE9+BPl09VN/6rFsW9GJzWnBA=="; + url = "https://registry.npmjs.org/@smithy/core/-/core-2.3.0.tgz"; + sha512 = "tvSwf+PF5uurExeJsl+sSNn4bPsYShL86fJ/wcj63cioJ0IF131BxC5QxX8qkIISk7Pr7g2+UJH9ib4cCafvqw=="; }; }; - "@smithy/credential-provider-imds-3.1.1" = { + "@smithy/credential-provider-imds-3.2.0" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz"; - sha512 = "htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz"; + sha512 = "0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA=="; }; }; - "@smithy/eventstream-codec-3.1.0" = { + "@smithy/eventstream-codec-3.1.2" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.0.tgz"; - sha512 = "XFDl70ZY+FabSnTX3oQGGYvdbEaC8vPEFkCEOoBkumqaZIwR1WjjJCDu2VMXlHbKWKshefWXdT0NYteL5v6uFw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz"; + sha512 = "0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw=="; }; }; - "@smithy/eventstream-serde-browser-3.0.2" = { + "@smithy/eventstream-serde-browser-3.0.5" = { name = "_at_smithy_slash_eventstream-serde-browser"; packageName = "@smithy/eventstream-serde-browser"; - version = "3.0.2"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.2.tgz"; - sha512 = "6147vdedQGaWn3Nt4P1KV0LuV8IH4len1SAeycyko0p8oRLWFyYyx0L8JHGclePDSphkjxZqBHtyIfyupCaTGg=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.5.tgz"; + sha512 = "dEyiUYL/ekDfk+2Ra4GxV+xNnFoCmk1nuIXg+fMChFTrM2uI/1r9AdiTYzPqgb72yIv/NtAj6C3dG//1wwgakQ=="; }; }; - "@smithy/eventstream-serde-config-resolver-3.0.1" = { + "@smithy/eventstream-serde-config-resolver-3.0.3" = { name = "_at_smithy_slash_eventstream-serde-config-resolver"; packageName = "@smithy/eventstream-serde-config-resolver"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.1.tgz"; - sha512 = "6+B8P+5Q1mll4u7IoI7mpmYOSW3/c2r3WQoYLdqOjbIKMixJFGmN79ZjJiNMy4X2GZ4We9kQ6LfnFuczSlhcyw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz"; + sha512 = "NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ=="; }; }; - "@smithy/eventstream-serde-node-3.0.2" = { + "@smithy/eventstream-serde-node-3.0.4" = { name = "_at_smithy_slash_eventstream-serde-node"; packageName = "@smithy/eventstream-serde-node"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.2.tgz"; - sha512 = "DLtmGAfqxZAql8rB+HqyPlUne22u3EEVj+hxlUjgXk0hXt+SfLGK0ljzRFmiWQ3qGpHu1NdJpJA9e5JE/dJxFw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.4.tgz"; + sha512 = "mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg=="; }; }; - "@smithy/eventstream-serde-universal-3.0.2" = { + "@smithy/eventstream-serde-universal-3.0.4" = { name = "_at_smithy_slash_eventstream-serde-universal"; packageName = "@smithy/eventstream-serde-universal"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.2.tgz"; - sha512 = "d3SgAIQ/s4EbU8HAHJ8m2MMJPAL30nqJktyVgvqZWNznA8PJl61gJw5gj/yjIt/Fvs3d4fU8FmPPAhdp2yr/7A=="; + url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.4.tgz"; + sha512 = "Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A=="; }; }; - "@smithy/fetch-http-handler-3.0.2" = { + "@smithy/fetch-http-handler-3.2.3" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "3.0.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.2.tgz"; - sha512 = "0nW6tLK0b7EqSsfKvnOmZCgJqnodBAnvqcrlC5dotKfklLedPTRGsQamSVbVDWyuU/QGg+YbZDJUQ0CUufJXZQ=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.3.tgz"; + sha512 = "m4dzQeafWi5KKCCnDwGGHYk9lqcLs9LvlXZRB0J38DMectsEbxdiO/Rx1NaYYMIkath7AnjpR+r0clL+7dwclQ=="; }; }; - "@smithy/hash-blob-browser-3.1.0" = { + "@smithy/hash-blob-browser-3.1.2" = { name = "_at_smithy_slash_hash-blob-browser"; packageName = "@smithy/hash-blob-browser"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.0.tgz"; - sha512 = "lKEHDN6bLzYdx5cFmdMHfYVmmTZTmjphwPBSumgkaniEYwRAXnbDEGETeuzfquS9Py1aH6cmqzXWxxkD7mV3sA=="; + url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz"; + sha512 = "hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg=="; }; }; - "@smithy/hash-node-3.0.1" = { + "@smithy/hash-node-3.0.3" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.1.tgz"; - sha512 = "w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz"; + sha512 = "2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw=="; }; }; - "@smithy/hash-stream-node-3.1.0" = { + "@smithy/hash-stream-node-3.1.2" = { name = "_at_smithy_slash_hash-stream-node"; packageName = "@smithy/hash-stream-node"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.0.tgz"; - sha512 = "OkU9vjN17yYsXTSrouctZn2iYwG4z8WSc7F50+9ogG2crOtMopkop+22j35tX2ry2i/vLRCYgnqEmBWfvnYT2g=="; + url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz"; + sha512 = "PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g=="; }; }; - "@smithy/invalid-dependency-3.0.1" = { + "@smithy/invalid-dependency-3.0.3" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz"; - sha512 = "RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz"; + sha512 = "ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw=="; }; }; "@smithy/is-array-buffer-2.2.0" = { @@ -9814,166 +9526,166 @@ let sha512 = "+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ=="; }; }; - "@smithy/md5-js-3.0.1" = { + "@smithy/md5-js-3.0.3" = { name = "_at_smithy_slash_md5-js"; packageName = "@smithy/md5-js"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.1.tgz"; - sha512 = "wQa0YGsR4Zb1GQLGwOOgRAbkj22P6CFGaFzu5bKk8K4HVNIC2dBlIxqZ/baF0pLiSZySAPdDZT7CdZ7GkGXt5A=="; + url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz"; + sha512 = "O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q=="; }; }; - "@smithy/middleware-content-length-3.0.1" = { + "@smithy/middleware-content-length-3.0.5" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "3.0.1"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz"; - sha512 = "6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz"; + sha512 = "ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw=="; }; }; - "@smithy/middleware-endpoint-3.0.2" = { + "@smithy/middleware-endpoint-3.1.0" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz"; - sha512 = "gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz"; + sha512 = "5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw=="; }; }; - "@smithy/middleware-retry-3.0.4" = { + "@smithy/middleware-retry-3.0.12" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "3.0.4"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.4.tgz"; - sha512 = "Tu+FggbLNF5G9L6Wi8o32Mg4bhlBInWlhhaFKyytGRnkfxGopxFVXJQn7sjZdFYJyTz6RZZa06tnlvavUgtoVg=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.12.tgz"; + sha512 = "CncrlzNiBzuZZYLJ49H4dC6FEz62hnv0Y0nJyl/oZ73FX/9CDHWkIRD4ZOf5ntB6QyYWx0G3mXAOHOcM5omlLg=="; }; }; - "@smithy/middleware-serde-3.0.1" = { + "@smithy/middleware-serde-3.0.3" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz"; - sha512 = "ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz"; + sha512 = "puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA=="; }; }; - "@smithy/middleware-stack-3.0.1" = { + "@smithy/middleware-stack-3.0.3" = { name = "_at_smithy_slash_middleware-stack"; packageName = "@smithy/middleware-stack"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz"; - sha512 = "fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz"; + sha512 = "r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA=="; }; }; - "@smithy/node-config-provider-3.1.1" = { + "@smithy/node-config-provider-3.1.4" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz"; - sha512 = "z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz"; + sha512 = "YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ=="; }; }; - "@smithy/node-http-handler-3.0.1" = { + "@smithy/node-http-handler-3.1.4" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "3.0.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz"; - sha512 = "hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz"; + sha512 = "+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg=="; }; }; - "@smithy/property-provider-3.1.1" = { + "@smithy/property-provider-3.1.3" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.1.tgz"; - sha512 = "YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz"; + sha512 = "zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g=="; }; }; - "@smithy/protocol-http-4.0.1" = { + "@smithy/protocol-http-4.1.0" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.1.tgz"; - sha512 = "eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.0.tgz"; + sha512 = "dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA=="; }; }; - "@smithy/querystring-builder-3.0.1" = { + "@smithy/querystring-builder-3.0.3" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz"; - sha512 = "vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz"; + sha512 = "vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw=="; }; }; - "@smithy/querystring-parser-3.0.1" = { + "@smithy/querystring-parser-3.0.3" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz"; - sha512 = "Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz"; + sha512 = "zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ=="; }; }; - "@smithy/service-error-classification-3.0.1" = { + "@smithy/service-error-classification-3.0.3" = { name = "_at_smithy_slash_service-error-classification"; packageName = "@smithy/service-error-classification"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz"; - sha512 = "ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA=="; + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz"; + sha512 = "Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ=="; }; }; - "@smithy/shared-ini-file-loader-3.1.1" = { + "@smithy/shared-ini-file-loader-3.1.4" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz"; - sha512 = "nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz"; + sha512 = "qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ=="; }; }; - "@smithy/signature-v4-3.1.0" = { + "@smithy/signature-v4-4.1.0" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "3.1.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.0.tgz"; - sha512 = "m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.0.tgz"; + sha512 = "aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag=="; }; }; - "@smithy/smithy-client-3.1.2" = { + "@smithy/smithy-client-3.1.10" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "3.1.2"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.2.tgz"; - sha512 = "f3eQpczBOFUtdT/ptw2WpUKu1qH1K7xrssrSiHYtd9TuLXkvFqb88l9mz9FHeUVNSUxSnkW1anJnw6rLwUKzQQ=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.10.tgz"; + sha512 = "OLHJo0DAmhX69YUF3WbNfzzxGIncGdxao+v27o24msdhin2AWTxJMaBQ3iPGfIrWMjy+8YGMXUJ7PrkJlpznTw=="; }; }; - "@smithy/types-3.1.0" = { + "@smithy/types-3.3.0" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-3.1.0.tgz"; - sha512 = "qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz"; + sha512 = "IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA=="; }; }; - "@smithy/url-parser-3.0.1" = { + "@smithy/url-parser-3.0.3" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.1.tgz"; - sha512 = "G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz"; + sha512 = "pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A=="; }; }; "@smithy/util-base64-3.0.0" = { @@ -10030,31 +9742,31 @@ let sha512 = "pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ=="; }; }; - "@smithy/util-defaults-mode-browser-3.0.4" = { + "@smithy/util-defaults-mode-browser-3.0.12" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "3.0.4"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.4.tgz"; - sha512 = "sXtin3Mue3A3xo4+XkozpgPptgmRwvNPOqTvb3ANGTCzzoQgAPBNjpE+aXCINaeSMXwHmv7E2oEn2vWdID+SAQ=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.12.tgz"; + sha512 = "5b81UUPKjD61DMg7JBYzkSM1Vny/RfRRhnZYzuWjm25OyrEXsar3RgbbXYR+otdx+wrPR3QmuFtbDZmEgGpwVg=="; }; }; - "@smithy/util-defaults-mode-node-3.0.4" = { + "@smithy/util-defaults-mode-node-3.0.12" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "3.0.4"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.4.tgz"; - sha512 = "CUF6TyxLh3CgBRVYgZNOPDfzHQjeQr0vyALR6/DkQkOm7rNfGEzW1BRFi88C73pndmfvoiIT7ochuT76OPz9Dw=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.12.tgz"; + sha512 = "g2NdtGDN67PepBs0t/mkrlQ2nVkhKUDJZCNmEJIarzYq2sK4mKO9t61Nzlv+gHEEC3ESfRaMCC/Ol3ZfCZYg7Q=="; }; }; - "@smithy/util-endpoints-2.0.2" = { + "@smithy/util-endpoints-2.0.5" = { name = "_at_smithy_slash_util-endpoints"; packageName = "@smithy/util-endpoints"; - version = "2.0.2"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz"; - sha512 = "4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg=="; + url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz"; + sha512 = "ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg=="; }; }; "@smithy/util-hex-encoding-3.0.0" = { @@ -10066,31 +9778,31 @@ let sha512 = "eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ=="; }; }; - "@smithy/util-middleware-3.0.1" = { + "@smithy/util-middleware-3.0.3" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.1.tgz"; - sha512 = "WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz"; + sha512 = "l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw=="; }; }; - "@smithy/util-retry-3.0.1" = { + "@smithy/util-retry-3.0.3" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.1.tgz"; - sha512 = "5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz"; + sha512 = "AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w=="; }; }; - "@smithy/util-stream-3.0.2" = { + "@smithy/util-stream-3.1.2" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "3.0.2"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.2.tgz"; - sha512 = "n5Obp5AnlI6qHo8sbupwrcpBe6vFp4qkl0SRNuExKPNrH3ABAMG2ZszRTIUIv2b4AsFrCO+qiy4uH1Q3z1dxTA=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.2.tgz"; + sha512 = "08zDzB7BqvybHfZKnav5lL1UniFDK6o6nZ3OWp60PKsi/na2LpU6OX8MCtDNVaPBpKpc8EH26fvFhNT6wvMlbw=="; }; }; "@smithy/util-uri-escape-3.0.0" = { @@ -10120,13 +9832,13 @@ let sha512 = "rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA=="; }; }; - "@smithy/util-waiter-3.0.1" = { + "@smithy/util-waiter-3.1.2" = { name = "_at_smithy_slash_util-waiter"; packageName = "@smithy/util-waiter"; - version = "3.0.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.0.1.tgz"; - sha512 = "wwnrVQdjQxvWGOAiLmqlEhENGCcDIN+XJ/+usPOgSZObAslrCXgKlkX7rNVwIWW2RhPguTKthvF+4AoO0Z6KpA=="; + url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz"; + sha512 = "4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw=="; }; }; "@socket.io/component-emitter-3.1.2" = { @@ -10147,13 +9859,13 @@ let sha512 = "0p9uXkuB22qGdNfy3VeEhxkU5uwvp/KrBTAbrLBURv6ilxIVwanKwjMc41lQfIVgPGcOkmLbTolfFrSsueu7zA=="; }; }; - "@stoplight/json-3.21.0" = { + "@stoplight/json-3.21.4" = { name = "_at_stoplight_slash_json"; packageName = "@stoplight/json"; - version = "3.21.0"; + version = "3.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/json/-/json-3.21.0.tgz"; - sha512 = "5O0apqJ/t4sIevXCO3SBN9AHCEKKR/Zb4gaj7wYe5863jme9g02Q0n/GhM7ZCALkL+vGPTe4ZzTETP8TFtsw3g=="; + url = "https://registry.npmjs.org/@stoplight/json/-/json-3.21.4.tgz"; + sha512 = "dNfiOuyl3/62Bs7o21v6EUvvhUFsPTK5kJMlST1SMnEyjyyMB/b0uoc7w3Df+TSGB2j2+vep4gdsKG3eUpc7Lg=="; }; }; "@stoplight/json-ref-readers-1.2.2" = { @@ -10336,40 +10048,40 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc-node/core-1.13.1" = { + "@swc-node/core-1.13.3" = { name = "_at_swc-node_slash_core"; packageName = "@swc-node/core"; - version = "1.13.1"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/core/-/core-1.13.1.tgz"; - sha512 = "emB5l2nZsXjUEAuusqjYvWnQMLWZp6K039Mv8aq5SX1rsNM/N7DNhw1i4/DX7AyzNZ0tT+ASWyTvqEURldp5HA=="; + url = "https://registry.npmjs.org/@swc-node/core/-/core-1.13.3.tgz"; + sha512 = "OGsvXIid2Go21kiNqeTIn79jcaX4l0G93X2rAnas4LFoDyA9wAwVK7xZdm+QsKoMn5Mus2yFLCc4OtX2dD/PWA=="; }; }; - "@swc-node/register-1.9.2" = { + "@swc-node/register-1.10.9" = { name = "_at_swc-node_slash_register"; packageName = "@swc-node/register"; - version = "1.9.2"; + version = "1.10.9"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/register/-/register-1.9.2.tgz"; - sha512 = "BBjg0QNuEEmJSoU/++JOXhrjWdu3PTyYeJWsvchsI0Aqtj8ICkz/DqlwtXbmZVZ5vuDPpTfFlwDBZe81zgShMA=="; + url = "https://registry.npmjs.org/@swc-node/register/-/register-1.10.9.tgz"; + sha512 = "iXy2sjP0phPEpK2yivjRC3PAgoLaT4sjSk0LDWCTdcTBJmR4waEog0E6eJbvoOkLkOtWw37SB8vCkl/bbh4+8A=="; }; }; - "@swc-node/sourcemap-support-0.5.0" = { + "@swc-node/sourcemap-support-0.5.1" = { name = "_at_swc-node_slash_sourcemap-support"; packageName = "@swc-node/sourcemap-support"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.5.0.tgz"; - sha512 = "fbhjL5G0YvFoWwNhWleuBUfotiX+USiA9oJqu9STFw+Hb0Cgnddn+HVS/K5fI45mn92e8V+cHD2jgFjk4w2T9Q=="; + url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.5.1.tgz"; + sha512 = "JxIvIo/Hrpv0JCHSyRpetAdQ6lB27oFYhv0PKCNf1g2gUXOjpeR1exrXccRxLMuAV5WAmGFBwRnNOJqN38+qtg=="; }; }; - "@swc/core-1.5.29" = { + "@swc/core-1.7.1" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.5.29"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.5.29.tgz"; - sha512 = "nvTtHJI43DUSOAf3h9XsqYg8YXKc0/N4il9y4j0xAkO0ekgDNo+3+jbw6MInawjKJF9uulyr+f5bAutTsOKVlw=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.7.1.tgz"; + sha512 = "M4gxJcvzZCH+QQJGVJDF3kT46C05IUPTFcA1wA65WAdg87MDzpr1mwtB/FmPsdcRFRbJIxET6uCsWgubn+KnJQ=="; }; }; "@swc/counter-0.1.3" = { @@ -10381,31 +10093,31 @@ let sha512 = "e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="; }; }; - "@swc/helpers-0.5.11" = { + "@swc/helpers-0.5.12" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.11"; + version = "0.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.11.tgz"; - sha512 = "YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.12.tgz"; + sha512 = "KMZNXiGibsW9kvZAO1Pam2JPTDBm+KSHMMHWdsyI/1DbIZjT2A6Gy3hblVXUMEDvUAKq+e0vL0X0o54owWji7g=="; }; }; - "@swc/types-0.1.8" = { + "@swc/types-0.1.12" = { name = "_at_swc_slash_types"; packageName = "@swc/types"; - version = "0.1.8"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/types/-/types-0.1.8.tgz"; - sha512 = "RNFA3+7OJFNYY78x0FYwi1Ow+iF1eF5WvmfY1nXPOEH4R2p/D4Cr1vzje7dNAI2aLFqpv8Wyz4oKSWqIZArpQA=="; + url = "https://registry.npmjs.org/@swc/types/-/types-0.1.12.tgz"; + sha512 = "wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA=="; }; }; - "@swc/wasm-1.5.29" = { + "@swc/wasm-1.7.1" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.5.29"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.5.29.tgz"; - sha512 = "uCvf2Sm9lGcwtqAoeB8Huh9POeM1tZqoMRwkQrdhUwaysNaeQJhCAU0zx5KeDjVna8W8/ELjgZW7HHZSw8Ifhw=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.7.1.tgz"; + sha512 = "K+o9bzvz6VhPr3E4je1Paz7p8zwNM6QBSlvwhGMFgxGXSb0X3yz0dihU/DUzqHwBmc1QLmN1yE6o7jqMtCJgmg=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10462,67 +10174,67 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@thaunknown/idb-chunk-store-1.0.2" = { + "@thaunknown/idb-chunk-store-1.0.4" = { name = "_at_thaunknown_slash_idb-chunk-store"; packageName = "@thaunknown/idb-chunk-store"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@thaunknown/idb-chunk-store/-/idb-chunk-store-1.0.2.tgz"; - sha512 = "UdKshbKdHDP+p0XPdv55QiU/scdB9TzvovGFSgXThf+7Yd3noLeYp6KpkYyc1jzUXvI3/8+TemPeASOimrOXvw=="; + url = "https://registry.npmjs.org/@thaunknown/idb-chunk-store/-/idb-chunk-store-1.0.4.tgz"; + sha512 = "4/XDQZHKHyJCGeqnVjHyqeAXClZJ9l90rRvoTslUiuvwTGAUpIb3poL0LfGJEdSuWV+zzGdDjIm/3L4x6crwbg=="; }; }; - "@thaunknown/simple-peer-10.0.7" = { + "@thaunknown/simple-peer-10.0.10" = { name = "_at_thaunknown_slash_simple-peer"; packageName = "@thaunknown/simple-peer"; - version = "10.0.7"; + version = "10.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@thaunknown/simple-peer/-/simple-peer-10.0.7.tgz"; - sha512 = "b4oPNaJEWk9UT/ADV8IFWcAyow+gOPLa73SptuOqm6IdMDr4zlsqGsdl4LQmvgMKMgWAOHdVViw/RYF5qYvkCg=="; + url = "https://registry.npmjs.org/@thaunknown/simple-peer/-/simple-peer-10.0.10.tgz"; + sha512 = "RtoYQChP5clkbh+crUhv0LD/fdzgNO/Ah/SBdcSqla6xY6GK50ukNhq39H4vzAKoYqvDu01Hc+JSD9DxCdoBOw=="; }; }; - "@thaunknown/simple-websocket-9.1.1" = { + "@thaunknown/simple-websocket-9.1.3" = { name = "_at_thaunknown_slash_simple-websocket"; packageName = "@thaunknown/simple-websocket"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@thaunknown/simple-websocket/-/simple-websocket-9.1.1.tgz"; - sha512 = "vzQloFWRodRZqZhpxMpBljFtISesY8TihA8T5uKwCYdj2I1ImMhE/gAeTCPsCGOtxJfGKu3hw/is6MXauWLjOg=="; + url = "https://registry.npmjs.org/@thaunknown/simple-websocket/-/simple-websocket-9.1.3.tgz"; + sha512 = "pf/FCJsgWtLJiJmIpiSI7acOZVq3bIQCpnNo222UFc8Ph1lOUOTpe6LoYhhiOSKB9GUaWJEVUtZ+sK1/aBgU5Q=="; }; }; - "@thaunknown/thirty-two-1.0.3" = { + "@thaunknown/thirty-two-1.0.5" = { name = "_at_thaunknown_slash_thirty-two"; packageName = "@thaunknown/thirty-two"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@thaunknown/thirty-two/-/thirty-two-1.0.3.tgz"; - sha512 = "bD6PvWbaf53JC04O7WnGDjqZBDgja/KT2Jd/6I2vJBIy+DLmQfQJZZ/G+16nAkVq1yGTIkO4rfc4RlH0DmEEqA=="; + url = "https://registry.npmjs.org/@thaunknown/thirty-two/-/thirty-two-1.0.5.tgz"; + sha512 = "Q53KyCXweV1CS62EfqtPDqfpksn5keQ59PGqzzkK+g8Vif1jB4inoBCcs/BUSdsqddhE3G+2Fn+4RX3S6RqT0A=="; }; }; - "@tinyhttp/accepts-2.2.1" = { + "@tinyhttp/accepts-2.2.2" = { name = "_at_tinyhttp_slash_accepts"; packageName = "@tinyhttp/accepts"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.1.tgz"; - sha512 = "2DHJLSJX1gqR5F6nKuu7+hyCNoPRNOxvnQ11m0X8klkSVoBFBO2HMf3bJ8P+fmNv1e6RjHzHF+G+hJ3dxXIQXQ=="; + url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.2.tgz"; + sha512 = "DmngnwOaPgNUGgTpX1UdlNrXaGG6k5rHFzslcYlvSQIg7s0PI6bF86U0fYq3q+yhJhKbnwzFez0wU1lAP+bKvA=="; }; }; - "@tinyhttp/app-2.2.3" = { + "@tinyhttp/app-2.3.0" = { name = "_at_tinyhttp_slash_app"; packageName = "@tinyhttp/app"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.2.3.tgz"; - sha512 = "njr499Tx9BwlnIGfJjTuqfPwaUSTsjhUeRq/jVtHJpS95UgWECH7kiq8+bEx6TFRXiNKpARZ6KJUemlMyV+iCg=="; + url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.3.0.tgz"; + sha512 = "2jGV5Er72wywjM8HBjYszECOiIzgNcRrO/kq1gHQqOQvrLa1KzIpUD1CCvPALUXiko7ZK2zKq5WyL+yRPC50uw=="; }; }; - "@tinyhttp/content-disposition-2.2.0" = { + "@tinyhttp/content-disposition-2.2.1" = { name = "_at_tinyhttp_slash_content-disposition"; packageName = "@tinyhttp/content-disposition"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.0.tgz"; - sha512 = "w1dJaSAtcCinOlT/YQg35RnFCOBbCHBGDVhH4yLoiJVtecRAJ2cYMf5HP+UhfbXURa38GC8fkRXO0vODDTjmeg=="; + url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.1.tgz"; + sha512 = "PQ5IWdOn7arScqTV+usIDJvwbanoAXtaopzgxjMS9y7TFwLSIelCblihRBEVIPIkIpsdhSJFH3RF+Daosyj+Aw=="; }; }; "@tinyhttp/content-type-0.1.4" = { @@ -10534,31 +10246,31 @@ let sha512 = "dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ=="; }; }; - "@tinyhttp/cookie-2.1.0" = { + "@tinyhttp/cookie-2.1.1" = { name = "_at_tinyhttp_slash_cookie"; packageName = "@tinyhttp/cookie"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.0.tgz"; - sha512 = "o56utxXvIuLTCtPm66r8lcyUufpw0RkO+u4wQrTbc6snyyGZZ9hHzGRxPyko0ks90ctOkLh0mNKn7YZaTWlvfw=="; + url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.1.tgz"; + sha512 = "h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA=="; }; }; - "@tinyhttp/cookie-signature-2.1.0" = { + "@tinyhttp/cookie-signature-2.1.1" = { name = "_at_tinyhttp_slash_cookie-signature"; packageName = "@tinyhttp/cookie-signature"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.0.tgz"; - sha512 = "bpOXBGf9rKoajtEG75O7xjwW+u2I/NNPkJWJTDdr6j7Vx0lG5R9Hnl3ty80Af4jwyo90ywXVpZIxKLubPK6RzA=="; + url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz"; + sha512 = "VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw=="; }; }; - "@tinyhttp/cors-2.0.0" = { + "@tinyhttp/cors-2.0.1" = { name = "_at_tinyhttp_slash_cors"; packageName = "@tinyhttp/cors"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.0.tgz"; - sha512 = "IwQsPBnK+gRrhTsPA4FPOfbNzZZt8cVsOIMNFb6HzoScaiWcoLEogL0Bz/aBSm8KM13uieVXoVT6udMqhqUS2A=="; + url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.1.tgz"; + sha512 = "qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A=="; }; }; "@tinyhttp/encode-url-2.1.1" = { @@ -10570,49 +10282,49 @@ let sha512 = "AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw=="; }; }; - "@tinyhttp/etag-2.1.1" = { + "@tinyhttp/etag-2.1.2" = { name = "_at_tinyhttp_slash_etag"; packageName = "@tinyhttp/etag"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.1.tgz"; - sha512 = "AcHGK1nMlKIHmlbg8bb8UY/KhiaAX17SAn3/6wlgwwdX4UizA8HETDfCH3KLdu2ZASokynuwVFNDJCo1DAawGw=="; + url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.2.tgz"; + sha512 = "j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw=="; }; }; - "@tinyhttp/forwarded-2.1.2" = { + "@tinyhttp/forwarded-2.1.1" = { name = "_at_tinyhttp_slash_forwarded"; packageName = "@tinyhttp/forwarded"; - version = "2.1.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.2.tgz"; - sha512 = "9H/eulJ68ElY/+zYpTpNhZ7vxGV+cnwaR6+oQSm7bVgZMyuQfgROW/qvZuhmgDTIxnGMXst+Ba4ij6w6Krcs3w=="; + url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.1.tgz"; + sha512 = "nO3kq0R1LRl2+CAMlnggm22zE6sT8gfvGbNvSitV6F9eaUSurHP0A8YZFMihSkugHxK+uIegh1TKrqgD8+lyGQ=="; }; }; - "@tinyhttp/proxy-addr-2.1.3" = { + "@tinyhttp/proxy-addr-2.2.0" = { name = "_at_tinyhttp_slash_proxy-addr"; packageName = "@tinyhttp/proxy-addr"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.1.3.tgz"; - sha512 = "Z0Q/0wEJpvall7LlBezXDy96CXLzPZb6xJawwEgsMXXQhmjb+r3EkpCBwMrWm2GlbJFL/UxKxpdumiNW3Ne06g=="; + url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.2.0.tgz"; + sha512 = "WM/PPL9xNvrs7/8Om5nhKbke5FHrP3EfjOOR+wBnjgESfibqn0K7wdUTnzSLp1lBmemr88os1XvzwymSgaibyA=="; }; }; - "@tinyhttp/req-2.2.2" = { + "@tinyhttp/req-2.2.3" = { name = "_at_tinyhttp_slash_req"; packageName = "@tinyhttp/req"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.2.tgz"; - sha512 = "LaL/RFRro0qjOQ0g3vxE6i9bWl9hhv9en7opykzLU4NimFPg2C8wl7Qkoyc0mDuoRMQmWpq730PDWXSUmLiT2A=="; + url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.3.tgz"; + sha512 = "HtIa4Gaa8QFTlmsvoif/B7yMK5H0WBUegH2kKW6scNwOpFXyxEk+VsctrIVgORrP5lybXAIRXlRhGuBBAMlVhw=="; }; }; - "@tinyhttp/res-2.2.2" = { + "@tinyhttp/res-2.2.3" = { name = "_at_tinyhttp_slash_res"; packageName = "@tinyhttp/res"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.2.tgz"; - sha512 = "YeEYFwozag2qO5xoTj1Df+d5l6MXUefxz3xbcJD6ASVqUQytTEYtOC0FjhQKLpTLjMJKlS4mkKmeIdDLFO9btg=="; + url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.3.tgz"; + sha512 = "PGl88OOdmMcOuKZaTbhGKAWPoJJf3+EfKIad8ydzjdenVjrTZZjIYJtmwYiUBeEice+YkOCO67qCIekVO5mHlw=="; }; }; "@tinyhttp/router-2.2.2" = { @@ -10624,22 +10336,22 @@ let sha512 = "i+1ouhPyTqcuJuOsKqmo7i+YD++0RF2lQLhBpcTnsaegD2gTEa3xW2Pcz7spYQGo7K8PQYtOrL7m9b14+BEXqg=="; }; }; - "@tinyhttp/send-2.2.1" = { + "@tinyhttp/send-2.2.2" = { name = "_at_tinyhttp_slash_send"; packageName = "@tinyhttp/send"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.1.tgz"; - sha512 = "uFW0fxmYIPpB5RKP2vpL8QuafjUrCBmBWxZMIhFb7uBQky87t7x1QdpRB0vc+w11a2kok+Nc8ClD5kc6CRJCFg=="; + url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.2.tgz"; + sha512 = "TZkGy9EdGk+vwYWQnjArQftaXAUIgp/fFlgaxlpamsCZKy7o+CNJ75xty4H3SaY3ZPgN47wv8rnJ50rDRQdFFQ=="; }; }; - "@tinyhttp/type-is-2.2.2" = { + "@tinyhttp/type-is-2.2.3" = { name = "_at_tinyhttp_slash_type-is"; packageName = "@tinyhttp/type-is"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.2.tgz"; - sha512 = "DmTm0MkdrUxEPI2WBBoYJT0bitWx6+xeUd3lya1NGbKmYArzyUE+KVro/9y/h6Bxh+RaAKNeTCF4H/ksbe/ULQ=="; + url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.3.tgz"; + sha512 = "RsZ4+or5xI+wrTlrd+/cLZELoJDMd1HSp+1P23VOZSu1xPAsO1XLf1FgluO8GbEW9Ll/l2yC7mO6diKzjc06HA=="; }; }; "@tinyhttp/url-2.1.1" = { @@ -10777,15 +10489,6 @@ let sha512 = "ec4tjL2Rr0pkZ5hww65c+EEPYwxOi4Ryv+0MtjeaSQRJyq322Q27eOQiFbuNgw2hpL4hB1/W/HBGk3VKS43osg=="; }; }; - "@tufjs/canonical-json-1.0.0" = { - name = "_at_tufjs_slash_canonical-json"; - packageName = "@tufjs/canonical-json"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz"; - sha512 = "QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ=="; - }; - }; "@tufjs/canonical-json-2.0.0" = { name = "_at_tufjs_slash_canonical-json"; packageName = "@tufjs/canonical-json"; @@ -10795,15 +10498,6 @@ let sha512 = "yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA=="; }; }; - "@tufjs/models-1.0.4" = { - name = "_at_tufjs_slash_models"; - packageName = "@tufjs/models"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz"; - sha512 = "qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A=="; - }; - }; "@tufjs/models-2.0.1" = { name = "_at_tufjs_slash_models"; packageName = "@tufjs/models"; @@ -10831,13 +10525,13 @@ let sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ=="; }; }; - "@types/accepts-1.3.7" = { - name = "_at_types_slash_accepts"; - packageName = "@types/accepts"; - version = "1.3.7"; + "@tybys/wasm-util-0.9.0" = { + name = "_at_tybys_slash_wasm-util"; + packageName = "@tybys/wasm-util"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ=="; + url = "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz"; + sha512 = "6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw=="; }; }; "@types/acorn-4.0.6" = { @@ -10876,15 +10570,6 @@ let sha512 = "V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A=="; }; }; - "@types/body-parser-1.19.2" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; - }; - }; "@types/body-parser-1.19.5" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -10921,13 +10606,13 @@ let sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; - "@types/cli-progress-3.11.5" = { + "@types/cli-progress-3.11.6" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; - version = "3.11.5"; + version = "3.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz"; - sha512 = "D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g=="; + url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.6.tgz"; + sha512 = "cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA=="; }; }; "@types/commander-2.12.2" = { @@ -11002,15 +10687,6 @@ let sha512 = "he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q=="; }; }; - "@types/cors-2.8.12" = { - name = "_at_types_slash_cors"; - packageName = "@types/cors"; - version = "2.8.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; - sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; - }; - }; "@types/cors-2.8.17" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; @@ -11065,15 +10741,6 @@ let sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A=="; }; }; - "@types/ejs-3.1.5" = { - name = "_at_types_slash_ejs"; - packageName = "@types/ejs"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz"; - sha512 = "nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="; - }; - }; "@types/es-aggregate-error-1.0.6" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; @@ -11083,13 +10750,22 @@ let sha512 = "qJ7LIFp06h1QE1aVxbVd+zJP2wdaugYXYfd6JxsyRMrYHaxb6itXPogW2tz+ylUJ1n1b+JF1PHyYCfYHm0dvUg=="; }; }; - "@types/eslint-8.56.10" = { + "@types/eslint-8.56.11" = { + name = "_at_types_slash_eslint"; + packageName = "@types/eslint"; + version = "8.56.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz"; + sha512 = "sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q=="; + }; + }; + "@types/eslint-9.6.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.56.10"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz"; - sha512 = "Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz"; + sha512 = "gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg=="; }; }; "@types/eslint-scope-3.7.7" = { @@ -11119,15 +10795,6 @@ let sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg=="; }; }; - "@types/express-4.17.14" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; - }; - }; "@types/express-4.17.21" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -11137,22 +10804,13 @@ let sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="; }; }; - "@types/express-serve-static-core-4.17.31" = { + "@types/express-serve-static-core-4.19.5" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.31"; + version = "4.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; - }; - }; - "@types/express-serve-static-core-4.19.3" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.3.tgz"; - sha512 = "KOzM7MhcBFlmnlr/fzISFF5vGWVSvN6fTd4T+ExOt08bA/dA5kpSzY52nMsI1KDFmUREpJelPYyuslLRSjjgCg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz"; + sha512 = "y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg=="; }; }; "@types/geojson-7946.0.4" = { @@ -11245,15 +10903,6 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.10" = { - name = "_at_types_slash_inquirer"; - packageName = "@types/inquirer"; - version = "8.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz"; - sha512 = "IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA=="; - }; - }; "@types/is-empty-1.2.3" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; @@ -11308,15 +10957,6 @@ let sha512 = "jd+Q+sD20Qfu9e2aEXogiO3vpOC1PYJOUdyN9gvs4Qrvkg4wF43L5OhqrPeokdv8TL0/mXoYfpkcoGZMNN2pkQ=="; }; }; - "@types/jscodeshift-0.7.2" = { - name = "_at_types_slash_jscodeshift"; - packageName = "@types/jscodeshift"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.2.tgz"; - sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; - }; - }; "@types/json-schema-7.0.15" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -11344,22 +10984,13 @@ let sha512 = "sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q=="; }; }; - "@types/lodash-4.17.5" = { + "@types/lodash-4.17.7" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.17.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz"; - sha512 = "MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw=="; - }; - }; - "@types/long-4.0.2" = { - name = "_at_types_slash_long"; - packageName = "@types/long"; - version = "4.0.2"; + version = "4.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"; - sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz"; + sha512 = "8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA=="; }; }; "@types/lru-cache-5.1.1" = { @@ -11371,13 +11002,13 @@ let sha512 = "ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw=="; }; }; - "@types/markdown-it-14.1.1" = { + "@types/markdown-it-14.1.2" = { name = "_at_types_slash_markdown-it"; packageName = "@types/markdown-it"; - version = "14.1.1"; + version = "14.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.1.tgz"; - sha512 = "4NpsnpYl2Gt1ljyBGrKMxFYAYvpqbnnkgP/i/g+NLpjEUa3obn1XJCur9YbEXKDAkaXqsR1LbDnGEJ0MmKFxfg=="; + url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz"; + sha512 = "promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog=="; }; }; "@types/mdast-3.0.15" = { @@ -11488,15 +11119,6 @@ let sha512 = "ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg=="; }; }; - "@types/node-10.17.60" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.17.60"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz"; - sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; - }; - }; "@types/node-14.18.63" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -11515,22 +11137,22 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.11" = { + "@types/node-16.18.104" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.11"; + version = "16.18.104"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz"; - sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz"; + sha512 = "OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ=="; }; }; - "@types/node-16.18.98" = { + "@types/node-16.18.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.98"; + version = "16.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.98.tgz"; - sha512 = "fpiC20NvLpTLAzo3oVBKIqBGR6Fx/8oAK/SSf7G+fydnXMY1x4x9RZ6sBXhqKlCU21g2QapUsbLlhv3+a7wS+Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz"; + sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; }; "@types/node-16.9.1" = { @@ -11542,31 +11164,31 @@ let sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.19.30" = { + "@types/node-18.19.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.19.30"; + version = "18.19.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz"; - sha512 = "453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.19.34.tgz"; + sha512 = "eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g=="; }; }; - "@types/node-18.19.34" = { + "@types/node-18.19.42" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.19.34"; + version = "18.19.42"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.19.34.tgz"; - sha512 = "eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz"; + sha512 = "d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg=="; }; }; - "@types/node-20.14.2" = { + "@types/node-20.14.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.14.2"; + version = "20.14.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz"; - sha512 = "xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz"; + sha512 = "r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ=="; }; }; "@types/node-6.14.13" = { @@ -11668,6 +11290,15 @@ let sha512 = "hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw=="; }; }; + "@types/readable-stream-4.0.15" = { + name = "_at_types_slash_readable-stream"; + packageName = "@types/readable-stream"; + version = "4.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.15.tgz"; + sha512 = "oAZ3kw+kJFkEqyh7xORZOku1YAKvsFTogRY8kVl4vHpEKiDkfnSA/My8haRE7fvmix5Zyy+1pwzOi7yycGLBJw=="; + }; + }; "@types/responselike-1.0.3" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; @@ -11749,13 +11380,13 @@ let sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw=="; }; }; - "@types/shimmer-1.0.5" = { + "@types/shimmer-1.2.0" = { name = "_at_types_slash_shimmer"; packageName = "@types/shimmer"; - version = "1.0.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz"; - sha512 = "9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww=="; + url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz"; + sha512 = "UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg=="; }; }; "@types/sizzle-2.3.8" = { @@ -11875,13 +11506,13 @@ let sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; - "@types/ws-8.5.10" = { + "@types/ws-8.5.11" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.10"; + version = "8.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz"; - sha512 = "vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.11.tgz"; + sha512 = "4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w=="; }; }; "@types/yargs-15.0.19" = { @@ -12046,13 +11677,13 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-8.2.2" = { + "@vercel/build-utils-8.3.5" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "8.2.2"; + version = "8.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.2.2.tgz"; - sha512 = "+Nf/Yk3GeMI47L/g5KYEvsj7yqVkhb6vZqjxavUBRVPSsgJ7fuNVfYvvpFj/Y0BYysEF8XNUxKFuwGROiop/ow=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.3.5.tgz"; + sha512 = "lJNcA1XKMbQg6npC8grQBEVg11w8BSBr8bXUSZokYmvtNXheL/5cKGAD01Uba9x1P/ae9lJ9zDorpoSq4AWSfw=="; }; }; "@vercel/error-utils-2.0.2" = { @@ -12082,13 +11713,13 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.33" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.39" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.33"; + version = "2.0.39"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.33.tgz"; - sha512 = "fJFRZaQfaaNdun8u/QepzKVrGnTW/9pXls322la5pP5xHAbaWPTTNoFtG/odZUXiv0oNV1qVWnTI4bnqFh6Icw=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.39.tgz"; + sha512 = "rvShSeoiUvw1JoQ5r9EJBwELmA6lZDH2agG9KCBgKowd8YQZIm7r3DddvWPJ8s2x7P4kv0eCbr5e89Z2wsiygw=="; }; }; "@vercel/go-3.1.1" = { @@ -12100,40 +11731,40 @@ let sha512 = "mrzomNYltxkjvtUmaYry5YEyvwTz6c/QQHE5Gr/pPGRIniUiP6T6OFOJ49RBN7e6pRXaNzHPVuidiuBhvHh5+Q=="; }; }; - "@vercel/hydrogen-1.0.2" = { + "@vercel/hydrogen-1.0.4" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.2.tgz"; - sha512 = "/Q2MKk1GfOuZAnkE9jQexjtUQqanbY65R+xtJWd9yKIgwcfRI1hxiNH3uXyVM5AvLoY+fxxULkSuxDtUKpkJpQ=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.4.tgz"; + sha512 = "Sc0lpmI/J6O3o2cL75k8klL7ir2gi6kYI92O5+MrR3hh4fwz/atUIL9UWsTGuFjKTm69VAoJrmn3VKf0/0SGLw=="; }; }; - "@vercel/next-4.2.17" = { + "@vercel/next-4.3.6" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.2.17"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.2.17.tgz"; - sha512 = "b1ZwH/3sL4+CrrIjncZLAqjd+ts0KyVGL0HEOWU340OI3hXmQQAN+2k0MWlqm8Vu8rFGfk9VEQ9yJG/pmPx6mg=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.3.6.tgz"; + sha512 = "qUHp79xX07qYtz7DGSogyWgEMrf+eu/IGV/92YnVA1xzDBogIFc8XFvMlN8QwDrsWWsR+I2eMSiGD+P8znlsaA=="; }; }; - "@vercel/nft-0.27.2" = { + "@vercel/nft-0.27.3" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.27.2"; + version = "0.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.2.tgz"; - sha512 = "7LeioS1yE5hwPpQfD3DdH04tuugKjo5KrJk3yK5kAI3Lh76iSsK/ezoFQfzuT08X3ZASQOd1y9ePjLNI9+TxTQ=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.3.tgz"; + sha512 = "oySTdDSzUAFDXpsSLk9Q943o+/Yu/+TCFxnehpFQEf/3khi2stMpTHPVNwFdvZq/Z4Ky93lE+MGHpXCRpMkSCA=="; }; }; - "@vercel/node-3.1.7" = { + "@vercel/node-3.2.7" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.1.7"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.1.7.tgz"; - sha512 = "EYSHEt0Up70cOlawkSzb5CFHyHoOMuJG9Q/hWU+4zIpnXefZSanR/oaZMd+UFoaAKDVryBz35FVV7gNo6HxX9A=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.2.7.tgz"; + sha512 = "/eWXgkkjBm1Es6oRmltw5m0SLT8tnOdlSKYpQhPfpJlWVzLb8h3cWhTS+cSsnn3gZ0c6w4XSjiZBbGKQJevxoQ=="; }; }; "@vercel/python-4.3.0" = { @@ -12145,22 +11776,22 @@ let sha512 = "tj6ffEh+ligmQoo/ONOg7DNX0VGKJt9FyswyOIIp6lZufs5oGzHAfan4+5QzF/2INxvXobN0aMYgcbFHJ81ZKg=="; }; }; - "@vercel/redwood-2.0.10" = { + "@vercel/redwood-2.1.3" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "2.0.10"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.10.tgz"; - sha512 = "vZmjOtiUQOdQHVIRrlPY/pSVuwn5GSuq5ihg530Rq51pYIHf0PSP/BnF6zventlG0bKe53MarxE+mmBUb0LDxw=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.1.3.tgz"; + sha512 = "lpsdQSHS2hvSX29/rJNm4q38dVXKstS4MVg875KE6zyXpACwviXuet0Cadyv0E60w7f2B6Ra+nJMpwKz6oJ5xg=="; }; }; - "@vercel/remix-builder-2.1.7" = { + "@vercel/remix-builder-2.2.1" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.1.7"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.1.7.tgz"; - sha512 = "OGd7aod8wz3uMabGGzmDtNQaSz5+8ZJOmUzhMPxqHwmkTOYntIEPCXhAsi26kf+IuDP7Zj2Md7gUAJGsq5QNSg=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.2.1.tgz"; + sha512 = "3mM8XNWEo5HmPv/FT2pseGk6MIHcRcLgNHwVQxWe+CSgEXt4QcNQYtwF6v9pb4HDTt09Y1rRkSED5HXvMO38/A=="; }; }; "@vercel/routing-utils-3.1.0" = { @@ -12181,13 +11812,13 @@ let sha512 = "UZYwlSEEfVnfzTmgkD+kxex9/gkZGt7unOWNyWFN7V/ZnZSsGBUgv6hXLnwejdRi3EztgRQEBd1kUKlXdIeC0Q=="; }; }; - "@vercel/static-build-2.5.11" = { + "@vercel/static-build-2.5.17" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.5.11"; + version = "2.5.17"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.11.tgz"; - sha512 = "CUZInKro8CqNH4ZyNccRSfy8cF4KBklIiGOwWVjjjVQLtIGdC55iVADIHAsCmA5yEJVsjenIi+943/JcR0bw2Q=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.17.tgz"; + sha512 = "i7fp4wCUgNvZIv06qlQFtFhZJ5WZcwOyg7KmWWhLBsyx/U+LBzUKP80lWAedqB6xmZ7zvNnruGUArzJvI+DnjA=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12199,67 +11830,67 @@ let sha512 = "2qtvcBJ1bGY0dYGYh3iM7yGKkk971FujLEDXzuW5wcZsPr1GSEjO/w2iSr3qve6nDDtBImsGoDEnus5FI4+fIw=="; }; }; - "@volar/kit-2.2.5" = { + "@volar/kit-2.4.0-alpha.18" = { name = "_at_volar_slash_kit"; packageName = "@volar/kit"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/kit/-/kit-2.2.5.tgz"; - sha512 = "Bmn0UCaT43xUGGRwcmFG9lKhiCCLjRT4ScSLLPn5C9ltUcSGnIFFDlbZZa1PreHYHq25/4zkXt9Ap32klAh17w=="; + url = "https://registry.npmjs.org/@volar/kit/-/kit-2.4.0-alpha.18.tgz"; + sha512 = "dZMSNhesh23lhd61ax2l04IgIcYofAjm8M+5BKAmX47ROweyc8RrrslszCFUJynlmXx6JS1PoHqvo8+E0aAYQQ=="; }; }; - "@volar/language-core-2.2.5" = { + "@volar/language-core-2.4.0-alpha.18" = { name = "_at_volar_slash_language-core"; packageName = "@volar/language-core"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-2.2.5.tgz"; - sha512 = "2htyAuxRrAgETmFeUhT4XLELk3LiEcqoW/B8YUXMF6BrGWLMwIR09MFaZYvrA2UhbdAeSyeQ726HaWSWkexUcQ=="; + url = "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz"; + sha512 = "JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg=="; }; }; - "@volar/language-server-2.2.5" = { + "@volar/language-server-2.4.0-alpha.18" = { name = "_at_volar_slash_language-server"; packageName = "@volar/language-server"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-2.2.5.tgz"; - sha512 = "PV/jkUkI+m72HTXwnY7hsGqLY3VNi96ZRoWFRzVC9QG/853bixxjveXPJIiydMJ9I739lO3kcj3hnGrF5Sm+HA=="; + url = "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.18.tgz"; + sha512 = "dciHEE/R5kzI0bY71QfkoCVQ3cQI6g9MHfA4oIP6UhnJy0CdleUalWSygOXoD3Nq7Yk6wn2BRrb1PP5MsadY/Q=="; }; }; - "@volar/language-service-2.2.5" = { + "@volar/language-service-2.4.0-alpha.18" = { name = "_at_volar_slash_language-service"; packageName = "@volar/language-service"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-2.2.5.tgz"; - sha512 = "a97e/0uCe+uSu23F4zvgvldqJtZe6jugQeEHWjTfhgOEO8+Be0t5CZNNVItQqmPyAsD8eElg0S/cP6uxvCmCSQ=="; + url = "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz"; + sha512 = "EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog=="; }; }; - "@volar/snapshot-document-2.2.5" = { + "@volar/snapshot-document-2.4.0-alpha.18" = { name = "_at_volar_slash_snapshot-document"; packageName = "@volar/snapshot-document"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.2.5.tgz"; - sha512 = "MTOvWVKxM7ugKO3Amffkv2pND03fe2JtfygYaputqjVFML7YxtTXj8SPnI2pODLeSwOKzDYL6Q8r5j6Y5AgUzQ=="; + url = "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.18.tgz"; + sha512 = "JAeclEly/wnILhR4Pu9MpgBLInZJH49O1zoy8fU+pk5I+zpv7JIEby5z2UFAS60+sIDnxBdAGd7rZ5VibE70vg=="; }; }; - "@volar/source-map-2.2.5" = { + "@volar/source-map-2.4.0-alpha.18" = { name = "_at_volar_slash_source-map"; packageName = "@volar/source-map"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-2.2.5.tgz"; - sha512 = "wrOEIiZNf4E+PWB0AxyM4tfhkfldPsb3bxg8N6FHrxJH2ohar7aGu48e98bp3pR9HUA7P/pR9VrLmkTrgCCnWQ=="; + url = "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz"; + sha512 = "MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g=="; }; }; - "@volar/typescript-2.2.5" = { + "@volar/typescript-2.4.0-alpha.18" = { name = "_at_volar_slash_typescript"; packageName = "@volar/typescript"; - version = "2.2.5"; + version = "2.4.0-alpha.18"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/typescript/-/typescript-2.2.5.tgz"; - sha512 = "eSV/n75+ppfEVugMC/salZsI44nXDPAyL6+iTYCNLtiLHGJsnMv9GwiDMujrvAUj/aLQyqRJgYtXRoxop2clCw=="; + url = "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz"; + sha512 = "sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ=="; }; }; "@vscode/emmet-helper-2.9.3" = { @@ -12271,15 +11902,6 @@ let sha512 = "rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw=="; }; }; - "@vscode/l10n-0.0.16" = { - name = "_at_vscode_slash_l10n"; - packageName = "@vscode/l10n"; - version = "0.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.16.tgz"; - sha512 = "JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg=="; - }; - }; "@vscode/l10n-0.0.18" = { name = "_at_vscode_slash_l10n"; packageName = "@vscode/l10n"; @@ -12289,22 +11911,22 @@ let sha512 = "KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="; }; }; - "@vscode/test-electron-2.4.0" = { + "@vscode/test-electron-2.4.1" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.0.tgz"; - sha512 = "yojuDFEjohx6Jb+x949JRNtSn6Wk2FAh4MldLE3ck9cfvCqzwxF32QsNy1T9Oe4oT+ZfFcg0uPUCajJzOmPlTA=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.1.tgz"; + sha512 = "Gc6EdaLANdktQ1t+zozoBVRynfIsMKMc94Svu1QreOBC8y76x4tvaK32TljrLi1LI2+PK58sDVbL7ALdqf3VRQ=="; }; }; - "@vscode/vsce-2.27.0" = { + "@vscode/vsce-2.31.1" = { name = "_at_vscode_slash_vsce"; packageName = "@vscode/vsce"; - version = "2.27.0"; + version = "2.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.27.0.tgz"; - sha512 = "FFUMBVSyyjjJpWszwqk7d4U3YllY8FdWslbUDMRki1x4ZjA3Z0hmRMfypWrjP9sptbSR9nyPFU4uqjhy2qRB/w=="; + url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.31.1.tgz"; + sha512 = "LwEQFKXV21C4/brvGPH/9+7ZOUM5cbK7oJ4fVmy0YG75NIy1HV8eMSoBZrl+u23NxpAhor62Cu1aI+JFtCtjSg=="; }; }; "@vscode/vsce-sign-2.0.4" = { @@ -12397,94 +12019,49 @@ let sha512 = "pAiRN6qSAhDM5SVOIxgx+2xnoVUePHbRNC7OD2aOR3WltTKxxF25OfpK8h8UQ7A0BuRkSgREbB59DBlFk4iAeg=="; }; }; - "@vue/cli-shared-utils-5.0.8" = { - name = "_at_vue_slash_cli-shared-utils"; - packageName = "@vue/cli-shared-utils"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz"; - sha512 = "uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ=="; - }; - }; - "@vue/cli-ui-5.0.8" = { - name = "_at_vue_slash_cli-ui"; - packageName = "@vue/cli-ui"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-5.0.8.tgz"; - sha512 = "1eyL1h1T3LVejYplDqERO8TK03sjR3QTOTHa01ABreCdqFTZItiUVud34uEcuoZ6Gi69xdl+LSx6Hvo4t9tfrA=="; - }; - }; - "@vue/cli-ui-addon-webpack-5.0.8" = { - name = "_at_vue_slash_cli-ui-addon-webpack"; - packageName = "@vue/cli-ui-addon-webpack"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.8.tgz"; - sha512 = "sg+3a9vHGzpFRrv7MVZRQ9oDztFN9Mvx0MleidKyPIAWMSOskSQT8zTngy8bEyXjXwNv6mCn2jvUR/tgbldyow=="; - }; - }; - "@vue/cli-ui-addon-widgets-5.0.8" = { - name = "_at_vue_slash_cli-ui-addon-widgets"; - packageName = "@vue/cli-ui-addon-widgets"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.8.tgz"; - sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; - }; - }; - "@vue/compiler-core-3.4.29" = { + "@vue/compiler-core-3.4.34" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.4.29"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz"; - sha512 = "TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.34.tgz"; + sha512 = "Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ=="; }; }; - "@vue/compiler-dom-3.4.29" = { + "@vue/compiler-dom-3.4.34" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.4.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz"; - sha512 = "A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w=="; - }; - }; - "@vue/compiler-sfc-2.7.16" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "2.7.16"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz"; - sha512 = "KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.34.tgz"; + sha512 = "3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw=="; }; }; - "@vue/compiler-sfc-3.4.29" = { + "@vue/compiler-sfc-3.4.34" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.4.29"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.29.tgz"; - sha512 = "zygDcEtn8ZimDlrEQyLUovoWgKQic6aEQqRXce2WXBvSeHbEbcAsXyCk9oG33ZkyWH4sl9D3tkYc1idoOkdqZQ=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.34.tgz"; + sha512 = "x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw=="; }; }; - "@vue/compiler-ssr-3.4.29" = { + "@vue/compiler-ssr-3.4.34" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.4.29"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.29.tgz"; - sha512 = "rFbwCmxJ16tDp3N8XCx5xSQzjhidYjXllvEcqX/lopkoznlNPz3jyy0WGJCyhAaVQK677WWFt3YO/WUEkMMUFQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.34.tgz"; + sha512 = "8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g=="; }; }; - "@vue/shared-3.4.29" = { + "@vue/shared-3.4.34" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.4.29"; + version = "3.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz"; - sha512 = "hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.34.tgz"; + sha512 = "x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -12964,13 +12541,13 @@ let sha512 = "hqoz6StCW+AjV/3N+vg0s1ah82ptdVUb9nH2ttj3UbySOXUvytWw2yqy8c1cKzyRk6mDD00G47qS3fZI9/gMjg=="; }; }; - "@whatwg-node/node-fetch-0.5.11" = { + "@whatwg-node/node-fetch-0.5.14" = { name = "_at_whatwg-node_slash_node-fetch"; packageName = "@whatwg-node/node-fetch"; - version = "0.5.11"; + version = "0.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.11.tgz"; - sha512 = "LS8tSomZa3YHnntpWt3PP43iFEEl6YeIsvDakczHBKlay5LdkXFr8w7v8H6akpG5nRrzydyB0k1iE2eoL6aKIQ=="; + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.14.tgz"; + sha512 = "J/IQ0Hrb56sMPb3G42Wzrm9fu8+bHnb8lk7DkJ0XX7JCkSxvPEn1MmkLy7zntdbXs1gohYW42mDck0LzcjrMig=="; }; }; "@xmldom/xmldom-0.7.13" = { @@ -13504,22 +13081,22 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.12.0" = { + "acorn-8.11.3" = { name = "acorn"; packageName = "acorn"; - version = "8.12.0"; + version = "8.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz"; - sha512 = "RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz"; + sha512 = "Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg=="; }; }; - "acorn-8.8.2" = { + "acorn-8.12.1" = { name = "acorn"; packageName = "acorn"; - version = "8.8.2"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; - sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz"; + sha512 = "tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="; }; }; "acorn-globals-4.3.4" = { @@ -13621,13 +13198,13 @@ let sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; - "acorn-walk-8.2.0" = { + "acorn-walk-8.3.2" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "8.2.0"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz"; + sha512 = "cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A=="; }; }; "acorn-walk-8.3.3" = { @@ -13819,6 +13396,15 @@ let sha512 = "PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA=="; }; }; + "ajv-8.14.0" = { + name = "ajv"; + packageName = "ajv"; + version = "8.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz"; + sha512 = "oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA=="; + }; + }; "ajv-8.16.0" = { name = "ajv"; packageName = "ajv"; @@ -13828,6 +13414,15 @@ let sha512 = "F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw=="; }; }; + "ajv-8.17.1" = { + name = "ajv"; + packageName = "ajv"; + version = "8.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz"; + sha512 = "B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="; + }; + }; "ajv-8.6.3" = { name = "ajv"; packageName = "ajv"; @@ -13954,15 +13549,6 @@ let sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; }; - "ansi-colors-4.1.1" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; - }; - }; "ansi-colors-4.1.3" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -14251,78 +13837,6 @@ let sha512 = "FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA=="; }; }; - "apollo-datasource-3.3.2" = { - name = "apollo-datasource"; - packageName = "apollo-datasource"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.3.2.tgz"; - sha512 = "L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg=="; - }; - }; - "apollo-reporting-protobuf-3.4.0" = { - name = "apollo-reporting-protobuf"; - packageName = "apollo-reporting-protobuf"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz"; - sha512 = "h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog=="; - }; - }; - "apollo-server-core-3.13.0" = { - name = "apollo-server-core"; - packageName = "apollo-server-core"; - version = "3.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.13.0.tgz"; - sha512 = "v/g6DR6KuHn9DYSdtQijz8dLOkP78I5JSVJzPkARhDbhpH74QNwrQ2PP2URAPPEDJ2EeZNQDX8PvbYkAKqg+kg=="; - }; - }; - "apollo-server-env-4.2.1" = { - name = "apollo-server-env"; - packageName = "apollo-server-env"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz"; - sha512 = "vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g=="; - }; - }; - "apollo-server-errors-3.3.1" = { - name = "apollo-server-errors"; - packageName = "apollo-server-errors"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz"; - sha512 = "xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA=="; - }; - }; - "apollo-server-express-3.13.0" = { - name = "apollo-server-express"; - packageName = "apollo-server-express"; - version = "3.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.13.0.tgz"; - sha512 = "iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g=="; - }; - }; - "apollo-server-plugin-base-3.7.2" = { - name = "apollo-server-plugin-base"; - packageName = "apollo-server-plugin-base"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz"; - sha512 = "wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw=="; - }; - }; - "apollo-server-types-3.8.0" = { - name = "apollo-server-types"; - packageName = "apollo-server-types"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.8.0.tgz"; - sha512 = "ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A=="; - }; - }; "append-field-1.0.0" = { name = "append-field"; packageName = "append-field"; @@ -14368,13 +13882,13 @@ let sha512 = "JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw=="; }; }; - "applicationinsights-native-metrics-0.0.10" = { + "applicationinsights-native-metrics-0.0.11" = { name = "applicationinsights-native-metrics"; packageName = "applicationinsights-native-metrics"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.10.tgz"; - sha512 = "uruIWFcc/sEowcRvNz0mKMWMsPs2trSzegjCtjTqsSBk8EbnctTNMJtPdye7w46say+BwosNHRW3zYiBmY8CIg=="; + url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.11.tgz"; + sha512 = "NxzsyeFj5iwhSEzkHluIoNYb1DcMtlttQZjJCJ8QQroZ5H9nCDS77Y9BpfphR5tqMcfNNjuQuiRcdPhQk75QRw=="; }; }; "aproba-1.2.0" = { @@ -14404,15 +13918,6 @@ let sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; }; }; - "archive-type-4.0.0" = { - name = "archive-type"; - packageName = "archive-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz"; - sha512 = "zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA=="; - }; - }; "archiver-3.1.1" = { name = "archiver"; packageName = "archiver"; @@ -14845,15 +14350,6 @@ let sha512 = "tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw=="; }; }; - "as-table-1.0.55" = { - name = "as-table"; - packageName = "as-table"; - version = "1.0.55"; - src = fetchurl { - url = "https://registry.npmjs.org/as-table/-/as-table-1.0.55.tgz"; - sha512 = "xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ=="; - }; - }; "asap-2.0.6" = { name = "asap"; packageName = "asap"; @@ -14917,13 +14413,13 @@ let sha512 = "zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A=="; }; }; - "assert-never-1.2.1" = { + "assert-never-1.3.0" = { name = "assert-never"; packageName = "assert-never"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz"; - sha512 = "TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="; + url = "https://registry.npmjs.org/assert-never/-/assert-never-1.3.0.tgz"; + sha512 = "9Z3vxQ+berkL/JJo0dK+EY3Lp0s3NtSnP3VCLsh5HDcZPrh0M+KQRK5sWhUeyPPH+/RCxZqOxLMR+YC6vlviEQ=="; }; }; "assert-plus-0.1.2" = { @@ -14980,15 +14476,6 @@ let sha512 = "Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="; }; }; - "ast-types-0.12.1" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.1.tgz"; - sha512 = "H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng=="; - }; - }; "ast-types-0.13.4" = { name = "ast-types"; packageName = "ast-types"; @@ -14998,15 +14485,6 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; - "ast-types-0.14.2" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz"; - sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; - }; - }; "astral-regex-1.0.0" = { name = "astral-regex"; packageName = "astral-regex"; @@ -15205,15 +14683,6 @@ let sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; }; }; - "async-mutex-0.4.0" = { - name = "async-mutex"; - packageName = "async-mutex"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.0.tgz"; - sha512 = "eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA=="; - }; - }; "async-mutex-0.4.1" = { name = "async-mutex"; packageName = "async-mutex"; @@ -15223,13 +14692,13 @@ let sha512 = "WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA=="; }; }; - "async-retry-1.3.3" = { - name = "async-retry"; - packageName = "async-retry"; - version = "1.3.3"; + "async-mutex-0.5.0" = { + name = "async-mutex"; + packageName = "async-mutex"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz"; - sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz"; + sha512 = "1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA=="; }; }; "async-sema-3.1.1" = { @@ -15439,13 +14908,13 @@ let sha512 = "2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw=="; }; }; - "axobject-query-4.0.0" = { + "axobject-query-4.1.0" = { name = "axobject-query"; packageName = "axobject-query"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz"; - sha512 = "+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw=="; + url = "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz"; + sha512 = "qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ=="; }; }; "azure-devops-node-api-12.5.0" = { @@ -15475,15 +14944,6 @@ let sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g=="; }; }; - "babel-core-7.0.0-bridge.0" = { - name = "babel-core"; - packageName = "babel-core"; - version = "7.0.0-bridge.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz"; - sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg=="; - }; - }; "babel-loader-8.3.0" = { name = "babel-loader"; packageName = "babel-loader"; @@ -15502,6 +14962,15 @@ let sha512 = "+qeGXSbHZwinZzO6R3wP+6XDKup83Pgg2B3TQt2zwfDdgC7NqT9Kd3ws7iqk53zAO/8iOIRU6VUyUzt2LDE3Eg=="; }; }; + "babel-plugin-macros-3.1.0" = { + name = "babel-plugin-macros"; + packageName = "babel-plugin-macros"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz"; + sha512 = "Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg=="; + }; + }; "babel-plugin-module-resolver-4.1.0" = { name = "babel-plugin-module-resolver"; packageName = "babel-plugin-module-resolver"; @@ -15682,13 +15151,13 @@ let sha512 = "kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="; }; }; - "base-x-3.0.9" = { + "base-x-3.0.10" = { name = "base-x"; packageName = "base-x"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz"; - sha512 = "H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ=="; + url = "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz"; + sha512 = "7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ=="; }; }; "base64-arraybuffer-0.1.2" = { @@ -15808,15 +15277,6 @@ let sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; }; }; - "bcrypt-5.1.0" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.0.tgz"; - sha512 = "RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q=="; - }; - }; "bcrypt-nodejs-0.0.3" = { name = "bcrypt-nodejs"; packageName = "bcrypt-nodejs"; @@ -15988,6 +15448,15 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; + "bin-links-4.0.4" = { + name = "bin-links"; + packageName = "bin-links"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz"; + sha512 = "cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA=="; + }; + }; "binary-0.3.0" = { name = "binary"; packageName = "binary"; @@ -16105,22 +15574,22 @@ let sha512 = "VyLcUjVMEOdSpHaCG/7odvCdLbAB1y3l9A2V6WIje24uV7FkJPrQrH/RrlFmKxP89pFVDEnE+YlHaFujlFIZsg=="; }; }; - "bittorrent-protocol-4.1.12" = { + "bittorrent-protocol-4.1.13" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "4.1.12"; + version = "4.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-4.1.12.tgz"; - sha512 = "peyUDP5NQaiPSau24jCpPhLfDFCCK1DUE0N5xlJSPVIkgQmsVLi62N/Lm++pUNrBenfnhf6WKQo0nyN6x5dufQ=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-4.1.13.tgz"; + sha512 = "tUF8HBy/CwexDgEiFmmgWx7RCXC02gc72ZEoFxdRnqraZBUVFN611hYLfB/zArlhFeaUErfJZOa8CWtrDeXQsA=="; }; }; - "bittorrent-tracker-11.1.0" = { + "bittorrent-tracker-11.1.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "11.1.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.0.tgz"; - sha512 = "WKIIy1wVxFiKro5noDldW8W4C4xCjl8gHvZcG0LWM40J6VZOf7gXdrdB2/GI55+JAgrph8NGsZUeusbyzlbiQQ=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.1.tgz"; + sha512 = "j5IMK80wWB44S/3TE+HwIRLYBmY00KvIoI/s7e37mVe5raBNPVTxXgXlOcvECMJvjhk1igta31d+JHTbM8c51A=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -16132,15 +15601,6 @@ let sha512 = "YFgPTVRhUMncZr8tM3ige7gnViMGhKoGF23qaiISRG8xtYebTGHrMSMXsTXo6O1KbtdEI+4jzvGY1K/wdT9GUA=="; }; }; - "bitwise-xor-0.0.0" = { - name = "bitwise-xor"; - packageName = "bitwise-xor"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitwise-xor/-/bitwise-xor-0.0.0.tgz"; - sha512 = "3eOkZMBO04dRBn7551o6+IX9Ua7V+B/IubS7sffoa/VC3jdBM4YbuD+LjUNFojY7H+gptMUdTaQgHWTce4L3kw=="; - }; - }; "bl-1.2.3" = { name = "bl"; packageName = "bl"; @@ -16168,13 +15628,13 @@ let sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="; }; }; - "blake3-wasm-2.1.5" = { - name = "blake3-wasm"; - packageName = "blake3-wasm"; - version = "2.1.5"; + "bl-6.0.14" = { + name = "bl"; + packageName = "bl"; + version = "6.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz"; - sha512 = "F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g=="; + url = "https://registry.npmjs.org/bl/-/bl-6.0.14.tgz"; + sha512 = "TJfbvGdL7KFGxTsEbsED7avqpFdY56q9IW0/aiytyheJzxST/+Io6cx/4Qx0K2/u0BPRDs65mjaQzYvMZeNocQ=="; }; }; "blob-0.0.2" = { @@ -16330,15 +15790,6 @@ let sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; - "body-parser-1.20.0" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; - sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; - }; - }; "body-parser-1.20.2" = { name = "body-parser"; packageName = "body-parser"; @@ -16375,15 +15826,6 @@ let sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; }; }; - "boolean-3.2.0" = { - name = "boolean"; - packageName = "boolean"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz"; - sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; - }; - }; "bower-1.8.14" = { name = "bower"; packageName = "bower"; @@ -16717,13 +16159,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.23.1" = { + "browserslist-4.23.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.23.1"; + version = "4.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz"; - sha512 = "TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz"; + sha512 = "qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA=="; }; }; "brq-0.1.10" = { @@ -17059,15 +16501,6 @@ let sha512 = "uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="; }; }; - "builtins-5.1.0" = { - name = "builtins"; - packageName = "builtins"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz"; - sha512 = "SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg=="; - }; - }; "bundle-name-4.1.0" = { name = "bundle-name"; packageName = "bundle-name"; @@ -17194,22 +16627,13 @@ let sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; }; }; - "cacache-17.1.4" = { - name = "cacache"; - packageName = "cacache"; - version = "17.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz"; - sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; - }; - }; - "cacache-18.0.3" = { + "cacache-18.0.4" = { name = "cacache"; packageName = "cacache"; - version = "18.0.3"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz"; - sha512 = "qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg=="; + url = "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz"; + sha512 = "B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ=="; }; }; "cache-base-1.0.1" = { @@ -17257,15 +16681,6 @@ let sha512 = "zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ=="; }; }; - "cacheable-request-2.1.4" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha512 = "vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ=="; - }; - }; "cacheable-request-6.1.0" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -17518,13 +16933,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001634" = { + "caniuse-lite-1.0.30001643" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001634"; + version = "1.0.30001643"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz"; - sha512 = "fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz"; + sha512 = "ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg=="; }; }; "canvas-2.11.2" = { @@ -17536,15 +16951,6 @@ let sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw=="; }; }; - "capnp-ts-0.7.0" = { - name = "capnp-ts"; - packageName = "capnp-ts"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capnp-ts/-/capnp-ts-0.7.0.tgz"; - sha512 = "XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g=="; - }; - }; "capture-stack-trace-1.0.2" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; @@ -17617,13 +17023,13 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.68.79" = { + "cdk8s-2.68.87" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.68.79"; + version = "2.68.87"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.79.tgz"; - sha512 = "aXYFGZU6FflDDz/Ywu2PJ/FHN2mLQbdbQjmzHjKypOk8P99iUcDq3rfWAUxAQGeErQlbyPCilKFfVEa1qqrRwg=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.87.tgz"; + sha512 = "bJ+sT8q8uS+Y8qFqgZFpGZwcCQB6cx4A76iaKk+Xsh/HherhZ4x40NyATjR4BerljueC2JR0Tq9ZSahyWaZxQQ=="; }; }; "cdk8s-plus-25-2.22.79" = { @@ -17635,13 +17041,13 @@ let sha512 = "QSxCBAbLvDJvC3lqt7lO2x8Il84kCsrwIdfAVFxUiwh4wHQxi18ENI9JI16tEhS/2gxv1YyeUNBM1ucH6q9oJA=="; }; }; - "cdktf-0.20.7" = { + "cdktf-0.20.8" = { name = "cdktf"; packageName = "cdktf"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.20.7.tgz"; - sha512 = "7za8QQYM1G0/6JUCYY+5smwNfNfbiZVPCMD7SeX2rTYmOLaGEkHZtMvuUTEKSqsE56fKudnfVd2J2edz2CETFg=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.20.8.tgz"; + sha512 = "O4O5h0b1E6scc/tqq9EUIQGDbPmdrCQpdkPdbDtUHHzhZGtmFpIMc5MgP1SgB+EzAutnG2oUDefjCqWMnhDe9A=="; }; }; "center-align-0.1.3" = { @@ -17653,6 +17059,15 @@ let sha512 = "Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ=="; }; }; + "centra-2.7.0" = { + name = "centra"; + packageName = "centra"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/centra/-/centra-2.7.0.tgz"; + sha512 = "PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg=="; + }; + }; "chainsaw-0.1.0" = { name = "chainsaw"; packageName = "chainsaw"; @@ -17968,15 +17383,6 @@ let sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; }; }; - "chokidar-3.5.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - }; "chokidar-3.6.0" = { name = "chokidar"; packageName = "chokidar"; @@ -18004,6 +17410,15 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; + "chownr-3.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz"; + sha512 = "+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g=="; + }; + }; "chroma-js-2.4.2" = { name = "chroma-js"; packageName = "chroma-js"; @@ -18049,13 +17464,13 @@ let sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ=="; }; }; - "chromium-bidi-0.5.23" = { + "chromium-bidi-0.6.2" = { name = "chromium-bidi"; packageName = "chromium-bidi"; - version = "0.5.23"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.23.tgz"; - sha512 = "1o/gLU9wDqbN5nL2MtfjykjOuighGXc3/hnWueO1haiEoFgX8h5vbvcA4tgdQfjw1mkZ1OEF4x/+HVeqEX6NoA=="; + url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz"; + sha512 = "4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg=="; }; }; "chunk-store-iterator-1.0.3" = { @@ -18157,15 +17572,6 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "clean-css-3.4.28" = { - name = "clean-css"; - packageName = "clean-css"; - version = "3.4.28"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; - sha512 = "aTWyttSdI2mYi07kWqHi24NUU9YlELFKGOAgFzZjDN1064DMAOy2FBuoyGmkKRlXkbpXd0EVHmiVkbKhKoirTw=="; - }; - }; "clean-css-4.2.4" = { name = "clean-css"; packageName = "clean-css"; @@ -18607,15 +18013,6 @@ let sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q=="; }; }; - "clone-response-1.0.2" = { - name = "clone-response"; - packageName = "clone-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha512 = "yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="; - }; - }; "clone-response-1.0.3" = { name = "clone-response"; packageName = "clone-response"; @@ -18679,13 +18076,13 @@ let sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; }; }; - "cmd-shim-6.0.1" = { + "cmd-shim-6.0.3" = { name = "cmd-shim"; packageName = "cmd-shim"; - version = "6.0.1"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz"; - sha512 = "S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q=="; + url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz"; + sha512 = "FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA=="; }; }; "cmdln-3.2.1" = { @@ -18733,13 +18130,13 @@ let sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; - "cockatiel-3.1.3" = { + "cockatiel-3.2.1" = { name = "cockatiel"; packageName = "cockatiel"; - version = "3.1.3"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cockatiel/-/cockatiel-3.1.3.tgz"; - sha512 = "xC759TpZ69d7HhfDp8m2WkRwEUiCkxY8Ee2OQH/3H6zmy2D/5Sm+zSTbPRa+V2QyjDtpMvjOIAOVjA2gp6N1kQ=="; + url = "https://registry.npmjs.org/cockatiel/-/cockatiel-3.2.1.tgz"; + sha512 = "gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q=="; }; }; "code-block-writer-10.1.1" = { @@ -18787,22 +18184,22 @@ let sha512 = "7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw=="; }; }; - "codemaker-1.100.0" = { + "codemaker-1.101.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.100.0"; + version = "1.101.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.100.0.tgz"; - sha512 = "EVKV5v2HZf/a2nuRZJ3pMo1BImN6MX/9O22Yo1gQn+DeFbU2TqKnpCu16pTOVg4b4CakbFckeimVzQIqmFGquQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.101.0.tgz"; + sha512 = "bAg+N4PA8mniJrCpTYFdaFmJA+3fE1Vjgf4o1EnPc07nw6qRcJsr/D9ZZoutEsvw7UM8OmZp4qZxVzpCqRhhQQ=="; }; }; - "codemaker-1.95.0" = { + "codemaker-1.98.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.95.0"; + version = "1.98.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.95.0.tgz"; - sha512 = "q/U2NeZSaKnVMarOi+BR8MbaHEFKVmBefTSSXj/0W4OBarw/uUT2qCPojYF16gJtfFz7qCkJeuP+zYDq+xNEpg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.98.0.tgz"; + sha512 = "UAeICTmY7lJXf4OPnDTwKWg/DU87u67nyxuTjMON+vO8yo8C+EcPWnmmOmWtZm3wWLPsPuxyYIQxIIi/4OZ9TA=="; }; }; "coffeescript-2.7.0" = { @@ -19102,15 +18499,6 @@ let sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; - "commander-2.8.1" = { - name = "commander"; - packageName = "commander"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - sha512 = "+pJLBFVk+9ZZdlAOB5WuIElVPPth47hILFkmGym57aq8kwxsowvByvB0DHs1vQAhyMZzdcpTtF0VDKGkSDR4ZQ=="; - }; - }; "commander-3.0.2" = { name = "commander"; packageName = "commander"; @@ -19201,13 +18589,13 @@ let sha512 = "gGSHSON1HdpFDb3WpU6C1tdksZV0lpfzoihXK+CD0l4xQ2TvHbVuiZy8Dg414ZqbeRxt2sU8d9kC0srpM2+RzQ=="; }; }; - "comment-json-4.2.3" = { + "comment-json-4.2.4" = { name = "comment-json"; packageName = "comment-json"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.3.tgz"; - sha512 = "SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw=="; + url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.4.tgz"; + sha512 = "E5AjpSW+O+N5T2GsOQMHLLsJvrYw6G/AFt9GvU6NguEAfzKShh7hRiLtVo6S9KbRpFMGqE5ojo0/hE+sdteWvQ=="; }; }; "commist-1.1.0" = { @@ -19219,6 +18607,24 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "commist-3.2.0" = { + name = "commist"; + packageName = "commist"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz"; + sha512 = "4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw=="; + }; + }; + "common-ancestor-path-1.0.1" = { + name = "common-ancestor-path"; + packageName = "common-ancestor-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz"; + sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="; + }; + }; "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; @@ -19300,6 +18706,15 @@ let sha512 = "LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg=="; }; }; + "compare-versions-6.1.1" = { + name = "compare-versions"; + packageName = "compare-versions"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz"; + sha512 = "4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg=="; + }; + }; "component-bind-1.0.0" = { name = "component-bind"; packageName = "component-bind"; @@ -19561,22 +18976,13 @@ let sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w=="; }; }; - "connect-redis-7.1.0" = { + "connect-redis-7.1.1" = { name = "connect-redis"; packageName = "connect-redis"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.0.tgz"; - sha512 = "UaqO1EirWjON2ENsyau7N5lbkrdYBpS6mYlXSeff/OYXsd6EGZ+SXSmNPoljL2PSua8fgjAEaldSA73PMZQ9Eg=="; - }; - }; - "consola-3.2.3" = { - name = "consola"; - packageName = "consola"; - version = "3.2.3"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz"; - sha512 = "I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ=="; + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.1.tgz"; + sha512 = "M+z7alnCJiuzKa8/1qAYdGUXHYfDnLolOGAUjOioB07pP39qxjG+X9ibsud7qUBc4jMV5Mcy3ugGv8eFcgamJQ=="; }; }; "console-browserify-1.1.0" = { @@ -19624,15 +19030,6 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.167" = { - name = "constructs"; - packageName = "constructs"; - version = "10.1.167"; - src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.167.tgz"; - sha512 = "zGt88EmcJUtWbd/sTM9GKcHRjYWzEx5jzMYuK69vl25Dj01sJAc7uF6AEJgZBtlLAc3VnRUvzgitHwmJkS9BFw=="; - }; - }; "constructs-10.3.0" = { name = "constructs"; packageName = "constructs"; @@ -20021,15 +19418,6 @@ let sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; "cookie-0.6.0" = { name = "cookie"; packageName = "cookie"; @@ -20057,13 +19445,13 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; - "cookie-signature-1.2.1" = { + "cookie-signature-1.0.7" = { name = "cookie-signature"; packageName = "cookie-signature"; - version = "1.2.1"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.1.tgz"; - sha512 = "78KWk9T26NhzXtuL26cIJ8/qNHANyJ/ZYrmEXFzUmhZdjpBv+DlWlOANRTGBt48YcyslsLrj0bMLFTmXvLRCOw=="; + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz"; + sha512 = "NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="; }; }; "cookiejar-2.1.4" = { @@ -20174,15 +19562,6 @@ let sha512 = "s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg=="; }; }; - "cose-base-2.2.0" = { - name = "cose-base"; - packageName = "cose-base"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz"; - sha512 = "AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g=="; - }; - }; "cosmiconfig-6.0.0" = { name = "cosmiconfig"; packageName = "cosmiconfig"; @@ -20381,22 +19760,22 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-6.0.17" = { + "create-torrent-6.0.18" = { name = "create-torrent"; packageName = "create-torrent"; - version = "6.0.17"; + version = "6.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-6.0.17.tgz"; - sha512 = "GGrNP1mu3WSyJHyo+x6AnJlQWW7bbyUfoEDFfo/U2kpeTVYRCgWdQC4/sq4oreltpMTEP8UUB3U3niHIgLU/gQ=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-6.0.18.tgz"; + sha512 = "rN1y6A0pnM/ijMcUfbcmAGFGjegtc76TpVsleOWLxxm6hkjbx2q2F0zN4u3LDweAzd6hM6sQySNgFEGZA1geCQ=="; }; }; - "cron-parser-3.5.0" = { + "cron-parser-4.9.0" = { name = "cron-parser"; packageName = "cron-parser"; - version = "3.5.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-3.5.0.tgz"; - sha512 = "wyVZtbRs6qDfFd8ap457w3XVntdvqcwBGxBoTvJQH9KGVKL/fB+h2k3C8AqiVxvUQKN1Ps/Ns46CNViOpVDhfQ=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz"; + sha512 = "p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q=="; }; }; "cronosjs-1.7.1" = { @@ -20543,13 +19922,13 @@ let sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA=="; }; }; - "cspell-config-lib-8.8.4" = { + "cspell-config-lib-8.12.1" = { name = "cspell-config-lib"; packageName = "cspell-config-lib"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.8.4.tgz"; - sha512 = "Xf+aL669Cm+MYZTZULVWRQXB7sRWx9qs0hPrgqxeaWabLUISK57/qwcI24TPVdYakUCoud9Nv+woGi5FcqV5ZQ=="; + url = "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.12.1.tgz"; + sha512 = "xEoKdb8hyturyiUXFdRgQotYegYe3OZS+Yc7JHnB75Ykt+Co2gtnu2M/Yb0yoqaHCXflVO6MITrKNaxricgqVw=="; }; }; "cspell-dict-vimlang-1.0.1" = { @@ -20561,22 +19940,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-8.8.4" = { + "cspell-dictionary-8.12.1" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.8.4.tgz"; - sha512 = "eDi61MDDZycS5EASz5FiYKJykLEyBT0mCvkYEUCsGVoqw8T9gWuWybwwqde3CMq9TOwns5pxGcFs2v9RYgtN5A=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.12.1.tgz"; + sha512 = "jYHEA48on6pBQYVUEzXV63wy5Ulx/QNUZcoiG3C0OmYIKjACTaEg02AMDOr+Eaj34E5v4pGEShzot4Qtt/aiNQ=="; }; }; - "cspell-gitignore-8.8.4" = { + "cspell-gitignore-8.12.1" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.8.4.tgz"; - sha512 = "rLdxpBh0kp0scwqNBZaWVnxEVmSK3UWyVSZmyEL4jmmjusHYM9IggfedOhO4EfGCIdQ32j21TevE0tTslyc4iA=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.12.1.tgz"; + sha512 = "XlO87rdrab3VKU8e7+RGEfqEtYqo7ObgfZeYEAdJlwUXvqYxBzA11jDZAovDz/5jv0YfRMx6ch5t6+1zfSeBbQ=="; }; }; "cspell-glob-0.1.25" = { @@ -20588,22 +19967,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-8.8.4" = { + "cspell-glob-8.12.1" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.8.4.tgz"; - sha512 = "+tRrOfTSbF/44uNl4idMZVPNfNM6WTmra4ZL44nx23iw1ikNhqZ+m0PC1oCVSlURNBEn8faFXjC/oT2BfgxoUQ=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.12.1.tgz"; + sha512 = "ZplEPLlNwj7luEKu/VudIaV+cGTQHExihGvAUxlIVMFURiAFMT5eH0UsQoCEpSevIEueO+slLUDy7rxwTwAGdQ=="; }; }; - "cspell-grammar-8.8.4" = { + "cspell-grammar-8.12.1" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.8.4.tgz"; - sha512 = "UxDO517iW6vs/8l4OhLpdMR7Bp+tkquvtld1gWz8WYQiDwORyf0v5a3nMh4ILYZGoolOSnDuI9UjWOLI6L/vvQ=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.12.1.tgz"; + sha512 = "IAES553M5nuB/wtiWYayDX2/5OmDu2VmEcnV6SXNze8oop0oodSqr3h46rLy+m1EOOD8nenMa295N/dRPqTB/g=="; }; }; "cspell-io-4.1.7" = { @@ -20615,13 +19994,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-8.8.4" = { + "cspell-io-8.12.1" = { name = "cspell-io"; packageName = "cspell-io"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.8.4.tgz"; - sha512 = "aqB/QMx+xns46QSyPEqi05uguCSxvqRnh2S/ZOhhjPlKma/7hK9niPRcwKwJXJEtNzdiZZkkC1uZt9aJe/7FTA=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.12.1.tgz"; + sha512 = "uPjYQP/OKmA8B1XbJunUTBingtrb6IKkp7enyljsZEbtPRKSudP16QPacgyZLLb5rCVQXyexebGfQ182jmq7dg=="; }; }; "cspell-lib-4.3.12" = { @@ -20633,13 +20012,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-8.8.4" = { + "cspell-lib-8.12.1" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.8.4.tgz"; - sha512 = "hK8gYtdQ9Lh86c8cEHITt5SaoJbfvXoY/wtpR4k393YR+eAxKziyv8ihQyFE/Z/FwuqtNvDrSntP9NLwTivd3g=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.12.1.tgz"; + sha512 = "z2aZXnrip76zbH0j0ibTGux3mA71TMHtoEAd+n66so7Tx3QydUDAI0u7tzfbP3JyqL9ZWPlclQAfbutMUuzMBQ=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -20651,13 +20030,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-8.8.4" = { + "cspell-trie-lib-8.12.1" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.8.4.tgz"; - sha512 = "yCld4ZL+pFa5DL+Arfvmkv3cCQUOfdRlxElOzdkRZqWyO6h/UmO8xZb21ixVYHiqhJGZmwc3BG9Xuw4go+RLig=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.12.1.tgz"; + sha512 = "a9QmGGUhparM9v184YsB+D0lSdzVgWDlLFEBjVLQJyvp43HErZjvcTPUojUypNQUEjxvksX0/C4pO5Wq8YUD8w=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -20822,15 +20201,6 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; - "cssfilter-0.0.10" = { - name = "cssfilter"; - packageName = "cssfilter"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; - sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; - }; - }; "cssnano-5.1.15" = { name = "cssnano"; packageName = "cssnano"; @@ -20840,13 +20210,13 @@ let sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw=="; }; }; - "cssnano-7.0.2" = { + "cssnano-7.0.4" = { name = "cssnano"; packageName = "cssnano"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.2.tgz"; - sha512 = "LXm/Xx6TNLzfHM2lBaIQHfvtdW5QfdbyLzfJAWZrclCAb47yVa0/yJG69+amcw3Lq0YZ+kyU40rbsMPLcMt9aw=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.4.tgz"; + sha512 = "rQgpZra72iFjiheNreXn77q1haS2GEy69zCMbu4cpXCFPMQF+D4Ik5V7ktMzUF/sA7xCIgcqHwGPnCD+0a1vHg=="; }; }; "cssnano-preset-default-5.2.14" = { @@ -20858,13 +20228,13 @@ let sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A=="; }; }; - "cssnano-preset-default-7.0.2" = { + "cssnano-preset-default-7.0.4" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.2.tgz"; - sha512 = "z95kGKZx8VWHfERj7LFzuiTxylbvEp07ZEYaFu+t6bFyNOXLd/+3oPyNaY7ISwcrfHFCkt8OfRo4IZxVRJZ7dg=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.4.tgz"; + sha512 = "jQ6zY9GAomQX7/YNLibMEsRZguqMUGuupXcEk2zZ+p3GUxwCAsobqPYE62VrJ9qZ0l9ltrv2rgjwZPBIFIjYtw=="; }; }; "cssnano-utils-3.1.0" = { @@ -21092,13 +20462,13 @@ let sha512 = "w8a8nQk9YSCkMmH2wDbFqpH1XMz7l409mSvWnnG6Iu6D0Ydhvq61XASE7QIaA46FxfG2Ag524ZuGgAy2cXPfsw=="; }; }; - "cytoscape-3.29.2" = { + "cytoscape-3.30.1" = { name = "cytoscape"; packageName = "cytoscape"; - version = "3.29.2"; + version = "3.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/cytoscape/-/cytoscape-3.29.2.tgz"; - sha512 = "2G1ycU28Nh7OHT9rkXRLpCDP30MKH1dXJORZuBhtEhEW7pKwgPi77ImqlCWinouyE1PNepIOGZBOrE84DG7LyQ=="; + url = "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.1.tgz"; + sha512 = "TRJc3HbBPkHd50u9YfJh2FxD1lDLZ+JXnJoyBn5LkncoeuT7fapO/Hq/Ed8TdFclaKshzInge2i30bg7VKeoPQ=="; }; }; "cytoscape-cose-bilkent-4.1.0" = { @@ -21110,15 +20480,6 @@ let sha512 = "wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ=="; }; }; - "cytoscape-fcose-2.2.0" = { - name = "cytoscape-fcose"; - packageName = "cytoscape-fcose"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz"; - sha512 = "ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ=="; - }; - }; "d-1.0.2" = { name = "d"; packageName = "d"; @@ -21533,15 +20894,6 @@ let sha512 = "NxuWFXR3+HJULO6F6VprWnUQbx0MXgfEuOfz3m+pw8LYZV06SHRjcaBVvVlwH132xJq12mljySVDLcbMcFM7EA=="; }; }; - "data-uri-to-buffer-2.0.2" = { - name = "data-uri-to-buffer"; - packageName = "data-uri-to-buffer"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz"; - sha512 = "ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA=="; - }; - }; "data-uri-to-buffer-4.0.1" = { name = "data-uri-to-buffer"; packageName = "data-uri-to-buffer"; @@ -21578,13 +20930,13 @@ let sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; }; }; - "data-urls-4.0.0" = { + "data-urls-5.0.0" = { name = "data-urls"; packageName = "data-urls"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz"; - sha512 = "/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g=="; + url = "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz"; + sha512 = "ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg=="; }; }; "data-view-buffer-1.0.1" = { @@ -21704,13 +21056,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.11" = { + "dayjs-1.11.12" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.11"; + version = "1.11.12"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz"; - sha512 = "okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz"; + sha512 = "Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg=="; }; }; "deasync-0.1.20" = { @@ -21821,15 +21173,6 @@ let sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; "debug-4.3.5" = { name = "debug"; packageName = "debug"; @@ -22019,6 +21362,15 @@ let sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="; }; }; + "dedent-1.5.3" = { + name = "dedent"; + packageName = "dedent"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz"; + sha512 = "NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ=="; + }; + }; "dedent-js-1.0.1" = { name = "dedent-js"; packageName = "dedent-js"; @@ -22235,15 +21587,6 @@ let sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="; }; }; - "defu-6.1.4" = { - name = "defu"; - packageName = "defu"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz"; - sha512 = "mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="; - }; - }; "degenerator-5.0.1" = { name = "degenerator"; packageName = "degenerator"; @@ -22496,13 +21839,13 @@ let sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; - "detect-port-1.5.1" = { + "detect-port-1.6.1" = { name = "detect-port"; packageName = "detect-port"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/detect-port/-/detect-port-1.5.1.tgz"; - sha512 = "aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ=="; + url = "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz"; + sha512 = "CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q=="; }; }; "detective-5.2.1" = { @@ -22532,13 +21875,13 @@ let sha512 = "RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA=="; }; }; - "devtools-protocol-0.0.1299070" = { + "devtools-protocol-0.0.1312386" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1299070"; + version = "0.0.1312386"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1299070.tgz"; - sha512 = "+qtL3eX50qsJ7c+qVyagqi7AWMoQCBGNfoyJZMwm/NSXVqLYbuitrWEEIzxfUmTNy7//Xe8yhMmQ+elj3uAqSg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz"; + sha512 = "DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA=="; }; }; "dezalgo-1.0.4" = { @@ -22613,15 +21956,6 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; - "diff-5.0.0" = { - name = "diff"; - packageName = "diff"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; - sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; - }; - }; "diff-5.1.0" = { name = "diff"; packageName = "diff"; @@ -22982,15 +22316,6 @@ let sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; }; }; - "domexception-4.0.0" = { - name = "domexception"; - packageName = "domexception"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz"; - sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; - }; - }; "domhandler-2.2.1" = { name = "domhandler"; packageName = "domhandler"; @@ -23045,13 +22370,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-3.1.5" = { + "dompurify-3.1.6" = { name = "dompurify"; packageName = "dompurify"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-3.1.5.tgz"; - sha512 = "lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz"; + sha512 = "cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ=="; }; }; "domutils-1.4.3" = { @@ -23180,15 +22505,6 @@ let sha512 = "IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ=="; }; }; - "dotenv-16.3.2" = { - name = "dotenv"; - packageName = "dotenv"; - version = "16.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz"; - sha512 = "HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ=="; - }; - }; "dotenv-16.4.5" = { name = "dotenv"; packageName = "dotenv"; @@ -23216,13 +22532,13 @@ let sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; }; }; - "dotenv-expand-10.0.0" = { + "dotenv-expand-11.0.6" = { name = "dotenv-expand"; packageName = "dotenv-expand"; - version = "10.0.0"; + version = "11.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz"; - sha512 = "GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A=="; + url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz"; + sha512 = "8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g=="; }; }; "dotenv-expand-5.1.0" = { @@ -23252,15 +22568,6 @@ let sha512 = "rE0V29BV5FyylK3Uw5hmP90TBuwGHAqPYfaRHW/VHsKe9Xqi7RACVg0k0FokeE+MTWr9mtUy75GyszRACiD3Ow=="; }; }; - "download-7.1.0" = { - name = "download"; - packageName = "download"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/download/-/download-7.1.0.tgz"; - sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; - }; - }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -23270,15 +22577,6 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; - "download-git-repo-3.0.2" = { - name = "download-git-repo"; - packageName = "download-git-repo"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-3.0.2.tgz"; - sha512 = "N8hWXD4hXqmEcNoR8TBYFntaOcYvEQ7Bz90mgm3bZRTuteGQqwT32VDMnTyD0KTEvb8BWrMc1tVmzuV9u/WrAg=="; - }; - }; "draftlog-1.0.13" = { name = "draftlog"; packageName = "draftlog"; @@ -23405,15 +22703,6 @@ let sha512 = "8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q=="; }; }; - "easy-stack-1.0.1" = { - name = "easy-stack"; - packageName = "easy-stack"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz"; - sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; - }; - }; "eazy-logger-4.0.1" = { name = "eazy-logger"; packageName = "eazy-logger"; @@ -23495,13 +22784,13 @@ let sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="; }; }; - "electron-to-chromium-1.4.802" = { + "electron-to-chromium-1.5.1" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.802"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz"; - sha512 = "TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.1.tgz"; + sha512 = "FKbOCOQ5QRB3VlIbl1LZQefWIYwszlBloaXcY2rbfpu9ioJnNh3TK03YtIDKDo3WKBi8u+YV4+Fn2CkEozgf4w=="; }; }; "elegant-spinner-1.0.1" = { @@ -23522,22 +22811,22 @@ let sha512 = "wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg=="; }; }; - "elkjs-0.8.2" = { + "elkjs-0.9.3" = { name = "elkjs"; packageName = "elkjs"; - version = "0.8.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/elkjs/-/elkjs-0.8.2.tgz"; - sha512 = "L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ=="; + url = "https://registry.npmjs.org/elkjs/-/elkjs-0.9.3.tgz"; + sha512 = "f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ=="; }; }; - "elliptic-6.5.5" = { + "elliptic-6.5.6" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.5"; + version = "6.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz"; - sha512 = "7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz"; + sha512 = "mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ=="; }; }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { @@ -23730,13 +23019,13 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; - "engine.io-3.6.1" = { + "engine.io-3.6.2" = { name = "engine.io"; packageName = "engine.io"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.1.tgz"; - sha512 = "dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.2.tgz"; + sha512 = "C4JjGQZLY3kWlIDx0BQNKizbrfpb7NahxDztGdN5jrPK2ghmXiNDN+E/t0JzDeNRZxPVaszxEng42Pmj27X/0w=="; }; }; "engine.io-6.4.2" = { @@ -23748,13 +23037,13 @@ let sha512 = "FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg=="; }; }; - "engine.io-6.5.4" = { + "engine.io-6.5.5" = { name = "engine.io"; packageName = "engine.io"; - version = "6.5.4"; + version = "6.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz"; - sha512 = "KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz"; + sha512 = "C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA=="; }; }; "engine.io-client-1.3.1" = { @@ -23775,22 +23064,22 @@ let sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ=="; }; }; - "engine.io-client-3.5.3" = { + "engine.io-client-3.5.4" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.3.tgz"; - sha512 = "qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.4.tgz"; + sha512 = "ydc8uuMMDxC5KCKNJN3zZKYJk2sgyTuTZQ7Aj1DJSsLKAcizA/PzWivw8fZMIjJVBo2CJOYzntv4FSjY/Lr//g=="; }; }; - "engine.io-client-6.5.3" = { + "engine.io-client-6.5.4" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz"; - sha512 = "9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz"; + sha512 = "GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ=="; }; }; "engine.io-parser-1.0.6" = { @@ -23820,13 +23109,13 @@ let sha512 = "P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ=="; }; }; - "engine.io-parser-5.2.2" = { + "engine.io-parser-5.2.3" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz"; - sha512 = "RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz"; + sha512 = "HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q=="; }; }; "enhanced-resolve-2.3.0" = { @@ -23838,13 +23127,13 @@ let sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q=="; }; }; - "enhanced-resolve-5.17.0" = { + "enhanced-resolve-5.17.1" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.17.0"; + version = "5.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz"; - sha512 = "dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz"; + sha512 = "LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg=="; }; }; "enquirer-2.3.6" = { @@ -23991,15 +23280,6 @@ let sha512 = "cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q=="; }; }; - "envinfo-7.8.1" = { - name = "envinfo"; - packageName = "envinfo"; - version = "7.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz"; - sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw=="; - }; - }; "environment-1.1.0" = { name = "environment"; packageName = "environment"; @@ -24135,13 +23415,13 @@ let sha512 = "cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w=="; }; }; - "es-module-lexer-1.5.3" = { + "es-module-lexer-1.5.4" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz"; - sha512 = "i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz"; + sha512 = "MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw=="; }; }; "es-object-atoms-1.0.0" = { @@ -24171,15 +23451,6 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es-vary-0.1.2" = { - name = "es-vary"; - packageName = "es-vary"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-vary/-/es-vary-0.1.2.tgz"; - sha512 = "pLqqZoOutAXQXyBJrUYVNM5fZngiOJYi1Xl4svQMrluTsqDUOQlBMw9EYgLrsWL6niDYn/Yd1y2Pj6GC+j/yjA=="; - }; - }; "es5-ext-0.10.64" = { name = "es5-ext"; packageName = "es5-ext"; @@ -24189,15 +23460,6 @@ let sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg=="; }; }; - "es6-error-4.1.1" = { - name = "es6-error"; - packageName = "es6-error"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"; - sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; - }; - }; "es6-iterator-2.0.3" = { name = "es6-iterator"; packageName = "es6-iterator"; @@ -24243,15 +23505,6 @@ let sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; }; }; - "es6-promise-pool-2.5.0" = { - name = "es6-promise-pool"; - packageName = "es6-promise-pool"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise-pool/-/es6-promise-pool-2.5.0.tgz"; - sha512 = "VHErXfzR/6r/+yyzPKeBvO0lgjfC5cbDCQWjWwMZWSb6YU39TGIl51OUmCfWCq4ylMdJSB8zkz2vIuIeIxXApA=="; - }; - }; "es6-promisify-5.0.0" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -24297,15 +23550,6 @@ let sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA=="; }; }; - "esbuild-0.17.19" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz"; - sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="; - }; - }; "esbuild-0.19.12" = { name = "esbuild"; packageName = "esbuild"; @@ -24666,13 +23910,13 @@ let sha512 = "dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ=="; }; }; - "eslint-9.5.0" = { + "eslint-9.7.0" = { name = "eslint"; packageName = "eslint"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz"; - sha512 = "+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz"; + sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -24702,13 +23946,13 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; - "eslint-plugin-vue-9.26.0" = { + "eslint-plugin-vue-9.27.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.26.0"; + version = "9.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.26.0.tgz"; - sha512 = "eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz"; + sha512 = "5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA=="; }; }; "eslint-rule-docs-1.1.235" = { @@ -24738,13 +23982,13 @@ let sha512 = "dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg=="; }; }; - "eslint-scope-8.0.1" = { + "eslint-scope-8.0.2" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz"; - sha512 = "pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz"; + sha512 = "6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA=="; }; }; "eslint-utils-2.1.0" = { @@ -24810,13 +24054,13 @@ let sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg=="; }; }; - "espree-10.0.1" = { + "espree-10.1.0" = { name = "espree"; packageName = "espree"; - version = "10.0.1"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz"; - sha512 = "MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww=="; + url = "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz"; + sha512 = "M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA=="; }; }; "espree-3.5.4" = { @@ -24873,13 +24117,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.5.0" = { + "esquery-1.6.0" = { name = "esquery"; packageName = "esquery"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz"; - sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz"; + sha512 = "ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg=="; }; }; "esrap-1.2.2" = { @@ -24936,15 +24180,6 @@ let sha512 = "xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw=="; }; }; - "estree-walker-0.6.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"; - sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; - }; - }; "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; @@ -24999,13 +24234,13 @@ let sha512 = "J1gDRkLpuGNvWYzWslBQR9cDV4nd4kfvVTE/Wy4Kkm4yb3EYRSlyi0eB/inTsSTTVyA0+HyzHgbr95Fn/Z1fSw=="; }; }; - "ethereum-cryptography-2.2.0" = { + "ethereum-cryptography-2.2.1" = { name = "ethereum-cryptography"; packageName = "ethereum-cryptography"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.0.tgz"; - sha512 = "hsm9JhfytIf8QME/3B7j4bc8V+VdTU+Vas1aJlvIS96ffoNAosudXvGoEvWmc7QZYdkC8mrMJz9r0fcbw7GyCA=="; + url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz"; + sha512 = "r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg=="; }; }; "ethjs-unit-0.1.6" = { @@ -25026,15 +24261,6 @@ let sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; }; }; - "event-pubsub-4.3.0" = { - name = "event-pubsub"; - packageName = "event-pubsub"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz"; - sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; - }; - }; "event-stream-3.1.7" = { name = "event-stream"; packageName = "event-stream"; @@ -25206,15 +24432,6 @@ let sha512 = "kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw=="; }; }; - "execa-3.4.0" = { - name = "execa"; - packageName = "execa"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz"; - sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; - }; - }; "execa-5.0.0" = { name = "execa"; packageName = "execa"; @@ -25251,13 +24468,13 @@ let sha512 = "VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="; }; }; - "execa-9.2.0" = { + "execa-9.3.0" = { name = "execa"; packageName = "execa"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-9.2.0.tgz"; - sha512 = "vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg=="; + url = "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz"; + sha512 = "l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg=="; }; }; "execall-2.0.0" = { @@ -25296,15 +24513,6 @@ let sha512 = "MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg=="; }; }; - "exit-hook-2.2.1" = { - name = "exit-hook"; - packageName = "exit-hook"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz"; - sha512 = "eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw=="; - }; - }; "exit-hook-4.0.0" = { name = "exit-hook"; packageName = "exit-hook"; @@ -25548,15 +24756,6 @@ let sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg=="; }; }; - "express-history-api-fallback-2.2.1" = { - name = "express-history-api-fallback"; - packageName = "express-history-api-fallback"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz"; - sha512 = "swxwm3aP8vrOOvlzOdZvHlSZtJGwHKaY94J6AkrAgCTmcbko3IRwbkhLv2wKV1WeZhjxX58aLMpP3atDBnKuZg=="; - }; - }; "express-interceptor-1.2.0" = { name = "express-interceptor"; packageName = "express-interceptor"; @@ -25566,31 +24765,22 @@ let sha512 = "fCbcJv8ZwabDg0M/3PmHUxfr/WKHGMpAicR9TfGdhANV4M1GBDSrBTenHIK3aegyRN5S6eDwlvyNFiLynnc19w=="; }; }; - "express-prom-bundle-6.5.0" = { + "express-prom-bundle-7.0.0" = { name = "express-prom-bundle"; packageName = "express-prom-bundle"; - version = "6.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.5.0.tgz"; - sha512 = "paFAm0FK7TV1Ln6Blh9edDt2mJ4Pk6Py/fjhZDMcoMHENYryBjCpnXDXuCu8NE1kkvp58IrPcAAkNeNqdvZnnw=="; - }; - }; - "express-request-id-1.4.1" = { - name = "express-request-id"; - packageName = "express-request-id"; - version = "1.4.1"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-request-id/-/express-request-id-1.4.1.tgz"; - sha512 = "qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw=="; + url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-7.0.0.tgz"; + sha512 = "VwVaCyGBGHkHdecpTqRdW1Jm2fXK8weCUKjGjNWorc9g4M+cZ3xoj+N9uQzfRWfIPXJG5QOaiAziOIalQzMwgA=="; }; }; - "express-session-1.17.3" = { + "express-session-1.18.0" = { name = "express-session"; packageName = "express-session"; - version = "1.17.3"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz"; - sha512 = "4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw=="; + url = "https://registry.npmjs.org/express-session/-/express-session-1.18.0.tgz"; + sha512 = "m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ=="; }; }; "express-validator-6.15.0" = { @@ -25638,15 +24828,6 @@ let sha512 = "a5CV1NyCQvSG+isfUoD4jrjIhwRIZ2E2htpZTXLhaHbmjd0ECduGGYOvXj3Fajus2DuZpjRSbPMlF5PBO4iqBA=="; }; }; - "ext-name-5.0.0" = { - name = "ext-name"; - packageName = "ext-name"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz"; - sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -25953,6 +25134,24 @@ let sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; }; }; + "fast-unique-numbers-8.0.13" = { + name = "fast-unique-numbers"; + packageName = "fast-unique-numbers"; + version = "8.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz"; + sha512 = "7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g=="; + }; + }; + "fast-uri-3.0.1" = { + name = "fast-uri"; + packageName = "fast-uri"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz"; + sha512 = "MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw=="; + }; + }; "fast-url-parser-1.1.3" = { name = "fast-url-parser"; packageName = "fast-url-parser"; @@ -26214,6 +25413,15 @@ let sha512 = "XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="; }; }; + "file-entry-cache-9.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz"; + sha512 = "6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw=="; + }; + }; "file-or-stdin-1.0.2" = { name = "file-or-stdin"; packageName = "file-or-stdin"; @@ -26268,15 +25476,6 @@ let sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; }; }; - "file-type-4.4.0" = { - name = "file-type"; - packageName = "file-type"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz"; - sha512 = "f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ=="; - }; - }; "file-type-5.2.0" = { name = "file-type"; packageName = "file-type"; @@ -26295,15 +25494,6 @@ let sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; }; }; - "file-type-8.1.0" = { - name = "file-type"; - packageName = "file-type"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz"; - sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -26637,15 +25827,6 @@ let sha512 = "OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A=="; }; }; - "fkill-7.2.1" = { - name = "fkill"; - packageName = "fkill"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz"; - sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; - }; - }; "fkill-9.0.0" = { name = "fkill"; packageName = "fkill"; @@ -26709,6 +25890,15 @@ let sha512 = "f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="; }; }; + "flat-cache-5.0.0" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz"; + sha512 = "JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ=="; + }; + }; "flatiron-0.4.3" = { name = "flatiron"; packageName = "flatiron"; @@ -26745,15 +25935,6 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.238.0" = { - name = "flow-parser"; - packageName = "flow-parser"; - version = "0.238.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.238.0.tgz"; - sha512 = "VE7XSv1epljsIN2YeBnxCmGJihpNIAnLLu/pPOdA+Gkso7qDltJwUi6vfHjgxdBbjSdAuPGnhuOHJUQG+yYwIg=="; - }; - }; "fluent-ffmpeg-2.1.3" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -26781,15 +25962,6 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.15.5" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.5"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz"; - sha512 = "vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="; - }; - }; "follow-redirects-1.15.6" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -26889,13 +26061,13 @@ let sha512 = "J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw=="; }; }; - "foreground-child-3.2.0" = { + "foreground-child-3.2.1" = { name = "foreground-child"; packageName = "foreground-child"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz"; - sha512 = "CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA=="; + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz"; + sha512 = "PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA=="; }; }; "forever-agent-0.6.1" = { @@ -27024,13 +26196,13 @@ let sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fp-ts-2.16.6" = { + "fp-ts-2.16.8" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.16.6"; + version = "2.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.6.tgz"; - sha512 = "v7w209VPj4L6pPn/ftFRJu31Oa8QagwcVw7BZmLCUWU4AQoc954rX9ogSIahDf67Pg+GjPbkW/Kn9XWnlWJG0g=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.8.tgz"; + sha512 = "nmDtNqmMZkOxu0M5hkrS9YA15/KPkYkILb6Axg9XBAoUoYEtzg+LFmVWqZrl9FNttsW0qIUpx9RCA9INbv+Bxw=="; }; }; "fragment-cache-0.2.1" = { @@ -27348,15 +26520,6 @@ let sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; - "fsevents-2.3.3" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"; - sha512 = "5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="; - }; - }; "fstream-1.0.12" = { name = "fstream"; packageName = "fstream"; @@ -27366,15 +26529,6 @@ let sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg=="; }; }; - "fswin-2.17.1227" = { - name = "fswin"; - packageName = "fswin"; - version = "2.17.1227"; - src = fetchurl { - url = "https://registry.npmjs.org/fswin/-/fswin-2.17.1227.tgz"; - sha512 = "xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw=="; - }; - }; "fullname-4.0.1" = { name = "fullname"; packageName = "fullname"; @@ -27546,15 +26700,6 @@ let sha512 = "H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag=="; }; }; - "generic-pool-3.9.0" = { - name = "generic-pool"; - packageName = "generic-pool"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz"; - sha512 = "hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g=="; - }; - }; "gensequence-2.3.0" = { name = "gensequence"; packageName = "gensequence"; @@ -27726,15 +26871,6 @@ let sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; }; }; - "get-source-2.0.12" = { - name = "get-source"; - packageName = "get-source"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/get-source/-/get-source-2.0.12.tgz"; - sha512 = "X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w=="; - }; - }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -27861,13 +26997,13 @@ let sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg=="; }; }; - "get-tsconfig-4.7.5" = { + "get-tsconfig-4.7.6" = { name = "get-tsconfig"; packageName = "get-tsconfig"; - version = "4.7.5"; + version = "4.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz"; - sha512 = "ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw=="; + url = "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz"; + sha512 = "ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA=="; }; }; "get-uri-6.0.3" = { @@ -27924,15 +27060,6 @@ let sha512 = "zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="; }; }; - "git-config-path-2.0.0" = { - name = "git-config-path"; - packageName = "git-config-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-config-path/-/git-config-path-2.0.0.tgz"; - sha512 = "qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA=="; - }; - }; "git-diff-tree-1.1.0" = { name = "git-diff-tree"; packageName = "git-diff-tree"; @@ -28023,13 +27150,13 @@ let sha512 = "ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ=="; }; }; - "git-url-parse-13.1.0" = { + "git-url-parse-14.0.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "13.1.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz"; - sha512 = "5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-14.0.0.tgz"; + sha512 = "NnLweV+2A4nCvn4U/m2AoYu0pPKlsmhK9cknG7IMwsjFY1S2jxM+mAhsDxyxfCIGfGaD+dozsyX4b6vkYc83yQ=="; }; }; "gitconfiglocal-1.0.0" = { @@ -28104,22 +27231,31 @@ let sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; }; }; - "glob-10.3.12" = { + "glob-10.4.1" = { + name = "glob"; + packageName = "glob"; + version = "10.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz"; + sha512 = "2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw=="; + }; + }; + "glob-10.4.5" = { name = "glob"; packageName = "glob"; - version = "10.3.12"; + version = "10.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz"; - sha512 = "TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg=="; + url = "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"; + sha512 = "7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="; }; }; - "glob-10.4.1" = { + "glob-11.0.0" = { name = "glob"; packageName = "glob"; - version = "10.4.1"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz"; - sha512 = "2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw=="; + url = "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz"; + sha512 = "9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g=="; }; }; "glob-6.0.4" = { @@ -28275,15 +27411,6 @@ let sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; }; }; - "global-agent-3.0.0" = { - name = "global-agent"; - packageName = "global-agent"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz"; - sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; - }; - }; "global-directory-4.0.1" = { name = "global-directory"; packageName = "global-directory"; @@ -28447,13 +27574,13 @@ let sha512 = "Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w=="; }; }; - "globby-14.0.1" = { + "globby-14.0.2" = { name = "globby"; packageName = "globby"; - version = "14.0.1"; + version = "14.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz"; - sha512 = "jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ=="; + url = "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz"; + sha512 = "s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw=="; }; }; "globby-6.1.0" = { @@ -28627,15 +27754,6 @@ let sha512 = "Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg=="; }; }; - "got-8.3.2" = { - name = "got"; - packageName = "got"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; - }; - }; "got-9.6.0" = { name = "got"; packageName = "got"; @@ -28681,15 +27799,6 @@ let sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; - }; - }; "gradle-to-js-2.0.1" = { name = "gradle-to-js"; packageName = "gradle-to-js"; @@ -28699,22 +27808,13 @@ let sha512 = "is3hDn9zb8XXnjbEeAEIqxTpLHUiGBqjegLmXPuyMBfKAggpadWFku4/AP8iYAGBX6qR9/5UIUIp47V0XI3aMw=="; }; }; - "grammarly-richtext-encoder-0.0.0" = { - name = "grammarly-richtext-encoder"; - packageName = "grammarly-richtext-encoder"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grammarly-richtext-encoder/-/grammarly-richtext-encoder-0.0.0.tgz"; - sha512 = "vH2bsdjoJLQ33sZCquG1GyiFyK+Qk8n04NzqHLWTnY9l8lg08AGUyA8ZgeZHdi3I81nrdcGO13V9qYyP6sdshw=="; - }; - }; - "grant-5.4.21" = { + "grant-5.4.22" = { name = "grant"; packageName = "grant"; - version = "5.4.21"; + version = "5.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/grant/-/grant-5.4.21.tgz"; - sha512 = "QaoZudI9Gmh2W415gd71Iul6gpVH9sG1SkjfnGHtqYZopQDQ5PUVxRol5zFCrwGi9S0EbExbelHlZScgdChg2w=="; + url = "https://registry.npmjs.org/grant/-/grant-5.4.22.tgz"; + sha512 = "DEi+/JjXT84mmFYhSmv+SX14v+3Z7vuCIYAMwtdPCTXHMSLhWqSYqWAMXDUQZuV7yaJv2d84AYnkCFNooLKBsA=="; }; }; "grapheme-splitter-1.0.4" = { @@ -28780,6 +27880,15 @@ let sha512 = "5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw=="; }; }; + "graphql-15.9.0" = { + name = "graphql"; + packageName = "graphql"; + version = "15.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-15.9.0.tgz"; + sha512 = "GCOQdvm7XxV1S4U4CGrsdlEN37245eC8P9zaYCMr6K1BG0IPGy5lUwmJsEOGyl1GD6HXjOtl2keCP9asRBwNvA=="; + }; + }; "graphql-16.8.1" = { name = "graphql"; packageName = "graphql"; @@ -28789,13 +27898,13 @@ let sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; }; }; - "graphql-16.8.2" = { + "graphql-16.9.0" = { name = "graphql"; packageName = "graphql"; - version = "16.8.2"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz"; - sha512 = "cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz"; + sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw=="; }; }; "graphql-config-3.0.3" = { @@ -28825,13 +27934,13 @@ let sha512 = "8ewD6otGO43vg2TiEGjoLz3CweTwfaf4ZnqfNREqZXS2JSJGXtsRBOMMknCxMfFVh4x14ql3jyDrXcyAAtbmkQ=="; }; }; - "graphql-language-service-server-2.13.0" = { + "graphql-language-service-server-2.13.1" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.13.0.tgz"; - sha512 = "/bvH7NPmWrc8rOCgV/Y1HVuKhjdZRMDkGQGEoWJFcGWDaLIp9LcffTLmeZA66NVS7pDmMeriKa2tH8LfPXH6OA=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.13.1.tgz"; + sha512 = "Bmkf+qW61XSV49P55U0K8ceG2++ctjhrefe62G5Iwm72RtvMlB41FUpv5KA/P79nxLNPPH1Fa+07whfxLylbHw=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -29437,13 +28546,13 @@ let sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; }; }; - "helmet-4.6.0" = { + "helmet-7.1.0" = { name = "helmet"; packageName = "helmet"; - version = "4.6.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz"; - sha512 = "HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="; + url = "https://registry.npmjs.org/helmet/-/helmet-7.1.0.tgz"; + sha512 = "g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg=="; }; }; "help-me-3.0.0" = { @@ -29455,6 +28564,15 @@ let sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; + "help-me-5.0.0" = { + name = "help-me"; + packageName = "help-me"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz"; + sha512 = "7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg=="; + }; + }; "hexoid-1.0.0" = { name = "hexoid"; packageName = "hexoid"; @@ -29554,15 +28672,6 @@ let sha512 = "xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw=="; }; }; - "hosted-git-info-6.1.1" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz"; - sha512 = "r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w=="; - }; - }; "hosted-git-info-7.0.2" = { name = "hosted-git-info"; packageName = "hosted-git-info"; @@ -29617,13 +28726,13 @@ let sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; }; }; - "html-encoding-sniffer-3.0.0" = { + "html-encoding-sniffer-4.0.0" = { name = "html-encoding-sniffer"; packageName = "html-encoding-sniffer"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; - sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA=="; + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz"; + sha512 = "Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ=="; }; }; "html-entities-1.4.0" = { @@ -29779,15 +28888,6 @@ let sha512 = "Jbx0+ejo2IOx+cRUYAGS1z6RGc6JfYUNkysZM4u4Sfk1uLlGv814F7/PIjQQAuThLdAWxb74JMGd5J8zex1VQg=="; }; }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; - }; - }; "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -30067,13 +29167,13 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; - "https-proxy-agent-7.0.4" = { + "https-proxy-agent-7.0.5" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz"; - sha512 = "wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz"; + sha512 = "1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw=="; }; }; "human-signals-1.1.1" = { @@ -30130,13 +29230,13 @@ let sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; }; }; - "hybrid-chunk-store-1.2.4" = { + "hybrid-chunk-store-1.2.6" = { name = "hybrid-chunk-store"; packageName = "hybrid-chunk-store"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/hybrid-chunk-store/-/hybrid-chunk-store-1.2.4.tgz"; - sha512 = "wLVIU7rDAz0bQ9sOVwqNWV44A+yAitm+yw66vilkIhZ7V1lVQtiZBQ98YF4vr8rmbqnysgW+pW/PZ1UQtnQCCA=="; + url = "https://registry.npmjs.org/hybrid-chunk-store/-/hybrid-chunk-store-1.2.6.tgz"; + sha512 = "D8DkY6FT+exjw4b6uQ8z5QfUokcIb0YYPHaa/zpBdFIoS1CS7mjM4wnd2mGoo2XUeM5Y10C23AXOQRExoifPbA=="; }; }; "hyperdyperid-1.2.0" = { @@ -30211,22 +29311,13 @@ let sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; }; }; - "idb-6.1.5" = { + "idb-7.1.1" = { name = "idb"; packageName = "idb"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz"; - sha512 = "IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="; - }; - }; - "idb-keyval-6.2.1" = { - name = "idb-keyval"; - packageName = "idb-keyval"; - version = "6.2.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz"; - sha512 = "8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="; + url = "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz"; + sha512 = "gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ=="; }; }; "ieee754-1.1.13" = { @@ -30301,15 +29392,6 @@ let sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; }; }; - "ignore-walk-5.0.1" = { - name = "ignore-walk"; - packageName = "ignore-walk"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz"; - sha512 = "yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw=="; - }; - }; "ignore-walk-6.0.5" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -30427,13 +29509,13 @@ let sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="; }; }; - "immutable-4.3.6" = { + "immutable-4.3.7" = { name = "immutable"; packageName = "immutable"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz"; - sha512 = "Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz"; + sha512 = "1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="; }; }; "import-fresh-3.3.0" = { @@ -30463,15 +29545,6 @@ let sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; }; }; - "import-global-0.1.0" = { - name = "import-global"; - packageName = "import-global"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-global/-/import-global-0.1.0.tgz"; - sha512 = "8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg=="; - }; - }; "import-in-the-middle-1.4.2" = { name = "import-in-the-middle"; packageName = "import-in-the-middle"; @@ -30508,6 +29581,15 @@ let sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; }; }; + "import-local-3.2.0" = { + name = "import-local"; + packageName = "import-local"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz"; + sha512 = "2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA=="; + }; + }; "import-meta-resolve-2.2.2" = { name = "import-meta-resolve"; packageName = "import-meta-resolve"; @@ -30697,15 +29779,6 @@ let sha512 = "QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g=="; }; }; - "ini-4.1.2" = { - name = "ini"; - packageName = "ini"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz"; - sha512 = "AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw=="; - }; - }; "ini-4.1.3" = { name = "ini"; packageName = "ini"; @@ -30715,13 +29788,13 @@ let sha512 = "X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg=="; }; }; - "init-package-json-5.0.0" = { + "init-package-json-6.0.3" = { name = "init-package-json"; packageName = "init-package-json"; - version = "5.0.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz"; - sha512 = "kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw=="; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-6.0.3.tgz"; + sha512 = "Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w=="; }; }; "ink-2.7.1" = { @@ -30886,22 +29959,13 @@ let sha512 = "M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg=="; }; }; - "inquirer-9.2.22" = { - name = "inquirer"; - packageName = "inquirer"; - version = "9.2.22"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.22.tgz"; - sha512 = "SqLLa/Oe5rZUagTR9z+Zd6izyatHglbmbvVofo1KzuVB54YHleWzeHNLoR7FOICGOeQSqeLh1cordb3MzhGcEw=="; - }; - }; - "inquirer-9.2.23" = { + "inquirer-9.3.6" = { name = "inquirer"; packageName = "inquirer"; - version = "9.2.23"; + version = "9.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.23.tgz"; - sha512 = "kod5s+FBPIDM2xiy9fu+6wdU/SkK5le5GS9lh4FEBjBHqiMgD9lLFbCbuqFNAjNL2ZOy9Wd9F694IOzN9pZHBA=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.3.6.tgz"; + sha512 = "riK/iQB2ctwkpWYgjjWIRv3MBLt2gzb2Sj0JNQNbyTXgyXsLWcDPJ5WS5ZDTCx7BRFnJsARtYh+58fjP5M2Y0Q=="; }; }; "inquirer-autocomplete-prompt-3.0.1" = { @@ -31084,15 +30148,6 @@ let sha512 = "qsc720yevCO+4NydrJWgEWKccAQwTOvj2m73O/VBA6iUL2HGZJ9XqBiyraNrBXX/W1IAjdpXdRZk24sq8TzBRg=="; }; }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha512 = "TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ=="; - }; - }; "into-stream-6.0.0" = { name = "into-stream"; packageName = "into-stream"; @@ -31120,15 +30175,6 @@ let sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; - "inversify-6.0.2" = { - name = "inversify"; - packageName = "inversify"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inversify/-/inversify-6.0.2.tgz"; - sha512 = "i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA=="; - }; - }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -31138,6 +30184,15 @@ let sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; + "ioredis-5.4.1" = { + name = "ioredis"; + packageName = "ioredis"; + version = "5.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.4.1.tgz"; + sha512 = "2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -31489,13 +30544,13 @@ let sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; }; - "is-core-module-2.13.1" = { + "is-core-module-2.15.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.1"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz"; - sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz"; + sha512 = "Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA=="; }; }; "is-core-module-2.9.0" = { @@ -31939,15 +30994,6 @@ let sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw=="; }; }; - "is-nan-1.3.2" = { - name = "is-nan"; - packageName = "is-nan"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; - sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; - }; - }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -32875,13 +31921,22 @@ let sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; }; }; - "jackspeak-3.4.0" = { + "jackspeak-3.4.3" = { name = "jackspeak"; packageName = "jackspeak"; - version = "3.4.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz"; - sha512 = "JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz"; + sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="; + }; + }; + "jackspeak-4.0.1" = { + name = "jackspeak"; + packageName = "jackspeak"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz"; + sha512 = "cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog=="; }; }; "jade-0.27.0" = { @@ -32893,22 +31948,13 @@ let sha512 = "VPrAZm2V9+0tqISXjca7ipt2LPMpLwnFZFM+1VG7q2LmiUQp1imCa++FgSqWxIs4W5gUTp/xlrUlx5xyFHYE6w=="; }; }; - "jake-10.9.1" = { + "jake-10.9.2" = { name = "jake"; packageName = "jake"; - version = "10.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz"; - sha512 = "61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w=="; - }; - }; - "javascript-stringify-2.1.0" = { - name = "javascript-stringify"; - packageName = "javascript-stringify"; - version = "2.1.0"; + version = "10.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz"; - sha512 = "JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="; + url = "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz"; + sha512 = "2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA=="; }; }; "jest-diff-29.7.0" = { @@ -33019,13 +32065,13 @@ let sha512 = "NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ=="; }; }; - "joi-17.13.1" = { + "joi-17.13.3" = { name = "joi"; packageName = "joi"; - version = "17.13.1"; + version = "17.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.13.1.tgz"; - sha512 = "vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg=="; + url = "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz"; + sha512 = "otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA=="; }; }; "join-async-iterator-1.1.1" = { @@ -33073,13 +32119,13 @@ let sha512 = "m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="; }; }; - "jquery.terminal-2.42.0" = { + "jquery.terminal-2.42.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.42.0"; + version = "2.42.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.42.0.tgz"; - sha512 = "poZX1qYCWRUXR12ex/SAh1U3chFCbZ81iN1ajUVbNAidQEGIqyPmHZd5FoSkjPs5jV6ckZLF3t4R6bao12g2Ag=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.42.2.tgz"; + sha512 = "TC3jRvCly1ZohSsy3m2UQjyOEYyZSl7YZQDUeF07nrQX1HAes+AznykYdhEPRHh2viYVp9GW0c1W+pm2eibLAw=="; }; }; "js-base64-2.6.3" = { @@ -33118,15 +32164,6 @@ let sha512 = "X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="; }; }; - "js-message-1.0.7" = { - name = "js-message"; - packageName = "js-message"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz"; - sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; - }; - }; "js-sdsl-4.3.0" = { name = "js-sdsl"; packageName = "js-sdsl"; @@ -33244,15 +32281,6 @@ let sha512 = "xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ=="; }; }; - "jscodeshift-0.11.0" = { - name = "jscodeshift"; - packageName = "jscodeshift"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.11.0.tgz"; - sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; - }; - }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -33271,22 +32299,22 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; - "jsdom-22.1.0" = { + "jsdom-23.0.1" = { name = "jsdom"; packageName = "jsdom"; - version = "22.1.0"; + version = "23.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz"; - sha512 = "/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw=="; + url = "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz"; + sha512 = "2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ=="; }; }; - "jsep-1.3.8" = { + "jsep-1.3.9" = { name = "jsep"; packageName = "jsep"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz"; - sha512 = "qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ=="; + url = "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz"; + sha512 = "i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw=="; }; }; "jsesc-0.5.0" = { @@ -33307,103 +32335,76 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsii-1.100.0" = { + "jsii-5.4.12" = { name = "jsii"; packageName = "jsii"; - version = "1.100.0"; + version = "5.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.100.0.tgz"; - sha512 = "DUTvq90XyyIRE+O/CAIHXZwBsxVy9ZkFDGkDjUknYV84VyzlMnBkdptQq0oJj8LRPTMJl2yiiPPMsJCvuv01Xg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.4.12.tgz"; + sha512 = "/6Mw+iSS8c/s1n2qH3TO1Bqd1YUY/aR0TZ2qTfOKN2UmmU4fwhZzSxrGRerPFQbhUm8v+8RS7kWEhSOv+eGQ9Q=="; }; }; - "jsii-5.3.29" = { + "jsii-5.4.26" = { name = "jsii"; packageName = "jsii"; - version = "5.3.29"; + version = "5.4.26"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.3.29.tgz"; - sha512 = "vEEOtjD8s/C8ORHvN87Bt9jHcY1diJoC1sS+TVnCkeb4V9q5fOEVr4gl/FsU5ea8dSWZHdd7VqCtr0jYAwKleg=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.4.26.tgz"; + sha512 = "vb1k7wsVfgYysXagV6ASStC7I+uEFRttSxpVSlz3HTNaoQYgQwiShkpqhRLlzYw9Pl5jERs+457QTVSj7Ze+zg=="; }; }; - "jsii-5.4.21" = { - name = "jsii"; - packageName = "jsii"; - version = "5.4.21"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.4.21.tgz"; - sha512 = "uCruIDzEEFHBwZRT5PiRSd2/KdsZWwHq8VWS5o8p5tngUGpz4BYdEG/jmOKYyjVz+ScVx+Ur/eN2zieTP6Ge2Q=="; - }; - }; - "jsii-pacmak-1.100.0" = { + "jsii-pacmak-1.101.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.100.0"; + version = "1.101.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.100.0.tgz"; - sha512 = "MxB4UYwpRjxZ/2y+LPy5HVkBciubU4T8d3A3mnj6Pj5lQfe3VZ9pStYHNTsv0q5J8xg4uIcc8/RhFHj1mzk2oA=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.101.0.tgz"; + sha512 = "07a04KtOj+Kmx+5XQVD1JG6QOh6JNqFWh4bbzMDKiFx7JoHhQnLq07b/OlUpCuP7J7Q9WaXXYM59EUQpXO07wg=="; }; }; - "jsii-pacmak-1.95.0" = { + "jsii-pacmak-1.98.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.95.0"; + version = "1.98.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.95.0.tgz"; - sha512 = "h/eo3p3jG4/Wtb9WdavvcgXzyN5QXZck3k0xvIWp5SKxFLorQ+TWhY7BHG0e+VXl+mxcni6BuQ5wFLavq65RQQ=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.98.0.tgz"; + sha512 = "p2H8IbiI3RNIUg+oRcJ9Xu1I7CgJUxCMpUl5IPzWAjz1qzhIKOzlkaAMGJfJZJQtib5kWI2OmZ6xBZScWg16+Q=="; }; }; - "jsii-reflect-1.100.0" = { + "jsii-reflect-1.101.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.100.0"; + version = "1.101.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.100.0.tgz"; - sha512 = "4hicwZirzhSqFRpX/USpvy6RewDi5mCkDESLjBSNpnGWhc3oVByX3x/KJyKQdjEfjVkflHWxSGJEA0qEMoXFUw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.101.0.tgz"; + sha512 = "ZCFb+laktj/ekNadUYksf+jLZq4fjoQeNe344GwslJOaemGjgAeqy0atV2H8nvTYU8ubszFApUPpdoRvtxgdPw=="; }; }; - "jsii-rosetta-1.100.0" = { + "jsii-rosetta-5.4.14" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.100.0"; + version = "5.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.100.0.tgz"; - sha512 = "JeVS7twbDM48Z6IE9OJ24DzBs9scpeWa9XmI00bggMWV0xcP2GCTkz2c8cqEZU4DPggcygS1H+TWhQiSkol4gQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.14.tgz"; + sha512 = "SIaqWpzk33Tqr+x4M4umt9Z9CSxcr6i48pN6aTe7nzT3ELmBABsWzHHpnoCDUlLzx5OG+PKMfVdxoh7z3TX0lQ=="; }; }; - "jsii-rosetta-5.3.28" = { + "jsii-rosetta-5.4.25" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "5.3.28"; + version = "5.4.25"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.3.28.tgz"; - sha512 = "pvfaaMYJhsGz9BXmQenlC+aey2HTRiPwlTr7FcH4wr0THkKbIwChPpS26YWSGyNLmTqDZUvmQv+xDtMx5qFXGg=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.25.tgz"; + sha512 = "tXVABsWJMknMNhUpGkbOWaqHYv45vRSxO2ZLY+s+Eiti1R/G2XeGWJd/a9MJDauLaOVODpzN6z1GQ+WYZjZlIw=="; }; }; - "jsii-rosetta-5.4.21" = { - name = "jsii-rosetta"; - packageName = "jsii-rosetta"; - version = "5.4.21"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.21.tgz"; - sha512 = "g7E935trSNQ8rbs+VYQiDBbeoaqS0sO7HuJ+bz27x7pvKBri5Uk9w+aLtmFI8UhHX7JgZ6mUxruY0zRW4AqCyQ=="; - }; - }; - "jsii-srcmak-0.1.1039" = { + "jsii-srcmak-0.1.1193" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.1039"; + version = "0.1.1193"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1039.tgz"; - sha512 = "3lBjyxBy5UpPGK8bXFmVRzaoK6caDQ5DO40Qbyv3LOWtrsuUQmuVI2/5wRwNtfg6sFzOFD3+kE3LZuNXo7QE/Q=="; - }; - }; - "jsii-srcmak-0.1.1154" = { - name = "jsii-srcmak"; - packageName = "jsii-srcmak"; - version = "0.1.1154"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1154.tgz"; - sha512 = "x2iOuiUAg4xhk3dEz67ElrbSdMk+KSHCOV9CT82PWrmehXg+kZ4pudoAk8/4KLiS9UR0ZLtugZQQPMIZp6E67w=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1193.tgz"; + sha512 = "q3pEUmudzgl75ZXqHXWB6m7CMil9rAcY1Ln7hsWHgpf4DPeS7YEvUa+jOQ5YY4T3ljN8Q0G08jJIPutQ1osqaA=="; }; }; "json-buffer-3.0.0" = { @@ -33595,6 +32596,15 @@ let sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; + "json-stringify-nice-1.1.4" = { + name = "json-stringify-nice"; + packageName = "json-stringify-nice"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz"; + sha512 = "5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw=="; + }; + }; "json-stringify-pretty-compact-3.0.0" = { name = "json-stringify-pretty-compact"; packageName = "json-stringify-pretty-compact"; @@ -33649,13 +32659,13 @@ let sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; - "jsonata-1.8.7" = { + "jsonata-2.0.5" = { name = "jsonata"; packageName = "jsonata"; - version = "1.8.7"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.7.tgz"; - sha512 = "tOW2/hZ+nR2bcQZs+0T62LVe5CHaNa3laFFWb/262r39utN6whJGBF7IR2Wq1QXrDbhftolk5gggW8uUJYlBTQ=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-2.0.5.tgz"; + sha512 = "wEse9+QLIIU5IaCgtJCPsFi/H4F3qcikWzF4bAELZiRz08ohfx3Q6CjDRf4ZPF5P/92RI3KIHtb7u3jqPaHXdQ=="; }; }; "jsonc-parser-1.0.3" = { @@ -33694,13 +32704,13 @@ let sha512 = "gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="; }; }; - "jsonc-parser-3.2.1" = { + "jsonc-parser-3.3.1" = { name = "jsonc-parser"; packageName = "jsonc-parser"; - version = "3.2.1"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz"; - sha512 = "AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="; + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz"; + sha512 = "HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="; }; }; "jsonfile-1.0.1" = { @@ -33901,6 +32911,24 @@ let sha512 = "Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ=="; }; }; + "just-diff-6.0.2" = { + name = "just-diff"; + packageName = "just-diff"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz"; + sha512 = "S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA=="; + }; + }; + "just-diff-apply-5.5.0" = { + name = "just-diff-apply"; + packageName = "just-diff-apply"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz"; + sha512 = "OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw=="; + }; + }; "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; @@ -33919,15 +32947,6 @@ let sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; }; }; - "jwk-to-pem-2.0.5" = { - name = "jwk-to-pem"; - packageName = "jwk-to-pem"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz"; - sha512 = "L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A=="; - }; - }; "jws-3.2.2" = { name = "jws"; packageName = "jws"; @@ -34036,13 +33055,13 @@ let sha512 = "fwGvRXWjaSzMed8iQHkZH41wvaoq+3tIhuIbkqBBYFuuJtWoDWqgCYTADGPqLyaLX4Ct8aP5NtAxCaxk4cfcCg=="; }; }; - "katex-0.16.9" = { + "katex-0.16.10" = { name = "katex"; packageName = "katex"; - version = "0.16.9"; + version = "0.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.9.tgz"; - sha512 = "fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ=="; + url = "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz"; + sha512 = "ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA=="; }; }; "keep-alive-agent-0.0.1" = { @@ -34099,15 +33118,6 @@ let sha512 = "VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ=="; }; }; - "keyv-3.0.0" = { - name = "keyv"; - packageName = "keyv"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; - }; - }; "keyv-3.1.0" = { name = "keyv"; packageName = "keyv"; @@ -34243,13 +33253,13 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; - "ky-1.3.0" = { + "ky-1.4.0" = { name = "ky"; packageName = "ky"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ky/-/ky-1.3.0.tgz"; - sha512 = "QUViPXlgP6NKA57IAPff/aZSmRA6qs9wKxlEpayBorwRZG+x2LG7jD4kXh8lnH3q/gkUr64NyZ7kwErUEZJmlw=="; + url = "https://registry.npmjs.org/ky/-/ky-1.4.0.tgz"; + sha512 = "tPhhoGUiEiU/WXR4rt8klIoLdnTtyu+9jVKHd/wauEjYud32jyn63mzKWQweaQrHWxBQtYoVtdcEnYX1LosnFQ=="; }; }; "labeled-stream-splicer-2.0.2" = { @@ -34315,13 +33325,22 @@ let sha512 = "KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg=="; }; }; - "launch-editor-2.6.1" = { + "latest-version-9.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-9.0.0.tgz"; + sha512 = "7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA=="; + }; + }; + "launch-editor-2.8.0" = { name = "launch-editor"; packageName = "launch-editor"; - version = "2.6.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz"; - sha512 = "eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw=="; + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz"; + sha512 = "vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA=="; }; }; "layout-base-1.0.2" = { @@ -34333,15 +33352,6 @@ let sha512 = "8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg=="; }; }; - "layout-base-2.0.1" = { - name = "layout-base"; - packageName = "layout-base"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz"; - sha512 = "dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg=="; - }; - }; "lazy-1.0.11" = { name = "lazy"; packageName = "lazy"; @@ -34540,22 +33550,22 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "libnpmaccess-7.0.2" = { + "libnpmaccess-8.0.6" = { name = "libnpmaccess"; packageName = "libnpmaccess"; - version = "7.0.2"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-7.0.2.tgz"; - sha512 = "vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw=="; + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-8.0.6.tgz"; + sha512 = "uM8DHDEfYG6G5gVivVl+yQd4pH3uRclHC59lzIbSvy7b5FEwR+mU49Zq1jEyRtRFv7+M99mUW9S0wL/4laT4lw=="; }; }; - "libnpmpublish-7.3.0" = { + "libnpmpublish-9.0.9" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "7.3.0"; + version = "9.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.3.0.tgz"; - sha512 = "fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-9.0.9.tgz"; + sha512 = "26zzwoBNAvX9AWOPiqqF6FG4HrSCPsHFkQm7nT+xU1ggAujL/eae81RnCv4CJ2In9q9fh10B88sYSzKCUh/Ghg=="; }; }; "lie-3.1.1" = { @@ -34792,6 +33802,15 @@ let sha512 = "rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g=="; }; }; + "listr2-8.2.3" = { + name = "listr2"; + packageName = "listr2"; + version = "8.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/listr2/-/listr2-8.2.3.tgz"; + sha512 = "Lllokma2mtoniUOS94CcOErHWAug5iu7HOmDrvWgpw8jyQH2fomgB+7lZS4HWZxytUuQwkGOwe49FvwVaA85Xw=="; + }; + }; "lmdb-2.5.3" = { name = "lmdb"; packageName = "lmdb"; @@ -34810,13 +33829,13 @@ let sha512 = "9bMdFfc80S+vSldBmG3HOuLVHnxRdNTlpzR6QDnzqCQtCzGUEAGTzBKYMeIM+I/sU4oZfgbcbS7X7F65/z/oxQ=="; }; }; - "load-bmfont-1.4.1" = { + "load-bmfont-1.4.2" = { name = "load-bmfont"; packageName = "load-bmfont"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz"; - sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; + url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.2.tgz"; + sha512 = "qElWkmjW9Oq1F9EI5Gt7aD9zcdHb9spJCW1L/dmPf7KzCCEJxq8nhHz5eCgI9aMf7vrG/wyaCqdsI+Iy9ZTlog=="; }; }; "load-ip-set-3.0.1" = { @@ -35971,6 +34990,15 @@ let sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw=="; }; }; + "log-update-6.0.0" = { + name = "log-update"; + packageName = "log-update"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz"; + sha512 = "niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw=="; + }; + }; "log4js-6.9.1" = { name = "log4js"; packageName = "log4js"; @@ -35980,13 +35008,13 @@ let sha512 = "1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g=="; }; }; - "logform-2.6.0" = { + "logform-2.6.1" = { name = "logform"; packageName = "logform"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz"; - sha512 = "1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ=="; + url = "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz"; + sha512 = "CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA=="; }; }; "logidrom-0.3.1" = { @@ -36016,15 +35044,6 @@ let sha512 = "WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="; }; }; - "long-4.0.0" = { - name = "long"; - packageName = "long"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; - sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; - }; - }; "long-5.2.3" = { name = "long"; packageName = "long"; @@ -36106,15 +35125,6 @@ let sha512 = "UFdqQF3jrmFgSx7JEPwbEbHh6T/LNBiJGjqrMtG0XN2UtFjCb6eVFOI2GMJO5PApowakhZlMUjWXuR9vWQcnkw=="; }; }; - "lowdb-1.0.0" = { - name = "lowdb"; - packageName = "lowdb"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz"; - sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; - }; - }; "lowdb-7.0.1" = { name = "lowdb"; packageName = "lowdb"; @@ -36142,15 +35152,6 @@ let sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha512 = "RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="; - }; - }; "lowercase-keys-1.0.1" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -36205,22 +35206,31 @@ let sha512 = "5OUtoiVIGU4VXBOshidmtOsvBIvcQR6FD/RzWSvaeHyxCGB+PCUCu+52lqMfdc0h/2CLvHhZS4TwUmMQrrMbBQ=="; }; }; - "lru-cache-10.0.3" = { + "lru-cache-10.2.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "10.0.3"; + version = "10.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz"; + sha512 = "9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ=="; + }; + }; + "lru-cache-10.4.3" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz"; - sha512 = "B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"; + sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="; }; }; - "lru-cache-10.2.2" = { + "lru-cache-11.0.0" = { name = "lru-cache"; packageName = "lru-cache"; - version = "10.2.2"; + version = "11.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz"; - sha512 = "9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz"; + sha512 = "Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA=="; }; }; "lru-cache-2.2.0" = { @@ -36268,15 +35278,6 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.13.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz"; - sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; - }; - }; "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -36314,22 +35315,13 @@ let sha256 = "f813d671f8f8088d70d29f7a7770bdd5ed41ed97240ae9346d7ced0c094ee049"; }; }; - "luxon-1.28.1" = { + "luxon-3.4.4" = { name = "luxon"; packageName = "luxon"; - version = "1.28.1"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz"; - sha512 = "gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw=="; - }; - }; - "magic-string-0.25.9" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.9"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz"; + sha512 = "zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA=="; }; }; "magic-string-0.30.10" = { @@ -36458,15 +35450,6 @@ let sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; }; }; - "make-fetch-happen-11.1.1" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "11.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz"; - sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; - }; - }; "make-fetch-happen-13.0.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -36773,15 +35756,6 @@ let sha512 = "h1S0f3HzPtaNTaIBXu/3PVsXhKgZGk9DYrqp+bNZwp1wjYhJnEKggossj+DCCQ72+2y3Kcd7fNP2cEkp9jK6Ig=="; }; }; - "matcher-3.0.0" = { - name = "matcher"; - packageName = "matcher"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz"; - sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; - }; - }; "math-random-1.0.4" = { name = "math-random"; packageName = "math-random"; @@ -37268,13 +36242,13 @@ let sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; }; }; - "memfs-4.9.2" = { + "memfs-4.9.4" = { name = "memfs"; packageName = "memfs"; - version = "4.9.2"; + version = "4.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-4.9.2.tgz"; - sha512 = "f16coDZlTG1jskq3mxarwB+fGRrd0uXWt+o1WIhRfOwbXQZqUDsTVxQBFK9JjRQHblg8eAG2JSbprDXKjc7ijQ=="; + url = "https://registry.npmjs.org/memfs/-/memfs-4.9.4.tgz"; + sha512 = "Xlj8b2rU11nM6+KU6wC7cuWcHQhVINWCUgdPS4Ar9nPxLaOya3RghqK7ALyDW2QtGebYAYs6uEdEVnwPVT942A=="; }; }; "memory-cache-0.2.0" = { @@ -37421,13 +36395,13 @@ let sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; - "mermaid-10.6.1" = { + "mermaid-10.9.1" = { name = "mermaid"; packageName = "mermaid"; - version = "10.6.1"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-10.6.1.tgz"; - sha512 = "Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-10.9.1.tgz"; + sha512 = "Mx45Obds5W1UkW1nv/7dHRsbfMM1aOKA2+Pxs/IGHNonygDHwmng8xTHyS9z4KWVi0rbko8gjiBmuwwXQ7tiNA=="; }; }; "meros-1.1.4" = { @@ -38132,6 +37106,15 @@ let sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="; }; }; + "mime-4.0.0-beta.1" = { + name = "mime"; + packageName = "mime"; + version = "4.0.0-beta.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-4.0.0-beta.1.tgz"; + sha512 = "8/p99P1RV17prytee/A6D+8shNqdDzyvGJ/CVfiuXwh4cTsv3P3qGyaYSx2hdqnqbKKqYUfTC5zAjCtcd1BShw=="; + }; + }; "mime-4.0.1" = { name = "mime"; packageName = "mime"; @@ -38186,6 +37169,15 @@ let sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; + "mime-db-1.53.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.53.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz"; + sha512 = "oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -38357,15 +37349,6 @@ let sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; - "miniflare-3.20240610.0" = { - name = "miniflare"; - packageName = "miniflare"; - version = "3.20240610.0"; - src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20240610.0.tgz"; - sha512 = "J6aXmkII5gcq+kC4TurxKiR4rC++apPST/K8P/YjqoQQgrJ+NRPacBhf6iVh8R3ujnXYXaq+Ae+gm+LM0XHK/w=="; - }; - }; "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; @@ -38384,6 +37367,15 @@ let sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="; }; }; + "minimatch-10.0.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz"; + sha512 = "ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -38429,15 +37421,6 @@ let sha512 = "lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng=="; }; }; - "minimatch-5.0.1" = { - name = "minimatch"; - packageName = "minimatch"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz"; - sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; - }; - }; "minimatch-5.1.2" = { name = "minimatch"; packageName = "minimatch"; @@ -38510,13 +37493,13 @@ let sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; }; }; - "minimatch-9.0.4" = { + "minimatch-9.0.5" = { name = "minimatch"; packageName = "minimatch"; - version = "9.0.4"; + version = "9.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz"; - sha512 = "KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz"; + sha512 = "G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="; }; }; "minimist-0.0.10" = { @@ -38663,15 +37646,6 @@ let sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; }; }; - "minipass-json-stream-1.0.1" = { - name = "minipass-json-stream"; - packageName = "minipass-json-stream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz"; - sha512 = "ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg=="; - }; - }; "minipass-pipeline-1.2.4" = { name = "minipass-pipeline"; packageName = "minipass-pipeline"; @@ -38708,6 +37682,15 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; + "minizlib-3.0.1" = { + name = "minizlib"; + packageName = "minizlib"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz"; + sha512 = "umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg=="; + }; + }; "mitt-1.2.0" = { name = "mitt"; packageName = "mitt"; @@ -38771,6 +37754,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-3.0.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz"; + sha512 = "+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="; + }; + }; "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; @@ -38834,15 +37826,6 @@ let sha512 = "oPowVpTm8p3jsK2AKI+NzoS6TBKv7gWY/Hj4ZNh5YWiB3S4eP54y8vSEEgVUdrqgTbjwEzIunNAVQJGRW0bakQ=="; }; }; - "moment-2.29.4" = { - name = "moment"; - packageName = "moment"; - version = "2.29.4"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"; - sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; - }; - }; "moment-2.30.1" = { name = "moment"; packageName = "moment"; @@ -38861,15 +37844,6 @@ let sha512 = "zp8slBaeHVn8VOr7aTVzXYYayoVtEF3XI9gmgimyR3PBZsBk4JlXlFgxmcKxRjBZ1voh9ao77u/qwMGSZVZ9+A=="; }; }; - "moment-timezone-0.5.43" = { - name = "moment-timezone"; - packageName = "moment-timezone"; - version = "0.5.43"; - src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz"; - sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ=="; - }; - }; "moment-timezone-0.5.45" = { name = "moment-timezone"; packageName = "moment-timezone"; @@ -38915,22 +37889,22 @@ let sha512 = "4aE3U7CCBWgrQlQDMq8da4woBWDGHioJFiOZ8Ie6Yq2uwYQ9V2kGhTz4x3u6Wc+OU17nw0yc3rJ/lQ4jIiPe3A=="; }; }; - "mqtt-4.3.7" = { + "mqtt-4.3.8" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.7"; + version = "4.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz"; - sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.8.tgz"; + sha512 = "2xT75uYa0kiPEF/PE0VPdavmEkoBzMT/UL9moid0rAvlCtV48qBwxD62m7Ld/4j8tSkIO1E/iqRl/S72SEOhOw=="; }; }; - "mqtt-4.3.8" = { + "mqtt-5.7.0" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.8"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.8.tgz"; - sha512 = "2xT75uYa0kiPEF/PE0VPdavmEkoBzMT/UL9moid0rAvlCtV48qBwxD62m7Ld/4j8tSkIO1E/iqRl/S72SEOhOw=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-5.7.0.tgz"; + sha512 = "/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg=="; }; }; "mqtt-packet-6.10.0" = { @@ -38942,6 +37916,15 @@ let sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; }; }; + "mqtt-packet-9.0.0" = { + name = "mqtt-packet"; + packageName = "mqtt-packet"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.0.tgz"; + sha512 = "8v+HkX+fwbodsWAZIZTI074XIoxVBOmPeggQuDFCGg1SqNcC+uoRMWu7J6QlJPqIUIJXmjNYYHxBBLr1Y/Df4w=="; + }; + }; "mri-1.2.0" = { name = "mri"; packageName = "mri"; @@ -39014,13 +37997,13 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.10.2" = { + "msgpackr-1.11.0" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.2.tgz"; - sha512 = "L60rsPynBvNE+8BWipKKZ9jHcSGbtyJYIwjRq0VrIvQ08cRjntGXJYW/tmciZ2IHWIY8WEW32Qa2xbh5+SKBZA=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.0.tgz"; + sha512 = "I8qXuuALqJe5laEBYoFykChhSXLikZmUhccjGsPuSJ/7uPip2TJ7lwdIQwWSAi0jGZDXv4WOP8Qg65QZRuXxXw=="; }; }; "muggle-string-0.4.1" = { @@ -39203,15 +38186,6 @@ let sha512 = "bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="; }; }; - "nanoid-2.1.11" = { - name = "nanoid"; - packageName = "nanoid"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz"; - sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; - }; - }; "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; @@ -39627,15 +38601,6 @@ let sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; }; - "node-addon-api-5.1.0" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz"; - sha512 = "eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="; - }; - }; "node-addon-api-6.1.0" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -39645,13 +38610,13 @@ let sha512 = "+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="; }; }; - "node-addon-api-7.1.0" = { + "node-addon-api-7.1.1" = { name = "node-addon-api"; packageName = "node-addon-api"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz"; - sha512 = "mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz"; + sha512 = "5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ=="; }; }; "node-api-version-0.2.0" = { @@ -39681,22 +38646,13 @@ let sha512 = "h66cRVEWnPQFxh5Y1hk9MNs6jvlB26CjT727ZztkIkPN+eyRI2c9powQrBJ9pty2Kj7IBySDnYHig7QElmU4Pg=="; }; }; - "node-datachannel-0.9.1" = { + "node-datachannel-0.10.1" = { name = "node-datachannel"; packageName = "node-datachannel"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.9.1.tgz"; - sha512 = "b6Uc6YN5We2/aZA6QGicxSdWUDSwlR+vcO/Dn44BY5gieF3AOwsL/zPD+Ril+1KvYDwVJkVbRIovbG76E4PpwA=="; - }; - }; - "node-dir-0.1.17" = { - name = "node-dir"; - packageName = "node-dir"; - version = "0.1.17"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz"; - sha512 = "tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg=="; + url = "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.10.1.tgz"; + sha512 = "rhxb1iQgbFLY6HMt3W6Xcs8Q1k4jIMgI7KduXcYvIn2UMKYK6e/eegya2caF/+XYAqTeo1743gOr11CXvJ/DJA=="; }; }; "node-domexception-1.0.0" = { @@ -39816,15 +38772,6 @@ let sha512 = "ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg=="; }; }; - "node-fetch-native-1.6.4" = { - name = "node-fetch-native"; - packageName = "node-fetch-native"; - version = "1.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz"; - sha512 = "IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ=="; - }; - }; "node-forge-0.10.0" = { name = "node-forge"; packageName = "node-forge"; @@ -39861,13 +38808,13 @@ let sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; }; - "node-gyp-10.1.0" = { + "node-gyp-10.2.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz"; - sha512 = "B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz"; + sha512 = "sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw=="; }; }; "node-gyp-3.8.0" = { @@ -39996,22 +38943,22 @@ let sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA=="; }; }; - "node-red-admin-3.1.3" = { + "node-red-admin-4.0.0" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "3.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.1.3.tgz"; - sha512 = "RRkjwLjriCKW3bqiU21y3j+wpZ4bDf2EH3IEqxwP6hT4ccIwEK8Nt9dPZRWD6NyWGbEVDSTM5H0/whaRdFCqSw=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.0.0.tgz"; + sha512 = "OP2IE/5r+TCeZBj5x+8MfslEjsxqGc1Er5rI5IMG3D/A3++3r0EkW+tlc0pKnX8lmKs1batgAtMIQbh4XkMY3w=="; }; }; - "node-releases-2.0.14" = { + "node-releases-2.0.18" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.14"; + version = "2.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz"; - sha512 = "y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz"; + sha512 = "d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="; }; }; "node-rsa-1.1.1" = { @@ -40023,13 +38970,13 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; - "node-schedule-2.1.0" = { + "node-schedule-2.1.1" = { name = "node-schedule"; packageName = "node-schedule"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.0.tgz"; - sha512 = "nl4JTiZ7ZQDc97MmpTq9BQjYhq7gOtoh7SiPH069gBFBj0PzD8HI7zyFs6rzqL8Y5tTiEEYLxgtbx034YPrbyQ=="; + url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz"; + sha512 = "OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ=="; }; }; "node-ssdp-2.9.1" = { @@ -40203,22 +39150,13 @@ let sha512 = "EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg=="; }; }; - "normalize-package-data-5.0.0" = { + "normalize-package-data-6.0.2" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz"; - sha512 = "h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q=="; - }; - }; - "normalize-package-data-6.0.1" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz"; - sha512 = "6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz"; + sha512 = "V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g=="; }; }; "normalize-path-2.1.1" = { @@ -40257,15 +39195,6 @@ let sha512 = "dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw=="; }; }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; - }; - }; "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -40383,22 +39312,22 @@ let sha512 = "dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ=="; }; }; - "npm-package-arg-10.1.0" = { + "npm-package-arg-11.0.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "10.1.0"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz"; - sha512 = "uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA=="; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz"; + sha512 = "IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw=="; }; }; - "npm-package-arg-11.0.2" = { + "npm-package-arg-11.0.3" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz"; - sha512 = "IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw=="; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz"; + sha512 = "sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw=="; }; }; "npm-package-arg-6.1.0" = { @@ -40428,15 +39357,6 @@ let sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g=="; }; }; - "npm-package-arg-8.1.1" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz"; - sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg=="; - }; - }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -40464,15 +39384,6 @@ let sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg=="; }; }; - "npm-packlist-5.1.1" = { - name = "npm-packlist"; - packageName = "npm-packlist"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz"; - sha512 = "UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw=="; - }; - }; "npm-packlist-8.0.2" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -40491,6 +39402,15 @@ let sha512 = "Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw=="; }; }; + "npm-pick-manifest-9.1.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz"; + sha512 = "nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA=="; + }; + }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -40500,24 +39420,6 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-14.0.5" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "14.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz"; - sha512 = "kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA=="; - }; - }; - "npm-registry-fetch-16.2.1" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "16.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz"; - sha512 = "8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA=="; - }; - }; "npm-registry-fetch-17.1.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -40689,22 +39591,22 @@ let sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA=="; }; }; - "nwsapi-2.2.10" = { + "nwsapi-2.2.12" = { name = "nwsapi"; packageName = "nwsapi"; - version = "2.2.10"; + version = "2.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz"; - sha512 = "QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ=="; + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz"; + sha512 = "qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w=="; }; }; - "nx-19.3.0" = { + "nx-19.5.3" = { name = "nx"; packageName = "nx"; - version = "19.3.0"; + version = "19.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-19.3.0.tgz"; - sha512 = "WILWiROUkZWwuPJ12tP24Z0NULPEhxFN9i55/fECuVXYaFtkg6FvEne9C4d4bRqhZPcbrz6WhHnzE3NhdjH7XQ=="; + url = "https://registry.npmjs.org/nx/-/nx-19.5.3.tgz"; + sha512 = "ZUrnRwPdRWXeo8IuLj16Oo9IfiDjd8C6xKWC4F6wcTNZ9ZS7ZErrfqaQr04zdO89ASF9brbkqm0UkMyDPc6kPQ=="; }; }; "oas-kit-common-1.0.8" = { @@ -40770,13 +39672,13 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "oauth2orize-1.11.1" = { + "oauth2orize-1.12.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.1.tgz"; - sha512 = "9dSx/Gwm0J2Rvj4RH9+h7iXVnRXZ6biwWRgb2dCeQhCosODS0nYdM9I/G7BUGsjbgn0pHjGcn1zcCRtzj2SlRA=="; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.12.0.tgz"; + sha512 = "j4XtFDQUBsvUHPjUmvmNDUDMYed2MphMIJBhyxVVe8hGCjkuYnjIsW+D9qk8c5ciXRdnk6x6tEbiO6PLeOZdCQ=="; }; }; "object-assign-3.0.0" = { @@ -40833,13 +39735,13 @@ let sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; }; }; - "object-inspect-1.13.1" = { + "object-inspect-1.13.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"; - sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz"; + sha512 = "IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="; }; }; "object-is-1.1.6" = { @@ -41103,13 +40005,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.100.0" = { + "oo-ascii-tree-1.101.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.100.0"; + version = "1.101.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.100.0.tgz"; - sha512 = "Y/C4AN9IVjsIyNQ1iK4x65xe2AV9q0MtXlYAOKZLA2ZscOzZJbRNi0BzcpmeMb/DSIAFm9M5kaxLqdAKpETbHg=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.101.0.tgz"; + sha512 = "hNE9Nfvo4HLa9/dAiaiXUm64KHUvgBa7jPftsb8gZdTv1G1wSMMnd9j7SMcRzaMbDEqi+0cfgeBSIcsKy+k0vA=="; }; }; "open-0.0.2" = { @@ -41193,13 +40095,13 @@ let sha512 = "+9g4actZKeb3czfi9gVQ4Br2Ju3KwhCAQJBNaKgye5KggqcBLIhFHH+nIkcm0BUX00TrAJl6dH4JWgM4G4JWrw=="; }; }; - "openpgp-5.11.1" = { + "openpgp-5.11.2" = { name = "openpgp"; packageName = "openpgp"; - version = "5.11.1"; + version = "5.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.1.tgz"; - sha512 = "TynUBPuaSI7dN0gP+A38CjNRLxkOkkptefNanalDQ71BFAKKm+dLbksymSW5bUrB7RcAneMySL/Y+r/TbLpOnQ=="; + url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.2.tgz"; + sha512 = "f8dJFVLwdkvPvW3VPFs6q9Vs2+HNhdvwls7a/MIFcQUB+XiQzRe7alfa3RtwfGJU7oUDDMAWPZ0nYsHa23Az+A=="; }; }; "opentracing-0.14.7" = { @@ -41445,6 +40347,15 @@ let sha512 = "RMtGSVNM4NWSF9uVWCUqaYiA7ID8Vqm/rSk2W37eYVrDLOI/3do2IRY7rQYkvJqb6sS6LAnALODBkD50tIM1kw=="; }; }; + "oxc-resolver-1.10.2" = { + name = "oxc-resolver"; + packageName = "oxc-resolver"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-1.10.2.tgz"; + sha512 = "NIbwVqoU8Bhl7PVtItHCg+VFFokIDwBgIgFUwFG2Y8ePhxftFh5xG+KLar5PLWXlCP4WunPIuXD3jr3v6/MfRw=="; + }; + }; "p-any-2.1.0" = { name = "p-any"; packageName = "p-any"; @@ -41454,15 +40365,6 @@ let sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; }; }; - "p-cancelable-0.4.1" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; - }; - }; "p-cancelable-1.1.0" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -41499,15 +40401,6 @@ let sha512 = "wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw=="; }; }; - "p-event-2.3.1" = { - name = "p-event"; - packageName = "p-event"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz"; - sha512 = "NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA=="; - }; - }; "p-event-5.0.1" = { name = "p-event"; packageName = "p-event"; @@ -41544,15 +40437,6 @@ let sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; }; }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha512 = "zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg=="; - }; - }; "p-is-promise-2.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; @@ -41814,15 +40698,6 @@ let sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; }; }; - "p-timeout-2.0.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; - }; - }; "p-timeout-3.1.0" = { name = "p-timeout"; packageName = "p-timeout"; @@ -41886,13 +40761,13 @@ let sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw=="; }; }; - "pac-proxy-agent-7.0.1" = { + "pac-proxy-agent-7.0.2" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz"; - sha512 = "ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A=="; + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz"; + sha512 = "BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg=="; }; }; "pac-resolver-7.0.1" = { @@ -41913,6 +40788,15 @@ let sha512 = "knDtirWWqKVJrLY3gEBLflVvueTMpyjbAwX/9j/EKi2DsjNemp5voS8cyKyGh57SNaMJNhNRZbIaWdneOcLU1g=="; }; }; + "package-json-10.0.1" = { + name = "package-json"; + packageName = "package-json"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz"; + sha512 = "ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg=="; + }; + }; "package-json-2.4.0" = { name = "package-json"; packageName = "package-json"; @@ -41958,13 +40842,13 @@ let sha512 = "cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA=="; }; }; - "pacote-17.0.7" = { - name = "pacote"; - packageName = "pacote"; - version = "17.0.7"; + "package-json-from-dist-1.0.0" = { + name = "package-json-from-dist"; + packageName = "package-json-from-dist"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-17.0.7.tgz"; - sha512 = "sgvnoUMlkv9xHwDUKjKQFXVyUi8dtJGKp3vg6sYy+TxbDic5RjZCHF3ygv0EJgNRZ2GfRONjlKPUfokJ9lDpwQ=="; + url = "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz"; + sha512 = "dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw=="; }; }; "pacote-18.0.6" = { @@ -42075,6 +40959,15 @@ let sha512 = "0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA=="; }; }; + "parse-conflict-json-3.0.1" = { + name = "parse-conflict-json"; + packageName = "parse-conflict-json"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz"; + sha512 = "01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw=="; + }; + }; "parse-english-5.0.0" = { name = "parse-english"; packageName = "parse-english"; @@ -42111,15 +41004,6 @@ let sha512 = "FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q=="; }; }; - "parse-git-config-3.0.0" = { - name = "parse-git-config"; - packageName = "parse-git-config"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-git-config/-/parse-git-config-3.0.0.tgz"; - sha512 = "wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA=="; - }; - }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -42129,6 +41013,15 @@ let sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; }; }; + "parse-github-url-1.0.3" = { + name = "parse-github-url"; + packageName = "parse-github-url"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.3.tgz"; + sha512 = "tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww=="; + }; + }; "parse-gitignore-1.0.1" = { name = "parse-gitignore"; packageName = "parse-gitignore"; @@ -42282,13 +41175,13 @@ let sha512 = "Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ=="; }; }; - "parse-torrent-11.0.16" = { + "parse-torrent-11.0.17" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "11.0.16"; + version = "11.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-11.0.16.tgz"; - sha512 = "5GoOdmW0HpiB78aQpBz8/5V3V1LjBRDNiL7DOs33pKeCLOzFnfMrsRD6CYmaUBT5Vi/dXE0hfePsjDGJSMF48w=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-11.0.17.tgz"; + sha512 = "bkfEtrqIMT4+bSWs+m7+Ktd7LSJsDefA9qfJQ3UFwOeBqipiQ+347guu79zX++nRwMnrdvRecLmgaRcdiYjE4w=="; }; }; "parse-torrent-4.1.0" = { @@ -42498,13 +41391,13 @@ let sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="; }; }; - "passport-0.6.0" = { + "passport-0.7.0" = { name = "passport"; packageName = "passport"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz"; - sha512 = "0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug=="; + url = "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz"; + sha512 = "cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ=="; }; }; "passport-http-bearer-1.0.1" = { @@ -42741,6 +41634,15 @@ let sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="; }; }; + "path-scurry-2.0.0" = { + name = "path-scurry"; + packageName = "path-scurry"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz"; + sha512 = "ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -42786,15 +41688,6 @@ let sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="; }; }; - "path-to-regexp-6.2.2" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz"; - sha512 = "GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw=="; - }; - }; "path-type-1.1.0" = { name = "path-type"; packageName = "path-type"; @@ -42840,15 +41733,6 @@ let sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg=="; }; }; - "pathe-1.1.2" = { - name = "pathe"; - packageName = "pathe"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz"; - sha512 = "whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ=="; - }; - }; "pause-0.0.1" = { name = "pause"; packageName = "pause"; @@ -42957,6 +41841,15 @@ let sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; }; }; + "phin-3.7.1" = { + name = "phin"; + packageName = "phin"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/phin/-/phin-3.7.1.tgz"; + sha512 = "GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ=="; + }; + }; "picocolors-0.2.1" = { name = "picocolors"; packageName = "picocolors"; @@ -43011,15 +41904,6 @@ let sha512 = "0ypsOQt9D4e3hziV8O4elD9uN0z/jtUEfxVRtNaAAtXIyUx9m/SzlO020i8YNL2aL/E6blOvvHQcin6HZlFy/w=="; }; }; - "pid-port-0.1.1" = { - name = "pid-port"; - packageName = "pid-port"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pid-port/-/pid-port-0.1.1.tgz"; - sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; - }; - }; "pid-port-1.0.0" = { name = "pid-port"; packageName = "pid-port"; @@ -43317,13 +42201,13 @@ let sha512 = "LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow=="; }; }; - "pnpm-sync-lib-0.2.6" = { + "pnpm-sync-lib-0.2.9" = { name = "pnpm-sync-lib"; packageName = "pnpm-sync-lib"; - version = "0.2.6"; + version = "0.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm-sync-lib/-/pnpm-sync-lib-0.2.6.tgz"; - sha512 = "6bEpWpEo2AJnUeMy6j1+3xm71C/h4LtHDmaBVyNgnsErgJ8uiB8ekWvgheVHsUxz038oFy2tAXPMHrr59VLbdA=="; + url = "https://registry.npmjs.org/pnpm-sync-lib/-/pnpm-sync-lib-0.2.9.tgz"; + sha512 = "qd2/crPxmpEXAWHlotOQfxQZ3a1fZIG4u73CiSPwPYDtd7Ithx7O3gtqzQb/0LXDEvk1NpL7u4xf7yEiUCqg3Q=="; }; }; "pony-cause-1.1.1" = { @@ -43344,15 +42228,6 @@ let sha512 = "HmfV88y4tmtR9JsLzdtNwJea+cQdGt+ozeDWdlxHbCiPcoG+/iSAnJ1mEAYdOqITgCoFIT67o3VdY684Ed3FWA=="; }; }; - "portfinder-1.0.32" = { - name = "portfinder"; - packageName = "portfinder"; - version = "1.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz"; - sha512 = "on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg=="; - }; - }; "portscanner-2.2.0" = { name = "portscanner"; packageName = "portscanner"; @@ -43389,13 +42264,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.38" = { + "postcss-8.4.40" = { name = "postcss"; packageName = "postcss"; - version = "8.4.38"; + version = "8.4.40"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz"; - sha512 = "Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz"; + sha512 = "YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q=="; }; }; "postcss-calc-10.0.0" = { @@ -43425,13 +42300,13 @@ let sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ=="; }; }; - "postcss-colormin-7.0.0" = { + "postcss-colormin-7.0.1" = { name = "postcss-colormin"; packageName = "postcss-colormin"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.0.tgz"; - sha512 = "5CN6fqtsEtEtwf3mFV3B4UaZnlYljPpzmGeDB4yCK067PnAtfLe9uX2aFZaEwxHE7HopG5rUkW8gyHrNAesHEg=="; + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.1.tgz"; + sha512 = "uszdT0dULt3FQs47G5UHCduYK+FnkLYlpu1HpWu061eGsKZ7setoG7kA+WC9NQLsOJf69D5TxGHgnAdRgylnFQ=="; }; }; "postcss-convert-values-5.1.3" = { @@ -43443,13 +42318,13 @@ let sha512 = "82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA=="; }; }; - "postcss-convert-values-7.0.0" = { + "postcss-convert-values-7.0.2" = { name = "postcss-convert-values"; packageName = "postcss-convert-values"; - version = "7.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.0.tgz"; - sha512 = "bMuzDgXBbFbByPgj+/r6va8zNuIDUaIIbvAFgdO1t3zdgJZ77BZvu6dfWyd6gHEJnYzmeVr9ayUsAQL3/qLJ0w=="; + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.2.tgz"; + sha512 = "MuZIF6HJ4izko07Q0TgW6pClalI4al6wHRNPkFzqQdwAwG7hPn0lA58VZdxyb2Vl5AYjJ1piO+jgF9EnTjQwQQ=="; }; }; "postcss-discard-comments-5.1.2" = { @@ -43461,13 +42336,13 @@ let sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="; }; }; - "postcss-discard-comments-7.0.0" = { + "postcss-discard-comments-7.0.1" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.0.tgz"; - sha512 = "xpSdzRqYmy4YIVmjfGyYXKaI1SRnK6CTr+4Zmvyof8ANwvgfZgGdVtmgAvzh59gJm808mJCWQC9tFN0KF5dEXA=="; + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.1.tgz"; + sha512 = "GVrQxUOhmle1W6jX2SvNLt4kmN+JYhV7mzI6BMnkAWR9DtVvg8e67rrV0NfdWhn7x1zxvzdWkMBPdBDCls+uwQ=="; }; }; "postcss-discard-duplicates-5.1.0" = { @@ -43596,13 +42471,13 @@ let sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ=="; }; }; - "postcss-merge-longhand-7.0.1" = { + "postcss-merge-longhand-7.0.2" = { name = "postcss-merge-longhand"; packageName = "postcss-merge-longhand"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.1.tgz"; - sha512 = "qZlD26hnqSTMxSSOMS8+QCeRWtqOdMKeQHvHcBhjL3mJxKUs47cvO1Y1x3iTdYIk3ioMcRHTiy229TT0mEMH/A=="; + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.2.tgz"; + sha512 = "06vrW6ZWi9qeP7KMS9fsa9QW56+tIMW55KYqF7X3Ccn+NI2pIgPV6gFfvXTMQ05H90Y5DvnCDPZ2IuHa30PMUg=="; }; }; "postcss-merge-rules-5.1.4" = { @@ -43614,13 +42489,13 @@ let sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g=="; }; }; - "postcss-merge-rules-7.0.1" = { + "postcss-merge-rules-7.0.2" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.1.tgz"; - sha512 = "bb8McYQbo2etgs0uVt6AfngajACK3FHSVP3sGLhprrjbtHJWgG03JZ4KKBlJ8/5Fb8/Rr+mMKaybMYeoYrAg0A=="; + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.2.tgz"; + sha512 = "VAR47UNvRsdrTHLe7TV1CeEtF9SJYR5ukIB9U4GZyZOptgtsS20xSxy+k5wMrI3udST6O1XuIn7cjQkg7sDAAw=="; }; }; "postcss-minify-font-values-5.1.0" = { @@ -43668,13 +42543,13 @@ let sha512 = "+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw=="; }; }; - "postcss-minify-params-7.0.0" = { + "postcss-minify-params-7.0.1" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.0.tgz"; - sha512 = "XOJAuX8Q/9GT1sGxlUvaFEe2H9n50bniLZblXXsAT/BwSfFYvzSZeFG7uupwc0KbKpTnflnQ7aMwGzX6JUWliQ=="; + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.1.tgz"; + sha512 = "e+Xt8xErSRPgSRFxHeBCSxMiO8B8xng7lh8E0A5ep1VfwYhY8FXhu4Q3APMjgx9YDDbSp53IBGENrzygbUvgUQ=="; }; }; "postcss-minify-selectors-5.2.1" = { @@ -43686,13 +42561,13 @@ let sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg=="; }; }; - "postcss-minify-selectors-7.0.1" = { + "postcss-minify-selectors-7.0.2" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.1.tgz"; - sha512 = "YfIbGtcgMFquPxV2L/ASs36ZS4DsgfcDX9tQ8cTEIvBTv+0GXFKtcvvpi9tCKto/+DWGWYKMCESFG3Pnan0Feg=="; + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.2.tgz"; + sha512 = "dCzm04wqW1uqLmDZ41XYNBJfjgps3ZugDpogAmJXoCb5oCiTzIX4oPXXKxDpTvWOnKxQKR4EbV4ZawJBLcdXXA=="; }; }; "postcss-modules-extract-imports-3.1.0" = { @@ -43731,13 +42606,13 @@ let sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; }; }; - "postcss-nested-6.0.1" = { + "postcss-nested-6.2.0" = { name = "postcss-nested"; packageName = "postcss-nested"; - version = "6.0.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz"; - sha512 = "mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ=="; + url = "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz"; + sha512 = "HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ=="; }; }; "postcss-normalize-charset-5.1.0" = { @@ -43857,13 +42732,13 @@ let sha512 = "qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA=="; }; }; - "postcss-normalize-unicode-7.0.0" = { + "postcss-normalize-unicode-7.0.1" = { name = "postcss-normalize-unicode"; packageName = "postcss-normalize-unicode"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.0.tgz"; - sha512 = "OnKV52/VFFDAim4n0pdI+JAhsolLBdnCKxE6VV5lW5Q/JeVGFN8UM8ur6/A3EAMLsT1ZRm3fDHh/rBoBQpqi2w=="; + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.1.tgz"; + sha512 = "PTPGdY9xAkTw+8ZZ71DUePb7M/Vtgkbbq+EoI33EuyQEzbKemEQMhe5QSr0VP5UfZlreANDPxSfcdSprENcbsg=="; }; }; "postcss-normalize-url-5.1.0" = { @@ -43911,13 +42786,13 @@ let sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ=="; }; }; - "postcss-ordered-values-7.0.0" = { + "postcss-ordered-values-7.0.1" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.0.tgz"; - sha512 = "KROvC63A8UQW1eYDljQe1dtwc1E/M+mMwDT6z7khV/weHYLWTghaLRLunU7x1xw85lWFwVZOAGakxekYvKV+0w=="; + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.1.tgz"; + sha512 = "irWScWRL6nRzYmBOXReIKch75RRhNS86UPUAxXdmW/l0FcAsg0lvAXQCby/1lymxn/o0gVa6Rv/0f03eJOwHxw=="; }; }; "postcss-reduce-initial-5.1.2" = { @@ -43929,13 +42804,13 @@ let sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg=="; }; }; - "postcss-reduce-initial-7.0.0" = { + "postcss-reduce-initial-7.0.1" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.0.tgz"; - sha512 = "iqGgmBxY9LrblZ0BKLjmrA1mC/cf9A/wYCCqSmD6tMi+xAyVl0+DfixZIHSVDMbCPRPjNmVF0DFGth/IDGelFQ=="; + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.1.tgz"; + sha512 = "0JDUSV4bGB5FGM5g8MkS+rvqKukJZ7OTHw/lcKn7xPNqeaqJyQbUO8/dJpvyTpaVwPsd3Uc33+CfNzdVowp2WA=="; }; }; "postcss-reduce-transforms-5.1.0" = { @@ -43965,13 +42840,13 @@ let sha512 = "/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA=="; }; }; - "postcss-resolve-nested-selector-0.1.1" = { + "postcss-resolve-nested-selector-0.1.4" = { name = "postcss-resolve-nested-selector"; packageName = "postcss-resolve-nested-selector"; - version = "0.1.1"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; - sha512 = "HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw=="; + url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.4.tgz"; + sha512 = "R6vHqZWgVnTAPq0C+xjyHfEZqfIYboCBVSy24MjxEDm+tIh1BU4O6o7DP7AA7kHzf136d+Qc5duI4tlpHjixDw=="; }; }; "postcss-safe-parser-4.0.2" = { @@ -44019,13 +42894,13 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; - "postcss-selector-parser-6.1.0" = { + "postcss-selector-parser-6.1.1" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz"; - sha512 = "UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz"; + sha512 = "b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg=="; }; }; "postcss-svgo-5.1.0" = { @@ -44154,13 +43029,13 @@ let sha512 = "QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ=="; }; }; - "preferred-pm-3.1.3" = { + "preferred-pm-3.1.4" = { name = "preferred-pm"; packageName = "preferred-pm"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.1.3.tgz"; - sha512 = "MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w=="; + url = "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.1.4.tgz"; + sha512 = "lEHd+yEm22jXdCphDrkvIJQU66EuLojPPtvZkpKIkiD+l0DMThF/niqZKJSoU8Vl7iuvtmzyMhir9LdVy5WMnA=="; }; }; "prelude-ls-1.1.2" = { @@ -44235,13 +43110,13 @@ let sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; }; }; - "prettier-3.3.2" = { + "prettier-3.3.3" = { name = "prettier"; packageName = "prettier"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz"; - sha512 = "rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz"; + sha512 = "i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew=="; }; }; "prettier-bytes-1.0.4" = { @@ -44253,13 +43128,13 @@ let sha512 = "dLbWOa4xBn+qeWeIF60qRoB6Pk2jX5P3DIVgOQyMyvBpu931Q+8dXz8X0snJiFkQdohDDLnZQECjzsAj75hgZQ=="; }; }; - "prettier-plugin-astro-0.14.0" = { + "prettier-plugin-astro-0.14.1" = { name = "prettier-plugin-astro"; packageName = "prettier-plugin-astro"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.0.tgz"; - sha512 = "7jRGJsexaRIyUzTk8uzXlP45cw6DQ5Ci4bTe0xCBCcuO1Fff8jJy9oI+kRCQKSdDFTSAArMSg8GpvzlKBtSaZA=="; + url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz"; + sha512 = "RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw=="; }; }; "pretty-bytes-5.6.0" = { @@ -44325,13 +43200,13 @@ let sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; - "pretty-ms-9.0.0" = { + "pretty-ms-9.1.0" = { name = "pretty-ms"; packageName = "pretty-ms"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz"; - sha512 = "E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng=="; + url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz"; + sha512 = "o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw=="; }; }; "prettyjson-1.2.5" = { @@ -44352,15 +43227,6 @@ let sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug=="; }; }; - "printable-characters-1.0.42" = { - name = "printable-characters"; - packageName = "printable-characters"; - version = "1.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz"; - sha512 = "dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ=="; - }; - }; "printf-0.2.5" = { name = "printf"; packageName = "printf"; @@ -44379,15 +43245,6 @@ let sha512 = "Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="; }; }; - "private-0.1.8" = { - name = "private"; - packageName = "private"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; - }; - }; "probe-image-size-6.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; @@ -44433,15 +43290,6 @@ let sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; }; - "process-exists-4.1.0" = { - name = "process-exists"; - packageName = "process-exists"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-exists/-/process-exists-4.1.0.tgz"; - sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA=="; - }; - }; "process-exists-5.0.0" = { name = "process-exists"; packageName = "process-exists"; @@ -44469,6 +43317,15 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "proggy-2.0.0" = { + name = "proggy"; + packageName = "proggy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proggy/-/proggy-2.0.0.tgz"; + sha512 = "69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A=="; + }; + }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -44496,13 +43353,13 @@ let sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; - "prom-client-14.0.1" = { + "prom-client-15.1.2" = { name = "prom-client"; packageName = "prom-client"; - version = "14.0.1"; + version = "15.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-14.0.1.tgz"; - sha512 = "HxTArb6fkOntQHoRGvv4qd/BkorjliiuO2uSWC2KC17MUTKYttWdDoXX/vxOhQdkoECEM9BBH0pj2l8G8kev6w=="; + url = "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz"; + sha512 = "on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ=="; }; }; "promise-7.3.1" = { @@ -44523,6 +43380,24 @@ let sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg=="; }; }; + "promise-all-reject-late-1.0.1" = { + name = "promise-all-reject-late"; + packageName = "promise-all-reject-late"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz"; + sha512 = "vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw=="; + }; + }; + "promise-call-limit-3.0.1" = { + name = "promise-call-limit"; + packageName = "promise-call-limit"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.1.tgz"; + sha512 = "utl+0x8gIDasV5X+PI5qWEPqH6fJS0pFtQ/4gZ95xfEFb/89dmh+/b895TbFDBLiafBvxD/PGTKfvxl4kH/pQg=="; + }; + }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -44649,13 +43524,13 @@ let sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; }; }; - "protobufjs-7.2.6" = { + "protobufjs-7.3.2" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.6"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz"; - sha512 = "dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz"; + sha512 = "RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg=="; }; }; "protocols-2.0.1" = { @@ -44712,24 +43587,6 @@ let sha512 = "yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="; }; }; - "ps-list-6.3.0" = { - name = "ps-list"; - packageName = "ps-list"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz"; - sha512 = "qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA=="; - }; - }; - "ps-list-7.2.0" = { - name = "ps-list"; - packageName = "ps-list"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz"; - sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; - }; - }; "ps-list-8.1.1" = { name = "ps-list"; packageName = "ps-list"; @@ -44973,22 +43830,22 @@ let sha512 = "FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug=="; }; }; - "puppeteer-22.11.0" = { + "puppeteer-22.14.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "22.11.0"; + version = "22.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.11.0.tgz"; - sha512 = "U5U0Dx5Tsd/ec39BmflhcSFIK9UnZxGQfyUzvQVHivt6gIi6RgJqYL9MJaU90OG6tTz65XqzN4wF0ZyDyY0NuA=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz"; + sha512 = "MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw=="; }; }; - "puppeteer-core-22.11.0" = { + "puppeteer-core-22.14.0" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "22.11.0"; + version = "22.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.11.0.tgz"; - sha512 = "57YUjhRoSpZWg9lCssWsgzM1/X/1jQnkKbbspbeW0bhZTt3TD4WdNXEYI7KrFFnSvx21tyHhfWW0zlxzbwYSAA=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz"; + sha512 = "rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw=="; }; }; "purgecss-6.0.0" = { @@ -45018,13 +43875,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.367" = { + "pyright-1.1.373" = { name = "pyright"; packageName = "pyright"; - version = "1.1.367"; + version = "1.1.373"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.367.tgz"; - sha512 = "qw6PmU59P4OAonqPEsaJ4CYHIpkr3eBsyXRpVJnmBoXldEZEoM3qdXIeo9BlsPFE+hzdNKNgBjSNAXdiOixEuw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.373.tgz"; + sha512 = "ZJSjqnHbeZowUnuAiojZqCLeY1XVzRIc2GvMFFNy/z6YSyJXwChPDQL5Jl2bavTvXNO0ITRmMBVvoKCRN7cc3g=="; }; }; "q-1.5.1" = { @@ -45072,15 +43929,6 @@ let sha512 = "nR5uYqNsm8CgBhfCpsYKz6iDhvKjf0xdFT4KanNlLP40COGwZEsjbLoDyL9VrTXyiICUGUbsiN3gBpLGZhSZWQ=="; }; }; - "qs-6.10.3" = { - name = "qs"; - packageName = "qs"; - version = "6.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; - sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; - }; - }; "qs-6.10.4" = { name = "qs"; packageName = "qs"; @@ -45099,13 +43947,13 @@ let sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; - "qs-6.12.1" = { + "qs-6.12.3" = { name = "qs"; packageName = "qs"; - version = "6.12.1"; + version = "6.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz"; - sha512 = "zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.12.3.tgz"; + sha512 = "AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ=="; }; }; "qs-6.5.2" = { @@ -45144,15 +43992,6 @@ let sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; - "query-string-5.1.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; - sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; - }; - }; "query-string-6.14.1" = { name = "query-string"; packageName = "query-string"; @@ -45477,15 +44316,6 @@ let sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; "raw-body-2.5.2" = { name = "raw-body"; packageName = "raw-body"; @@ -45666,15 +44496,6 @@ let sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ=="; }; }; - "read-2.1.0" = { - name = "read"; - packageName = "read"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read/-/read-2.1.0.tgz"; - sha512 = "bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ=="; - }; - }; "read-3.0.1" = { name = "read"; packageName = "read"; @@ -45765,24 +44586,6 @@ let sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA=="; }; }; - "read-package-json-6.0.4" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz"; - sha512 = "AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw=="; - }; - }; - "read-package-json-7.0.1" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz"; - sha512 = "8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q=="; - }; - }; "read-package-json-fast-3.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -45990,6 +44793,15 @@ let sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; + "readable-stream-4.5.2" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz"; + sha512 = "yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g=="; + }; + }; "readable-web-to-node-stream-2.0.0" = { name = "readable-web-to-node-stream"; packageName = "readable-web-to-node-stream"; @@ -46071,24 +44883,6 @@ let sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g=="; }; }; - "recast-0.17.2" = { - name = "recast"; - packageName = "recast"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.17.2.tgz"; - sha512 = "YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg=="; - }; - }; - "recast-0.20.5" = { - name = "recast"; - packageName = "recast"; - version = "0.20.5"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz"; - sha512 = "E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ=="; - }; - }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -46170,13 +44964,22 @@ let sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; }; }; - "redis-4.6.14" = { - name = "redis"; - packageName = "redis"; - version = "4.6.14"; + "redis-errors-1.2.0" = { + name = "redis-errors"; + packageName = "redis-errors"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.14.tgz"; - sha512 = "GrNg/e33HtsQwNXL7kJT+iNFPSwE1IPmd7wzV3j4f2z0EYxZfZE7FVTmUysgAtqQQtg5NXF5SNLR9OdO/UHOfw=="; + url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; + sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="; + }; + }; + "redis-parser-3.0.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; + sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; }; }; "reduce-flatten-1.0.1" = { @@ -47124,15 +45927,6 @@ let sha512 = "S07L+2VbJB32WddD/o/PnYGKym63zLVbymygVWXvt8L79VAngcjAxhHaGuFOICLxEV90EasEPzqPKKHPspXP8w=="; }; }; - "request-light-0.2.5" = { - name = "request-light"; - packageName = "request-light"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz"; - sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw=="; - }; - }; "request-light-0.4.0" = { name = "request-light"; packageName = "request-light"; @@ -47268,13 +46062,13 @@ let sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="; }; }; - "requirejs-2.3.6" = { + "requirejs-2.3.7" = { name = "requirejs"; packageName = "requirejs"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz"; - sha512 = "ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg=="; + url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz"; + sha512 = "DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw=="; }; }; "requires-port-1.0.0" = { @@ -47448,15 +46242,6 @@ let sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; - "resolve.exports-2.0.2" = { - name = "resolve.exports"; - packageName = "resolve.exports"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz"; - sha512 = "X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg=="; - }; - }; "resp-modifier-6.0.2" = { name = "resp-modifier"; packageName = "resp-modifier"; @@ -47718,13 +46503,13 @@ let sha512 = "Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og=="; }; }; - "rimraf-5.0.7" = { + "rimraf-5.0.9" = { name = "rimraf"; packageName = "rimraf"; - version = "5.0.7"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz"; - sha512 = "nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.9.tgz"; + sha512 = "3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA=="; }; }; "ripemd160-2.0.2" = { @@ -47745,15 +46530,6 @@ let sha512 = "nQptLCZeyyJfgbpf2x97k5YE8vzDn7bhwx9NlvODdhgbU0mL1ruh71X0HYdRaOEvWC7Cr+SfV0p5p+Ib5yOl7A=="; }; }; - "roarr-2.15.4" = { - name = "roarr"; - packageName = "roarr"; - version = "2.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz"; - sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; - }; - }; "robust-predicates-3.0.2" = { name = "robust-predicates"; packageName = "robust-predicates"; @@ -47763,33 +46539,6 @@ let sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="; }; }; - "rollup-plugin-inject-3.0.2" = { - name = "rollup-plugin-inject"; - packageName = "rollup-plugin-inject"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz"; - sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w=="; - }; - }; - "rollup-plugin-node-polyfills-0.2.1" = { - name = "rollup-plugin-node-polyfills"; - packageName = "rollup-plugin-node-polyfills"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz"; - sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA=="; - }; - }; - "rollup-pluginutils-2.8.2" = { - name = "rollup-pluginutils"; - packageName = "rollup-pluginutils"; - version = "2.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"; - sha512 = "EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ=="; - }; - }; "round-to-6.0.0" = { name = "round-to"; packageName = "round-to"; @@ -47817,15 +46566,6 @@ let sha512 = "APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw=="; }; }; - "rss-parser-3.13.0" = { - name = "rss-parser"; - packageName = "rss-parser"; - version = "3.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.13.0.tgz"; - sha512 = "7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w=="; - }; - }; "rss-parser-3.7.1" = { name = "rss-parser"; packageName = "rss-parser"; @@ -48150,13 +46890,13 @@ let sha512 = "X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg=="; }; }; - "sasl-scram-sha-1-1.2.1" = { + "sasl-scram-sha-1-1.3.0" = { name = "sasl-scram-sha-1"; packageName = "sasl-scram-sha-1"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz"; - sha512 = "o63gNo+EGsk1ML0bNeUAjRomIIcG7VaUyA+ffhd9MME5BjqVEpp42YkmBBZqzz1KmJG3YqpRLE4PfUe7FjexaA=="; + url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz"; + sha512 = "hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ=="; }; }; "saslmechanisms-0.1.1" = { @@ -48168,13 +46908,13 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.77.5" = { + "sass-1.77.8" = { name = "sass"; packageName = "sass"; - version = "1.77.5"; + version = "1.77.8"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz"; - sha512 = "oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz"; + sha512 = "4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ=="; }; }; "sass-formatter-0.7.9" = { @@ -48447,22 +47187,22 @@ let sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; }; }; - "semver-7.6.0" = { + "semver-7.6.2" = { name = "semver"; packageName = "semver"; - version = "7.6.0"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz"; - sha512 = "EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz"; + sha512 = "FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w=="; }; }; - "semver-7.6.2" = { + "semver-7.6.3" = { name = "semver"; packageName = "semver"; - version = "7.6.2"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz"; - sha512 = "FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"; + sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="; }; }; "semver-compare-1.0.0" = { @@ -48555,13 +47295,13 @@ let sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; - "serialize-error-2.1.0" = { + "serialize-error-11.0.3" = { name = "serialize-error"; packageName = "serialize-error"; - version = "2.1.0"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz"; - sha512 = "ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw=="; + url = "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz"; + sha512 = "2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g=="; }; }; "serialize-error-6.0.0" = { @@ -48573,24 +47313,6 @@ let sha512 = "3vmBkMZLQO+BR4RPHcyRGdE09XCF6cvxzk2N2qn8Er3F91cy8Qt7VvEbZBOpaL53qsBbe2cFOefU6tRY6WDelA=="; }; }; - "serialize-error-7.0.1" = { - name = "serialize-error"; - packageName = "serialize-error"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz"; - sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; - }; - }; - "serialize-javascript-6.0.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; - sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; - }; - }; "serialize-javascript-6.0.2" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -48906,15 +47628,6 @@ let sha512 = "sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="; }; }; - "shortid-2.2.16" = { - name = "shortid"; - packageName = "shortid"; - version = "2.2.16"; - src = fetchurl { - url = "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz"; - sha512 = "Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g=="; - }; - }; "should-13.2.3" = { name = "should"; packageName = "should"; @@ -49014,15 +47727,6 @@ let sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; }; }; - "sigstore-1.9.0" = { - name = "sigstore"; - packageName = "sigstore"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz"; - sha512 = "0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A=="; - }; - }; "sigstore-2.3.1" = { name = "sigstore"; packageName = "sigstore"; @@ -49428,13 +48132,13 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; - "socket.io-2.5.0" = { + "socket.io-2.5.1" = { name = "socket.io"; packageName = "socket.io"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.5.0.tgz"; - sha512 = "gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.5.1.tgz"; + sha512 = "eaTE4tBKRD6RFoetquMbxgvcpvoDtRyIlkIMI/SMK2bsKvbENTsDeeu4GJ/z9c90yOWxB7b/eC+yKLPbHnH6bA=="; }; }; "socket.io-4.6.1" = { @@ -49473,13 +48177,13 @@ let sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; }; }; - "socket.io-adapter-2.5.4" = { + "socket.io-adapter-2.5.5" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz"; - sha512 = "wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz"; + sha512 = "eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg=="; }; }; "socket.io-client-1.0.6" = { @@ -49536,13 +48240,13 @@ let sha512 = "uW3UiLVibAyleKq8r/yZe1oPO51olhY18T6HtnN0iI6RLqJfYC0YiyAFlsPw1+8I0Z1qFd8jFLTRZo2vr6ISxA=="; }; }; - "socket.io-parser-3.3.3" = { + "socket.io-parser-3.3.4" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "3.3.3"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz"; - sha512 = "qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.4.tgz"; + sha512 = "z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow=="; }; }; "socket.io-parser-3.4.3" = { @@ -49599,13 +48303,13 @@ let sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; }; }; - "socks-proxy-agent-8.0.3" = { + "socks-proxy-agent-8.0.4" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "8.0.3"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz"; - sha512 = "VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz"; + sha512 = "GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw=="; }; }; "socks5-client-1.2.8" = { @@ -49644,15 +48348,6 @@ let sha512 = "tr2eBD+9sTck9c7y0GkX9n8r4WcuzACYMFAGIjQum/F/LpJUZ0MvR4S6wiCrzvrCiznekBdxeG+8vSBE6d9H7A=="; }; }; - "sonic-forest-1.0.3" = { - name = "sonic-forest"; - packageName = "sonic-forest"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sonic-forest/-/sonic-forest-1.0.3.tgz"; - sha512 = "dtwajos6IWMEWXdEbW1IkEkyL2gztCAgDplRIX+OT5aRKnEd5e7r7YCxRgXZdhRP1FBdOBf8axeTPhzDv8T4wQ=="; - }; - }; "sorcery-0.10.0" = { name = "sorcery"; packageName = "sorcery"; @@ -49752,15 +48447,6 @@ let sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; }; - "source-map-0.4.4" = { - name = "source-map"; - packageName = "source-map"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; - sha512 = "Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A=="; - }; - }; "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; @@ -50301,13 +48987,13 @@ let sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; }; }; - "stacktracey-2.1.8" = { - name = "stacktracey"; - packageName = "stacktracey"; - version = "2.1.8"; + "standard-as-callback-2.1.0" = { + name = "standard-as-callback"; + packageName = "standard-as-callback"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/stacktracey/-/stacktracey-2.1.8.tgz"; - sha512 = "Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw=="; + url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"; + sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; "stat-mode-0.3.0" = { @@ -50634,6 +49320,15 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; + "streamx-2.17.0" = { + name = "streamx"; + packageName = "streamx"; + version = "2.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamx/-/streamx-2.17.0.tgz"; + sha512 = "mzRXEeafEA0skX5XLiDht/zdIqEVs4kgayUTFHDoMjiaZ2kC7DoFsQDJVXRILI2Qme/kWXxLpuU6P0B+xcXpFA=="; + }; + }; "streamx-2.18.0" = { name = "streamx"; packageName = "streamx"; @@ -50643,15 +49338,6 @@ let sha512 = "LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ=="; }; }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha512 = "R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="; - }; - }; "strict-uri-encode-2.0.0" = { name = "strict-uri-encode"; packageName = "strict-uri-encode"; @@ -50688,13 +49374,13 @@ let sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag=="; }; }; - "string-kit-0.17.10" = { + "string-kit-0.18.3" = { name = "string-kit"; packageName = "string-kit"; - version = "0.17.10"; + version = "0.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.17.10.tgz"; - sha512 = "n3/2BeEJrlzztoxeBTt9DVh0dfHordBuZoFsSJs59tk1JoPVvtvNsvAgqu0Nlpj5Y/qoQbnT8jCnfuoHcsfGnw=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.18.3.tgz"; + sha512 = "G8cBS7wxxHhwQrKU0Y8SjZJRtCzZ61bMmMCO1bWm6N6y2obT0koGK8uWYloMOaVPPr8zk7Ic995uEd4Jw504AQ=="; }; }; "string-length-1.0.1" = { @@ -50787,13 +49473,13 @@ let sha512 = "k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ=="; }; }; - "string-width-7.1.0" = { + "string-width-7.2.0" = { name = "string-width"; packageName = "string-width"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz"; - sha512 = "SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw=="; + url = "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz"; + sha512 = "tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="; }; }; "string-width-cjs-4.2.3" = { @@ -51201,13 +49887,13 @@ let sha512 = "sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw=="; }; }; - "stylehacks-7.0.1" = { + "stylehacks-7.0.2" = { name = "stylehacks"; packageName = "stylehacks"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.1.tgz"; - sha512 = "PnrT4HzajnxbjfChpeBKLSpSykilnGBlD+pIffCoT5KbLur9fcL8uKRQJJap85byR2wCYZl/4Otk5eq76qeZxQ=="; + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.2.tgz"; + sha512 = "HdkWZS9b4gbgYTdMg4gJLmm7biAUug1qTqXjS+u8X+/pUd+9Px1E+520GnOW3rST9MNsVOVpsJG+mPHNosxjOQ=="; }; }; "stylelint-13.13.1" = { @@ -51246,15 +49932,6 @@ let sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg=="; }; }; - "subscriptions-transport-ws-0.11.0" = { - name = "subscriptions-transport-ws"; - packageName = "subscriptions-transport-ws"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz"; - sha512 = "8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ=="; - }; - }; "subscriptions-transport-ws-0.9.19" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; @@ -51444,13 +50121,13 @@ let sha512 = "d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA=="; }; }; - "svelte-5.0.0-next.155" = { + "svelte-5.0.0-next.198" = { name = "svelte"; packageName = "svelte"; - version = "5.0.0-next.155"; + version = "5.0.0-next.198"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.155.tgz"; - sha512 = "4a4EZuiTmg4eQJuQ6LTyK+DxRAZCYm4mXgqSWcZ7TellzLfaC1Je5nxBl1aZP3xdNhvPFIstQ8c7I6d+99FdZQ=="; + url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.198.tgz"; + sha512 = "1eyQplJR7Rg5dTuHZoDamLJfqyk4k6cB3h6TMybWKrS/MIL4++iNV+q+NP6EUBngZ2iRBup7gRt0jYUbPI0UMw=="; }; }; "svelte-preprocess-5.1.4" = { @@ -51462,13 +50139,13 @@ let sha512 = "IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA=="; }; }; - "svelte2tsx-0.7.9" = { + "svelte2tsx-0.7.13" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.7.9"; + version = "0.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.9.tgz"; - sha512 = "Rm+0LAwg9wT4H2IsR8EaM9EWErTzi9LmuZKxkH5b1ua94XjQmwHstBP4VabLgA9AE6XmwBg+xK7Cjzwfm6ustQ=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.13.tgz"; + sha512 = "aObZ93/kGAiLXA/I/kP+x9FriZM+GboB/ReOIGmLNbVGEd2xC+aTCppm3mk1cc9I/z60VQf7b2QDxC3jOXu3yw=="; }; }; "sver-1.8.4" = { @@ -51588,13 +50265,13 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "synckit-0.9.0" = { + "synckit-0.9.1" = { name = "synckit"; packageName = "synckit"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz"; - sha512 = "7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg=="; + url = "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz"; + sha512 = "7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A=="; }; }; "syntax-error-1.4.0" = { @@ -51651,13 +50328,13 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; - "tailwindcss-3.4.4" = { + "tailwindcss-3.4.6" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.4.4"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz"; - sha512 = "ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz"; + sha512 = "1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA=="; }; }; "tapable-0.2.9" = { @@ -51741,6 +50418,15 @@ let sha512 = "DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A=="; }; }; + "tar-7.2.0" = { + name = "tar"; + packageName = "tar"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-7.2.0.tgz"; + sha512 = "hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w=="; + }; + }; "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; @@ -51750,13 +50436,13 @@ let sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; }; - "tar-fs-3.0.5" = { + "tar-fs-3.0.6" = { name = "tar-fs"; packageName = "tar-fs"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.5.tgz"; - sha512 = "JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg=="; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz"; + sha512 = "iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w=="; }; }; "tar-stream-1.6.2" = { @@ -51786,15 +50472,6 @@ let sha512 = "qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ=="; }; }; - "taskkill-3.1.0" = { - name = "taskkill"; - packageName = "taskkill"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-3.1.0.tgz"; - sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w=="; - }; - }; "taskkill-5.0.0" = { name = "taskkill"; packageName = "taskkill"; @@ -51939,13 +50616,13 @@ let sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag=="; }; }; - "terminal-kit-3.0.1" = { + "terminal-kit-3.0.2" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.0.1.tgz"; - sha512 = "KvscEh/893Qza4+1wW9BOYAYFFS3uy8JfuMpyxNS1Rw+bw2Qx33RjVkjzPkfY2hfzAcTEw9KGko4XZuX2scsQw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.0.2.tgz"; + sha512 = "0xWCHPIs8Zo72OCgntgieACWuYnNlNY66xwG9Cw7jsLnzMsl7C4YGpzZc/xECIV3BezJcchOC6IpfRap333m4w=="; }; }; "terminal-link-2.1.1" = { @@ -51966,13 +50643,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.31.1" = { + "terser-5.31.3" = { name = "terser"; packageName = "terser"; - version = "5.31.1"; + version = "5.31.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz"; - sha512 = "37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz"; + sha512 = "pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA=="; }; }; "terser-webpack-plugin-5.3.10" = { @@ -51984,13 +50661,13 @@ let sha512 = "BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w=="; }; }; - "text-decoder-1.1.0" = { + "text-decoder-1.1.1" = { name = "text-decoder"; packageName = "text-decoder"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz"; - sha512 = "TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw=="; + url = "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz"; + sha512 = "8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA=="; }; }; "text-decoding-1.0.0" = { @@ -52533,13 +51210,13 @@ let sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; }; }; - "torrent-discovery-11.0.6" = { + "torrent-discovery-11.0.7" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "11.0.6"; + version = "11.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-11.0.6.tgz"; - sha512 = "9gnsBZLuOzbWlTIv0lx3pjmZ2Bj4WZfY06iO9AXKiNxA7/k508CWIE80PojYsgsR9SyjDkIVfnHLyJOgnDycvQ=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-11.0.7.tgz"; + sha512 = "JRG3Ko3YPrNbd3agqijOwqdyV0+m+8X7kkWDYu4zCMZxnyK87Mc6Bd1glXxOevY10GwBf2wQ+DToBOXYbvcA0Q=="; }; }; "torrent-discovery-5.4.0" = { @@ -52605,15 +51282,6 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; - "tough-cookie-4.1.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz"; - sha512 = "aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw=="; - }; - }; "tough-cookie-4.1.4" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -52650,13 +51318,13 @@ let sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; }; - "tr46-4.1.1" = { + "tr46-5.0.0" = { name = "tr46"; packageName = "tr46"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz"; - sha512 = "2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw=="; + url = "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz"; + sha512 = "tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g=="; }; }; "trash-8.1.1" = { @@ -52686,13 +51354,13 @@ let sha512 = "7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg=="; }; }; - "tree-dump-1.0.1" = { + "tree-dump-1.0.2" = { name = "tree-dump"; packageName = "tree-dump"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.1.tgz"; - sha512 = "WCkcRBVPSlHHq1dc/px9iOfqklvzCbdRwvlNfxGZsrHqf6aZttfPrd7DJTt6oR10dwUfpFFQeVTkPbBIZxX/YA=="; + url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz"; + sha512 = "dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ=="; }; }; "tree-kill-1.2.2" = { @@ -52731,6 +51399,15 @@ let sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; }; }; + "treeverse-3.0.0" = { + name = "treeverse"; + packageName = "treeverse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz"; + sha512 = "gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ=="; + }; + }; "trim-newlines-1.0.0" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -53010,13 +51687,13 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsx-4.15.4" = { + "tsx-4.16.2" = { name = "tsx"; packageName = "tsx"; - version = "4.15.4"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsx/-/tsx-4.15.4.tgz"; - sha512 = "d++FLCwJLrXaBFtRcqdPBzu6FiVOJ2j+UsvUZPtoTrnYtCGU5CEW7iHXtNZfA2fcRTvJFWPqA6SWBuB0GSva9w=="; + url = "https://registry.npmjs.org/tsx/-/tsx-4.16.2.tgz"; + sha512 = "C1uWweJDgdtX2x600HjaFaucXTilT7tgUZHbOE4+ypskZ1OP8CRCSDkCxG6Vya9EwaFIVagWwpaVAn5wzypaqQ=="; }; }; "tty-browserify-0.0.1" = { @@ -53028,15 +51705,6 @@ let sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; - "tuf-js-1.1.7" = { - name = "tuf-js"; - packageName = "tuf-js"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz"; - sha512 = "i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg=="; - }; - }; "tuf-js-2.2.1" = { name = "tuf-js"; packageName = "tuf-js"; @@ -53109,6 +51777,15 @@ let sha512 = "Z3/iJ6IWh8VBiACWQJaA5ulPQE5E1QwvBHj00uGzdQxdRnd8fh1DPqNOJqzQDu6DkOstORrtXzf/9adB+vMtEA=="; }; }; + "turndown-7.2.0" = { + name = "turndown"; + packageName = "turndown"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz"; + sha512 = "eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A=="; + }; + }; "turndown-plugin-gfm-1.0.2" = { name = "turndown-plugin-gfm"; packageName = "turndown-plugin-gfm"; @@ -53118,13 +51795,13 @@ let sha512 = "vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg=="; }; }; - "tus-js-client-3.1.3" = { + "tus-js-client-4.1.0" = { name = "tus-js-client"; packageName = "tus-js-client"; - version = "3.1.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-3.1.3.tgz"; - sha512 = "n9k6rI/nPOuP2TaqPG6Ogz3a3V1cSH9en7N0VH4gh95jmG8JA58TJzLms2lBfb7aKVb3fdUunqYEG3WnQnZRvQ=="; + url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.1.0.tgz"; + sha512 = "e/nC/kJahvNYBcnwcqzuhFIvVELMMpbVXIoOOKdUn74SdQCvJd2JjqV2jZLv2EFOVbV4qLiO0lV7BxBXF21b6Q=="; }; }; "tweetnacl-0.14.5" = { @@ -53181,15 +51858,6 @@ let sha512 = "53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg=="; }; }; - "type-fest-0.13.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; - sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; - }; - }; "type-fest-0.16.0" = { name = "type-fest"; packageName = "type-fest"; @@ -53289,13 +51957,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.20.0" = { + "type-fest-4.23.0" = { name = "type-fest"; packageName = "type-fest"; - version = "4.20.0"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.20.0.tgz"; - sha512 = "MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.23.0.tgz"; + sha512 = "ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w=="; }; }; "type-is-1.6.18" = { @@ -53388,15 +52056,6 @@ let sha512 = "OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA=="; }; }; - "typescript-2.9.2" = { - name = "typescript"; - packageName = "typescript"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"; - sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w=="; - }; - }; "typescript-3.9.10" = { name = "typescript"; packageName = "typescript"; @@ -53406,15 +52065,6 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-4.5.5" = { - name = "typescript"; - packageName = "typescript"; - version = "4.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; - }; - }; "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; @@ -53424,40 +52074,40 @@ let sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; }; }; - "typescript-5.3.3" = { + "typescript-5.4.5" = { name = "typescript"; packageName = "typescript"; - version = "5.3.3"; + version = "5.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz"; - sha512 = "pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz"; + sha512 = "vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="; }; }; - "typescript-5.4.5" = { + "typescript-5.5.4" = { name = "typescript"; packageName = "typescript"; - version = "5.4.5"; + version = "5.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz"; - sha512 = "vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz"; + sha512 = "Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q=="; }; }; - "typescript-5.6.0-dev.20240614" = { + "typescript-5.6.0-dev.20240725" = { name = "typescript"; packageName = "typescript"; - version = "5.6.0-dev.20240614"; + version = "5.6.0-dev.20240725"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240614.tgz"; - sha512 = "ZyRthucrT5pvqNRBtPTNixd1dnpzyf0WIK6WoTkLRIzMiI0IWM+jjI5DfNuokEx+7C8pXQDF+Zi8HPYg5ZLS+A=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240725.tgz"; + sha512 = "kgUK4mJogTfm3+NjdYSb7LIerXpAG8lyYSdPHdfGPaJyBRhMJARPENf0TeUxhEOrGRuxHTrIPKdrSOQX5xTsuw=="; }; }; - "typescript-auto-import-cache-0.3.2" = { + "typescript-auto-import-cache-0.3.3" = { name = "typescript-auto-import-cache"; packageName = "typescript-auto-import-cache"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz"; - sha512 = "+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg=="; + url = "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz"; + sha512 = "ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA=="; }; }; "typescript-tslint-plugin-0.5.4" = { @@ -53532,15 +52182,6 @@ let sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A=="; }; }; - "ufo-1.5.3" = { - name = "ufo"; - packageName = "ufo"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz"; - sha512 = "Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw=="; - }; - }; "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; @@ -53559,13 +52200,13 @@ let sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g=="; }; }; - "uglify-js-3.18.0" = { + "uglify-js-3.19.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.18.0"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz"; - sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.0.tgz"; + sha512 = "wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -53712,13 +52353,13 @@ let sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw=="; }; }; - "underscore-1.13.6" = { + "underscore-1.13.7" = { name = "underscore"; packageName = "underscore"; - version = "1.13.6"; + version = "1.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; - sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz"; + sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g=="; }; }; "underscore-1.4.4" = { @@ -53775,15 +52416,6 @@ let sha512 = "+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew=="; }; }; - "undici-5.26.5" = { - name = "undici"; - packageName = "undici"; - version = "5.26.5"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz"; - sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw=="; - }; - }; "undici-5.28.4" = { name = "undici"; packageName = "undici"; @@ -53802,15 +52434,6 @@ let sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; }; }; - "unenv-1.10.0-1717606461.a117952" = { - name = "unenv"; - packageName = "unenv"; - version = "1.10.0-1717606461.a117952"; - src = fetchurl { - url = "https://registry.npmjs.org/unenv-nightly/-/unenv-nightly-1.10.0-1717606461.a117952.tgz"; - sha512 = "u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg=="; - }; - }; "unherit-3.0.1" = { name = "unherit"; packageName = "unherit"; @@ -53892,13 +52515,13 @@ let sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; - "unified-11.0.4" = { + "unified-11.0.5" = { name = "unified"; packageName = "unified"; - version = "11.0.4"; + version = "11.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz"; - sha512 = "apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ=="; + url = "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz"; + sha512 = "xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA=="; }; }; "unified-9.2.2" = { @@ -54162,13 +52785,13 @@ let sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q=="; }; }; - "unist-util-inspect-8.0.0" = { + "unist-util-inspect-8.1.0" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-8.0.0.tgz"; - sha512 = "/3Wn/wU6/H6UEo4FoYUeo8KUePN8ERiZpQYFWYoihOsr1DoDuv80PeB0hobVZyYSvALa2e556bG1A1/AbwU4yg=="; + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-8.1.0.tgz"; + sha512 = "mOlg8Mp33pR0eeFpo5d2902ojqFFOKMMG2hF8bmH7ZlhnmjFgh0NI3/ZDwdaBJNbvrS7LZFVrBVtIE9KZ9s7vQ=="; }; }; "unist-util-is-3.0.0" = { @@ -54612,13 +53235,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.16" = { + "update-browserslist-db-1.1.0" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.16"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz"; - sha512 = "KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz"; + sha512 = "EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ=="; }; }; "update-check-1.5.3" = { @@ -54675,13 +53298,13 @@ let sha512 = "EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og=="; }; }; - "update-notifier-7.0.0" = { + "update-notifier-7.1.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-7.0.0.tgz"; - sha512 = "Hv25Bh+eAbOLlsjJreVPOs4vd51rrtCrmhyOJtbpAojro34jS4KQaEp4/EvlHJX7jSO42VvEFpkastVyXyIsdQ=="; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-7.1.0.tgz"; + sha512 = "8SV3rIqVY6EFC1WxH6L0j55s0MO79MFBS1pivmInRJg3pCEDgWHBj1Q6XByTtCLOZIFA0f6zoG9ZWf2Ks9lvTA=="; }; }; "upnp-device-client-1.0.2" = { @@ -55035,6 +53658,15 @@ let sha512 = "2ZLjisH0HQkpqZTg2m7TK0Yn7TETTg7DxM0EpCKIIIV2ky9w9nSxW5a7gzdk4nH2h+pomrrGw0uywrUJfsm2eA=="; }; }; + "uuid-10.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz"; + sha512 = "8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ=="; + }; + }; "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; @@ -55107,15 +53739,6 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "uuid-9.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; - sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; - }; - }; "uuid-9.0.1" = { name = "uuid"; packageName = "uuid"; @@ -55206,15 +53829,6 @@ let sha512 = "M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw=="; }; }; - "validate-npm-package-name-5.0.0" = { - name = "validate-npm-package-name"; - packageName = "validate-npm-package-name"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz"; - sha512 = "YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ=="; - }; - }; "validate-npm-package-name-5.0.1" = { name = "validate-npm-package-name"; packageName = "validate-npm-package-name"; @@ -55323,15 +53937,6 @@ let sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ=="; }; }; - "vega-5.29.0" = { - name = "vega"; - packageName = "vega"; - version = "5.29.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.29.0.tgz"; - sha512 = "4+pX8UIxV1rtHpIKvzHXof5CeyMTGKMDFtuN8UmSjvJ+l5FtSen++qmSxbAc/EnkLqo5i9B2iCYTr2og77EBrA=="; - }; - }; "vega-5.30.0" = { name = "vega"; packageName = "vega"; @@ -55413,15 +54018,6 @@ let sha512 = "0kUfAj0dg0U6GcEY0Kp6LiSTCZ8l8jl1qVdQyToMyKmtZg/q56qsiJQZy3WWRr1MtWkTIZL71xSJXgjwjeUaAw=="; }; }; - "vega-functions-5.14.0" = { - name = "vega-functions"; - packageName = "vega-functions"; - version = "5.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.14.0.tgz"; - sha512 = "Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg=="; - }; - }; "vega-functions-5.15.0" = { name = "vega-functions"; packageName = "vega-functions"; @@ -55449,15 +54045,6 @@ let sha512 = "m+xDtT5092YPSnV0rdTLW+AWmoCb+A54JQ66MUJwiDBpKxvfKnTiQeuiWDU2YudjUoXZN9EBOcI6QHF8H2Lu2A=="; }; }; - "vega-label-1.2.1" = { - name = "vega-label"; - packageName = "vega-label"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-label/-/vega-label-1.2.1.tgz"; - sha512 = "n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg=="; - }; - }; "vega-label-1.3.0" = { name = "vega-label"; packageName = "vega-label"; @@ -55476,15 +54063,6 @@ let sha512 = "ktIdGz3DRIS3XfTP9lJ6oMT5cKwC86nQkjUbXZbOtwXQFVNE2xVWBuH13GP6FKUZxg5hJCMtb5v/e/fwTvhKsQ=="; }; }; - "vega-parser-6.3.0" = { - name = "vega-parser"; - packageName = "vega-parser"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.3.0.tgz"; - sha512 = "swS5RuP2imRarMpGWaAZusoKkXc4Z5WxWx349pkqxIAf4F7H8Ya9nThEkSWsFozd75O9nWh0QLifds8Xb7KjUg=="; - }; - }; "vega-parser-6.4.0" = { name = "vega-parser"; packageName = "vega-parser"; @@ -55503,15 +54081,6 @@ let sha512 = "sqfnAAHumU7MWU1tQN3b6HNgKGF3legek0uLHhjLKcDJQxEc7kwcD18txFz2ffQks6d5j+AUhBiq4GARWf0DEQ=="; }; }; - "vega-regression-1.2.0" = { - name = "vega-regression"; - packageName = "vega-regression"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.2.0.tgz"; - sha512 = "6TZoPlhV/280VbxACjRKqlE0Nv48z5g4CSNf1FmGGTWS1rQtElPTranSoVW4d7ET5eVQ6f9QLxNAiALptvEq+g=="; - }; - }; "vega-regression-1.3.0" = { name = "vega-regression"; packageName = "vega-regression"; @@ -55521,15 +54090,6 @@ let sha512 = "gxOQfmV7Ft/MYKpXDEo09WZyBuKOBqxqDRWay9KtfGq/E0Y4vbTPsWLv2cB1ToPJdKE6XSN6Re9tCIw5M/yMUg=="; }; }; - "vega-runtime-6.1.4" = { - name = "vega-runtime"; - packageName = "vega-runtime"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.4.tgz"; - sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ=="; - }; - }; "vega-runtime-6.2.0" = { name = "vega-runtime"; packageName = "vega-runtime"; @@ -55548,15 +54108,6 @@ let sha512 = "dArA28DbV/M92O2QvswnzCmQ4bq9WwLKUoyhqFYWCltmDwkmvX7yhqiFLFMWPItIm7mi4Qyoygby6r4DKd1X2A=="; }; }; - "vega-scenegraph-4.12.0" = { - name = "vega-scenegraph"; - packageName = "vega-scenegraph"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.12.0.tgz"; - sha512 = "l0Us6TLRV7AAd1CxB6mvxXt9/psknqgrr0+6d1zNWtHL8tGszPE4FqllZC5m4ZtUouvE4PWKGybd5uJR0dpchw=="; - }; - }; "vega-scenegraph-4.13.0" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; @@ -55593,15 +54144,6 @@ let sha512 = "6rXc6JdDt8MnCRy6UzUCsa6EeFycPDmvioMddLfKw38OYCV8pRQC5nw44gyddOwXgUTJLiCtn/sp53P0iA542A=="; }; }; - "vega-transforms-4.11.1" = { - name = "vega-transforms"; - packageName = "vega-transforms"; - version = "4.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.11.1.tgz"; - sha512 = "DDbqEQnvy9/qEvv0bAKPqAuzgaNb7Lh2xKJFom2Yzx4tZHCl8dnKxC1lH9JnJlAMdtZuiNLPARUkf3pCNQ/olw=="; - }; - }; "vega-transforms-4.12.0" = { name = "vega-transforms"; packageName = "vega-transforms"; @@ -55611,15 +54153,6 @@ let sha512 = "bh/2Qbj85O70mjfLRgPKAsABArgSUP0k+GjmaY54zukIRxoGxKju+85nigeX/aR/INpEqNWif+5lL+NvmyWA5w=="; }; }; - "vega-typings-1.1.0" = { - name = "vega-typings"; - packageName = "vega-typings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.1.0.tgz"; - sha512 = "uI6RWlMiGRhsgmw/LzJtjCc0kwhw2f0JpyNMTAnOy90kE4e4CiaZN5nJp8S9CcfcBoPEZHc166AOn2SSNrKn3A=="; - }; - }; "vega-typings-1.3.1" = { name = "vega-typings"; packageName = "vega-typings"; @@ -55638,15 +54171,6 @@ let sha512 = "omNmGiZBdjm/jnHjZlywyYqafscDdHaELHx1q96n5UOz/FlO9JO99P4B3jZg391EFG8dqhWjQilSf2JH6F1mIw=="; }; }; - "vega-view-5.12.1" = { - name = "vega-view"; - packageName = "vega-view"; - version = "5.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-view/-/vega-view-5.12.1.tgz"; - sha512 = "9TdF35FTZNzfvfj+YM38vHOgfeGxMy2xMY+2B46ZHoustt3J/mxtfueu3RGFsGIitUGhFrmLeEHxlVHP/tY+sQ=="; - }; - }; "vega-view-5.13.0" = { name = "vega-view"; packageName = "vega-view"; @@ -55656,15 +54180,6 @@ let sha512 = "ZPAAQ3iYz6YrQjJoDT+0bcxJkXt9PKF5v4OO7Omw8PFhkIv++jFXeKlQTW1bBtyQ92dkdGGHv5lYY67Djqjf3A=="; }; }; - "vega-view-transforms-4.5.9" = { - name = "vega-view-transforms"; - packageName = "vega-view-transforms"; - version = "4.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.9.tgz"; - sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g=="; - }; - }; "vega-view-transforms-4.6.0" = { name = "vega-view-transforms"; packageName = "vega-view-transforms"; @@ -55755,13 +54270,13 @@ let sha512 = "r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g=="; }; }; - "vfile-6.0.1" = { + "vfile-6.0.2" = { name = "vfile"; packageName = "vfile"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz"; - sha512 = "1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw=="; + url = "https://registry.npmjs.org/vfile/-/vfile-6.0.2.tgz"; + sha512 = "zND7NlS8rJYb/sPqkb13ZvbbUoExdbi4w3SfRrMq6R3FvnLQmmfpajJNITuuYm6AZ5uao9vy4BAos3EXBPf2rg=="; }; }; "vfile-find-up-6.1.0" = { @@ -55782,13 +54297,13 @@ let sha512 = "YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw=="; }; }; - "vfile-location-5.0.2" = { + "vfile-location-5.0.3" = { name = "vfile-location"; packageName = "vfile-location"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.2.tgz"; - sha512 = "NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz"; + sha512 = "5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg=="; }; }; "vfile-message-2.0.4" = { @@ -55971,76 +54486,67 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "volar-service-css-0.0.45" = { + "volar-service-css-0.0.59" = { name = "volar-service-css"; packageName = "volar-service-css"; - version = "0.0.45"; + version = "0.0.59"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.45.tgz"; - sha512 = "f+AlUI1+kESbcZSVaNJVAnK0c/9Da5StoxzPqA5/8VqUHJWNdubWNnwG5xpFVTfgh6pgTcey3UBhBfHytFaIOg=="; + url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz"; + sha512 = "gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA=="; }; }; - "volar-service-emmet-0.0.45" = { + "volar-service-emmet-0.0.59" = { name = "volar-service-emmet"; packageName = "volar-service-emmet"; - version = "0.0.45"; + version = "0.0.59"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.45.tgz"; - sha512 = "9nLXSDkR1vA/3fQkFEsSXAu3XovQxOpTkVG2jilQgfek/K1ZLkaA/WMhN/TtmPmQg4NxE9Ni6mA5udBQ5gVXIA=="; + url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz"; + sha512 = "6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q=="; }; }; - "volar-service-html-0.0.45" = { + "volar-service-html-0.0.59" = { name = "volar-service-html"; packageName = "volar-service-html"; - version = "0.0.45"; + version = "0.0.59"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.45.tgz"; - sha512 = "tLTJqfy1v5C4nmeAsfekFIKPl4r4qDMyL0L9MWywr/EApZzPCsbeUGxCqdzxSMC2q7PMCfX2i167txDo+J0LVA=="; + url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz"; + sha512 = "hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q=="; }; }; - "volar-service-prettier-0.0.45" = { + "volar-service-prettier-0.0.59" = { name = "volar-service-prettier"; packageName = "volar-service-prettier"; - version = "0.0.45"; + version = "0.0.59"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.45.tgz"; - sha512 = "+mBS2EsDgp/kunKEBnHvhBwIQm5v2ahw4NKpKdg4sTpXy3UxqHt+Fq/wRYQ7Z8LlNVNRVfp75ThjM+w2zaZBAw=="; + url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.59.tgz"; + sha512 = "FmBR4lsgFRGR3V0LnxZZal0WqdOJjuLL6mQSj4p57M15APtQwuocG/FiF+ONGFnwRXMOIBDBTCARdth+TKgL3A=="; }; }; - "volar-service-typescript-0.0.45" = { + "volar-service-typescript-0.0.59" = { name = "volar-service-typescript"; packageName = "volar-service-typescript"; - version = "0.0.45"; + version = "0.0.59"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.45.tgz"; - sha512 = "i/mMIIAMastJ2kgPo3qvX0Rrl7NyxhIYZ0ug/B4ambZcLPI1vzBgS2fmvyWX3jhBYHh8NmbAotFj+0Y9JtN47A=="; + url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz"; + sha512 = "VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA=="; }; }; - "volar-service-typescript-twoslash-queries-0.0.45" = { + "volar-service-typescript-twoslash-queries-0.0.59" = { name = "volar-service-typescript-twoslash-queries"; packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.45"; - src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.45.tgz"; - sha512 = "KrPUUvKggZgV9mrDpstCzmf20irgv0ooMv+FGDzIIQUkya+d2+nSS8Mx2h9FvsYgLccUVw5jU3Rhwhd3pv/7qg=="; - }; - }; - "vscode-css-languageservice-3.0.13" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "3.0.13"; + version = "0.0.59"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-3.0.13.tgz"; - sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; + url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz"; + sha512 = "skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ=="; }; }; - "vscode-css-languageservice-6.2.14" = { + "vscode-css-languageservice-6.3.0" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "6.2.14"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz"; - sha512 = "5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz"; + sha512 = "nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -56052,40 +54558,13 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-html-languageservice-2.1.12" = { + "vscode-html-languageservice-5.3.0" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "2.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.1.12.tgz"; - sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; - }; - }; - "vscode-html-languageservice-5.2.0" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0.tgz"; - sha512 = "cdNMhyw57/SQzgUUGSIMQ66jikqEN6nBNyhx5YuOyj9310+eY9zw8Q0cXpiKzDX8aHYFewQEXRnigl06j/TVwQ=="; - }; - }; - "vscode-html-languageservice-5.2.0-34a5462" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "5.2.0-34a5462"; - src = fetchurl { - url = "https://registry.npmjs.org/@johnsoncodehk/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0-34a5462.tgz"; - sha512 = "etqLfpSJ5zaw76KUNF603be6d6QsiQPmaHr9FKEp4zhLZJzWCCMH6Icak7MtLUFLZLMpL761mZNImi/joBo1ZA=="; - }; - }; - "vscode-json-languageservice-3.11.0" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "3.11.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz"; - sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz"; + sha512 = "C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g=="; }; }; "vscode-json-languageservice-4.2.1" = { @@ -56097,15 +54576,6 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-jsonrpc-3.5.0" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz"; - sha512 = "LeE9LS1IOIRDZy5Xugrbk2tKeMa64vkRODrXPZbwyn2l/Q0e/jyYq8ze/Lo96sjOFiRe3HHbTVN39Ta8KN2RpA=="; - }; - }; "vscode-jsonrpc-4.0.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -56169,15 +54639,6 @@ let sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="; }; }; - "vscode-jsonrpc-8.2.0-next.2" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "8.2.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.2.tgz"; - sha512 = "1FQrqLselaLLe5ApFSU/8qGUbJ8tByWbqczMkT2PEDpDYthCQTe5wONPuVphe7BB+FvZwvBFI2kFkY7FtyHc1A=="; - }; - }; "vscode-jsonrpc-8.2.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -56196,24 +54657,6 @@ let sha512 = "GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing=="; }; }; - "vscode-languageserver-3.5.1" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz"; - sha512 = "RYUKn0DgHTFcS8kS4VaNCjNMaQXYqiXdN9bKrFjXzu5RPKfjIYcoh47oVWwZj4L3R/DPB0Se7HPaDatvYY2XgQ=="; - }; - }; - "vscode-languageserver-4.4.2" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz"; - sha512 = "61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA=="; - }; - }; "vscode-languageserver-5.2.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -56259,15 +54702,6 @@ let sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; - "vscode-languageserver-8.2.0-next.3" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "8.2.0-next.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.2.0-next.3.tgz"; - sha512 = "fqHRwcIRoxfKke7iLDSeUmdo3uk7o/uWNn/44xdWa4urdhsvpTZ5c1GsL1EX4TAvdDg0qeXy89NBZ5Gld2DkgQ=="; - }; - }; "vscode-languageserver-9.0.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -56331,15 +54765,6 @@ let sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; - "vscode-languageserver-protocol-3.17.4-next.3" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.17.4-next.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.3.tgz"; - sha512 = "GnW3ldfzlsDK9B1/L1edBW1ddSakC59r+DRipTYCcXIT/zCCbLID998Dxn+exgrL33e3/XLQ+7hQQiSz6TnhKQ=="; - }; - }; "vscode-languageserver-protocol-3.17.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -56349,24 +54774,6 @@ let sha512 = "mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg=="; }; }; - "vscode-languageserver-protocol-3.5.1" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz"; - sha512 = "1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA=="; - }; - }; - "vscode-languageserver-protocol-foldingprovider-2.0.1" = { - name = "vscode-languageserver-protocol-foldingprovider"; - packageName = "vscode-languageserver-protocol-foldingprovider"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz"; - sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; - }; - }; "vscode-languageserver-textdocument-1.0.11" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; @@ -56412,15 +54819,6 @@ let sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; }; }; - "vscode-languageserver-types-3.16.0-next.2" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz"; - sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; - }; - }; "vscode-languageserver-types-3.17.0-next.3" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -56448,15 +54846,6 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; - "vscode-languageserver-types-3.17.4-next.2" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.17.4-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.2.tgz"; - sha512 = "r6tXyCXyXQH7b6VHkvRT0Nd9v+DWQiosgTR6HQajCb4iJ1myr3KgueWEGBF1Ph5/YAiDy8kXUhf8dHl7wE1H2A=="; - }; - }; "vscode-languageserver-types-3.17.5" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -56466,33 +54855,6 @@ let sha512 = "Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="; }; }; - "vscode-languageserver-types-3.5.0" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; - sha512 = "D4rUfu/oKYdc9Tmec0nEfedj+uXO2tZHR+eoHs9rE9G/QpRyZaHuug8ZUNGTGdO+ALLGgenL6bRpY8y3J9acHg=="; - }; - }; - "vscode-nls-2.0.2" = { - name = "vscode-nls"; - packageName = "vscode-nls"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"; - sha512 = "xK4p7Wksahb1imTwJZeA7+OSobDlRkWYWBuz9eR6LyJRLLG4LBxvLvZF8GO1ZY1tUWHITjZn2BtA8nRufKdHSg=="; - }; - }; - "vscode-nls-3.2.5" = { - name = "vscode-nls"; - packageName = "vscode-nls"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-3.2.5.tgz"; - sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw=="; - }; - }; "vscode-nls-4.1.2" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -56538,24 +54900,6 @@ let sha512 = "AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="; }; }; - "vue-2.7.16" = { - name = "vue"; - packageName = "vue"; - version = "2.7.16"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz"; - sha512 = "4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw=="; - }; - }; - "vue-codemod-0.0.5" = { - name = "vue-codemod"; - packageName = "vue-codemod"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.5.tgz"; - sha512 = "DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A=="; - }; - }; "vue-eslint-parser-7.11.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -56601,13 +54945,13 @@ let sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; }; }; - "w3c-xmlserializer-4.0.0" = { + "w3c-xmlserializer-5.0.0" = { name = "w3c-xmlserializer"; packageName = "w3c-xmlserializer"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"; - sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw=="; + url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz"; + sha512 = "o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA=="; }; }; "walk-2.3.15" = { @@ -56718,15 +55062,6 @@ let sha512 = "d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="; }; }; - "web-tree-sitter-0.20.5" = { - name = "web-tree-sitter"; - packageName = "web-tree-sitter"; - version = "0.20.5"; - src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.5.tgz"; - sha512 = "mpXlqIeEBE5Q71cnBnt8w6XKhIiKmllPECqsIFBtMvzcfCxA8+614iyMJXBCQo95Vs3y1zORLqiLJn25pYZ4Tw=="; - }; - }; "web-tree-sitter-0.22.5" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -56826,13 +55161,13 @@ let sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; }; }; - "webpack-5.92.0" = { + "webpack-5.93.0" = { name = "webpack"; packageName = "webpack"; - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz"; - sha512 = "Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz"; + sha512 = "Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA=="; }; }; "webpack-cli-5.1.4" = { @@ -56853,13 +55188,13 @@ let sha512 = "BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q=="; }; }; - "webpack-dev-middleware-7.2.1" = { + "webpack-dev-middleware-7.3.0" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "7.2.1"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz"; - sha512 = "hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.3.0.tgz"; + sha512 = "xD2qnNew+F6KwOGZR7kWdbIou/ud7cVqLEXeK1q0nHcNsX/u7ul/fSdlOTX4ntSL5FNFy7ZJJXbf0piF591JYw=="; }; }; "webpack-dev-server-4.15.2" = { @@ -56907,13 +55242,13 @@ let sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webrtc-polyfill-1.1.6" = { + "webrtc-polyfill-1.1.8" = { name = "webrtc-polyfill"; packageName = "webrtc-polyfill"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/webrtc-polyfill/-/webrtc-polyfill-1.1.6.tgz"; - sha512 = "sB9m4P5ZF6Af1zNiMc/jW+PMVtvPSRuE3f0FNhje5iplljZ5mAUTUtZTdaoi+l5Z17/ePQinJbNDfT+YzB6fdQ=="; + url = "https://registry.npmjs.org/webrtc-polyfill/-/webrtc-polyfill-1.1.8.tgz"; + sha512 = "ms2rE5MEg1KXQX45sjl2QaIIevhpPogqoFz7Z1MAJYxWUuxFfI3L0SoiifrTNrWJiJiuFn/Dsf5OIGUWJFdU5g=="; }; }; "websocket-driver-0.7.4" = { @@ -56934,13 +55269,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-2.4.1" = { + "webtorrent-2.4.12" = { name = "webtorrent"; packageName = "webtorrent"; - version = "2.4.1"; + version = "2.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.4.1.tgz"; - sha512 = "9/WTMFaAAbfopNQiGK5rD7ZJJTdPwOrl/T6izTWVEk56+cJdtZBz9FelMnwnS4Q7rqFKoEYuonzi+ig0nXjYsA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.4.12.tgz"; + sha512 = "Lp/2WDQH0nUhIkpp03F7PnAorQSVCFIDGY4ZNeNPGtA1CgoeX4eie1BfK6QAlH/OtHbilPhpxlVrBkZsA6HqPA=="; }; }; "whatwg-encoding-1.0.5" = { @@ -56952,13 +55287,13 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; - "whatwg-encoding-2.0.0" = { + "whatwg-encoding-3.1.1" = { name = "whatwg-encoding"; packageName = "whatwg-encoding"; - version = "2.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; - sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz"; + sha512 = "6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -56970,22 +55305,22 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; - "whatwg-mimetype-3.0.0" = { + "whatwg-mimetype-4.0.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; - sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz"; + sha512 = "QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg=="; }; }; - "whatwg-url-12.0.1" = { + "whatwg-url-14.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "12.0.1"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz"; - sha512 = "Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz"; + sha512 = "1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw=="; }; }; "whatwg-url-5.0.0" = { @@ -57015,13 +55350,13 @@ let sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; }; }; - "when-exit-2.1.2" = { + "when-exit-2.1.3" = { name = "when-exit"; packageName = "when-exit"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/when-exit/-/when-exit-2.1.2.tgz"; - sha512 = "u9J+toaf3CCxCAzM/484qNAxQE75rFdVgiFEEV8Xps2gzYhf0tx73s1WXDQhkwV17E3MxRMz40m7Ekd2/121Lg=="; + url = "https://registry.npmjs.org/when-exit/-/when-exit-2.1.3.tgz"; + sha512 = "uVieSTccFIr/SFQdFWN/fFaQYmV37OKtuaGphMAzi4DmmUlrvRBJW5WSLkHyjNQY/ePJMz3LoiX9R3yy1Su6Hw=="; }; }; "whet.extend-0.9.9" = { @@ -57105,13 +55440,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-pm-2.0.0" = { + "which-pm-2.2.0" = { name = "which-pm"; packageName = "which-pm"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/which-pm/-/which-pm-2.0.0.tgz"; - sha512 = "Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w=="; + url = "https://registry.npmjs.org/which-pm/-/which-pm-2.2.0.tgz"; + sha512 = "MOiaDbA5ZZgUjkeMWM5EkJp4loW5ZRoa5bc3/aeMox/PJelMhE6t7S/mLuiY43DBupyxH+S0U1bTui9kWUlmsw=="; }; }; "which-typed-array-1.1.15" = { @@ -57285,22 +55620,22 @@ let sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g=="; }; }; - "winston-3.13.0" = { + "winston-3.13.1" = { name = "winston"; packageName = "winston"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz"; - sha512 = "rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ=="; + url = "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz"; + sha512 = "SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw=="; }; }; - "winston-transport-4.7.0" = { + "winston-transport-4.7.1" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz"; - sha512 = "ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.1.tgz"; + sha512 = "wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA=="; }; }; "with-7.0.2" = { @@ -57393,22 +55728,31 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20240610.1" = { - name = "workerd"; - packageName = "workerd"; - version = "1.20240610.1"; + "worker-timers-7.1.8" = { + name = "worker-timers"; + packageName = "worker-timers"; + version = "7.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20240610.1.tgz"; - sha512 = "Rtut5GrsODQMh6YU43b9WZ980Wd05Ov1/ds88pT/SoetmXFBvkBzdRfiHiATv+azmGX8KveE0i/Eqzk/yI01ug=="; + url = "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz"; + sha512 = "R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw=="; }; }; - "workerpool-6.2.1" = { - name = "workerpool"; - packageName = "workerpool"; - version = "6.2.1"; + "worker-timers-broker-6.1.8" = { + name = "worker-timers-broker"; + packageName = "worker-timers-broker"; + version = "6.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz"; + sha512 = "FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ=="; + }; + }; + "worker-timers-worker-7.0.71" = { + name = "worker-timers-worker"; + packageName = "worker-timers-worker"; + version = "7.0.71"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz"; - sha512 = "ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="; + url = "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz"; + sha512 = "ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ=="; }; }; "workerpool-6.5.1" = { @@ -57618,13 +55962,13 @@ let sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; }; }; - "ws-6.2.2" = { + "ws-6.2.3" = { name = "ws"; packageName = "ws"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; - sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz"; + sha512 = "jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA=="; }; }; "ws-7.4.5" = { @@ -57636,31 +55980,13 @@ let sha512 = "xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="; }; }; - "ws-7.4.6" = { + "ws-7.5.10" = { name = "ws"; packageName = "ws"; - version = "7.4.6"; + version = "7.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz"; - sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; - }; - }; - "ws-7.5.6" = { - name = "ws"; - packageName = "ws"; - version = "7.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"; - sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; - }; - }; - "ws-7.5.9" = { - name = "ws"; - packageName = "ws"; - version = "7.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz"; + sha512 = "+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="; }; }; "ws-8.11.0" = { @@ -57681,22 +56007,22 @@ let sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; }; - "ws-8.17.0" = { + "ws-8.17.1" = { name = "ws"; packageName = "ws"; - version = "8.17.0"; + version = "8.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz"; - sha512 = "uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow=="; + url = "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz"; + sha512 = "6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ=="; }; }; - "ws-8.8.1" = { + "ws-8.18.0" = { name = "ws"; packageName = "ws"; - version = "8.8.1"; + version = "8.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"; - sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; + url = "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz"; + sha512 = "8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="; }; }; "xcase-2.0.1" = { @@ -57834,6 +56160,15 @@ let sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; }; }; + "xml-name-validator-5.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz"; + sha512 = "EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg=="; + }; + }; "xml-parse-from-string-1.0.1" = { name = "xml-parse-from-string"; packageName = "xml-parse-from-string"; @@ -57997,15 +56332,6 @@ let sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; }; }; - "xss-1.0.15" = { - name = "xss"; - packageName = "xss"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz"; - sha512 = "FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg=="; - }; - }; "xstate-4.38.3" = { name = "xstate"; packageName = "xstate"; @@ -58042,15 +56368,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "xxhash-wasm-1.0.2" = { - name = "xxhash-wasm"; - packageName = "xxhash-wasm"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.0.2.tgz"; - sha512 = "ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A=="; - }; - }; "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; @@ -58105,6 +56422,15 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; + "yallist-5.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz"; + sha512 = "YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="; + }; + }; "yaml-1.10.2" = { name = "yaml"; packageName = "yaml"; @@ -58132,13 +56458,13 @@ let sha512 = "aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg=="; }; }; - "yaml-front-matter-4.1.1" = { - name = "yaml-front-matter"; - packageName = "yaml-front-matter"; - version = "4.1.1"; + "yaml-2.5.0" = { + name = "yaml"; + packageName = "yaml"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz"; - sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz"; + sha512 = "2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw=="; }; }; "yargs-13.3.2" = { @@ -58267,15 +56593,6 @@ let sha512 = "9pIKIJhnI5tonzG6OnCFlz/yln8xHYcGl+pn3xR0Vzff0vzN1PbNRaelgfgRUwZ3s4i3jvxT9WhmUGL4whnasA=="; }; }; - "yargs-parser-20.2.4" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"; - sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; - }; - }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -58420,22 +56737,31 @@ let sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; }; - "yocto-queue-1.0.0" = { + "yocto-queue-1.1.1" = { name = "yocto-queue"; packageName = "yocto-queue"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz"; - sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="; + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz"; + sha512 = "b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g=="; }; }; - "yoctocolors-2.0.2" = { + "yoctocolors-2.1.1" = { name = "yoctocolors"; packageName = "yoctocolors"; - version = "2.0.2"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz"; + sha512 = "GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ=="; + }; + }; + "yoctocolors-cjs-2.1.2" = { + name = "yoctocolors-cjs"; + packageName = "yoctocolors-cjs"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.0.2.tgz"; - sha512 = "Ct97huExsu7cWeEjmrXlofevF8CvzUglJ4iGUet5B8xn1oumtAZBpHU4GzYuoE6PVqcZ5hghtBrSlhwHuR1Jmw=="; + url = "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz"; + sha512 = "cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA=="; }; }; "yoga-layout-prebuilt-1.10.0" = { @@ -58456,15 +56782,6 @@ let sha512 = "N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA=="; }; }; - "youch-3.3.3" = { - name = "youch"; - packageName = "youch"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz"; - sha512 = "qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA=="; - }; - }; "yurnalist-2.1.0" = { name = "yurnalist"; packageName = "yurnalist"; @@ -58552,16 +56869,45 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "18.0.4"; + version = "18.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-18.0.4.tgz"; - sha512 = "i7DLVIc4HN0CFZZKbEeVeQSADRG1Dt2CwXh/wTUzglRLu/tE7Q+WMrqJ2+lGTT2edZp2KKysM4Gxp+ATAzP8AQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-18.1.2.tgz"; + sha512 = "5H0scWgJcDE3NSM6/j/xSwNfAQBVOhVjXuj+nZOaEkJC0Bxh6AoEdWpQdzmZ6qSlx4LMlJYI6P/sH0kiBlFfgA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1800.4" - sources."@angular-devkit/core-18.0.4" - sources."@angular-devkit/schematics-18.0.4" - sources."@inquirer/figures-1.0.3" + sources."@angular-devkit/architect-0.1801.2" + sources."@angular-devkit/core-18.1.2" + sources."@angular-devkit/schematics-18.1.2" + (sources."@inquirer/checkbox-2.4.2" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + ]; + }) + sources."@inquirer/confirm-3.1.17" + (sources."@inquirer/core-9.0.5" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + sources."signal-exit-4.1.0" + sources."wrap-ansi-6.2.0" + ]; + }) + sources."@inquirer/editor-2.1.17" + sources."@inquirer/expand-2.1.17" + sources."@inquirer/figures-1.0.5" + sources."@inquirer/input-2.2.4" + (sources."@inquirer/password-2.1.17" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + ]; + }) + sources."@inquirer/prompts-5.0.7" + sources."@inquirer/rawlist-2.1.17" + (sources."@inquirer/select-2.4.2" // { + dependencies = [ + sources."ansi-escapes-4.3.2" + ]; + }) + sources."@inquirer/type-1.5.1" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -58572,11 +56918,11 @@ in sources."wrap-ansi-8.1.0" ]; }) - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@ljharb/through-2.3.13" + sources."@jridgewell/sourcemap-codec-1.5.0" + sources."@listr2/prompt-adapter-inquirer-2.0.13" sources."@npmcli/agent-2.2.2" sources."@npmcli/fs-3.1.1" - (sources."@npmcli/git-5.0.7" // { + (sources."@npmcli/git-5.0.8" // { dependencies = [ sources."isexe-3.1.1" sources."which-4.0.0" @@ -58598,7 +56944,7 @@ in sources."which-4.0.0" ]; }) - sources."@schematics/angular-18.0.4" + sources."@schematics/angular-18.1.2" sources."@sigstore/bundle-2.3.2" sources."@sigstore/core-1.1.0" sources."@sigstore/protobuf-specs-0.3.2" @@ -58607,14 +56953,16 @@ in sources."@sigstore/verify-1.2.1" sources."@tufjs/canonical-json-2.0.0" sources."@tufjs/models-2.0.1" + sources."@types/mute-stream-0.0.4" + sources."@types/node-20.14.12" + sources."@types/wrap-ansi-3.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-2.0.0" sources."agent-base-7.1.1" sources."aggregate-error-3.1.0" - sources."ajv-8.13.0" + sources."ajv-8.16.0" sources."ajv-formats-3.0.1" - sources."ansi-colors-4.1.3" - sources."ansi-escapes-4.3.2" + sources."ansi-escapes-6.2.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" (sources."anymatch-3.1.3" // { @@ -58629,36 +56977,42 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."buffer-5.7.1" - sources."cacache-18.0.3" - sources."call-bind-1.0.7" + sources."cacache-18.0.4" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" + sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.2" + (sources."cli-truncate-4.0.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-10.3.0" + sources."string-width-7.2.0" + sources."strip-ansi-7.1.0" + ]; + }) sources."cli-width-4.1.0" sources."cliui-8.0.1" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorette-2.0.20" sources."cross-spawn-7.0.3" sources."debug-4.3.5" sources."defaults-1.0.4" - sources."define-data-property-1.1.4" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" sources."escalade-3.1.2" + sources."eventemitter3-5.0.1" sources."exponential-backoff-3.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fill-range-7.1.1" - (sources."foreground-child-3.2.0" // { + (sources."foreground-child-3.2.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -58666,36 +57020,26 @@ in sources."fs-minipass-3.0.3" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.4" - sources."glob-10.4.1" + sources."get-east-asian-width-1.2.0" + sources."glob-10.4.5" sources."glob-parent-5.1.2" - sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" sources."hasown-2.0.2" sources."hosted-git-info-7.0.2" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" + sources."https-proxy-agent-7.0.5" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-walk-6.0.5" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inherits-2.0.4" - sources."ini-4.1.2" - (sources."inquirer-9.2.22" // { - dependencies = [ - sources."chalk-5.3.0" - sources."wrap-ansi-6.2.0" - ]; - }) + sources."ini-4.1.3" sources."ip-address-9.0.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -58704,19 +57048,40 @@ in sources."is-number-7.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jsbn-1.1.0" sources."json-parse-even-better-errors-3.0.2" sources."json-schema-traverse-1.0.0" - sources."jsonc-parser-3.2.1" + sources."jsonc-parser-3.3.1" sources."jsonparse-1.3.1" - sources."lodash-4.17.21" + (sources."listr2-8.2.3" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."emoji-regex-10.3.0" + sources."string-width-7.2.0" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-9.0.0" + ]; + }) sources."log-symbols-4.1.0" - sources."lru-cache-10.2.2" + (sources."log-update-6.0.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."emoji-regex-10.3.0" + sources."is-fullwidth-code-point-5.0.0" + sources."slice-ansi-7.1.0" + sources."string-width-7.2.0" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-9.0.0" + ]; + }) + sources."lru-cache-10.4.3" sources."magic-string-0.30.10" sources."make-fetch-happen-13.0.1" sources."mimic-fn-2.1.0" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."minipass-collect-2.0.1" sources."minipass-fetch-3.0.5" @@ -58744,15 +57109,14 @@ in sources."ms-2.1.2" sources."mute-stream-1.0.0" sources."negotiator-0.6.3" - (sources."node-gyp-10.1.0" // { + (sources."node-gyp-10.2.0" // { dependencies = [ sources."isexe-3.1.1" - sources."proc-log-3.0.0" sources."which-4.0.0" ]; }) sources."nopt-7.2.1" - sources."normalize-package-data-6.0.1" + sources."normalize-package-data-6.0.2" sources."normalize-path-3.0.0" sources."npm-bundled-3.0.1" sources."npm-install-checks-6.3.0" @@ -58762,9 +57126,15 @@ in sources."npm-pick-manifest-9.0.1" sources."npm-registry-fetch-17.1.0" sources."onetime-5.1.2" - sources."ora-5.4.1" + (sources."ora-5.4.1" // { + dependencies = [ + sources."cli-cursor-3.1.0" + sources."restore-cursor-3.1.0" + ]; + }) sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" + sources."package-json-from-dist-1.0.0" sources."pacote-18.0.6" sources."path-key-3.1.1" sources."path-parse-1.0.7" @@ -58783,21 +57153,26 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-1.22.8" - sources."restore-cursor-3.1.0" + sources."restore-cursor-4.0.0" sources."retry-0.12.0" - sources."run-async-3.0.0" + sources."rfdc-1.4.1" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.6.2" - sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."sigstore-2.3.1" + (sources."slice-ansi-5.0.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + sources."is-fullwidth-code-point-4.0.0" + ]; + }) sources."smart-buffer-4.2.0" sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.3" + sources."socks-proxy-agent-8.0.4" sources."source-map-0.7.4" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" @@ -58828,6 +57203,7 @@ in sources."tslib-2.6.3" sources."tuf-js-2.2.1" sources."type-fest-0.21.3" + sources."undici-types-5.26.5" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."uri-js-4.4.1" @@ -58842,6 +57218,7 @@ in sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" + sources."yoctocolors-cjs-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -58856,10 +57233,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.21.12"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.21.12.tgz"; - sha512 = "2aDL3WUv8hMJb2L3r/PIQWsTLyq7RQr3v9xD16fiz6O8ys1xEyLhhTOv8gxtZvJiTzjTF5pHoArvRdesGL1DMQ=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.22.0.tgz"; + sha512 = "qP2zFsmypfWpKnmQcjoqMfYrPRHbqcXnhaUrg3VGqPGFXyN9sKz2+/TvNKByWDqAfuVStE8Fy2ppuVdoWQDjkw=="; }; buildInputs = globalBuildInputs; meta = { @@ -58871,131 +57248,25 @@ in bypassCache = true; reconstructLock = true; }; - "@astrojs/language-server" = nodeEnv.buildNodePackage { - name = "_at_astrojs_slash_language-server"; - packageName = "@astrojs/language-server"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.10.0.tgz"; - sha512 = "crHXpqYfA5qWioiuZnZFpTsNItgBlF1f0S9MzDYS7/pfCALkHNJ7K3w9U/j0uMKymsT4hC7BfMaX0DYlfdSzHg=="; - }; - dependencies = [ - sources."@astrojs/compiler-2.8.0" - sources."@emmetio/abbreviation-2.3.3" - sources."@emmetio/css-abbreviation-2.1.8" - sources."@emmetio/css-parser-0.4.0" - sources."@emmetio/html-matcher-1.3.0" - sources."@emmetio/scanner-1.0.4" - sources."@emmetio/stream-reader-2.2.0" - sources."@emmetio/stream-reader-utils-0.1.0" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@volar/kit-2.2.5" - sources."@volar/language-core-2.2.5" - sources."@volar/language-server-2.2.5" - sources."@volar/language-service-2.2.5" - sources."@volar/snapshot-document-2.2.5" - sources."@volar/source-map-2.2.5" - sources."@volar/typescript-2.2.5" - (sources."@vscode/emmet-helper-2.9.3" // { - dependencies = [ - sources."vscode-uri-2.1.2" - ]; - }) - sources."@vscode/l10n-0.0.16" - sources."braces-3.0.3" - sources."emmet-2.4.7" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."glob-parent-5.1.2" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."jsonc-parser-2.3.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."muggle-string-0.4.1" - sources."path-browserify-1.0.1" - sources."picomatch-2.3.1" - sources."prettier-3.3.2" - (sources."prettier-plugin-astro-0.14.0" // { - dependencies = [ - sources."@astrojs/compiler-1.8.2" - ]; - }) - sources."queue-microtask-1.2.3" - sources."request-light-0.7.0" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."s.color-0.0.15" - sources."sass-formatter-0.7.9" - sources."semver-7.6.2" - sources."suf-log-2.5.3" - sources."to-regex-range-5.0.1" - sources."typesafe-path-0.2.2" - sources."typescript-5.4.5" - sources."typescript-auto-import-cache-0.3.2" - sources."volar-service-css-0.0.45" - sources."volar-service-emmet-0.0.45" - (sources."volar-service-html-0.0.45" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - sources."vscode-html-languageservice-5.2.0-34a5462" - ]; - }) - sources."volar-service-prettier-0.0.45" - sources."volar-service-typescript-0.0.45" - sources."volar-service-typescript-twoslash-queries-0.0.45" - (sources."vscode-css-languageservice-6.2.14" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - ]; - }) - (sources."vscode-html-languageservice-5.2.0" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - ]; - }) - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-9.0.1" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)"; - homepage = "https://github.com/withastro/language-tools#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@babel/cli" = nodeEnv.buildNodePackage { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.24.7"; + version = "7.24.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.7.tgz"; - sha512 = "8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.8.tgz"; + sha512 = "isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { + sources."@babel/compat-data-7.24.9" + (sources."@babel/core-7.24.9" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { + sources."@babel/generator-7.24.10" + (sources."@babel/helper-compilation-targets-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; @@ -59004,28 +57275,28 @@ in sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helpers-7.24.8" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/traverse-7.24.8" + sources."@babel/types-7.24.9" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.23.1" - sources."caniuse-lite-1.0.30001634" + sources."browserslist-4.23.2" + sources."caniuse-lite-1.0.30001643" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -59033,7 +57304,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."debug-4.3.5" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -59051,7 +57322,7 @@ in sources."make-dir-2.1.0" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."picocolors-1.0.1" @@ -59060,7 +57331,7 @@ in sources."slash-2.0.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."wrappy-1.0.2" sources."yallist-3.1.1" ]; @@ -59106,9 +57377,9 @@ in sources."@commitlint/top-level-19.0.0" sources."@commitlint/types-19.0.3" sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."JSONStream-1.3.5" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" @@ -59133,6 +57404,7 @@ in sources."escape-string-regexp-1.0.5" sources."execa-8.0.1" sources."fast-deep-equal-3.1.3" + sources."fast-uri-3.0.1" sources."find-up-7.0.0" sources."get-caller-file-2.0.5" sources."get-stream-8.0.1" @@ -59187,11 +57459,10 @@ in sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."picocolors-1.0.1" - sources."punycode-2.3.1" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -59202,10 +57473,9 @@ in sources."supports-color-5.5.0" sources."text-extensions-2.4.0" sources."through-2.3.8" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."unicorn-magic-0.1.0" - sources."uri-js-4.4.1" sources."which-2.0.2" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -59217,7 +57487,7 @@ in sources."y18n-5.0.8" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" - sources."yocto-queue-1.0.0" + sources."yocto-queue-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -59240,7 +57510,7 @@ in dependencies = [ sources."@commitlint/types-19.0.3" sources."@types/conventional-commits-parser-5.0.0" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."array-ify-1.0.0" sources."chalk-5.3.0" sources."compare-func-2.0.0" @@ -59262,10 +57532,10 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.128.1"; + version = "5.130.2"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.128.1.tgz"; - sha512 = "Im/WUAT2Oqxvy92VqVZ+SoBsdffm0F7Luy5dJX853NFrj0W6VzspcR8T5yKKYHzh4fk4YNRKBVa7Mz3VhUJ0ow=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.130.2.tgz"; + sha512 = "BmTod8PGP61MtJAEl4nsxGrS27dqkCU55NM5V7vh0Vqpl8OkrJXT7Ucvzbm/kbDG3J5d2Clc9pEmbRNiMPjwuw=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -59303,11 +57573,11 @@ in sources."tslib-2.6.3" ]; }) - (sources."@azure/core-rest-pipeline-1.16.0" // { + (sources."@azure/core-rest-pipeline-1.16.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" sources."agent-base-7.1.1" - sources."https-proxy-agent-7.0.4" + sources."https-proxy-agent-7.0.5" sources."tslib-2.6.3" ]; }) @@ -59316,25 +57586,25 @@ in sources."tslib-2.6.3" ]; }) - (sources."@azure/core-util-1.9.0" // { + (sources."@azure/core-util-1.9.1" // { dependencies = [ sources."@azure/abort-controller-2.1.2" sources."tslib-2.6.3" ]; }) - (sources."@azure/identity-4.0.1" // { + (sources."@azure/identity-4.2.1" // { dependencies = [ sources."tslib-2.6.3" ]; }) - (sources."@azure/logger-1.1.2" // { + (sources."@azure/logger-1.1.3" // { dependencies = [ sources."tslib-2.6.3" ]; }) - sources."@azure/msal-browser-3.17.0" - sources."@azure/msal-common-14.12.0" - sources."@azure/msal-node-2.9.2" + sources."@azure/msal-browser-3.20.0" + sources."@azure/msal-common-14.14.0" + sources."@azure/msal-node-2.12.0" (sources."@azure/storage-blob-12.17.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" @@ -59342,25 +57612,25 @@ in ]; }) sources."@babel/code-frame-7.24.7" - sources."@babel/generator-7.24.7" + sources."@babel/generator-7.24.10" sources."@babel/helper-environment-visitor-7.24.7" sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/traverse-7.24.8" + sources."@babel/types-7.24.9" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@microsoft/rush-lib-5.128.1" + sources."@microsoft/rush-lib-5.130.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -59396,14 +57666,14 @@ in sources."@pnpm/types-6.4.0" ]; }) - sources."@rushstack/heft-config-file-0.14.25" - (sources."@rushstack/node-core-library-5.4.1" // { + sources."@rushstack/heft-config-file-0.15.2" + (sources."@rushstack/node-core-library-5.5.0" // { dependencies = [ sources."import-lazy-4.0.0" ]; }) - sources."@rushstack/package-deps-hash-4.1.57" - (sources."@rushstack/package-extractor-0.7.16" // { + sources."@rushstack/package-deps-hash-4.1.61" + (sources."@rushstack/package-extractor-0.7.20" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.0.8" @@ -59414,18 +57684,18 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.128.1" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.128.1" - sources."@rushstack/rush-http-build-cache-plugin-5.128.1" - sources."@rushstack/rush-sdk-5.128.1" - sources."@rushstack/stream-collator-4.1.56" - (sources."@rushstack/terminal-0.13.0" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.130.2" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.130.2" + sources."@rushstack/rush-http-build-cache-plugin-5.130.2" + sources."@rushstack/rush-sdk-5.130.2" + sources."@rushstack/stream-collator-4.1.60" + (sources."@rushstack/terminal-0.13.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) - (sources."@rushstack/ts-command-line-4.22.0" // { + (sources."@rushstack/ts-command-line-4.22.2" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -59433,19 +57703,19 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.17.5" + sources."@types/lodash-4.17.7" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.5" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.4" sources."@types/parse-json-4.0.2" sources."@types/tunnel-0.0.3" - sources."@vue/compiler-core-3.4.29" - sources."@vue/compiler-dom-3.4.29" - sources."@vue/compiler-sfc-3.4.29" - sources."@vue/compiler-ssr-3.4.29" - sources."@vue/shared-3.4.29" + sources."@vue/compiler-core-3.4.34" + sources."@vue/compiler-dom-3.4.34" + sources."@vue/compiler-sfc-3.4.34" + sources."@vue/compiler-ssr-3.4.34" + sources."@vue/shared-3.4.34" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -59680,7 +57950,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-docker-2.2.1" sources."is-es2016-keyword-1.0.0" sources."is-extglob-2.1.1" @@ -59886,13 +58156,13 @@ in ]; }) sources."please-upgrade-node-3.2.0" - (sources."pnpm-sync-lib-0.2.6" // { + (sources."pnpm-sync-lib-0.2.9" // { dependencies = [ sources."yaml-2.4.1" ]; }) - sources."postcss-8.4.38" - (sources."preferred-pm-3.1.3" // { + sources."postcss-8.4.40" + (sources."preferred-pm-3.1.4" // { dependencies = [ sources."find-up-5.0.0" sources."locate-path-6.0.0" @@ -60044,7 +58314,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-pm-2.0.0" + sources."which-pm-2.2.0" sources."widest-line-3.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -60084,10 +58354,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.61.2"; + version = "3.64.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.61.2.tgz"; - sha512 = "XVG6IyNBJTL8YN6qGzRKapkOijI2mTVeDB2zTg/BnQsmDV57XH5ciGfDWSSN39banCZg7jwU+FssIXgmDl5ERg=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.64.1.tgz"; + sha512 = "7S5SfhlQnk5Rng8t0oh22TEldCSlFm18yWgP+st7blUrk94wsNDiykv3oAYlm8fG6xZzEp80HQZjX7yBYgcQvw=="; }; dependencies = [ sources."@ast-grep/napi-0.11.0" @@ -60119,30 +58389,7 @@ in sources."@esbuild/win32-arm64-0.19.8" sources."@esbuild/win32-ia32-0.19.8" sources."@esbuild/win32-x64-0.19.8" - sources."@parcel/watcher-2.4.1" - sources."@parcel/watcher-android-arm64-2.4.1" - sources."@parcel/watcher-darwin-arm64-2.4.1" - sources."@parcel/watcher-darwin-x64-2.4.1" - sources."@parcel/watcher-freebsd-x64-2.4.1" - sources."@parcel/watcher-linux-arm-glibc-2.4.1" - sources."@parcel/watcher-linux-arm64-glibc-2.4.1" - sources."@parcel/watcher-linux-arm64-musl-2.4.1" - sources."@parcel/watcher-linux-x64-glibc-2.4.1" - sources."@parcel/watcher-linux-x64-musl-2.4.1" - sources."@parcel/watcher-win32-arm64-2.4.1" - sources."@parcel/watcher-win32-ia32-2.4.1" - sources."@parcel/watcher-win32-x64-2.4.1" - sources."braces-3.0.3" - sources."detect-libc-1.0.3" sources."esbuild-0.19.8" - sources."fill-range-7.1.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."micromatch-4.0.7" - sources."node-addon-api-7.1.0" - sources."picomatch-2.3.1" - sources."to-regex-range-5.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -60173,22 +58420,22 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -60223,33 +58470,34 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."function-bind-1.1.2" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" 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."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.7" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" @@ -60257,7 +58505,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -60265,8 +58513,8 @@ in sources."lilconfig-3.1.2" ]; }) - sources."postcss-nested-6.0.1" - sources."postcss-selector-parser-6.1.0" + sources."postcss-nested-6.2.0" + sources."postcss-selector-parser-6.1.1" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -60293,7 +58541,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.4" + sources."tailwindcss-3.4.6" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -60304,7 +58552,7 @@ in ]; }) sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -60318,7 +58566,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -60350,22 +58598,22 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -60400,34 +58648,35 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."function-bind-1.1.2" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" 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."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.7" sources."mini-svg-data-uri-1.4.4" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" @@ -60435,7 +58684,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -60443,8 +58692,8 @@ in sources."lilconfig-3.1.2" ]; }) - sources."postcss-nested-6.0.1" - sources."postcss-selector-parser-6.1.0" + sources."postcss-nested-6.2.0" + sources."postcss-selector-parser-6.1.1" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -60471,7 +58720,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.4" + sources."tailwindcss-3.4.6" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -60482,7 +58731,7 @@ in ]; }) sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -60496,7 +58745,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -60528,22 +58777,22 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -60578,33 +58827,34 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."function-bind-1.1.2" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" 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."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.7" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" @@ -60612,7 +58862,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -60620,8 +58870,8 @@ in sources."lilconfig-3.1.2" ]; }) - sources."postcss-nested-6.0.1" - sources."postcss-selector-parser-6.1.0" + sources."postcss-nested-6.2.0" + sources."postcss-selector-parser-6.1.1" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -60648,7 +58898,7 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tailwindcss-3.4.4" + sources."tailwindcss-3.4.6" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."to-regex-range-5.0.1" @@ -60659,7 +58909,7 @@ in ]; }) sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -60673,7 +58923,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -60705,22 +58955,22 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -60755,36 +59005,37 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."function-bind-1.1.2" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" 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."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lodash.castarray-4.4.0" sources."lodash.isplainobject-4.0.6" sources."lodash.merge-4.6.2" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.7" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" @@ -60792,7 +59043,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -60800,9 +59051,9 @@ in sources."lilconfig-3.1.2" ]; }) - (sources."postcss-nested-6.0.1" // { + (sources."postcss-nested-6.2.0" // { dependencies = [ - sources."postcss-selector-parser-6.1.0" + sources."postcss-selector-parser-6.1.1" ]; }) sources."postcss-selector-parser-6.0.10" @@ -60832,9 +59083,9 @@ in sources."strip-ansi-cjs-6.0.1" sources."sucrase-3.35.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tailwindcss-3.4.4" // { + (sources."tailwindcss-3.4.6" // { dependencies = [ - sources."postcss-selector-parser-6.1.0" + sources."postcss-selector-parser-6.1.1" ]; }) sources."thenify-3.3.1" @@ -60847,7 +59098,7 @@ in ]; }) sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -60861,7 +59112,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -60877,10 +59128,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.13.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.13.3.tgz"; - sha512 = "FTg+WumdND6cgcRMdWhYKIPQ+00k21aIrbCFGQbDH79kWgRlHVDAur+ryVh+zT5YeM8u475tddn02nmJ2QqIow=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.0.4.tgz"; + sha512 = "JmlTk2EaOMZViEbHXNDTv8fvkIjuS63R0Bf0aqXo5j5BVjQGA2htESvcx73lqtBRqIuGGxPynQ3/cOLr/hdUnA=="; }; dependencies = [ sources."@aws-crypto/crc32-5.2.0" @@ -60902,104 +59153,100 @@ in sources."@smithy/util-utf8-2.3.0" ]; }) - sources."@aws-sdk/client-s3-3.598.0" - sources."@aws-sdk/client-sso-3.598.0" - sources."@aws-sdk/client-sso-oidc-3.598.0" - sources."@aws-sdk/client-sts-3.598.0" - sources."@aws-sdk/core-3.598.0" - sources."@aws-sdk/credential-provider-env-3.598.0" - sources."@aws-sdk/credential-provider-http-3.598.0" - sources."@aws-sdk/credential-provider-ini-3.598.0" - sources."@aws-sdk/credential-provider-node-3.598.0" - sources."@aws-sdk/credential-provider-process-3.598.0" - sources."@aws-sdk/credential-provider-sso-3.598.0" - sources."@aws-sdk/credential-provider-web-identity-3.598.0" - (sources."@aws-sdk/lib-storage-3.598.0" // { + sources."@aws-sdk/client-s3-3.617.0" + sources."@aws-sdk/client-sso-3.616.0" + sources."@aws-sdk/client-sso-oidc-3.616.0" + sources."@aws-sdk/client-sts-3.616.0" + sources."@aws-sdk/core-3.616.0" + sources."@aws-sdk/credential-provider-env-3.609.0" + sources."@aws-sdk/credential-provider-http-3.616.0" + sources."@aws-sdk/credential-provider-ini-3.616.0" + sources."@aws-sdk/credential-provider-node-3.616.0" + sources."@aws-sdk/credential-provider-process-3.614.0" + sources."@aws-sdk/credential-provider-sso-3.616.0" + sources."@aws-sdk/credential-provider-web-identity-3.609.0" + (sources."@aws-sdk/lib-storage-3.617.0" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/middleware-bucket-endpoint-3.598.0" - sources."@aws-sdk/middleware-expect-continue-3.598.0" - (sources."@aws-sdk/middleware-flexible-checksums-3.598.0" // { + sources."@aws-sdk/middleware-bucket-endpoint-3.616.0" + sources."@aws-sdk/middleware-expect-continue-3.616.0" + (sources."@aws-sdk/middleware-flexible-checksums-3.616.0" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" ]; }) - sources."@aws-sdk/middleware-host-header-3.598.0" - sources."@aws-sdk/middleware-location-constraint-3.598.0" - sources."@aws-sdk/middleware-logger-3.598.0" - sources."@aws-sdk/middleware-recursion-detection-3.598.0" - sources."@aws-sdk/middleware-sdk-s3-3.598.0" - sources."@aws-sdk/middleware-signing-3.598.0" - sources."@aws-sdk/middleware-ssec-3.598.0" - sources."@aws-sdk/middleware-user-agent-3.598.0" - sources."@aws-sdk/region-config-resolver-3.598.0" - sources."@aws-sdk/s3-presigned-post-3.598.0" - sources."@aws-sdk/s3-request-presigner-3.598.0" - sources."@aws-sdk/signature-v4-multi-region-3.598.0" - sources."@aws-sdk/token-providers-3.598.0" - sources."@aws-sdk/types-3.598.0" + sources."@aws-sdk/middleware-host-header-3.616.0" + sources."@aws-sdk/middleware-location-constraint-3.609.0" + sources."@aws-sdk/middleware-logger-3.609.0" + sources."@aws-sdk/middleware-recursion-detection-3.616.0" + sources."@aws-sdk/middleware-sdk-s3-3.617.0" + sources."@aws-sdk/middleware-signing-3.616.0" + sources."@aws-sdk/middleware-ssec-3.609.0" + sources."@aws-sdk/middleware-user-agent-3.616.0" + sources."@aws-sdk/region-config-resolver-3.614.0" + sources."@aws-sdk/s3-presigned-post-3.617.0" + sources."@aws-sdk/s3-request-presigner-3.617.0" + sources."@aws-sdk/signature-v4-multi-region-3.617.0" + sources."@aws-sdk/token-providers-3.614.0" + sources."@aws-sdk/types-3.609.0" sources."@aws-sdk/util-arn-parser-3.568.0" - sources."@aws-sdk/util-endpoints-3.598.0" - sources."@aws-sdk/util-format-url-3.598.0" + sources."@aws-sdk/util-endpoints-3.614.0" + sources."@aws-sdk/util-format-url-3.609.0" sources."@aws-sdk/util-locate-window-3.568.0" - sources."@aws-sdk/util-user-agent-browser-3.598.0" - sources."@aws-sdk/util-user-agent-node-3.598.0" + sources."@aws-sdk/util-user-agent-browser-3.609.0" + sources."@aws-sdk/util-user-agent-node-3.614.0" sources."@aws-sdk/util-utf8-browser-3.259.0" - sources."@aws-sdk/xml-builder-3.598.0" + sources."@aws-sdk/xml-builder-3.609.0" sources."@httptoolkit/websocket-stream-6.0.1" - sources."@redis/bloom-1.2.0" - sources."@redis/client-1.5.16" - sources."@redis/graph-1.1.1" - sources."@redis/json-1.0.6" - sources."@redis/search-1.1.6" - sources."@redis/time-series-1.0.5" - sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-3.0.1" + sources."@ioredis/commands-1.2.0" + sources."@opentelemetry/api-1.9.0" + sources."@sindresorhus/is-5.6.0" + sources."@smithy/abort-controller-3.1.1" sources."@smithy/chunked-blob-reader-3.0.0" sources."@smithy/chunked-blob-reader-native-3.0.0" - sources."@smithy/config-resolver-3.0.2" - sources."@smithy/core-2.2.1" - sources."@smithy/credential-provider-imds-3.1.1" - sources."@smithy/eventstream-codec-3.1.0" - sources."@smithy/eventstream-serde-browser-3.0.2" - sources."@smithy/eventstream-serde-config-resolver-3.0.1" - sources."@smithy/eventstream-serde-node-3.0.2" - sources."@smithy/eventstream-serde-universal-3.0.2" - sources."@smithy/fetch-http-handler-3.0.2" - sources."@smithy/hash-blob-browser-3.1.0" - (sources."@smithy/hash-node-3.0.1" // { + sources."@smithy/config-resolver-3.0.5" + sources."@smithy/core-2.3.0" + sources."@smithy/credential-provider-imds-3.2.0" + sources."@smithy/eventstream-codec-3.1.2" + sources."@smithy/eventstream-serde-browser-3.0.5" + sources."@smithy/eventstream-serde-config-resolver-3.0.3" + sources."@smithy/eventstream-serde-node-3.0.4" + sources."@smithy/eventstream-serde-universal-3.0.4" + sources."@smithy/fetch-http-handler-3.2.3" + sources."@smithy/hash-blob-browser-3.1.2" + (sources."@smithy/hash-node-3.0.3" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" sources."@smithy/util-buffer-from-3.0.0" ]; }) - sources."@smithy/hash-stream-node-3.1.0" - sources."@smithy/invalid-dependency-3.0.1" + sources."@smithy/hash-stream-node-3.1.2" + sources."@smithy/invalid-dependency-3.0.3" sources."@smithy/is-array-buffer-2.2.0" - sources."@smithy/md5-js-3.0.1" - sources."@smithy/middleware-content-length-3.0.1" - sources."@smithy/middleware-endpoint-3.0.2" - sources."@smithy/middleware-retry-3.0.4" - sources."@smithy/middleware-serde-3.0.1" - sources."@smithy/middleware-stack-3.0.1" - sources."@smithy/node-config-provider-3.1.1" - sources."@smithy/node-http-handler-3.0.1" - sources."@smithy/property-provider-3.1.1" - sources."@smithy/protocol-http-4.0.1" - sources."@smithy/querystring-builder-3.0.1" - sources."@smithy/querystring-parser-3.0.1" - sources."@smithy/service-error-classification-3.0.1" - sources."@smithy/shared-ini-file-loader-3.1.1" - (sources."@smithy/signature-v4-3.1.0" // { + sources."@smithy/md5-js-3.0.3" + sources."@smithy/middleware-content-length-3.0.5" + sources."@smithy/middleware-endpoint-3.1.0" + sources."@smithy/middleware-retry-3.0.12" + sources."@smithy/middleware-serde-3.0.3" + sources."@smithy/middleware-stack-3.0.3" + sources."@smithy/node-config-provider-3.1.4" + sources."@smithy/node-http-handler-3.1.4" + sources."@smithy/property-provider-3.1.3" + sources."@smithy/protocol-http-4.1.0" + sources."@smithy/querystring-builder-3.0.3" + sources."@smithy/querystring-parser-3.0.3" + sources."@smithy/service-error-classification-3.0.3" + sources."@smithy/shared-ini-file-loader-3.1.4" + (sources."@smithy/signature-v4-4.1.0" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" ]; }) - sources."@smithy/smithy-client-3.1.2" - sources."@smithy/types-3.1.0" - sources."@smithy/url-parser-3.0.1" + sources."@smithy/smithy-client-3.1.10" + sources."@smithy/types-3.3.0" + sources."@smithy/url-parser-3.0.3" (sources."@smithy/util-base64-3.0.0" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" @@ -61010,13 +59257,13 @@ in sources."@smithy/util-body-length-node-3.0.0" sources."@smithy/util-buffer-from-2.2.0" sources."@smithy/util-config-provider-3.0.0" - sources."@smithy/util-defaults-mode-browser-3.0.4" - sources."@smithy/util-defaults-mode-node-3.0.4" - sources."@smithy/util-endpoints-2.0.2" + sources."@smithy/util-defaults-mode-browser-3.0.12" + sources."@smithy/util-defaults-mode-node-3.0.12" + sources."@smithy/util-endpoints-2.0.5" sources."@smithy/util-hex-encoding-3.0.0" - sources."@smithy/util-middleware-3.0.1" - sources."@smithy/util-retry-3.0.1" - (sources."@smithy/util-stream-3.0.2" // { + sources."@smithy/util-middleware-3.0.3" + sources."@smithy/util-retry-3.0.3" + (sources."@smithy/util-stream-3.1.2" // { dependencies = [ sources."@smithy/is-array-buffer-3.0.0" sources."@smithy/util-buffer-from-3.0.0" @@ -61029,26 +59276,26 @@ in sources."@smithy/util-buffer-from-3.0.0" ]; }) - sources."@smithy/util-waiter-3.0.1" - sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.3" + sources."@smithy/util-waiter-3.1.2" + sources."@szmarczak/http-timer-5.0.1" + sources."@types/body-parser-1.19.5" + sources."@types/connect-3.4.38" + sources."@types/express-4.17.21" + sources."@types/express-serve-static-core-4.19.5" sources."@types/http-cache-semantics-4.0.4" - sources."@types/keyv-3.1.4" - sources."@types/node-20.14.2" - sources."@types/responselike-1.0.3" - sources."@types/ws-8.5.10" + sources."@types/http-errors-2.0.4" + sources."@types/mime-1.3.5" + sources."@types/node-20.14.12" + sources."@types/qs-6.9.15" + sources."@types/range-parser-1.2.7" + sources."@types/send-0.17.4" + sources."@types/serve-static-1.15.7" + sources."@types/ws-8.5.11" sources."accepts-1.3.8" - sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" - sources."asn1.js-5.4.1" sources."asynckit-0.4.0" - sources."atob-2.1.2" sources."aws-crt-1.21.3" - (sources."axios-1.7.2" // { - dependencies = [ - sources."form-data-4.0.0" - ]; - }) + sources."axios-1.7.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -61063,8 +59310,7 @@ in sources."readable-stream-3.6.2" ]; }) - sources."bn.js-4.12.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -61072,20 +59318,15 @@ in }) sources."bowser-2.11.0" sources."brace-expansion-1.1.11" - sources."brorand-1.1.0" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bytes-3.1.2" - sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.4" + sources."cacheable-lookup-7.0.0" + sources."cacheable-request-10.2.14" sources."call-bind-1.0.7" - sources."chalk-4.1.2" - sources."clone-response-1.0.3" sources."cluster-key-slot-1.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" sources."commist-1.1.0" @@ -61096,7 +59337,7 @@ in sources."readable-stream-3.6.2" ]; }) - sources."connect-redis-7.1.0" + sources."connect-redis-7.1.1" sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."cookie-0.4.1" @@ -61104,7 +59345,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" - sources."cron-parser-3.5.0" + sources."cron-parser-4.9.0" sources."crypto-js-4.2.0" sources."custom-error-instance-2.1.1" (sources."debug-4.3.5" // { @@ -61119,14 +59360,13 @@ in }) sources."defer-to-connect-2.0.1" sources."define-data-property-1.1.4" - sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" + sources."denque-2.1.0" sources."depd-2.0.0" sources."destroy-1.2.0" sources."duplexify-3.7.1" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."elliptic-6.5.5" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."es-define-property-1.0.0" @@ -61138,12 +59378,9 @@ in sources."events-3.3.0" (sources."express-4.19.2" // { dependencies = [ - sources."body-parser-1.20.2" sources."cookie-0.6.0" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.11.0" - sources."raw-body-2.5.2" ]; }) (sources."express-interceptor-1.2.0" // { @@ -61152,15 +59389,11 @@ in sources."ms-2.0.0" ]; }) - sources."express-prom-bundle-6.5.0" - (sources."express-request-id-1.4.1" // { + sources."express-prom-bundle-7.0.0" + (sources."express-session-1.18.0" // { dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."express-session-1.17.3" // { - dependencies = [ - sources."cookie-0.4.2" + sources."cookie-0.6.0" + sources."cookie-signature-1.0.7" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -61173,60 +59406,52 @@ in ]; }) sources."follow-redirects-1.15.6" - sources."form-data-3.0.1" + sources."form-data-4.0.0" + sources."form-data-encoder-2.1.4" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."generic-pool-3.9.0" sources."get-intrinsic-1.2.4" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."glob-7.2.3" sources."gopd-1.0.1" - sources."got-11.8.6" + sources."got-13.0.0" sources."graceful-fs-4.2.11" - (sources."grant-5.4.21" // { + (sources."grant-5.4.22" // { dependencies = [ - sources."cookie-signature-1.2.1" + sources."qs-6.12.3" ]; }) sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."hash.js-1.1.7" sources."hasown-2.0.2" - sources."helmet-4.6.0" + sources."helmet-7.1.0" (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.2" ]; }) - sources."hmac-drbg-1.0.1" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" - sources."http2-wrapper-1.0.3" + sources."http2-wrapper-2.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."ioredis-5.4.1" sources."ipaddr.js-2.2.0" - sources."is-nan-1.3.2" sources."is-stream-2.0.1" sources."isarray-1.0.0" sources."isomorphic-ws-4.0.1" sources."js-base64-3.7.7" sources."js-sdsl-4.3.0" sources."json-buffer-3.0.1" - (sources."jsonwebtoken-9.0.0" // { - dependencies = [ - sources."jwa-1.4.1" - sources."jws-3.2.2" - ]; - }) - sources."jwa-2.0.0" - sources."jwk-to-pem-2.0.5" - sources."jws-4.0.0" + sources."jsonwebtoken-9.0.2" + sources."jwa-1.4.1" + sources."jws-3.2.2" sources."keyv-4.5.4" sources."leven-2.1.0" sources."lodash-4.17.21" @@ -61236,21 +59461,28 @@ in sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."lodash._stringtopath-4.8.0" + sources."lodash.defaults-4.2.0" + sources."lodash.includes-4.3.0" + sources."lodash.isarguments-3.1.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" sources."lodash.throttle-4.1.1" sources."lodash.uniqby-4.5.0" sources."long-timeout-0.1.1" - sources."lowercase-keys-2.0.0" + sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" - sources."luxon-1.28.1" + sources."luxon-3.4.4" sources."media-typer-0.3.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-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" + sources."mimic-response-4.0.0" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."moment-2.30.1" @@ -61266,30 +59498,29 @@ in dependencies = [ sources."duplexify-4.1.3" sources."readable-stream-3.6.2" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) sources."mqtt-packet-6.10.0" sources."ms-2.1.3" sources."negotiator-0.6.3" sources."node-gyp-build-4.8.1" - sources."node-schedule-2.1.0" - sources."normalize-url-6.1.0" + sources."node-schedule-2.1.1" + sources."normalize-url-8.0.1" sources."number-allocator-1.0.14" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.13.1" - sources."object-keys-1.1.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."p-cancelable-2.1.1" + sources."p-cancelable-3.0.0" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."prom-client-14.0.1" + sources."prom-client-15.1.2" sources."proper-lockfile-4.1.2" (sources."proxy-addr-2.0.7" // { dependencies = [ @@ -61298,19 +59529,20 @@ in }) sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" (sources."readable-stream-2.3.8" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."redis-4.6.14" + sources."redis-errors-1.2.0" + sources."redis-parser-3.0.0" sources."reinterval-1.1.0" sources."request-compose-2.1.6" (sources."request-oauth-1.0.1" // { @@ -61320,12 +59552,12 @@ in }) sources."requires-port-1.0.0" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.1" + sources."responselike-3.0.0" sources."retry-0.12.0" sources."rfdc-1.4.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -61335,7 +59567,7 @@ in }) ]; }) - sources."serialize-error-2.1.0" + sources."serialize-error-11.0.3" sources."serialize-javascript-6.0.2" sources."serve-static-1.15.0" sources."set-function-length-1.2.2" @@ -61348,6 +59580,7 @@ in sources."readable-stream-3.6.2" ]; }) + sources."standard-as-callback-2.1.0" sources."statuses-2.0.1" (sources."stream-browserify-3.0.0" // { dependencies = [ @@ -61361,11 +59594,12 @@ in ]; }) sources."strnum-1.0.5" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" sources."tdigest-0.1.2" sources."toidentifier-1.0.1" sources."tslib-2.6.3" - sources."tus-js-client-3.1.3" + sources."tus-js-client-4.1.0" + sources."type-fest-2.19.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" @@ -61380,7 +59614,7 @@ in sources."validator-13.12.0" sources."vary-1.1.2" sources."wrappy-1.0.2" - sources."ws-8.8.1" + sources."ws-8.17.1" sources."xtend-4.0.2" sources."yallist-4.0.0" ]; @@ -61394,1117 +59628,6 @@ in bypassCache = true; reconstructLock = true; }; - "@vue/cli" = nodeEnv.buildNodePackage { - name = "_at_vue_slash_cli"; - packageName = "@vue/cli"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-5.0.8.tgz"; - sha512 = "c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA=="; - }; - dependencies = [ - sources."@achrinza/node-ipc-9.2.9" - sources."@akryum/winattr-3.0.0" - sources."@ampproject/remapping-2.3.0" - sources."@apollo/protobufjs-1.2.7" - sources."@apollo/usage-reporting-protobuf-4.1.1" - sources."@apollo/utils.dropunuseddefinitions-1.1.0" - (sources."@apollo/utils.keyvaluecache-1.0.2" // { - dependencies = [ - sources."lru-cache-7.13.1" - ]; - }) - sources."@apollo/utils.logger-1.0.1" - sources."@apollo/utils.printwithreducedwhitespace-1.1.0" - sources."@apollo/utils.removealiases-1.0.0" - sources."@apollo/utils.sortast-1.1.0" - sources."@apollo/utils.stripsensitiveliterals-1.2.0" - sources."@apollo/utils.usagereporting-1.0.1" - sources."@apollographql/apollo-tools-0.5.4" - sources."@apollographql/graphql-playground-html-1.6.29" - sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/generator-7.24.7" - sources."@babel/helper-annotate-as-pure-7.24.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."semver-6.3.1" - sources."yallist-3.1.1" - ]; - }) - (sources."@babel/helper-create-class-features-plugin-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-regexp-features-plugin-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-define-polyfill-provider-0.6.2" - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" - sources."@babel/helper-member-expression-to-functions-7.24.7" - sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" - sources."@babel/helper-optimise-call-expression-7.24.7" - sources."@babel/helper-plugin-utils-7.24.7" - sources."@babel/helper-remap-async-to-generator-7.24.7" - sources."@babel/helper-replace-supers-7.24.7" - sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" - sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helper-wrap-function-7.24.7" - sources."@babel/helpers-7.24.7" - (sources."@babel/highlight-7.24.7" // { - 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/parser-7.24.7" - sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7" - sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.21.0" - sources."@babel/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.24.7" - sources."@babel/plugin-syntax-import-assertions-7.24.7" - sources."@babel/plugin-syntax-import-attributes-7.24.7" - sources."@babel/plugin-syntax-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.24.7" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.24.7" - sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.24.7" - sources."@babel/plugin-transform-async-generator-functions-7.24.7" - sources."@babel/plugin-transform-async-to-generator-7.24.7" - sources."@babel/plugin-transform-block-scoped-functions-7.24.7" - sources."@babel/plugin-transform-block-scoping-7.24.7" - sources."@babel/plugin-transform-class-properties-7.24.7" - sources."@babel/plugin-transform-class-static-block-7.24.7" - sources."@babel/plugin-transform-classes-7.24.7" - sources."@babel/plugin-transform-computed-properties-7.24.7" - sources."@babel/plugin-transform-destructuring-7.24.7" - sources."@babel/plugin-transform-dotall-regex-7.24.7" - sources."@babel/plugin-transform-duplicate-keys-7.24.7" - sources."@babel/plugin-transform-dynamic-import-7.24.7" - sources."@babel/plugin-transform-exponentiation-operator-7.24.7" - sources."@babel/plugin-transform-export-namespace-from-7.24.7" - sources."@babel/plugin-transform-flow-strip-types-7.24.7" - sources."@babel/plugin-transform-for-of-7.24.7" - sources."@babel/plugin-transform-function-name-7.24.7" - sources."@babel/plugin-transform-json-strings-7.24.7" - sources."@babel/plugin-transform-literals-7.24.7" - sources."@babel/plugin-transform-logical-assignment-operators-7.24.7" - sources."@babel/plugin-transform-member-expression-literals-7.24.7" - sources."@babel/plugin-transform-modules-amd-7.24.7" - sources."@babel/plugin-transform-modules-commonjs-7.24.7" - sources."@babel/plugin-transform-modules-systemjs-7.24.7" - sources."@babel/plugin-transform-modules-umd-7.24.7" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7" - sources."@babel/plugin-transform-new-target-7.24.7" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.24.7" - sources."@babel/plugin-transform-numeric-separator-7.24.7" - sources."@babel/plugin-transform-object-rest-spread-7.24.7" - sources."@babel/plugin-transform-object-super-7.24.7" - sources."@babel/plugin-transform-optional-catch-binding-7.24.7" - sources."@babel/plugin-transform-optional-chaining-7.24.7" - sources."@babel/plugin-transform-parameters-7.24.7" - sources."@babel/plugin-transform-private-methods-7.24.7" - sources."@babel/plugin-transform-private-property-in-object-7.24.7" - sources."@babel/plugin-transform-property-literals-7.24.7" - sources."@babel/plugin-transform-regenerator-7.24.7" - sources."@babel/plugin-transform-reserved-words-7.24.7" - sources."@babel/plugin-transform-shorthand-properties-7.24.7" - sources."@babel/plugin-transform-spread-7.24.7" - sources."@babel/plugin-transform-sticky-regex-7.24.7" - sources."@babel/plugin-transform-template-literals-7.24.7" - sources."@babel/plugin-transform-typeof-symbol-7.24.7" - sources."@babel/plugin-transform-typescript-7.24.7" - sources."@babel/plugin-transform-unicode-escapes-7.24.7" - sources."@babel/plugin-transform-unicode-property-regex-7.24.7" - sources."@babel/plugin-transform-unicode-regex-7.24.7" - sources."@babel/plugin-transform-unicode-sets-regex-7.24.7" - (sources."@babel/preset-env-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/preset-flow-7.24.7" - sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.24.7" - (sources."@babel/register-7.24.6" // { - dependencies = [ - sources."make-dir-2.1.0" - sources."pify-4.0.1" - sources."semver-5.7.2" - ]; - }) - sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.24.7" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" - sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.20" // { - dependencies = [ - sources."@graphql-tools/merge-8.4.2" - sources."@graphql-tools/schema-9.0.19" - sources."@graphql-tools/utils-9.2.1" - sources."value-or-promise-1.0.12" - ]; - }) - sources."@graphql-tools/schema-8.5.1" - sources."@graphql-tools/utils-8.9.0" - sources."@graphql-typed-document-node/core-3.2.0" - sources."@hapi/hoek-9.3.0" - sources."@hapi/topo-5.1.0" - sources."@josephg/resolvable-1.0.1" - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@node-ipc/js-queue-2.0.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - 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."@sideway/address-4.1.5" - sources."@sideway/formula-3.0.1" - sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-0.7.0" - sources."@types/accepts-1.3.7" - sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.38" - sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.5" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" - sources."@types/http-errors-2.0.4" - sources."@types/inquirer-8.2.10" - (sources."@types/jscodeshift-0.7.2" // { - dependencies = [ - sources."ast-types-0.12.1" - sources."recast-0.17.2" - ]; - }) - sources."@types/long-4.0.2" - sources."@types/mime-1.3.5" - sources."@types/node-20.14.2" - sources."@types/normalize-package-data-2.4.4" - sources."@types/qs-6.9.15" - sources."@types/range-parser-1.2.7" - sources."@types/send-0.17.4" - sources."@types/serve-static-1.15.7" - sources."@types/through-0.0.33" - sources."@vue/cli-shared-utils-5.0.8" - (sources."@vue/cli-ui-5.0.8" // { - dependencies = [ - sources."clone-2.1.2" - ]; - }) - sources."@vue/cli-ui-addon-webpack-5.0.8" - sources."@vue/cli-ui-addon-widgets-5.0.8" - (sources."@vue/compiler-core-3.4.29" // { - dependencies = [ - sources."entities-4.5.0" - ]; - }) - sources."@vue/compiler-dom-3.4.29" - sources."@vue/compiler-sfc-2.7.16" - sources."@vue/shared-3.4.29" - sources."accepts-1.3.8" - sources."aggregate-error-3.1.0" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."apollo-datasource-3.3.2" - (sources."apollo-reporting-protobuf-3.4.0" // { - dependencies = [ - sources."@apollo/protobufjs-1.2.6" - sources."@types/node-10.17.60" - ]; - }) - sources."apollo-server-core-3.13.0" - sources."apollo-server-env-4.2.1" - sources."apollo-server-errors-3.3.1" - sources."apollo-server-express-3.13.0" - sources."apollo-server-plugin-base-3.7.2" - sources."apollo-server-types-3.8.0" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) - sources."argparse-2.0.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."assign-symbols-1.0.0" - sources."ast-types-0.14.2" - sources."async-2.6.4" - sources."async-retry-1.3.3" - sources."at-least-node-1.0.0" - sources."atob-2.1.2" - sources."babel-core-7.0.0-bridge.0" - (sources."babel-plugin-polyfill-corejs2-0.4.11" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.10.4" - sources."babel-plugin-polyfill-regenerator-0.6.2" - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.5.1" - sources."bl-4.1.0" - (sources."body-parser-1.20.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - ]; - }) - (sources."boxen-5.1.2" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."browserslist-4.23.1" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.8" - sources."builtins-1.0.3" - sources."bytes-3.1.2" - sources."cache-base-1.0.1" - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."lowercase-keys-1.0.0" - ]; - }) - sources."call-bind-1.0.7" - sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001634" - sources."caw-2.0.1" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - ]; - }) - sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.2" - sources."cli-width-3.0.0" - sources."cliui-7.0.4" - sources."clone-1.0.4" - sources."clone-deep-4.0.1" - sources."clone-response-1.0.2" - sources."collection-visit-1.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" - sources."commander-7.2.0" - sources."commondir-1.0.1" - sources."component-emitter-1.3.1" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."convert-source-map-2.0.0" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.37.1" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."cssfilter-0.0.10" - sources."csstype-3.1.3" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."decode-uri-component-0.2.2" - (sources."decompress-4.2.1" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - sources."pify-2.3.0" - ]; - }) - sources."deepmerge-4.3.1" - sources."defaults-1.0.4" - sources."define-data-property-1.1.4" - sources."define-lazy-prop-2.0.0" - sources."define-property-2.0.2" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dir-glob-3.0.1" - (sources."download-7.1.0" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - sources."download-git-repo-3.0.2" - sources."duplexer3-0.1.5" - sources."easy-stack-1.0.1" - sources."ee-first-1.1.1" - sources."ejs-3.1.10" - sources."electron-to-chromium-1.4.802" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."entities-2.2.0" - sources."envinfo-7.13.0" - sources."error-ex-1.3.2" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."escalade-3.1.2" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."estree-walker-2.0.2" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-pubsub-4.3.0" - sources."eventemitter3-3.1.2" - sources."execa-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - sources."is-descriptor-0.1.7" - ]; - }) - (sources."express-4.19.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."express-history-api-fallback-2.2.1" - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-glob-3.3.2" - sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.1" - sources."fd-slicer-1.1.0" - sources."figures-3.2.0" - sources."file-type-8.1.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fill-range-7.1.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."find-cache-dir-2.1.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."make-dir-2.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."semver-5.7.2" - ]; - }) - sources."find-up-5.0.0" - (sources."fkill-7.2.1" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."flow-parser-0.238.0" - sources."for-in-1.0.2" - sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-constants-1.0.0" - sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."fswin-2.17.1227" - sources."function-bind-1.1.2" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.4" - sources."get-proxy-2.1.0" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" - sources."git-clone-0.1.0" - sources."git-config-path-2.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - (sources."global-dirs-0.1.1" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."globals-11.12.0" - sources."globby-11.1.0" - sources."gopd-1.0.1" - (sources."got-8.3.2" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - sources."graceful-fs-4.2.11" - sources."graphql-15.8.0" - sources."graphql-subscriptions-1.2.1" - sources."graphql-tag-2.12.6" - sources."graphql-type-json-0.3.2" - sources."growly-1.3.0" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.3" - sources."has-to-string-tag-x-1.4.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-3.8.1" - sources."http-errors-2.0.0" - sources."human-signals-2.1.0" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.3.1" - sources."import-global-0.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."into-stream-3.1.0" - sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.1" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-core-module-2.13.1" - sources."is-data-descriptor-1.0.1" - sources."is-descriptor-1.0.3" - sources."is-docker-2.2.1" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-natural-number-4.0.1" - sources."is-number-7.0.0" - sources."is-object-1.0.2" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-promise-2.2.2" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-unicode-supported-0.1.0" - sources."is-windows-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isbinaryfile-4.0.10" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isurl-1.0.0" - sources."iterall-1.3.0" - (sources."jake-10.9.1" // { - dependencies = [ - sources."async-3.2.5" - ]; - }) - sources."javascript-stringify-2.1.0" - sources."joi-17.13.1" - sources."js-message-1.0.7" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - (sources."jscodeshift-0.11.0" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) - sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json5-2.2.3" - sources."jsonfile-6.1.0" - sources."keyv-3.0.0" - sources."kind-of-6.0.3" - sources."launch-editor-2.6.1" - sources."leven-3.1.0" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" - sources."lodash.merge-4.6.2" - sources."lodash.sortby-4.7.0" - sources."log-symbols-4.1.0" - sources."loglevel-1.9.1" - sources."long-4.0.0" - sources."lowdb-1.0.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."make-dir-1.3.0" - sources."map-cache-0.2.2" - sources."map-visit-1.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.7" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."mute-stream-0.0.8" - sources."nanoid-2.1.11" - sources."nanomatch-1.2.13" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - sources."node-abort-controller-3.1.1" - sources."node-dir-0.1.17" - sources."node-fetch-2.7.0" - sources."node-gyp-build-4.8.1" - (sources."node-notifier-10.0.1" // { - dependencies = [ - sources."uuid-8.3.2" - sources."which-2.0.2" - ]; - }) - sources."node-releases-2.0.14" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - (sources."normalize-url-2.0.1" // { - dependencies = [ - sources."sort-keys-2.0.0" - ]; - }) - sources."npm-conf-1.1.3" - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.13.1" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-0.4.1" - sources."p-event-2.3.1" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-timeout-2.0.1" - sources."p-try-2.2.0" - (sources."parse-git-config-3.0.0" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."parse-json-5.2.0" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."pend-1.2.0" - sources."picocolors-1.0.1" - sources."picomatch-2.3.1" - (sources."pid-port-0.1.1" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pirates-4.0.6" - sources."pkg-dir-5.0.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - sources."posix-character-classes-0.1.1" - (sources."postcss-8.4.38" // { - dependencies = [ - sources."nanoid-3.3.7" - ]; - }) - sources."prepend-http-2.0.0" - sources."prettier-2.8.8" - sources."prismjs-1.29.0" - sources."private-0.1.8" - (sources."process-exists-4.1.0" // { - dependencies = [ - sources."ps-list-6.3.0" - ]; - }) - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."proxy-addr-2.0.7" - sources."ps-list-7.2.0" - sources."pump-3.0.0" - sources."qs-6.11.0" - sources."query-string-5.1.1" - sources."queue-microtask-1.2.3" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."read-pkg-5.2.0" - sources."readable-stream-3.6.2" - sources."recast-0.20.5" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.1" - sources."regenerator-runtime-0.14.1" - sources."regenerator-transform-0.15.2" - sources."regex-not-1.0.2" - sources."regexpu-core-5.3.2" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."resolve-1.22.8" - sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-3.1.0" - sources."ret-0.1.15" - sources."retry-0.13.1" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."rss-parser-3.13.0" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - (sources."seek-bzip-1.0.6" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."semver-7.6.2" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."set-function-length-1.2.2" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shallow-clone-3.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shell-quote-1.8.1" - sources."shellwords-0.1.1" - sources."shortid-2.2.16" - sources."side-channel-1.0.6" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - sources."is-descriptor-0.1.7" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" - sources."source-map-0.6.1" - sources."source-map-js-1.2.0" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" - sources."source-map-url-0.4.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - ]; - }) - sources."statuses-2.0.1" - sources."steno-0.4.4" - sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-outer-1.0.1" - sources."subscriptions-transport-ws-0.11.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."symbol-observable-1.2.0" - (sources."tar-stream-1.6.2" // { - dependencies = [ - sources."bl-1.2.3" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - (sources."taskkill-3.1.0" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-3.4.0" - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - (sources."temp-0.8.4" // { - dependencies = [ - sources."rimraf-2.6.3" - ]; - }) - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."to-buffer-1.1.1" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."tr46-0.0.3" - sources."trim-repeated-1.0.0" - sources."tslib-2.6.3" - sources."tunnel-agent-0.6.0" - sources."type-fest-0.6.0" - sources."type-is-1.6.18" - sources."typescript-4.5.5" - sources."unbzip2-stream-1.4.3" - sources."undici-types-5.26.5" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."universalify-2.0.1" - sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."update-browserslist-db-1.0.16" - sources."urix-0.1.0" - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."use-3.1.1" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-9.0.1" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" - sources."value-or-promise-1.0.11" - sources."vary-1.1.2" - sources."vue-2.7.16" - (sources."vue-codemod-0.0.5" // { - dependencies = [ - sources."inquirer-7.3.3" - sources."rxjs-6.6.7" - sources."tslib-1.14.1" - ]; - }) - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."ws-7.5.9" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - (sources."xss-1.0.15" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - (sources."yaml-front-matter-4.1.1" // { - dependencies = [ - sources."argparse-1.0.10" - sources."commander-6.2.1" - sources."js-yaml-3.14.1" - ]; - }) - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - sources."yauzl-2.10.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command line interface for rapid Vue.js development"; - homepage = "https://cli.vuejs.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; @@ -62630,17 +59753,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.24.7" - sources."@babel/generator-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/generator-7.24.10" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/template-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/types-7.24.9" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -62722,8 +59845,8 @@ in sources."@npmcli/config-6.4.1" (sources."@npmcli/map-workspaces-3.0.6" // { dependencies = [ - sources."glob-10.4.1" - sources."minimatch-9.0.4" + sources."glob-10.4.5" + sources."minimatch-9.0.5" ]; }) sources."@npmcli/name-from-folder-2.0.0" @@ -62748,12 +59871,12 @@ in sources."@types/minimist-1.2.5" sources."@types/ms-0.7.34" sources."@types/nlcst-1.0.4" - sources."@types/node-18.19.34" + sources."@types/node-18.19.42" sources."@types/normalize-package-data-2.4.4" sources."@types/supports-color-8.1.3" sources."@types/unist-2.0.10" sources."abbrev-2.0.0" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -62848,7 +59971,7 @@ in sources."extend-3.0.2" sources."fault-2.0.1" sources."find-up-6.3.0" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" @@ -62904,7 +60027,7 @@ in sources."ci-info-3.9.0" ]; }) - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-decimal-2.0.1" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" @@ -62918,7 +60041,7 @@ in sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" @@ -63017,6 +60140,7 @@ in sources."p-limit-4.0.0" sources."p-locate-6.0.0" sources."package-json-8.1.1" + sources."package-json-from-dist-1.0.0" (sources."parse-english-5.0.0" // { dependencies = [ sources."nlcst-to-string-2.0.4" @@ -63035,7 +60159,7 @@ in sources."path-key-3.1.1" (sources."path-scurry-1.11.1" // { dependencies = [ - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" ]; }) sources."pause-stream-0.0.11" @@ -63092,7 +60216,7 @@ in sources."retext-profanities-7.2.2" sources."sade-1.8.1" sources."safe-buffer-5.2.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."semver-diff-4.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -63231,9 +60355,9 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yargs-parser-21.1.1" - sources."yocto-queue-1.0.0" + sources."yocto-queue-1.1.1" sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; @@ -63299,10 +60423,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.146.0"; + version = "2.150.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.146.0.tgz"; - sha512 = "uLotAflIqQn8rskLC1r2NGNMaTwDgW8Vq016QiACmatIcp2n/hfNlwazg+hRlSzq2FwGda6Qht2aOlsGm0QcBw=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.150.0.tgz"; + sha512 = "leo4J70QrJp+SYm/87VuoOVfALsW11F7JpkAGu5TLL/qd2k/CbovZ8k9/3Ov+jCVsvAgdn9DeHL01Sn6hSl6Zg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -63341,7 +60465,7 @@ in sources."@sindresorhus/merge-streams-4.0.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/debug-4.1.12" - sources."@types/eslint-8.56.10" + sources."@types/eslint-8.56.11" sources."@types/estree-1.0.5" sources."@types/estree-jsx-1.0.5" sources."@types/hast-3.0.4" @@ -63421,7 +60545,7 @@ in ]; }) sources."eslint-rule-docs-1.1.235" - sources."execa-9.2.0" + sources."execa-9.3.0" sources."extend-3.0.2" sources."fast-glob-3.3.2" sources."fastq-1.17.1" @@ -63429,7 +60553,6 @@ in sources."fill-range-7.1.1" sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" sources."get-east-asian-width-1.2.0" sources."get-stream-9.0.1" sources."github-slugger-2.0.0" @@ -63437,7 +60560,7 @@ in sources."glob-7.2.3" sources."glob-option-error-1.0.0" sources."glob-parent-5.1.2" - (sources."globby-14.0.1" // { + (sources."globby-14.0.2" // { dependencies = [ sources."@sindresorhus/merge-streams-2.3.0" ]; @@ -63449,7 +60572,6 @@ in }) sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" - sources."hasown-2.0.2" sources."hosted-git-info-7.0.2" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.1" @@ -63464,7 +60586,6 @@ in sources."is-alphabetical-2.0.1" sources."is-alphanumerical-2.0.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.13.1" sources."is-decimal-2.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -63491,7 +60612,7 @@ in }) sources."longest-streak-3.1.0" sources."lowercase-keys-3.0.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."mdast-comment-marker-3.0.0" sources."mdast-util-directive-3.0.0" sources."mdast-util-from-markdown-2.0.1" @@ -63531,7 +60652,7 @@ in sources."mimic-response-4.0.0" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."normalize-package-data-6.0.1" + sources."normalize-package-data-6.0.2" sources."normalize-url-8.0.1" (sources."npm-run-path-5.3.0" // { dependencies = [ @@ -63548,7 +60669,7 @@ in sources."@types/unist-2.0.10" ]; }) - sources."parse-github-url-1.0.2" + sources."parse-github-url-1.0.3" sources."parse-json-8.1.0" sources."parse-ms-4.0.0" sources."path-is-absolute-1.0.1" @@ -63558,7 +60679,7 @@ in sources."picomatch-2.3.1" sources."plur-4.0.0" sources."pluralize-8.0.0" - sources."pretty-ms-9.0.0" + sources."pretty-ms-9.1.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."quotation-2.0.3" @@ -63686,7 +60807,7 @@ in sources."rimraf-2.7.1" sources."rmfr-2.0.0" sources."run-parallel-1.2.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -63698,7 +60819,7 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.18" sources."stdin-discarder-0.2.2" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."stringify-entities-4.0.4" sources."strip-ansi-7.1.0" sources."strip-final-newline-4.0.0" @@ -63719,9 +60840,9 @@ in sources."to-regex-range-5.0.1" sources."to-vfile-8.0.0" sources."trough-2.2.0" - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" sources."unicorn-magic-0.1.0" - sources."unified-11.0.4" + sources."unified-11.0.5" sources."unified-lint-rule-3.0.0" sources."unified-message-control-5.0.0" sources."unique-string-3.0.0" @@ -63758,8 +60879,8 @@ in ]; }) sources."validate-npm-package-license-3.0.4" - sources."vfile-6.0.1" - sources."vfile-location-5.0.2" + sources."vfile-6.0.2" + sources."vfile-location-5.0.3" sources."vfile-message-4.0.2" sources."vfile-reporter-pretty-7.0.0" sources."vfile-statistics-3.0.0" @@ -63767,7 +60888,7 @@ in sources."which-2.0.2" sources."wrapped-1.0.1" sources."wrappy-1.0.2" - sources."yoctocolors-2.0.2" + sources."yoctocolors-2.1.1" sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; @@ -63844,7 +60965,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -63867,7 +60988,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.52.0" + sources."mime-db-1.53.0" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."mkdirp-0.5.6" @@ -64010,7 +61131,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.5" // { + (sources."elliptic-6.5.6" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -64050,7 +61171,7 @@ in sources."is-arguments-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-generator-function-1.0.10" sources."is-typed-array-1.1.13" sources."isarray-1.0.0" @@ -64069,7 +61190,7 @@ in sources."minimist-1.2.8" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."once-1.4.0" @@ -64095,7 +61216,7 @@ in ]; }) sources."punycode-1.4.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -64169,7 +61290,7 @@ in sources."@socket.io/component-emitter-3.1.2" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.17" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -64212,9 +61333,9 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."engine.io-6.5.4" - sources."engine.io-client-6.5.3" - sources."engine.io-parser-5.2.2" + sources."engine.io-6.5.5" + sources."engine.io-client-6.5.4" + sources."engine.io-parser-5.2.3" sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -64308,7 +61429,7 @@ in sources."server-destroy-1.0.1" sources."setprototypeof-1.2.0" sources."socket.io-4.7.5" - sources."socket.io-adapter-2.5.4" + sources."socket.io-adapter-2.5.5" sources."socket.io-client-4.7.5" sources."socket.io-parser-4.2.4" sources."statuses-1.3.1" @@ -64322,11 +61443,11 @@ in sources."undici-types-5.26.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.4" sources."utils-merge-1.0.1" sources."vary-1.1.2" sources."wrap-ansi-7.0.0" - sources."ws-8.11.0" + sources."ws-8.17.1" sources."xmlhttprequest-ssl-2.0.0" sources."y18n-5.0.8" sources."yargs-17.7.2" @@ -64345,16 +61466,16 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.198.145"; + version = "2.198.175"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.145.tgz"; - sha512 = "I1tHAcRV6k0zk32Row37Ds8eoQC0LmRrT62EMQuyyaivAus1AgGD7dGn3cw+idJCepfxME6Rrc7jOvIa/Mv3Jg=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.175.tgz"; + sha512 = "4p2thnOpOFZgBQ2OmiFT6llXRy09d4aHGkTPYx4OQzzFLGKEJ5wDMVJrZPvuOu1czvYrxk3jsULluouRbAgXqQ=="; }; dependencies = [ sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" - sources."@jsii/check-node-1.100.0" - sources."@jsii/spec-1.100.0" + sources."@jsii/check-node-1.101.0" + sources."@jsii/spec-1.101.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -64370,11 +61491,11 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.98" + sources."@types/node-16.18.104" sources."@types/triple-beam-1.3.5" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -64402,7 +61523,7 @@ in sources."call-bind-1.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.68.79" + sources."cdk8s-2.68.87" sources."cdk8s-plus-25-2.22.79" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -64416,7 +61537,7 @@ in ]; }) sources."clone-1.0.4" - (sources."codemaker-1.100.0" // { + (sources."codemaker-1.101.0" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -64460,7 +61581,7 @@ in sources."dotenv-16.4.5" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.6.0-dev.20240614" + sources."typescript-5.6.0-dev.20240725" ]; }) sources."emoji-regex-8.0.0" @@ -64482,6 +61603,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" + sources."fast-uri-3.0.1" sources."fastq-1.17.1" sources."fecha-4.2.3" sources."figures-3.2.0" @@ -64511,7 +61633,7 @@ in sources."globby-11.1.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" - sources."graphql-16.8.2" + sources."graphql-16.9.0" sources."graphql-tag-2.12.6" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" @@ -64534,7 +61656,7 @@ in sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" @@ -64556,13 +61678,12 @@ in sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."isarray-2.0.5" - (sources."jsii-5.4.21" // { + (sources."jsii-5.4.26" // { dependencies = [ - sources."@jsii/check-node-1.99.0" sources."yargs-17.7.2" ]; }) - (sources."jsii-pacmak-1.100.0" // { + (sources."jsii-pacmak-1.101.0" // { dependencies = [ sources."cliui-7.0.4" sources."clone-2.1.2" @@ -64573,7 +61694,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.100.0" // { + (sources."jsii-reflect-1.101.0" // { dependencies = [ sources."cliui-7.0.4" sources."fs-extra-10.1.0" @@ -64582,13 +61703,12 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-5.4.21" // { + (sources."jsii-rosetta-5.4.25" // { dependencies = [ - sources."@jsii/check-node-1.98.0" sources."yargs-17.7.2" ]; }) - (sources."jsii-srcmak-0.1.1154" // { + (sources."jsii-srcmak-0.1.1193" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-17.7.2" @@ -64604,7 +61724,7 @@ in sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."log4js-6.9.1" - sources."logform-2.6.0" + sources."logform-2.6.1" sources."lower-case-2.0.2" (sources."make-dir-3.1.0" // { dependencies = [ @@ -64624,13 +61744,13 @@ in sources."ncp-2.0.0" sources."no-case-3.0.4" sources."node-fetch-2.7.0" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.100.0" + sources."oo-ascii-tree-1.101.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-limit-3.1.0" @@ -64643,7 +61763,6 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."possible-typed-array-names-1.0.0" - sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" sources."rechoir-0.6.2" @@ -64665,7 +61784,7 @@ in sources."safe-regex-test-1.0.3" sources."safe-stable-stringify-2.4.3" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" (sources."semver-intersect-1.5.0" // { dependencies = [ sources."semver-6.3.1" @@ -64717,7 +61836,6 @@ in sources."unbox-primitive-1.0.2" sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" - sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utility-types-3.11.0" sources."wcwidth-1.0.1" @@ -64726,8 +61844,8 @@ in sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.1" sources."which-typed-array-1.1.15" - sources."winston-3.13.0" - sources."winston-transport-4.7.0" + sources."winston-3.13.1" + sources."winston-transport-4.7.1" sources."workerpool-6.5.1" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -64763,10 +61881,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.20.7"; + version = "0.20.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.20.7.tgz"; - sha512 = "muEJhxWHZLv1Rayz2t7W3gP1zZbCE4DPFq3gNo4G667TzrwdY7XWreeze8Pj7i3mkQu+K492cSVdWBYKa3AJpg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.20.8.tgz"; + sha512 = "iLTm3rlJXQ2OziNNAa5faONur/VWztue9jbrpqmmZo5QDUBqFbTbAcEQ1LgVqFvm4rBWXL3G26E7Di5iuCifuA=="; }; dependencies = [ (sources."@alcalzone/ansi-tokenize-0.1.3" // { @@ -64776,8 +61894,8 @@ in ]; }) sources."@babel/code-frame-7.24.7" - sources."@babel/generator-7.24.4" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/generator-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" (sources."@babel/highlight-7.24.7" // { dependencies = [ @@ -64790,10 +61908,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.24.7" - sources."@babel/template-7.24.0" - sources."@babel/types-7.24.0" - (sources."@cdktf/cli-core-0.20.7" // { + sources."@babel/parser-7.24.8" + sources."@babel/template-7.24.7" + sources."@babel/types-7.24.7" + (sources."@cdktf/cli-core-0.20.8" // { dependencies = [ (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -64808,47 +61926,37 @@ in sources."convert-to-spaces-1.0.2" sources."indent-string-4.0.0" sources."ink-3.2.0" - sources."lru-cache-6.0.0" sources."patch-console-1.0.0" sources."react-17.0.2" sources."react-reconciler-0.26.2" sources."restore-cursor-3.1.0" sources."scheduler-0.20.2" - sources."semver-7.6.0" + sources."semver-7.6.2" sources."slice-ansi-3.0.0" sources."type-fest-0.12.0" sources."utf-8-validate-5.0.10" sources."uuid-8.3.2" sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) - (sources."@cdktf/commons-0.20.7" // { + (sources."@cdktf/commons-0.20.8" // { dependencies = [ - sources."@sentry-internal/tracing-7.109.0" - sources."@sentry/core-7.109.0" - sources."@sentry/node-7.109.0" - sources."@sentry/types-7.109.0" - sources."@sentry/utils-7.109.0" sources."fs-extra-11.2.0" sources."jsonfile-6.1.0" sources."universalify-2.0.1" ]; }) - sources."@cdktf/hcl-tools-0.20.7" - (sources."@cdktf/hcl2cdk-0.20.7" // { + sources."@cdktf/hcl-tools-0.20.8" + (sources."@cdktf/hcl2cdk-0.20.8" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."commonmark-0.31.0" - sources."entities-3.0.1" - sources."glob-10.3.12" - sources."jsii-rosetta-5.3.28" - sources."minimatch-9.0.4" - sources."string.prototype.repeat-1.0.0" + sources."glob-10.4.1" + sources."minimatch-9.0.5" ]; }) - (sources."@cdktf/hcl2json-0.20.7" // { + (sources."@cdktf/hcl2json-0.20.8" // { dependencies = [ sources."fs-extra-11.2.0" sources."jsonfile-6.1.0" @@ -64856,14 +61964,14 @@ in ]; }) sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" - (sources."@cdktf/provider-generator-0.20.7" // { + (sources."@cdktf/provider-generator-0.20.8" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.12" - sources."minimatch-9.0.4" + sources."glob-10.4.1" + sources."minimatch-9.0.5" ]; }) - (sources."@cdktf/provider-schema-0.20.7" // { + (sources."@cdktf/provider-schema-0.20.8" // { dependencies = [ sources."fs-extra-11.2.0" sources."jsonfile-6.1.0" @@ -64874,7 +61982,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64885,7 +61993,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64894,7 +62002,7 @@ in }) (sources."@inquirer/core-2.3.1" // { dependencies = [ - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."type-fest-0.21.3" sources."wrap-ansi-6.2.0" @@ -64904,7 +62012,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64915,7 +62023,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64926,7 +62034,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64937,7 +62045,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64949,7 +62057,7 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" @@ -64960,14 +62068,14 @@ in dependencies = [ sources."@inquirer/core-6.0.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."ansi-escapes-4.3.2" sources."signal-exit-4.1.0" sources."type-fest-0.21.3" sources."wrap-ansi-6.2.0" ]; }) - sources."@inquirer/type-1.3.3" + sources."@inquirer/type-1.5.1" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -64981,20 +62089,21 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@jsii/check-node-1.95.0" - sources."@jsii/spec-1.100.0" + sources."@jsii/check-node-1.98.0" + sources."@jsii/spec-1.101.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sentry-internal/tracing-7.110.0" - sources."@sentry/core-7.110.0" - sources."@sentry/node-7.110.0" - sources."@sentry/types-7.110.0" - sources."@sentry/utils-7.110.0" + sources."@sentry-internal/tracing-7.116.0" + sources."@sentry/core-7.116.0" + sources."@sentry/integrations-7.116.0" + sources."@sentry/node-7.116.0" + sources."@sentry/types-7.116.0" + sources."@sentry/utils-7.116.0" sources."@types/mute-stream-0.0.1" - sources."@types/node-18.19.30" + sources."@types/node-18.19.34" sources."@types/prop-types-15.7.12" sources."@types/react-18.3.3" sources."@types/wrap-ansi-3.0.0" @@ -65003,7 +62112,7 @@ in sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" sources."agent-base-6.0.2" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ansi-escapes-7.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -65021,7 +62130,6 @@ in sources."arraybuffer.prototype.slice-1.0.3" sources."astral-regex-2.0.0" sources."async-3.2.5" - sources."at-least-node-1.0.0" sources."auto-bind-5.0.1" sources."available-typed-arrays-1.0.7" sources."balanced-match-1.0.2" @@ -65036,7 +62144,7 @@ in sources."call-bind-1.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.20.7" + sources."cdktf-0.20.8" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chokidar-3.6.0" @@ -65052,7 +62160,7 @@ in sources."emoji-regex-10.3.0" sources."is-fullwidth-code-point-4.0.0" sources."slice-ansi-5.0.0" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" ]; }) @@ -65060,7 +62168,7 @@ in sources."cliui-8.0.1" sources."clone-2.1.2" sources."code-excerpt-4.0.0" - (sources."codemaker-1.95.0" // { + (sources."codemaker-1.98.0" // { dependencies = [ sources."fs-extra-10.1.0" sources."jsonfile-6.1.0" @@ -65072,7 +62180,7 @@ in sources."commonmark-0.30.0" sources."compress-commons-4.1.2" sources."concat-map-0.0.1" - sources."constructs-10.1.167" + sources."constructs-10.3.0" sources."convert-to-spaces-2.0.1" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" @@ -65095,10 +62203,10 @@ in sources."detect-indent-5.0.0" sources."detect-libc-2.0.3" sources."detect-newline-2.1.0" - sources."detect-port-1.5.1" + sources."detect-port-1.6.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.6.0-dev.20240614" + sources."typescript-5.6.0-dev.20240725" ]; }) sources."eastasianwidth-0.2.0" @@ -65131,6 +62239,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" + sources."fast-uri-3.0.1" sources."fastq-1.17.1" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { @@ -65139,11 +62248,11 @@ in ]; }) sources."fill-range-7.1.1" - sources."find-up-4.1.0" + sources."find-up-3.0.0" sources."flatted-3.3.1" sources."follow-redirects-1.15.6" sources."for-each-0.3.3" - (sources."foreground-child-3.2.0" // { + (sources."foreground-child-3.2.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -65182,6 +62291,7 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" + sources."immediate-3.0.6" sources."indent-string-5.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -65192,7 +62302,7 @@ in sources."ansi-styles-6.2.1" sources."chalk-5.3.0" sources."emoji-regex-10.3.0" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" sources."wrap-ansi-9.0.0" ]; @@ -65222,7 +62332,7 @@ in sources."utf-8-validate-5.0.10" sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) sources."ink-spinner-4.0.3" @@ -65242,7 +62352,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" @@ -65268,11 +62378,11 @@ in sources."is-wsl-2.2.0" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" + sources."jackspeak-3.4.3" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."jsii-5.3.29" - (sources."jsii-pacmak-1.95.0" // { + sources."jsii-5.4.12" + (sources."jsii-pacmak-1.98.0" // { dependencies = [ sources."cliui-7.0.4" sources."escape-string-regexp-4.0.0" @@ -65283,9 +62393,9 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.100.0" // { + (sources."jsii-reflect-1.101.0" // { dependencies = [ - sources."@jsii/check-node-1.100.0" + sources."@jsii/check-node-1.101.0" sources."cliui-7.0.4" sources."fs-extra-10.1.0" sources."jsonfile-6.1.0" @@ -65294,34 +62404,11 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.100.0" // { + (sources."jsii-rosetta-5.4.14" // { dependencies = [ - sources."@jsii/check-node-1.100.0" - sources."cliui-7.0.4" sources."commonmark-0.31.0" sources."entities-3.0.1" - sources."fs-extra-10.1.0" - sources."jsii-1.100.0" - sources."jsonfile-6.1.0" sources."string.prototype.repeat-1.0.0" - sources."typescript-3.9.10" - sources."universalify-2.0.1" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - }) - (sources."jsii-srcmak-0.1.1039" // { - dependencies = [ - sources."camelcase-5.3.1" - sources."cliui-6.0.0" - sources."decamelize-1.2.0" - sources."fs-extra-9.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.1" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" ]; }) sources."json-schema-traverse-1.0.0" @@ -65333,7 +62420,9 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."locate-path-5.0.0" + sources."lie-3.1.1" + sources."localforage-1.10.0" + sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" @@ -65343,7 +62432,7 @@ in sources."lodash.union-4.6.0" sources."log4js-6.9.1" sources."loose-envify-1.4.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."mdurl-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -65362,7 +62451,6 @@ in sources."mute-stream-1.0.0" sources."nan-2.20.0" sources."napi-build-utils-1.0.2" - sources."ncp-2.0.0" sources."node-abi-3.65.0" sources."node-fetch-2.7.0" sources."node-gyp-build-4.8.1" @@ -65370,22 +62458,22 @@ in sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."object-hash-2.2.0" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-is-1.1.6" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."obliterator-2.0.4" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.100.0" + sources."oo-ascii-tree-1.101.0" sources."open-7.4.2" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-gitignore-1.0.1" sources."patch-console-2.0.0" - sources."path-exists-4.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" @@ -65395,14 +62483,7 @@ in sources."picomatch-2.3.1" sources."pidtree-0.6.0" sources."pidusage-3.0.2" - (sources."pkg-up-3.1.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."pkg-up-3.1.0" sources."possible-typed-array-names-1.0.0" sources."prebuild-install-7.1.2" sources."prettier-2.8.8" @@ -65415,7 +62496,7 @@ in (sources."react-devtools-core-4.28.5" // { dependencies = [ sources."utf-8-validate-5.0.10" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) sources."react-reconciler-0.29.2" @@ -65426,7 +62507,6 @@ in sources."regexp.prototype.flags-1.5.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" sources."resolve-1.22.8" sources."restore-cursor-4.0.0" @@ -65440,13 +62520,12 @@ in sources."safer-buffer-2.1.2" sources."sax-1.4.1" sources."scheduler-0.23.2" - sources."semver-7.6.2" + sources."semver-7.6.3" (sources."semver-intersect-1.5.0" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."set-blocking-2.0.0" sources."set-function-length-1.2.2" sources."set-function-name-2.0.2" sources."shebang-command-2.0.0" @@ -65496,16 +62575,15 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" sources."typed-array-length-1.0.6" - sources."typescript-5.3.3" + sources."typescript-5.4.5" sources."unbox-primitive-1.0.2" sources."undici-types-5.26.5" sources."universalify-0.1.2" - sources."uri-js-4.4.1" sources."utf-8-validate-6.0.4" sources."util-deprecate-1.0.2" sources."uuid-9.0.1" @@ -65514,13 +62592,12 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.2" - sources."which-module-2.0.1" sources."which-typed-array-1.1.15" (sources."widest-line-5.0.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-10.3.0" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" ]; }) @@ -65528,12 +62605,11 @@ in sources."wrap-ansi-7.0.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.17.0" + sources."ws-8.18.0" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" sources."xstate-4.38.3" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yauzl-2.10.0" @@ -65544,7 +62620,7 @@ in sources."archiver-utils-3.0.4" ]; }) - sources."zod-3.22.4" + sources."zod-3.23.8" ]; buildInputs = globalBuildInputs; meta = { @@ -65657,24 +62733,6 @@ in bypassCache = true; reconstructLock = true; }; - coc-diagnostic = nodeEnv.buildNodePackage { - name = "coc-diagnostic"; - packageName = "coc-diagnostic"; - version = "0.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.24.1.tgz"; - sha512 = "pAiP55qF3Uh4Mb7QzJAhtMyys3OOVg9iowupr27XBnoFZJxmxOZYG5nydOtHKBqhXIJ+mMfy/okHNLheD/4w/w=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "diagnostic-languageserver extension for coc.nvim"; - homepage = "https://github.com/iamcco/coc-diagnostic#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coc-docker = nodeEnv.buildNodePackage { name = "coc-docker"; packageName = "coc-docker"; @@ -65686,7 +62744,11 @@ in dependencies = [ sources."dockerfile-ast-0.4.2" sources."dockerfile-language-server-nodejs-0.9.0" - sources."dockerfile-language-service-0.9.0" + (sources."dockerfile-language-service-0.9.0" // { + dependencies = [ + sources."vscode-languageserver-types-3.17.0-next.3" + ]; + }) sources."dockerfile-utils-0.10.0" sources."tslib-2.6.3" sources."vscode-jsonrpc-8.1.0" @@ -65697,7 +62759,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.0-next.3" + sources."vscode-languageserver-types-3.17.5" ]; buildInputs = globalBuildInputs; meta = { @@ -65753,10 +62815,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.27.2"; + version = "0.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.27.2.tgz"; - sha512 = "uwy/RckeCGUU2pook/LADo/czly2ZyAUTB6GfIZK+DByaS7kmpuyapwnfD3BC5B+vOLqi+5JjrunCf4ts5McEg=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.27.3.tgz"; + sha512 = "NakEw0nyOvlzqb/8P40ywDMv6mgtyNXOHAEftzLS3K4zgnaKLrt0PsaPmAYUlUfrNw+isGrveMSQB2azjSU0iA=="; }; dependencies = [ sources."@sindresorhus/chunkify-0.2.0" @@ -65895,10 +62957,10 @@ in coc-haxe = nodeEnv.buildNodePackage { name = "coc-haxe"; packageName = "coc-haxe"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.20.0.tgz"; - sha512 = "bdxigpWTdoImf3+8ACcWwH/gjBMcovh87QiqOoqECcR10mOqewO63/UPfPASeZF9P6QiQEJrAJcBNpYNnY0upA=="; + url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.21.0.tgz"; + sha512 = "SQ1AbfLWomaNY+xDCKnNDMryVlsp6YbJ9S2mWvKF6DjuaTcxHE5hVUTMbkYA0zA+NiByFx5hzHEZdsIC/XMCCw=="; }; buildInputs = globalBuildInputs; meta = { @@ -66137,7 +63199,7 @@ in sources."flatted-3.3.1" sources."follow-redirects-1.15.6" sources."for-each-0.3.3" - sources."fp-ts-2.16.6" + sources."fp-ts-2.16.8" sources."fs-extra-8.1.0" (sources."fs-minipass-2.1.0" // { dependencies = [ @@ -66229,7 +63291,7 @@ in sources."node-fetch-2.7.0" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."once-1.4.0" @@ -66256,7 +63318,7 @@ in sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."set-function-name-2.0.2" sources."setimmediate-1.0.5" @@ -66357,13 +63419,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.365"; + version = "1.1.371"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.365.tgz"; - sha512 = "rADFFHjr8CBjZDKMfuyXLIeUelah3ZTxQTHEWatQwnrS9WW/Xj6goJO/8z06zjjvX2oVhJypDXbnjd5CJB0f1A=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.371.tgz"; + sha512 = "8vgKSjuMVpylSoHIwdzP9edeHwmjUFY+ZyBkcLQMdyjdZtEc3+6OblXS0Dm5nXosjLY/ATc+w+38ITIssqm76g=="; }; dependencies = [ - sources."pyright-1.1.367" + sources."pyright-1.1.373" ]; buildInputs = globalBuildInputs; meta = { @@ -66437,10 +63499,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.76.1"; + version = "0.77.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.76.1.tgz"; - sha512 = "a9/5Gm5msHs+5CWhNzICmpPWNFILtXmJ/r3Gae/lDXg6rtq+QUpQp+OUQlNSrjm9iuygbKyVGVkG26pJNAGaKg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.77.2.tgz"; + sha512 = "Qq08/2Fx31bgfQhxKomQN42mfGM9gDCd4CKDMmlCJBMZKD439LaLWlYXGevmkp0qcIU2AWFD415j7041OpkFhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -66491,7 +63553,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tslib-2.6.3" @@ -66629,7 +63691,7 @@ in }) (sources."cspell-lib-4.3.12" // { dependencies = [ - sources."comment-json-4.2.3" + sources."comment-json-4.2.4" sources."esprima-4.0.1" sources."fs-extra-9.1.0" sources."gensequence-3.1.1" @@ -66714,34 +63776,44 @@ in dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - sources."@babel/core-7.24.7" - sources."@babel/generator-7.24.7" - sources."@babel/helper-compilation-targets-7.24.7" + sources."@babel/compat-data-7.24.9" + (sources."@babel/core-7.24.9" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) + sources."@babel/generator-7.24.10" + (sources."@babel/helper-compilation-targets-7.24.8" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.1" + sources."yallist-3.1.1" + ]; + }) sources."@babel/helper-environment-visitor-7.24.7" sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helpers-7.24.8" (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/traverse-7.24.8" + sources."@babel/types-7.24.9" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -66753,7 +63825,7 @@ in sources."@types/normalize-package-data-2.4.4" sources."@types/parse-json-4.0.2" sources."@types/unist-2.0.10" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -66772,11 +63844,11 @@ in ]; }) sources."braces-3.0.3" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -66813,7 +63885,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -66824,6 +63896,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-diff-1.3.0" sources."fast-glob-3.3.2" + sources."fast-uri-3.0.1" sources."fastest-levenshtein-1.0.16" sources."fastq-1.17.1" sources."file-entry-cache-6.0.1" @@ -66846,12 +63919,7 @@ in sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hasown-2.0.2" - (sources."hosted-git-info-4.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) + sources."hosted-git-info-4.1.0" sources."html-tags-3.3.1" sources."htmlparser2-3.10.1" sources."ignore-5.3.1" @@ -66870,14 +63938,14 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-hexadecimal-1.0.4" sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" + sources."is-plain-obj-1.1.0" sources."is-regexp-2.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" @@ -66897,7 +63965,7 @@ in sources."lodash.truncate-4.4.2" sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" - sources."lru-cache-5.1.1" + sources."lru-cache-6.0.0" sources."map-obj-4.3.0" sources."mathml-tag-names-2.1.3" sources."mdast-util-from-markdown-0.8.5" @@ -66910,18 +63978,10 @@ in sources."min-indent-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."is-plain-obj-1.1.0" - ]; - }) + sources."minimist-options-4.1.0" sources."ms-2.1.2" - sources."node-releases-2.0.14" - (sources."normalize-package-data-3.0.3" // { - dependencies = [ - sources."semver-7.6.2" - ]; - }) + sources."node-releases-2.0.18" + sources."normalize-package-data-3.0.3" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" sources."num2fraction-1.2.2" @@ -66947,14 +64007,13 @@ in sources."postcss-html-0.36.0" sources."postcss-less-3.1.4" sources."postcss-media-query-parser-0.2.3" - sources."postcss-resolve-nested-selector-0.1.1" + sources."postcss-resolve-nested-selector-0.1.4" sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.1.0" + sources."postcss-selector-parser-6.1.1" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -66983,7 +64042,7 @@ in sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."semver-6.3.1" + sources."semver-7.6.3" sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -67016,12 +64075,15 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.2" + (sources."unified-9.2.2" // { + dependencies = [ + sources."is-plain-obj-2.1.0" + ]; + }) sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" - sources."update-browserslist-db-1.0.16" - sources."uri-js-4.4.1" + sources."update-browserslist-db-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.4.0" sources."validate-npm-package-license-3.0.4" @@ -67040,7 +64102,7 @@ in sources."which-1.3.1" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yargs-parser-20.2.9" sources."zwitch-1.0.5" @@ -67084,7 +64146,7 @@ in sha512 = "0yKAPkIKoLJWksPefWXVvRcRQ+Ja3kc2Bx/tKL4tQwEOlAwc5qeUU+1FZRw+71Jp8HeC5Wo9YqtlgSIJlyic3g=="; }; dependencies = [ - sources."semver-7.6.2" + sources."semver-7.6.3" ]; buildInputs = globalBuildInputs; meta = { @@ -67191,7 +64253,7 @@ in sources."hasown-2.0.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.1.2" @@ -67264,7 +64326,7 @@ in sha512 = "XUhAHtYOBHgLobVODFNONdJkCmFbsjS/8nMH95IQYRE0ECzwljupPOrGKBQa7OiGyWqQ5CAJfZJcbhzCHWdr+Q=="; }; dependencies = [ - sources."typescript-5.4.5" + sources."typescript-5.5.4" ]; buildInputs = globalBuildInputs; meta = { @@ -67372,13 +64434,14 @@ in ]; }) sources."esprima-4.0.1" - sources."esquery-1.5.0" + sources."esquery-1.6.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fast-uri-3.0.1" sources."file-entry-cache-6.0.1" sources."flat-cache-3.2.0" sources."flatted-3.3.1" @@ -67401,7 +64464,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-expression-4.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -67442,7 +64505,7 @@ in sources."resolve-1.22.8" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -67455,7 +64518,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.2" // { dependencies = [ - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -67765,58 +64828,6 @@ in bypassCache = true; reconstructLock = true; }; - concurrently = nodeEnv.buildNodePackage { - name = "concurrently"; - packageName = "concurrently"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz"; - sha512 = "1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg=="; - }; - dependencies = [ - sources."@babel/runtime-7.24.7" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."date-fns-2.30.0" - sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" - sources."get-caller-file-2.0.5" - sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."lodash-4.17.21" - sources."regenerator-runtime-0.14.1" - sources."require-directory-2.1.1" - sources."rxjs-7.8.1" - sources."shell-quote-1.8.1" - sources."spawn-command-0.0.2" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."supports-color-8.1.1" - sources."tree-kill-1.2.2" - sources."tslib-2.6.3" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Run commands concurrently"; - homepage = "https://github.com/open-cli-tools/concurrently#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; conventional-changelog-cli = nodeEnv.buildNodePackage { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; @@ -67858,27 +64869,24 @@ in sources."dot-prop-5.3.0" sources."escape-string-regexp-1.0.5" sources."find-up-simple-1.0.0" - sources."function-bind-1.1.2" sources."git-raw-commits-5.0.0" sources."git-semver-tags-8.0.0" sources."handlebars-4.7.8" sources."has-flag-3.0.0" - sources."hasown-2.0.2" sources."hosted-git-info-7.0.2" sources."index-to-position-0.1.2" - sources."is-core-module-2.13.1" sources."is-obj-2.0.0" sources."js-tokens-4.0.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."meow-13.2.0" sources."minimist-1.2.8" sources."neo-async-2.6.2" - sources."normalize-package-data-6.0.1" + sources."normalize-package-data-6.0.2" sources."parse-json-8.1.0" sources."picocolors-1.0.1" sources."read-package-up-11.0.0" sources."read-pkg-9.0.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."source-map-0.6.1" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.5.0" @@ -67887,8 +64895,8 @@ in sources."supports-color-5.5.0" sources."temp-dir-3.0.0" sources."tempfile-5.0.0" - sources."type-fest-4.20.0" - sources."uglify-js-3.18.0" + sources."type-fest-4.23.0" + sources."uglify-js-3.19.0" sources."unicorn-magic-0.1.0" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -67984,7 +64992,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.5" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -68072,14 +65080,14 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.1.0" sources."object-assign-4.1.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.8" @@ -68154,23 +65162,23 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "8.8.4"; + version = "8.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-8.8.4.tgz"; - sha512 = "eRUHiXvh4iRapw3lqE1nGOEAyYVfa/0lgK/e34SpcM/ECm4QuvbfY7Yl0ozCbiYywecog0RVbeJJUEYJTN5/Mg=="; + url = "https://registry.npmjs.org/cspell/-/cspell-8.12.1.tgz"; + sha512 = "mdnUUPydxxdj/uyF84U/DvPiY/l58Z2IpNwTx3H9Uve9dfT0vRv/7jiFNAvK4hAfZQaMaE7DPC00ckywTI/XgA=="; }; dependencies = [ - sources."@cspell/cspell-bundled-dicts-8.8.4" - sources."@cspell/cspell-json-reporter-8.8.4" - sources."@cspell/cspell-pipe-8.8.4" - sources."@cspell/cspell-resolver-8.8.4" - sources."@cspell/cspell-service-bus-8.8.4" - sources."@cspell/cspell-types-8.8.4" + sources."@cspell/cspell-bundled-dicts-8.12.1" + sources."@cspell/cspell-json-reporter-8.12.1" + sources."@cspell/cspell-pipe-8.12.1" + sources."@cspell/cspell-resolver-8.12.1" + sources."@cspell/cspell-service-bus-8.12.1" + sources."@cspell/cspell-types-8.12.1" sources."@cspell/dict-ada-4.0.2" - sources."@cspell/dict-aws-4.0.2" + sources."@cspell/dict-aws-4.0.3" sources."@cspell/dict-bash-4.1.3" - sources."@cspell/dict-companies-3.1.2" - sources."@cspell/dict-cpp-5.1.9" + sources."@cspell/dict-companies-3.1.3" + sources."@cspell/dict-cpp-5.1.12" sources."@cspell/dict-cryptocurrencies-5.0.0" sources."@cspell/dict-csharp-4.0.2" sources."@cspell/dict-css-4.0.12" @@ -68180,13 +65188,13 @@ in sources."@cspell/dict-docker-1.1.7" sources."@cspell/dict-dotnet-5.0.2" sources."@cspell/dict-elixir-4.0.3" - sources."@cspell/dict-en-common-misspellings-2.0.1" + sources."@cspell/dict-en-common-misspellings-2.0.3" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.3.21" + sources."@cspell/dict-en_us-4.3.23" sources."@cspell/dict-filetypes-3.0.4" sources."@cspell/dict-fonts-4.0.0" sources."@cspell/dict-fsharp-1.0.1" - sources."@cspell/dict-fullstack-3.1.8" + sources."@cspell/dict-fullstack-3.2.0" sources."@cspell/dict-gaming-terms-1.0.5" sources."@cspell/dict-git-3.0.0" sources."@cspell/dict-golang-6.0.9" @@ -68196,31 +65204,32 @@ in sources."@cspell/dict-html-symbol-entities-4.0.0" sources."@cspell/dict-java-5.0.7" sources."@cspell/dict-julia-1.0.1" - sources."@cspell/dict-k8s-1.0.5" + sources."@cspell/dict-k8s-1.0.6" sources."@cspell/dict-latex-4.0.0" sources."@cspell/dict-lorem-ipsum-4.0.0" sources."@cspell/dict-lua-4.0.3" sources."@cspell/dict-makefile-1.0.0" sources."@cspell/dict-monkeyc-1.0.6" sources."@cspell/dict-node-5.0.1" - sources."@cspell/dict-npm-5.0.16" + sources."@cspell/dict-npm-5.0.18" sources."@cspell/dict-php-4.0.8" - sources."@cspell/dict-powershell-5.0.4" + sources."@cspell/dict-powershell-5.0.5" sources."@cspell/dict-public-licenses-2.0.7" - sources."@cspell/dict-python-4.2.1" + sources."@cspell/dict-python-4.2.3" sources."@cspell/dict-r-2.0.1" sources."@cspell/dict-ruby-5.0.2" - sources."@cspell/dict-rust-4.0.4" - sources."@cspell/dict-scala-5.0.2" - sources."@cspell/dict-software-terms-3.4.6" + sources."@cspell/dict-rust-4.0.5" + sources."@cspell/dict-scala-5.0.3" + sources."@cspell/dict-software-terms-4.0.3" sources."@cspell/dict-sql-2.1.3" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-terraform-1.0.0" - sources."@cspell/dict-typescript-3.1.5" + sources."@cspell/dict-typescript-3.1.6" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-8.8.4" - sources."@cspell/strong-weak-map-8.8.4" + sources."@cspell/dynamic-import-8.12.1" + sources."@cspell/strong-weak-map-8.12.1" + sources."@cspell/url-8.12.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -68232,26 +65241,26 @@ in sources."chalk-template-1.1.0" sources."clear-module-4.1.2" sources."commander-12.1.0" - sources."comment-json-4.2.3" + sources."comment-json-4.2.4" sources."core-util-is-1.0.3" - sources."cspell-config-lib-8.8.4" - sources."cspell-dictionary-8.8.4" - sources."cspell-gitignore-8.8.4" - sources."cspell-glob-8.8.4" - sources."cspell-grammar-8.8.4" - sources."cspell-io-8.8.4" - sources."cspell-lib-8.8.4" - sources."cspell-trie-lib-8.8.4" + sources."cspell-config-lib-8.12.1" + sources."cspell-dictionary-8.12.1" + sources."cspell-gitignore-8.12.1" + sources."cspell-glob-8.12.1" + sources."cspell-grammar-8.12.1" + sources."cspell-io-8.12.1" + sources."cspell-lib-8.12.1" + sources."cspell-trie-lib-8.12.1" sources."env-paths-3.0.0" sources."esprima-4.0.1" sources."fast-equals-5.0.1" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.17.1" - sources."file-entry-cache-8.0.0" + sources."file-entry-cache-9.0.0" sources."fill-range-7.1.1" sources."find-up-simple-1.0.0" - sources."flat-cache-4.0.1" + sources."flat-cache-5.0.0" sources."flatted-3.3.1" sources."gensequence-7.0.0" sources."get-stdin-9.0.0" @@ -68280,13 +65289,13 @@ in sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."strip-ansi-7.1.0" sources."to-regex-range-5.0.1" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.8" sources."xdg-basedir-5.1.0" - sources."yaml-2.4.5" + sources."yaml-2.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -68424,15 +65433,15 @@ in dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv-vault/-/dotenv-vault-1.26.1.tgz"; - sha512 = "v+RK6LXpJQWhaelTT2s0b5FQB0qziRBuGCrAgAeDHtgkDEA0NqF7OXYXsrnKTuCPnwBg0FmNJr4lZebCpJnrFA=="; + url = "https://registry.npmjs.org/dotenv-vault/-/dotenv-vault-1.26.2.tgz"; + sha512 = "nURqmc3kii3kqiZXcBYdt0QrjpXBjXWtzevCwC9FRbIjwKenGoN/bZHC9l9ueYI3gGoKjgt/1Cmno6HvzgMlDA=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -68460,18 +65469,18 @@ in ]; }) sources."@oclif/screen-3.0.8" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.5" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/cli-progress-3.11.6" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -68575,7 +65584,7 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jake-10.9.1" + sources."jake-10.9.2" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.1.0" @@ -68623,7 +65632,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -68648,7 +65657,7 @@ in sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" @@ -68674,10 +65683,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.110.0"; + version = "6.111.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.110.0.tgz"; - sha512 = "PxA3Q5OMndTlmFyrf7s/u+aAjOxQF+T5WIN3wzQUfwJ4gVSFC6qMuRT6Zhue24fDzE17v53voT572aooNCPYQw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.111.0.tgz"; + sha512 = "nvcobmgSuPm+TwoilMVL5tjJW4ikI55uHFQS+dbHUc35HrMunPdgSeICCK+McNW+YL9bKe/1DSJxCpqzxwyVYA=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -68772,7 +65781,7 @@ in sources."mime-types-2.1.35" sources."minimist-1.2.8" sources."oauth-sign-0.9.0" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."p-finally-1.0.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" @@ -68886,7 +65895,7 @@ in sources."commander-5.1.0" ]; }) - (sources."@electron/get-3.0.0" // { + (sources."@electron/get-3.1.0" // { dependencies = [ sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" @@ -68899,8 +65908,8 @@ in sources."fs-extra-9.1.0" ]; }) - sources."@electron/osx-sign-1.3.0" - (sources."@electron/packager-18.3.2" // { + sources."@electron/osx-sign-1.3.1" + (sources."@electron/packager-18.3.3" // { dependencies = [ sources."fs-extra-11.2.0" ]; @@ -68910,10 +65919,10 @@ in dependencies = [ sources."brace-expansion-2.0.1" sources."fs-extra-11.2.0" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" ]; }) - (sources."@electron/windows-sign-1.1.2" // { + (sources."@electron/windows-sign-1.1.3" // { dependencies = [ sources."fs-extra-11.2.0" ]; @@ -68931,7 +65940,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/responselike-1.0.3" sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" @@ -68939,11 +65948,7 @@ in sources."agent-base-6.0.2" sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" - (sources."ansi-escapes-5.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) + sources."ansi-escapes-5.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" @@ -68954,7 +65959,6 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" sources."buffer-5.7.1" @@ -69008,11 +66012,8 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.4" - sources."define-properties-1.2.1" sources."delegates-1.0.0" sources."detect-libc-2.0.3" - sources."detect-node-2.1.0" sources."dir-compare-4.2.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" @@ -69021,9 +66022,6 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es6-error-4.1.1" sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."eventemitter3-5.0.1" @@ -69063,7 +66061,6 @@ in sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" - sources."get-intrinsic-1.2.4" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -69072,21 +66069,15 @@ in sources."get-stream-5.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."global-agent-3.0.0" sources."global-modules-1.0.0" (sources."global-prefix-1.0.2" // { dependencies = [ sources."which-1.3.1" ]; }) - sources."globalthis-1.0.4" - sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."hasown-2.0.2" sources."homedir-polyfill-1.0.3" @@ -69107,7 +66098,7 @@ in sources."interpret-3.1.1" sources."ip-address-9.0.5" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -69121,7 +66112,6 @@ in sources."isexe-2.0.0" sources."jsbn-1.1.0" sources."json-buffer-3.0.1" - sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."junk-3.1.0" sources."keyv-4.5.4" @@ -69156,11 +66146,6 @@ in sources."lru-cache-7.18.3" sources."make-fetch-happen-10.2.1" sources."map-age-cleaner-0.1.3" - (sources."matcher-3.0.0" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) sources."mem-4.3.0" sources."merge2-1.4.1" sources."micromatch-4.0.7" @@ -69196,7 +66181,6 @@ in ]; }) sources."npmlog-6.0.2" - sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."ora-5.4.1" @@ -69267,13 +66251,10 @@ in sources."reusify-1.0.4" sources."rfdc-1.4.1" sources."rimraf-3.0.2" - sources."roarr-2.15.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" - sources."semver-compare-1.0.0" - sources."serialize-error-7.0.1" + sources."semver-7.6.3" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -69313,7 +66294,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."type-fest-0.13.1" + sources."type-fest-1.4.0" sources."undici-types-5.26.5" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -69359,10 +66340,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "10.0.0"; + version = "10.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-10.0.0.tgz"; - sha512 = "N0s3BcFHBTOKYST7bzPvcMa7cGA7B7hDTOh+NgfkPB6qavGPgSFwbQo8c8BHFXI1iWw8vvjhh24/OEt06dFjOw=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-10.2.1.tgz"; + sha512 = "ayiCnxv58RYFPgYtgDhzcTIsJuN4CWFIl0IR1zMLlau/tNQxR6AnXTyF+XNUYEIHMaLwc1TDsZ5DlZu9e/2sXg=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.7" @@ -69383,7 +66364,7 @@ in sources."@jridgewell/trace-mapping-0.3.9" ]; }) - sources."@expo/apple-utils-1.7.0" + sources."@expo/apple-utils-1.7.1" (sources."@expo/bunyan-4.0.0" // { dependencies = [ sources."uuid-8.3.2" @@ -69406,13 +66387,13 @@ in ]; }) sources."@expo/config-types-50.0.0" - (sources."@expo/eas-build-job-1.0.117" // { + (sources."@expo/eas-build-job-1.0.119" // { dependencies = [ - sources."joi-17.13.1" - sources."semver-7.6.2" + sources."joi-17.13.3" + sources."semver-7.6.3" ]; }) - (sources."@expo/eas-json-10.0.0" // { + (sources."@expo/eas-json-10.0.3" // { dependencies = [ (sources."@babel/code-frame-7.23.5" // { dependencies = [ @@ -69496,10 +66477,10 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.7.0" - (sources."@expo/steps-1.0.117" // { + (sources."@expo/steps-1.0.119" // { dependencies = [ sources."@expo/spawn-async-1.7.2" - sources."joi-17.13.1" + sources."joi-17.13.3" ]; }) sources."@expo/timeago.js-1.0.0" @@ -69508,7 +66489,7 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -69528,27 +66509,27 @@ in }) sources."@oclif/screen-3.0.8" sources."@react-native/normalize-color-2.1.0" - sources."@segment/ajv-human-errors-2.12.0" + sources."@segment/ajv-human-errors-2.13.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/bunyan-1.8.11" - sources."@types/cli-progress-3.11.5" - sources."@types/node-20.14.2" + sources."@types/cli-progress-3.11.6" + sources."@types/node-20.14.12" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.7.13" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."agent-base-6.0.2" sources."ajv-8.11.0" @@ -69690,7 +66671,7 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - (sources."jake-10.9.1" // { + (sources."jake-10.9.2" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" @@ -69702,7 +66683,7 @@ in sources."join-component-1.1.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" - sources."jsep-1.3.8" + sources."jsep-1.3.9" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" sources."json5-2.2.3" @@ -69864,7 +66845,7 @@ in sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" sources."type-fest-0.21.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."unique-string-1.0.0" sources."universalify-2.0.1" @@ -69895,7 +66876,7 @@ in }) sources."xmlbuilder-14.0.0" sources."yallist-4.0.0" - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yn-3.1.1" sources."yocto-queue-0.1.0" sources."zod-3.23.8" @@ -69940,7 +66921,7 @@ in sources."@alcalzone/ansi-tokenize-0.1.3" sources."@types/prop-types-15.7.12" sources."@types/react-18.3.3" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ajv-formats-2.1.1" sources."ansi-escapes-7.0.0" sources."ansi-regex-6.0.1" @@ -69971,6 +66952,7 @@ in sources."escape-string-regexp-2.0.0" sources."execa-8.0.1" sources."fast-deep-equal-3.1.3" + sources."fast-uri-3.0.1" sources."get-east-asian-width-1.2.0" sources."get-stream-8.0.1" sources."human-signals-5.0.0" @@ -69978,12 +66960,12 @@ in (sources."ink-5.0.1" // { dependencies = [ sources."signal-exit-3.0.7" - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" ]; }) (sources."ink-text-input-6.0.0" // { dependencies = [ - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" ]; }) sources."is-docker-3.0.0" @@ -70014,12 +66996,11 @@ in sources."p-defer-1.0.0" sources."patch-console-2.0.0" sources."path-key-3.1.1" - sources."punycode-2.3.1" sources."react-18.3.1" (sources."react-devtools-core-4.28.5" // { dependencies = [ sources."utf-8-validate-5.0.10" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) sources."react-reconciler-0.29.2" @@ -70032,7 +67013,7 @@ in ]; }) sources."scheduler-0.23.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" @@ -70044,7 +67025,7 @@ in ]; }) sources."stack-utils-2.0.6" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" sources."strip-final-newline-3.0.0" sources."stubborn-fs-1.2.5" @@ -70052,13 +67033,12 @@ in sources."type-fest-3.13.1" sources."uint8array-extras-0.3.0" sources."unicode-emoji-json-0.6.0" - sources."uri-js-4.4.1" sources."utf-8-validate-6.0.4" - sources."when-exit-2.1.2" + sources."when-exit-2.1.3" sources."which-2.0.2" sources."widest-line-5.0.0" sources."wrap-ansi-9.0.0" - sources."ws-8.17.0" + sources."ws-8.18.0" sources."yoga-wasm-web-0.3.3" ]; buildInputs = globalBuildInputs; @@ -70109,10 +67089,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz"; - sha512 = "+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz"; + sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw=="; }; dependencies = [ (sources."@eslint-community/eslint-utils-4.4.0" // { @@ -70120,17 +67100,17 @@ in sources."eslint-visitor-keys-3.4.3" ]; }) - sources."@eslint-community/regexpp-4.10.1" - sources."@eslint/config-array-0.16.0" + sources."@eslint-community/regexpp-4.11.0" + sources."@eslint/config-array-0.17.1" sources."@eslint/eslintrc-3.1.0" - sources."@eslint/js-9.5.0" + sources."@eslint/js-9.7.0" sources."@eslint/object-schema-2.1.4" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/retry-0.3.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -70147,11 +67127,11 @@ in sources."debug-4.3.5" sources."deep-is-0.1.4" sources."escape-string-regexp-4.0.0" - sources."eslint-9.5.0" - sources."eslint-scope-8.0.1" + sources."eslint-9.7.0" + sources."eslint-scope-8.0.2" sources."eslint-visitor-keys-4.0.0" - sources."espree-10.0.1" - sources."esquery-1.5.0" + sources."espree-10.1.0" + sources."esquery-1.6.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -70245,26 +67225,24 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { + sources."@babel/code-frame-7.24.7" + sources."@babel/compat-data-7.24.9" + (sources."@babel/core-7.24.9" // { dependencies = [ - sources."@babel/code-frame-7.24.7" - sources."json5-2.2.3" + sources."debug-4.3.5" + sources."ms-2.1.2" sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.7" + sources."@babel/generator-7.24.10" sources."@babel/helper-annotate-as-pure-7.24.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { + (sources."@babel/helper-compilation-targets-7.24.8" // { dependencies = [ - sources."lru-cache-5.1.1" sources."semver-6.3.1" - sources."yallist-3.1.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.24.7" // { + (sources."@babel/helper-create-class-features-plugin-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; @@ -70274,31 +67252,37 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/helper-define-polyfill-provider-0.6.2" + (sources."@babel/helper-define-polyfill-provider-0.6.2" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + sources."resolve-1.22.8" + ]; + }) sources."@babel/helper-environment-visitor-7.24.7" sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" - sources."@babel/helper-member-expression-to-functions-7.24.7" + sources."@babel/helper-member-expression-to-functions-7.24.8" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" sources."@babel/helper-optimise-call-expression-7.24.7" - sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-plugin-utils-7.24.8" sources."@babel/helper-remap-async-to-generator-7.24.7" sources."@babel/helper-replace-supers-7.24.7" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" + sources."@babel/helper-validator-option-7.24.8" sources."@babel/helper-wrap-function-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helpers-7.24.8" (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7" @@ -70342,9 +67326,9 @@ in sources."@babel/plugin-transform-block-scoping-7.24.7" sources."@babel/plugin-transform-class-properties-7.24.7" sources."@babel/plugin-transform-class-static-block-7.24.7" - sources."@babel/plugin-transform-classes-7.24.7" + sources."@babel/plugin-transform-classes-7.24.8" sources."@babel/plugin-transform-computed-properties-7.24.7" - sources."@babel/plugin-transform-destructuring-7.24.7" + sources."@babel/plugin-transform-destructuring-7.24.8" sources."@babel/plugin-transform-dotall-regex-7.24.7" sources."@babel/plugin-transform-duplicate-keys-7.24.7" sources."@babel/plugin-transform-dynamic-import-7.24.7" @@ -70358,7 +67342,7 @@ in sources."@babel/plugin-transform-logical-assignment-operators-7.24.7" sources."@babel/plugin-transform-member-expression-literals-7.24.7" sources."@babel/plugin-transform-modules-amd-7.24.7" - sources."@babel/plugin-transform-modules-commonjs-7.24.7" + sources."@babel/plugin-transform-modules-commonjs-7.24.8" sources."@babel/plugin-transform-modules-systemjs-7.24.7" sources."@babel/plugin-transform-modules-umd-7.24.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7" @@ -70368,7 +67352,7 @@ in sources."@babel/plugin-transform-object-rest-spread-7.24.7" sources."@babel/plugin-transform-object-super-7.24.7" sources."@babel/plugin-transform-optional-catch-binding-7.24.7" - sources."@babel/plugin-transform-optional-chaining-7.24.7" + sources."@babel/plugin-transform-optional-chaining-7.24.8" sources."@babel/plugin-transform-parameters-7.24.7" sources."@babel/plugin-transform-private-methods-7.24.7" sources."@babel/plugin-transform-private-property-in-object-7.24.7" @@ -70388,36 +67372,38 @@ in sources."@babel/plugin-transform-spread-7.24.7" sources."@babel/plugin-transform-sticky-regex-7.24.7" sources."@babel/plugin-transform-template-literals-7.24.7" - sources."@babel/plugin-transform-typeof-symbol-7.24.7" - sources."@babel/plugin-transform-typescript-7.24.7" + sources."@babel/plugin-transform-typeof-symbol-7.24.8" + sources."@babel/plugin-transform-typescript-7.24.8" sources."@babel/plugin-transform-unicode-escapes-7.24.7" sources."@babel/plugin-transform-unicode-property-regex-7.24.7" sources."@babel/plugin-transform-unicode-regex-7.24.7" sources."@babel/plugin-transform-unicode-sets-regex-7.24.7" - (sources."@babel/preset-env-7.24.7" // { + (sources."@babel/preset-env-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; }) sources."@babel/preset-modules-0.1.6-no-external-plugins" sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.9.0" - (sources."@babel/template-7.24.7" // { + (sources."@babel/runtime-7.9.0" // { dependencies = [ - sources."@babel/code-frame-7.24.7" + sources."regenerator-runtime-0.13.11" ]; }) - (sources."@babel/traverse-7.24.7" // { + sources."@babel/template-7.24.7" + (sources."@babel/traverse-7.24.8" // { dependencies = [ - sources."@babel/code-frame-7.24.7" + sources."debug-4.3.5" + sources."ms-2.1.2" ]; }) - sources."@babel/types-7.24.7" + sources."@babel/types-7.24.9" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.7.3" // { dependencies = [ - sources."@babel/runtime-7.24.7" + sources."@babel/code-frame-7.10.4" + sources."@babel/runtime-7.24.8" (sources."@expo/config-8.0.5" // { dependencies = [ sources."semver-7.3.2" @@ -70425,10 +67411,9 @@ in }) (sources."@expo/config-plugins-6.0.2" // { dependencies = [ - sources."semver-7.6.2" + sources."semver-7.6.3" ]; }) - sources."@expo/config-types-48.0.0" (sources."@expo/dev-server-0.3.0" // { dependencies = [ sources."fs-extra-9.0.0" @@ -70449,12 +67434,13 @@ in sources."universalify-2.0.1" ]; }) + sources."mime-2.6.0" sources."semver-7.3.2" + sources."temp-dir-1.0.0" sources."tempy-0.3.0" sources."universalify-1.0.0" ]; }) - sources."@expo/metro-config-0.7.1" sources."@expo/package-manager-1.0.3" (sources."@expo/prebuild-config-6.0.1" // { dependencies = [ @@ -70465,21 +67451,51 @@ in ]; }) sources."ansi-regex-5.0.1" + (sources."body-parser-1.20.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."bplist-parser-0.3.2" + sources."bytes-3.1.2" + (sources."debug-4.3.5" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."form-data-3.0.1" sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" + sources."http-errors-2.0.0" + sources."iconv-lite-0.4.24" + sources."mime-1.6.0" + sources."ms-2.1.3" sources."node-forge-1.3.1" (sources."npm-package-arg-7.0.0" // { dependencies = [ sources."semver-5.7.2" ]; }) - sources."regenerator-runtime-0.14.1" + sources."on-finished-2.4.1" + sources."qs-6.11.0" + sources."raw-body-2.5.2" sources."semver-6.3.1" - sources."temp-dir-1.0.0" - sources."type-fest-0.3.1" - sources."universalify-0.1.2" + (sources."send-0.18.0" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + ]; + }) + sources."setprototypeof-1.2.0" + sources."slash-3.0.0" + sources."statuses-2.0.1" + sources."sudo-prompt-9.1.1" + sources."temp-dir-2.0.0" ]; }) (sources."@expo/code-signing-certificates-0.0.5" // { @@ -70489,55 +67505,96 @@ in }) (sources."@expo/config-6.0.24" // { dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@expo/config-types-45.0.0" sources."@expo/json-file-8.2.36" + sources."json5-1.0.2" ]; }) (sources."@expo/config-plugins-4.1.5" // { dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@expo/config-types-45.0.0" sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" sources."@xmldom/xmldom-0.7.13" - sources."semver-7.6.2" + sources."debug-4.3.5" + sources."json5-1.0.2" + sources."ms-2.1.2" + sources."semver-7.6.3" + sources."slash-3.0.0" sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/config-types-45.0.0" - sources."@expo/dev-server-0.2.0" + sources."@expo/config-types-48.0.0" + (sources."@expo/dev-server-0.2.0" // { + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@expo/config-8.0.5" + (sources."@expo/config-plugins-6.0.2" // { + dependencies = [ + sources."semver-7.6.3" + ]; + }) + sources."@expo/metro-config-0.6.0" + sources."body-parser-1.20.2" + sources."bytes-3.1.2" + sources."debug-4.3.5" + sources."depd-2.0.0" + sources."destroy-1.2.0" + sources."http-errors-2.0.0" + sources."iconv-lite-0.4.24" + sources."ms-2.1.2" + sources."on-finished-2.4.1" + sources."qs-6.11.0" + sources."raw-body-2.5.2" + sources."setprototypeof-1.2.0" + sources."slash-3.0.0" + sources."statuses-2.0.1" + sources."temp-dir-2.0.0" + ]; + }) (sources."@expo/devcert-1.1.2" // { dependencies = [ sources."debug-3.2.7" + sources."mkdirp-0.5.6" + sources."ms-2.1.3" sources."rimraf-2.7.1" - sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.21" // { + (sources."@expo/image-utils-0.3.23" // { dependencies = [ - sources."temp-dir-1.0.0" + sources."mime-2.6.0" sources."tempy-0.3.0" - sources."type-fest-0.3.1" ]; }) (sources."@expo/json-file-8.2.37" // { dependencies = [ - sources."json5-2.2.3" + sources."@babel/code-frame-7.10.4" ]; }) - (sources."@expo/metro-config-0.6.0" // { + (sources."@expo/metro-config-0.7.1" // { dependencies = [ + sources."@babel/code-frame-7.10.4" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."@expo/config-types-48.0.0" - sources."semver-7.6.2" + sources."debug-4.3.5" + sources."ms-2.1.2" + sources."semver-7.6.3" + sources."slash-3.0.0" ]; }) sources."@expo/osascript-2.0.33" (sources."@expo/package-manager-0.0.56" // { dependencies = [ + sources."@babel/code-frame-7.10.4" sources."@expo/json-file-8.2.36" sources."ansi-regex-5.0.1" + sources."json5-1.0.2" sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.2" + sources."sudo-prompt-9.1.1" ]; }) (sources."@expo/plist-0.0.20" // { @@ -70548,30 +67605,41 @@ in }) (sources."@expo/prebuild-config-4.0.3" // { dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@expo/config-types-45.0.0" + sources."@expo/image-utils-0.3.21" sources."@expo/json-file-8.2.36" + sources."commander-7.2.0" + sources."debug-4.3.5" + (sources."expo-modules-autolinking-0.8.1" // { + dependencies = [ + sources."fs-extra-9.1.0" + ]; + }) + sources."json5-1.0.2" + sources."jsonfile-6.1.0" + sources."mime-2.6.0" + sources."ms-2.1.2" + sources."tempy-0.3.0" + sources."universalify-2.0.1" ]; }) sources."@expo/rudder-sdk-node-1.1.1" (sources."@expo/schemer-1.4.5" // { dependencies = [ + sources."ajv-8.17.1" + sources."json-schema-traverse-1.0.0" sources."probe-image-size-7.2.3" ]; }) sources."@expo/sdk-runtime-versions-1.0.0" - (sources."@expo/spawn-async-1.5.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."@expo/spawn-async-1.5.0" sources."@expo/vector-icons-13.0.0" sources."@expo/webpack-config-18.1.0" (sources."@expo/xcpretty-4.3.1" // { dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."argparse-2.0.1" sources."js-yaml-4.1.0" ]; }) @@ -70581,6 +67649,7 @@ in sources."@hapi/topo-5.1.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ + sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" sources."strip-ansi-7.1.0" sources."wrap-ansi-8.1.0" @@ -70591,7 +67660,7 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@leichtgewicht/ip-codec-2.0.5" sources."@module-federation/runtime-0.1.6" @@ -70603,24 +67672,23 @@ in sources."@nodelib/fs.walk-1.2.8" (sources."@npmcli/fs-1.1.1" // { dependencies = [ - sources."semver-7.6.2" + sources."semver-7.6.3" ]; }) (sources."@npmcli/move-file-1.1.2" // { dependencies = [ - sources."mkdirp-1.0.4" sources."rimraf-3.0.2" ]; }) sources."@react-native/normalize-color-2.1.0" - sources."@rspack/binding-0.7.3" - sources."@rspack/core-0.7.3" + sources."@rspack/binding-0.7.5" + sources."@rspack/core-0.7.5" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" - sources."@swc/helpers-0.5.11" + sources."@swc/helpers-0.5.12" sources."@szmarczak/http-timer-4.0.6" sources."@trysound/sax-0.2.0" sources."@types/body-parser-1.19.5" @@ -70628,11 +67696,11 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/connect-3.4.38" sources."@types/connect-history-api-fallback-1.5.4" - sources."@types/eslint-8.56.10" + sources."@types/eslint-9.6.0" sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/express-4.17.21" - sources."@types/express-serve-static-core-4.19.3" + sources."@types/express-serve-static-core-4.19.5" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" sources."@types/http-cache-semantics-4.0.4" @@ -70645,7 +67713,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/node-forge-1.3.11" sources."@types/qs-6.9.15" sources."@types/range-parser-1.2.7" @@ -70655,7 +67723,7 @@ in sources."@types/serve-index-1.9.4" sources."@types/serve-static-1.15.7" sources."@types/sockjs-0.3.36" - sources."@types/ws-8.5.10" + sources."@types/ws-8.5.11" sources."@types/yargs-15.0.19" sources."@types/yargs-parser-21.0.3" sources."@urql/core-2.3.6" @@ -70680,18 +67748,23 @@ in sources."@xtuc/long-4.2.2" sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" - sources."agent-base-6.0.2" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) sources."aggregate-error-3.1.0" - sources."ajv-8.16.0" - sources."ajv-formats-2.1.1" - (sources."ajv-keywords-3.5.2" // { + sources."ajv-6.12.6" + (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" + sources."ajv-8.17.1" + sources."json-schema-traverse-1.0.0" ]; }) + sources."ajv-keywords-3.5.2" (sources."ansi-align-3.0.1" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -70704,16 +67777,16 @@ in ]; }) sources."ansi-html-community-0.0.8" - sources."ansi-regex-6.0.1" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."application-config-path-0.1.1" sources."arg-4.1.0" - sources."argparse-2.0.1" + sources."argparse-1.0.10" sources."array-buffer-byte-length-1.0.1" sources."array-flatten-1.1.1" - sources."array-union-2.1.0" + sources."array-union-3.0.1" sources."array-uniq-1.0.3" sources."arraybuffer.prototype.slice-1.0.3" sources."arrify-2.0.1" @@ -70723,8 +67796,16 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.7" sources."axios-0.21.1" - sources."babel-loader-8.3.0" - sources."babel-plugin-module-resolver-4.1.0" + (sources."babel-loader-8.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + (sources."babel-plugin-module-resolver-4.1.0" // { + dependencies = [ + sources."resolve-1.22.8" + ]; + }) (sources."babel-plugin-polyfill-corejs2-0.4.11" // { dependencies = [ sources."semver-6.3.1" @@ -70742,12 +67823,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-2.3.0" sources."blueimp-md5-2.19.0" - (sources."body-parser-1.20.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."body-parser-1.18.3" sources."bonjour-service-1.2.1" sources."boolbase-1.0.0" (sources."boxen-5.1.2" // { @@ -70761,18 +67837,18 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."builtins-1.0.3" - sources."bytes-3.1.2" + sources."bytes-3.0.0" (sources."cacache-15.3.0" // { dependencies = [ sources."lru-cache-6.0.0" - sources."mkdirp-1.0.4" + sources."p-map-4.0.0" sources."rimraf-3.0.2" ]; }) @@ -70783,7 +67859,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -70800,16 +67876,7 @@ in sources."ci-info-3.9.0" sources."clean-css-5.3.3" sources."clean-stack-2.2.0" - (sources."clean-webpack-plugin-4.0.0" // { - dependencies = [ - sources."array-union-1.0.2" - sources."del-4.1.1" - sources."globby-6.1.0" - sources."p-map-2.1.0" - sources."pify-2.3.0" - sources."rimraf-2.7.1" - ]; - }) + sources."clean-webpack-plugin-4.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-spinners-2.9.2" @@ -70832,20 +67899,13 @@ in sources."compare-versions-3.6.0" sources."component-type-1.2.2" 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."compression-1.7.4" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" (sources."connect-3.7.0" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."finalhandler-1.1.2" + sources."statuses-1.5.0" ]; }) sources."connect-history-api-fallback-2.0.0" @@ -70856,29 +67916,34 @@ in sources."cookie-signature-1.0.6" (sources."copy-webpack-plugin-10.2.4" // { dependencies = [ + sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" - sources."array-union-3.0.1" sources."glob-parent-6.0.2" - sources."globby-12.2.0" + sources."json-schema-traverse-1.0.0" sources."schema-utils-4.2.0" - sources."slash-4.0.0" ]; }) sources."core-js-compat-3.37.1" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" - sources."cross-spawn-7.0.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.2" + ]; + }) sources."crypt-0.0.2" sources."crypto-random-string-1.0.0" sources."css-declaration-sorter-6.4.1" (sources."css-loader-6.11.0" // { dependencies = [ - sources."semver-7.6.2" + sources."semver-7.6.3" ]; }) (sources."css-minimizer-webpack-plugin-3.4.1" // { dependencies = [ + sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" + sources."json-schema-traverse-1.0.0" sources."schema-utils-4.2.0" ]; }) @@ -70895,7 +67960,7 @@ in sources."data-view-byte-length-1.0.1" sources."data-view-byte-offset-1.0.0" sources."dateformat-3.0.3" - sources."debug-4.3.5" + sources."debug-2.6.9" sources."decache-4.4.0" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -70910,14 +67975,21 @@ in sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" sources."define-properties-1.2.1" - (sources."del-6.1.1" // { + (sources."del-4.1.1" // { dependencies = [ - sources."rimraf-3.0.2" + sources."array-union-1.0.2" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."p-map-2.1.0" + sources."rimraf-2.7.1" ]; }) sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" sources."detect-node-2.1.0" sources."dir-glob-3.0.1" sources."dns-packet-5.6.1" @@ -70931,7 +68003,7 @@ in sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -70941,14 +68013,14 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.17.0" + sources."enhanced-resolve-5.17.1" sources."entities-2.2.0" sources."env-editor-0.4.2" sources."eol-0.9.1" sources."es-abstract-1.23.3" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" - sources."es-module-lexer-1.5.3" + sources."es-module-lexer-1.5.4" sources."es-object-atoms-1.0.0" sources."es-set-tostringtag-2.0.3" sources."es-to-primitive-1.2.1" @@ -70970,61 +68042,46 @@ in sources."exec-async-2.2.0" (sources."execa-1.0.0" // { dependencies = [ - sources."cross-spawn-6.0.5" sources."get-stream-4.1.0" - sources."is-stream-1.1.0" - 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."expo-48.0.21" // { dependencies = [ - sources."@babel/runtime-7.24.7" - (sources."@expo/config-8.0.5" // { - dependencies = [ - sources."semver-7.3.2" - ]; - }) - (sources."@expo/config-plugins-6.0.2" // { - dependencies = [ - sources."semver-7.6.2" - ]; - }) - sources."@expo/config-types-48.0.0" - sources."commander-7.2.0" - sources."cross-spawn-6.0.5" - sources."expo-modules-autolinking-1.2.0" - sources."fs-extra-9.1.0" - sources."path-key-2.0.1" - sources."regenerator-runtime-0.14.1" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."@babel/code-frame-7.10.4" + sources."@babel/runtime-7.24.8" + sources."@expo/config-8.0.5" + sources."@expo/config-plugins-6.0.2" + sources."debug-4.3.5" + sources."ms-2.1.2" + sources."semver-7.6.3" + sources."slash-3.0.0" sources."uuid-3.4.0" - sources."which-1.3.1" ]; }) sources."expo-application-5.1.1" (sources."expo-asset-8.9.2" // { dependencies = [ + sources."@babel/code-frame-7.10.4" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."@expo/config-types-48.0.0" + sources."debug-4.3.5" sources."expo-constants-14.3.0" sources."expo-file-system-15.3.0" - sources."semver-7.6.2" + sources."ms-2.1.2" + sources."semver-7.6.3" + sources."slash-3.0.0" sources."uuid-3.4.0" ]; }) (sources."expo-constants-14.2.1" // { dependencies = [ + sources."@babel/code-frame-7.10.4" sources."@expo/config-8.0.5" sources."@expo/config-plugins-6.0.2" - sources."@expo/config-types-48.0.0" - sources."semver-7.6.2" + sources."debug-4.3.5" + sources."ms-2.1.2" + sources."semver-7.6.3" + sources."slash-3.0.0" sources."uuid-3.4.0" ]; }) @@ -71035,47 +68092,25 @@ in }) sources."expo-font-11.1.1" sources."expo-keep-awake-12.0.1" - (sources."expo-modules-autolinking-0.8.1" // { + (sources."expo-modules-autolinking-1.2.0" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" + sources."jsonfile-6.1.0" + sources."universalify-2.0.1" ]; }) sources."expo-modules-core-1.2.7" (sources."expo-pwa-0.0.125" // { dependencies = [ - sources."@expo/image-utils-0.3.23" sources."commander-2.20.0" - sources."temp-dir-1.0.0" - sources."tempy-0.3.0" - sources."type-fest-0.3.1" - ]; - }) - (sources."express-4.16.4" // { - dependencies = [ - sources."body-parser-1.18.3" - sources."bytes-3.0.0" - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."finalhandler-1.1.1" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.23" - sources."inherits-2.0.3" - sources."mime-1.4.1" - sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."qs-6.5.2" - sources."raw-body-2.3.3" - sources."safe-buffer-5.1.2" - sources."send-0.16.2" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" ]; }) + sources."express-4.16.4" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" + sources."fast-uri-3.0.1" sources."fastq-1.17.1" sources."faye-websocket-0.11.4" sources."fbemitter-3.0.0" @@ -71083,28 +68118,33 @@ in sources."fbjs-css-vars-1.0.2" sources."fetch-retry-4.1.1" sources."fill-range-7.1.1" - (sources."finalhandler-1.1.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."statuses-1.5.0" - ]; - }) + sources."finalhandler-1.1.1" (sources."find-babel-config-1.2.2" // { dependencies = [ + sources."json5-1.0.2" sources."path-exists-3.0.0" ]; }) sources."find-cache-dir-3.3.2" - sources."find-up-5.0.0" + (sources."find-up-5.0.0" // { + dependencies = [ + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) sources."find-yarn-workspace-root-2.0.0" sources."follow-redirects-1.15.6" sources."fontfaceobserver-2.3.0" sources."for-each-0.3.3" - (sources."foreground-child-3.2.0" // { + (sources."foreground-child-3.2.1" // { dependencies = [ + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" + sources."which-2.0.2" ]; }) sources."form-data-2.5.1" @@ -71113,6 +68153,11 @@ in sources."fresh-0.5.2" (sources."fs-extra-9.0.0" // { dependencies = [ + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.1" + ]; + }) sources."universalify-1.0.0" ]; }) @@ -71133,7 +68178,7 @@ in sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" sources."globalthis-1.0.4" - sources."globby-11.1.0" + sources."globby-12.2.0" sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.11" @@ -71166,14 +68211,23 @@ in sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-deceiver-1.2.7" - sources."http-errors-2.0.0" + (sources."http-errors-1.6.3" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.6" sources."http2-wrapper-1.0.3" - sources."https-proxy-agent-5.0.1" + (sources."https-proxy-agent-5.0.1" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.4.23" sources."icss-utils-5.1.0" sources."ignore-5.3.1" sources."imurmurhash-0.1.4" @@ -71193,7 +68247,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-data-view-1.0.1" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" @@ -71210,12 +68264,8 @@ in sources."is-number-7.0.0" sources."is-number-object-1.0.7" sources."is-path-cwd-2.2.0" - (sources."is-path-in-cwd-2.1.0" // { - dependencies = [ - sources."is-path-inside-2.1.0" - ]; - }) - sources."is-path-inside-3.0.3" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" sources."is-plain-obj-3.0.0" sources."is-port-reachable-2.0.1" (sources."is-reachable-4.0.0" // { @@ -71244,7 +68294,7 @@ in sources."is-regex-1.1.4" sources."is-root-2.1.0" sources."is-shared-array-buffer-1.0.3" - sources."is-stream-2.0.1" + sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.13" @@ -71253,7 +68303,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" (sources."jest-worker-27.5.1" // { dependencies = [ sources."has-flag-4.0.0" @@ -71261,14 +68311,10 @@ in ]; }) sources."jimp-compact-0.16.1" - sources."joi-17.13.1" + sources."joi-17.13.3" sources."join-component-1.1.0" sources."js-tokens-4.0.0" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."argparse-1.0.10" - ]; - }) + sources."js-yaml-3.14.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" @@ -71278,24 +68324,20 @@ in sources."md5-2.2.1" ]; }) - sources."json-schema-traverse-1.0.0" - sources."json5-1.0.2" - sources."jsonfile-6.1.0" + sources."json-schema-traverse-0.4.1" + sources."json5-2.2.3" + sources."jsonfile-4.0.0" sources."keychain-1.3.0" sources."keyv-4.5.4" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."launch-editor-2.6.1" + sources."launch-editor-2.8.0" sources."leven-3.1.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."loader-runner-4.3.0" - (sources."loader-utils-2.0.4" // { - dependencies = [ - sources."json5-2.2.3" - ]; - }) - sources."locate-path-6.0.0" + sources."loader-utils-2.0.4" + sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.memoize-4.1.2" @@ -71309,7 +68351,11 @@ in sources."loose-envify-1.4.0" sources."lower-case-2.0.2" sources."lowercase-keys-2.0.0" - sources."lru-cache-10.2.2" + (sources."lru-cache-5.1.1" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -71328,35 +68374,42 @@ in sources."methods-1.1.2" sources."metro-react-native-babel-preset-0.73.9" sources."micromatch-4.0.7" - sources."mime-2.6.0" + sources."mime-1.4.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" (sources."mini-css-extract-plugin-2.9.0" // { dependencies = [ + sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" + sources."json-schema-traverse-1.0.0" sources."schema-utils-4.2.0" ]; }) sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-3.0.4" sources."minimist-1.2.8" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minizlib-2.1.2" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" + sources."mkdirp-1.0.4" + sources."ms-2.0.0" sources."multicast-dns-7.2.5" - sources."mv-2.1.1" + (sources."mv-2.1.1" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) sources."mz-2.7.0" sources."nanoid-3.3.7" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" + sources."ms-2.1.3" ]; }) sources."negotiator-0.6.3" @@ -71368,7 +68421,7 @@ in sources."node-forge-0.10.0" sources."node-gyp-build-4.8.1" sources."node-html-parser-5.4.2" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" (sources."npm-package-arg-6.1.0" // { @@ -71377,26 +68430,21 @@ in sources."semver-5.7.2" ]; }) - (sources."npm-run-path-2.0.2" // { - dependencies = [ - sources."path-key-2.0.1" - ]; - }) + sources."npm-run-path-2.0.2" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" sources."object-assign-4.1.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."obuf-1.1.2" - sources."on-finished-2.4.1" + sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-8.4.2" (sources."ora-3.4.0" // { dependencies = [ - sources."ansi-regex-4.1.1" sources."chalk-2.4.2" sources."strip-ansi-5.2.0" ]; @@ -71404,16 +68452,12 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."p-any-2.1.0" // { - dependencies = [ - sources."type-fest-0.3.1" - ]; - }) + sources."p-any-2.1.0" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-3.0.0" sources."p-retry-4.1.0" sources."p-some-4.1.0" sources."p-timeout-3.1.0" @@ -71437,25 +68481,33 @@ in sources."lowercase-keys-1.0.1" sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" - sources."registry-auth-token-3.4.0" - sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."semver-6.3.1" ]; }) + sources."package-json-from-dist-1.0.0" sources."param-case-3.0.4" sources."parse-png-2.1.0" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - sources."password-prompt-1.1.3" + (sources."password-prompt-1.1.3" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."path-browserify-1.0.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-key-3.1.1" + sources."path-key-2.0.1" sources."path-parse-1.0.7" (sources."path-scurry-1.11.1" // { dependencies = [ + sources."lru-cache-10.4.3" sources."minipass-7.1.2" ]; }) @@ -71470,16 +68522,12 @@ in (sources."pkg-dir-4.2.0" // { dependencies = [ sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" ]; }) (sources."pkg-up-3.1.0" // { dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" ]; @@ -71487,7 +68535,7 @@ in sources."plist-3.1.0" sources."pngjs-3.4.0" sources."possible-typed-array-names-1.0.0" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.1" sources."postcss-convert-values-5.1.3" @@ -71517,7 +68565,7 @@ in sources."postcss-ordered-values-5.1.3" sources."postcss-reduce-initial-5.1.2" sources."postcss-reduce-transforms-5.1.0" - sources."postcss-selector-parser-6.1.0" + sources."postcss-selector-parser-6.1.1" sources."postcss-svgo-5.1.0" sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" @@ -71542,32 +68590,28 @@ in sources."pump-3.0.0" sources."punycode-2.3.1" sources."qrcode-terminal-0.11.0" - sources."qs-6.11.0" + sources."qs-6.5.2" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.2" + sources."raw-body-2.3.3" sources."rc-1.2.8" sources."react-is-17.0.2" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-2.3.8" sources."readdirp-3.6.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.1" - sources."regenerator-runtime-0.13.11" + sources."regenerator-runtime-0.14.1" sources."regenerator-transform-0.15.2" sources."regexp.prototype.flags-1.5.2" sources."regexpu-core-5.3.2" - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" + sources."registry-auth-token-3.4.0" + sources."registry-url-5.1.0" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -71577,14 +68621,10 @@ in sources."remove-trailing-slash-0.1.1" sources."renderkid-3.0.0" sources."require-from-string-2.0.2" - (sources."requireg-0.2.2" // { - dependencies = [ - sources."resolve-1.7.1" - ]; - }) + sources."requireg-0.2.2" sources."requires-port-1.0.0" sources."reselect-4.1.8" - sources."resolve-1.22.8" + sources."resolve-1.7.1" sources."resolve-alpn-1.2.1" sources."resolve-from-5.0.0" sources."responselike-2.0.1" @@ -71603,17 +68643,12 @@ in sources."isarray-2.0.5" ]; }) - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" sources."sax-1.4.1" - (sources."schema-utils-2.7.1" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."schema-utils-3.3.0" sources."select-hose-2.0.0" (sources."selfsigned-2.4.1" // { dependencies = [ @@ -71621,51 +68656,21 @@ in ]; }) sources."semver-7.3.2" - (sources."send-0.18.0" // { + sources."send-0.16.2" + (sources."serialize-error-6.0.0" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."mime-1.6.0" - sources."ms-2.1.3" + sources."type-fest-0.12.0" ]; }) - sources."serialize-error-6.0.0" sources."serialize-javascript-6.0.2" - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."ms-2.0.0" - sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" - ]; - }) - (sources."serve-static-1.13.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."mime-1.4.1" - sources."ms-2.0.0" - sources."on-finished-2.3.0" - sources."send-0.16.2" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - ]; - }) + sources."serve-index-1.9.1" + sources."serve-static-1.13.2" sources."set-function-length-1.2.2" sources."set-function-name-2.0.2" sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.8.1" sources."side-channel-1.0.6" sources."signal-exit-3.0.7" @@ -71675,7 +68680,7 @@ in ]; }) sources."sisteransi-1.0.5" - sources."slash-3.0.0" + sources."slash-4.0.0" sources."slugify-1.6.6" sources."sockjs-0.3.24" sources."source-list-map-2.0.1" @@ -71691,9 +68696,16 @@ in sources."source-map-0.5.7" ]; }) - sources."spdy-4.0.2" + (sources."spdy-4.0.2" // { + dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" + ]; + }) (sources."spdy-transport-3.0.0" // { dependencies = [ + sources."debug-4.3.5" + sources."ms-2.1.2" sources."readable-stream-3.6.2" ]; }) @@ -71701,16 +68713,12 @@ in sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stable-0.1.8" - sources."statuses-2.0.1" + sources."statuses-1.4.0" sources."stream-buffers-2.2.0" - (sources."stream-parser-0.3.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."stream-parser-0.3.1" (sources."string-width-5.1.2" // { dependencies = [ + sources."ansi-regex-6.0.1" sources."strip-ansi-7.1.0" ]; }) @@ -71722,11 +68730,7 @@ in sources."string.prototype.trim-1.2.9" sources."string.prototype.trimend-1.0.8" sources."string.prototype.trimstart-1.0.8" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.1" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -71747,12 +68751,12 @@ in dependencies = [ sources."brace-expansion-2.0.1" sources."commander-4.1.1" - sources."glob-10.4.1" - sources."minimatch-9.0.4" + sources."glob-10.4.5" + sources."minimatch-9.0.5" sources."minipass-7.1.2" ]; }) - sources."sudo-prompt-9.1.1" + sources."sudo-prompt-8.2.5" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.3.0" // { dependencies = [ @@ -71770,31 +68774,33 @@ in (sources."tar-6.2.1" // { dependencies = [ sources."minipass-5.0.0" - sources."mkdirp-1.0.4" ]; }) - sources."temp-dir-2.0.0" + sources."temp-dir-1.0.0" (sources."tempy-0.7.1" // { dependencies = [ + sources."array-union-2.1.0" sources."crypto-random-string-2.0.0" + sources."del-6.1.1" + sources."globby-11.1.0" + sources."is-path-inside-3.0.3" + sources."is-stream-2.0.1" + sources."p-map-4.0.0" + sources."rimraf-3.0.2" + sources."slash-3.0.0" + sources."temp-dir-2.0.0" sources."type-fest-0.16.0" sources."unique-string-2.0.0" ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.31.1" // { + (sources."terser-5.31.3" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" ]; }) - (sources."terser-webpack-plugin-5.3.10" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.3.0" - ]; - }) + sources."terser-webpack-plugin-5.3.10" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -71811,7 +68817,7 @@ in sources."ts-interface-checker-0.1.13" sources."tslib-2.6.3" sources."turndown-7.0.0" - sources."type-fest-0.12.0" + sources."type-fest-0.3.1" sources."type-is-1.6.18" sources."typed-array-buffer-1.0.2" sources."typed-array-byte-length-1.0.1" @@ -71829,11 +68835,16 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - sources."universalify-2.0.1" + sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."untildify-3.0.3" - sources."update-browserslist-db-1.0.16" - sources."update-check-1.5.3" + sources."update-browserslist-db-1.1.0" + (sources."update-check-1.5.3" // { + dependencies = [ + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + ]; + }) sources."uri-js-4.4.1" sources."url-join-4.0.0" sources."url-parse-1.5.10" @@ -71854,41 +68865,58 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.92.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.3.0" - ]; - }) + sources."webpack-5.93.0" (sources."webpack-dev-middleware-5.3.4" // { dependencies = [ + sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" + sources."json-schema-traverse-1.0.0" sources."schema-utils-4.2.0" ]; }) (sources."webpack-dev-server-4.15.2" // { dependencies = [ sources."@types/retry-0.12.0" + sources."ajv-8.17.1" sources."ajv-keywords-5.1.0" + sources."body-parser-1.20.2" + sources."bytes-3.1.2" sources."content-disposition-0.5.4" sources."cookie-0.6.0" - sources."debug-2.6.9" + sources."cross-spawn-7.0.3" sources."default-gateway-6.0.3" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."execa-5.1.1" sources."express-4.19.2" sources."finalhandler-1.2.0" sources."get-stream-6.0.1" + sources."http-errors-2.0.0" + sources."iconv-lite-0.4.24" sources."ipaddr.js-2.2.0" + sources."is-stream-2.0.1" + sources."json-schema-traverse-1.0.0" + sources."mime-1.6.0" sources."mimic-fn-2.1.0" - sources."ms-2.0.0" + sources."ms-2.1.3" sources."npm-run-path-4.0.1" + sources."on-finished-2.4.1" sources."onetime-5.1.2" sources."p-retry-4.6.2" + sources."path-key-3.1.1" + sources."qs-6.11.0" + sources."raw-body-2.5.2" sources."retry-0.13.1" sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" sources."schema-utils-4.2.0" + sources."send-0.18.0" sources."serve-static-1.15.0" + sources."setprototypeof-1.2.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."statuses-2.0.1" + sources."which-2.0.2" ]; }) (sources."webpack-manifest-plugin-4.1.1" // { @@ -71900,7 +68928,7 @@ in sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."whatwg-url-5.0.0" - sources."which-2.0.2" + sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-typed-array-1.1.15" (sources."widest-line-3.1.0" // { @@ -71931,7 +68959,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-8.17.0" + sources."ws-8.18.0" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" @@ -71940,8 +68968,6 @@ in (sources."xdl-60.0.10" // { dependencies = [ sources."bplist-parser-0.3.2" - sources."minimatch-3.0.4" - sources."p-map-3.0.0" ]; }) (sources."xml2js-0.4.23" // { @@ -71983,13 +69009,9 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."@puppeteer/browsers-2.2.3" // { - dependencies = [ - sources."debug-4.3.4" - ]; - }) + sources."@puppeteer/browsers-2.3.0" sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/prop-types-15.7.12" sources."@types/react-18.3.3" sources."@types/yauzl-2.10.3" @@ -72008,7 +69030,7 @@ in sources."bufferutil-4.0.8" sources."callsites-3.1.0" sources."chalk-5.3.0" - sources."chromium-bidi-0.5.23" + sources."chromium-bidi-0.6.2" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.2" @@ -72039,7 +69061,7 @@ in sources."data-uri-to-buffer-6.0.2" sources."debug-4.3.5" sources."degenerator-5.0.1" - sources."devtools-protocol-0.0.1299070" + sources."devtools-protocol-0.0.1312386" sources."emoji-regex-10.3.0" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" @@ -72062,7 +69084,7 @@ in sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" + sources."https-proxy-agent-7.0.5" sources."ieee754-1.2.1" sources."import-fresh-3.3.0" sources."indent-string-5.0.0" @@ -72089,7 +69111,7 @@ in sources."node-gyp-build-4.8.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."pac-proxy-agent-7.0.1" + sources."pac-proxy-agent-7.0.2" sources."pac-resolver-7.0.1" sources."parent-module-1.0.1" sources."parse-json-5.2.0" @@ -72100,14 +69122,14 @@ in sources."proxy-agent-6.4.0" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-22.11.0" - sources."puppeteer-core-22.11.0" + sources."puppeteer-22.14.0" + sources."puppeteer-core-22.14.0" sources."queue-tick-1.0.1" sources."react-18.3.1" (sources."react-devtools-core-4.28.5" // { dependencies = [ sources."utf-8-validate-5.0.10" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) sources."react-reconciler-0.29.2" @@ -72115,11 +69137,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-4.0.0" sources."scheduler-0.23.2" - (sources."semver-7.6.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) + sources."semver-7.6.3" sources."shell-quote-1.8.1" sources."signal-exit-3.0.7" (sources."slice-ansi-7.1.0" // { @@ -72129,21 +69147,21 @@ in }) sources."smart-buffer-4.2.0" sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.3" + sources."socks-proxy-agent-8.0.4" sources."source-map-0.6.1" sources."sprintf-js-1.1.3" sources."stack-utils-2.0.6" sources."streamx-2.18.0" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."strip-ansi-7.1.0" sources."supports-color-5.5.0" - sources."tar-fs-3.0.5" + sources."tar-fs-3.0.6" sources."tar-stream-3.1.7" - sources."text-decoder-1.1.0" + sources."text-decoder-1.1.1" sources."through-2.3.8" sources."tslib-2.6.3" - sources."type-fest-4.20.0" - sources."typescript-5.4.5" + sources."type-fest-4.23.0" + sources."typescript-5.5.4" sources."unbzip2-stream-1.4.3" sources."undici-types-5.26.5" sources."unicorn-magic-0.2.0" @@ -72153,9 +69171,8 @@ in sources."widest-line-5.0.0" sources."wrap-ansi-9.0.0" sources."wrappy-1.0.2" - sources."ws-8.17.0" + sources."ws-8.18.0" sources."y18n-5.0.8" - sources."yallist-4.0.0" (sources."yargs-17.7.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -72183,10 +69200,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.3.0.tgz"; - sha512 = "V3z3HudBRv8dsLgvyZIpj7AlUstu3n0uztAtYWblLMwbld1/7Az/1AIpWZRlweZJd8XkaCPbL10xXy/DeAqbqw=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.3.1.tgz"; + sha512 = "ILJSsLuUers5JpuYvtW6cNUF/AJ9Tay73wnsfA5dPjktt/hs0KCafK1pZ3ZC2ICiXe7SorcS9Pqlni5njqHkcg=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -72200,9 +69217,9 @@ in sources."@inquirer/prompts-3.3.2" sources."@inquirer/rawlist-1.2.16" sources."@inquirer/select-1.3.3" - sources."@inquirer/type-1.3.3" + sources."@inquirer/type-1.5.1" sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -72225,20 +69242,20 @@ in sources."@oclif/plugin-help-5.2.20" sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.5" + sources."@types/cli-progress-3.11.6" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/wrap-ansi-3.0.0" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -72391,7 +69408,7 @@ in sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."jake-10.9.1" + sources."jake-10.9.2" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.1.0" @@ -72451,7 +69468,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -72481,7 +69498,7 @@ in sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."universalify-2.0.1" sources."util-deprecate-1.0.2" @@ -72516,8 +69533,7 @@ in sha512 = "+eT/06NHwPXfzUSe4vDjjam9gZtalhwDYOq0xX6va88BLZd8APbo17Ajkz4hdnr2Gpls5+xFUqMeiklAQtBHYQ=="; }; dependencies = [ - sources."@inquirer/figures-1.0.3" - sources."@ljharb/through-2.3.13" + sources."@inquirer/figures-1.0.5" sources."aggregate-error-5.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" @@ -72525,7 +69541,6 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."call-bind-1.0.7" sources."chalk-5.3.0" sources."chardet-0.7.0" sources."clean-stack-5.2.0" @@ -72538,10 +69553,7 @@ in sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."defaults-1.0.4" - sources."define-data-property-1.1.4" sources."emoji-regex-10.3.0" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" sources."esc-exit-3.0.1" sources."escape-string-regexp-5.0.0" sources."execa-8.0.1" @@ -72552,23 +69564,16 @@ in ]; }) sources."fkill-9.0.0" - sources."function-bind-1.1.2" sources."fuzzy-search-3.2.1" sources."get-east-asian-width-1.2.0" - sources."get-intrinsic-1.2.4" sources."get-stream-8.0.1" - sources."gopd-1.0.1" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" sources."human-signals-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-9.2.23" // { + (sources."inquirer-9.3.6" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -72588,7 +69593,6 @@ in sources."is-stream-3.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."lodash-4.17.21" (sources."log-symbols-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72632,12 +69636,11 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."slice-ansi-5.0.0" - sources."string-width-7.1.0" + sources."string-width-7.2.0" sources."string_decoder-1.3.0" sources."strip-ansi-7.1.0" sources."strip-final-newline-3.0.0" @@ -72666,6 +69669,7 @@ in sources."strip-ansi-6.0.1" ]; }) + sources."yoctocolors-cjs-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -72688,14 +69692,14 @@ in dependencies = [ sources."@ethereumjs/rlp-4.0.1" sources."@ethereumjs/util-8.1.0" - sources."@noble/curves-1.4.0" + sources."@noble/curves-1.4.2" sources."@noble/hashes-1.4.0" sources."@scure/base-1.1.7" sources."@scure/bip32-1.4.0" sources."@scure/bip39-1.3.0" sources."@types/atob-2.1.4" sources."@types/inquirer-6.5.0" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -72741,7 +69745,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."ethereum-bloom-filters-1.1.0" - sources."ethereum-cryptography-2.2.0" + sources."ethereum-cryptography-2.2.1" (sources."ethjs-unit-0.1.6" // { dependencies = [ sources."bn.js-4.11.6" @@ -73077,7 +70081,7 @@ in sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."lazy-1.0.11" - sources."logform-2.6.0" + sources."logform-2.6.1" sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" @@ -73111,7 +70115,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-is-1.1.6" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -73252,12 +70256,12 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.2" sources."which-typed-array-1.1.15" - (sources."winston-3.13.0" // { + (sources."winston-3.13.1" // { dependencies = [ sources."async-3.2.5" ]; }) - sources."winston-transport-4.7.0" + sources."winston-transport-4.7.1" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" @@ -73276,10 +70280,10 @@ in fx = nodeEnv.buildNodePackage { name = "fx"; packageName = "fx"; - version = "34.0.0"; + version = "35.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fx/-/fx-34.0.0.tgz"; - sha512 = "/fZih3/WLsrtlaj2mahjWxAmyuikmcl3D5kKPqLtFmEilLsy9wp0+/vEmfvYXXhwJc+ajtCFDCf+yttXmPMHSQ=="; + url = "https://registry.npmjs.org/fx/-/fx-35.0.0.tgz"; + sha512 = "O07q+Lknrom5RUX/u53tjo2KTTLUnL0K703JbqMYb19ORijfJNvijzFqqYXEjdk25T9R14S6t6wHD8fCWXCM0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -73308,7 +70312,7 @@ in }) sources."@types/bn.js-5.1.5" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -73357,20 +70361,20 @@ in dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { + sources."@babel/compat-data-7.24.9" + (sources."@babel/core-7.24.9" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.7" + sources."@babel/generator-7.24.10" sources."@babel/helper-annotate-as-pure-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { + (sources."@babel/helper-compilation-targets-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; }) - (sources."@babel/helper-create-class-features-plugin-7.24.7" // { + (sources."@babel/helper-create-class-features-plugin-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; @@ -73378,40 +70382,40 @@ in sources."@babel/helper-environment-visitor-7.24.7" sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" - sources."@babel/helper-member-expression-to-functions-7.24.7" + sources."@babel/helper-member-expression-to-functions-7.24.8" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" sources."@babel/helper-optimise-call-expression-7.24.7" - sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-plugin-utils-7.24.8" sources."@babel/helper-replace-supers-7.24.7" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helpers-7.24.8" (sources."@babel/highlight-7.24.7" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/plugin-syntax-jsx-7.24.7" sources."@babel/plugin-syntax-typescript-7.24.7" - sources."@babel/plugin-transform-modules-commonjs-7.24.7" - sources."@babel/plugin-transform-typescript-7.24.7" + sources."@babel/plugin-transform-modules-commonjs-7.24.8" + sources."@babel/plugin-transform-typescript-7.24.8" sources."@babel/preset-typescript-7.24.7" - sources."@babel/runtime-7.24.7" + sources."@babel/runtime-7.24.8" sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/traverse-7.24.8" + sources."@babel/types-7.24.9" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@lmdb/lmdb-darwin-arm64-2.5.3" sources."@lmdb/lmdb-darwin-x64-2.5.3" @@ -73431,7 +70435,7 @@ in sources."@types/common-tags-1.8.4" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/node-fetch-2.6.11" sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" @@ -73447,7 +70451,7 @@ in sources."better-opn-2.1.1" sources."boolbase-1.0.0" sources."boxen-5.1.2" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.4" // { dependencies = [ @@ -73455,7 +70459,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73513,7 +70517,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -73591,7 +70595,7 @@ in sources."is-wsl-2.2.0" sources."is64bit-2.0.0" sources."isexe-2.0.0" - sources."joi-17.13.1" + sources."joi-17.13.3" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" @@ -73616,13 +70620,13 @@ in sources."mimic-fn-4.0.0" sources."mimic-response-1.0.1" sources."ms-2.1.2" - sources."msgpackr-1.10.2" + sources."msgpackr-1.11.0" sources."mute-stream-0.0.8" sources."node-addon-api-4.3.0" sources."node-fetch-2.7.0" sources."node-gyp-build-optional-packages-5.0.3" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-url-6.1.0" (sources."npm-run-path-5.3.0" // { dependencies = [ @@ -73681,7 +70685,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -73710,7 +70714,7 @@ in sources."undici-types-5.26.5" sources."unique-string-2.0.0" sources."universalify-2.0.1" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."weak-lru-cache-1.2.2" @@ -73759,15 +70763,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "40.0.3"; + version = "40.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-40.0.3.tgz"; - sha512 = "1zR4KJ2Pv5nWwxt/5UvCmw8Z2u75fR+BbclTQ/esxMGhQCCtpuu/oWD96MkBaDqZoQqHHTTJOBZk3OCpa2CPdg=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-40.1.2.tgz"; + sha512 = "jCpOPJaPTDLkQ85KraJOQHHmcBZkIY7p1vsrfhBOQK8hzt8JGR9SmcbsnK13tMWdCnu54XtSsLXiQXslNL77yA=="; }; dependencies = [ - sources."@gitbeaker/core-40.0.3" - sources."@gitbeaker/requester-utils-40.0.3" - sources."@gitbeaker/rest-40.0.3" + sources."@gitbeaker/core-40.1.2" + sources."@gitbeaker/requester-utils-40.1.2" + sources."@gitbeaker/rest-40.1.2" sources."ansi-styles-4.3.0" sources."call-bind-1.0.7" sources."chalk-4.1.2" @@ -73784,9 +70788,9 @@ in sources."has-proto-1.0.3" sources."has-symbols-1.0.3" sources."hasown-2.0.2" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."picomatch-browser-2.2.6" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."rate-limiter-flexible-4.0.1" sources."set-function-length-1.2.2" sources."side-channel-1.0.6" @@ -73804,57 +70808,13 @@ in bypassCache = true; reconstructLock = true; }; - grammarly-languageserver = nodeEnv.buildNodePackage { - name = "grammarly-languageserver"; - packageName = "grammarly-languageserver"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/grammarly-languageserver/-/grammarly-languageserver-0.0.4.tgz"; - sha512 = "+PbI/pMgAeoa0jbFI65JWRj3RjomHjvigrKZybXCYM3jlvTDKUyg7NWPug554ukKLaGIURQ1YGOptmfrYOMzQw=="; - }; - dependencies = [ - sources."@grammarly/sdk-1.11.0" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."encoding-0.1.13" - sources."entities-4.5.0" - sources."grammarly-richtext-encoder-0.0.0" - sources."htmlparser2-8.0.2" - sources."iconv-lite-0.6.3" - sources."idb-keyval-6.2.1" - sources."inversify-6.0.2" - sources."node-fetch-2.7.0" - sources."reflect-metadata-0.1.14" - sources."safer-buffer-2.1.2" - sources."tr46-0.0.3" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.16.0" - sources."web-tree-sitter-0.20.5" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "LSP server implementation for Grammarly"; - homepage = "https://github.com/znck/grammarly#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; graphql = nodeEnv.buildNodePackage { name = "graphql"; packageName = "graphql"; - version = "16.8.2"; + version = "16.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz"; - sha512 = "cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg=="; + url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz"; + sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw=="; }; buildInputs = globalBuildInputs; meta = { @@ -73899,6 +70859,7 @@ in sources."cross-fetch-3.0.6" sources."graphql-15.3.0" sources."has-flag-4.0.0" + sources."node-fetch-2.6.1" sources."supports-color-7.2.0" sources."tslib-2.0.2" ]; @@ -73996,7 +70957,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -74072,7 +71033,11 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."cross-fetch-3.1.4" + (sources."cross-fetch-3.1.4" // { + dependencies = [ + sources."node-fetch-2.6.1" + ]; + }) sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."dataloader-2.0.0" @@ -74089,6 +71054,7 @@ in sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."es-define-property-1.0.0" @@ -74104,6 +71070,7 @@ in sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ + sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) @@ -74146,7 +71113,7 @@ in ]; }) sources."graceful-fs-4.2.11" - sources."graphql-15.8.0" + sources."graphql-15.9.0" sources."graphql-config-3.0.3" sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" @@ -74163,7 +71130,7 @@ in sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-client-1.3.5" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.3.1" (sources."import-fresh-3.3.0" // { @@ -74265,7 +71232,7 @@ in sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-emoji-1.10.0" - sources."node-fetch-2.6.1" + sources."node-fetch-2.7.0" sources."node-fetch-h2-2.3.0" sources."node-gyp-build-4.8.1" sources."node-readfiles-0.2.0" @@ -74284,7 +71251,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."oauth-sign-0.9.0" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-is-1.1.6" sources."object-keys-1.1.1" sources."object.assign-4.1.5" @@ -74398,6 +71365,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -74413,6 +71381,8 @@ in sources."value-or-promise-1.0.11" sources."verror-1.10.0" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.2" @@ -74440,20 +71410,20 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.4.0.tgz"; - sha512 = "2bNbTYHwggYp/VwnmBzq2UQjoqwnIiBE8nE4M6ikC/0AX7hzNlz7uoBbQ0guFIrJ8Z6fyA0PjU28YGs5g5TMvw=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.4.1.tgz"; + sha512 = "bWnSJ6ibIAS8h2rR7DV+12FxoVPeJbcR9Du/WHGXMIj0eDwartZPX9NaXmlX6wInSdjjQm6BWdQt1dsim8Eu+w=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@ardatan/sync-fetch-0.0.1" - sources."@astrojs/compiler-2.8.0" + sources."@astrojs/compiler-2.9.2" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - sources."@babel/core-7.24.7" - sources."@babel/generator-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { + sources."@babel/compat-data-7.24.9" + sources."@babel/core-7.24.9" + sources."@babel/generator-7.24.10" + (sources."@babel/helper-compilation-targets-7.24.8" // { dependencies = [ sources."lru-cache-5.1.1" ]; @@ -74462,28 +71432,28 @@ in sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" - sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-plugin-utils-7.24.8" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helpers-7.24.8" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/plugin-syntax-import-assertions-7.24.7" sources."@babel/polyfill-7.12.1" sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/traverse-7.24.8" + sources."@babel/types-7.24.9" sources."@graphql-tools/batch-execute-9.0.4" sources."@graphql-tools/code-file-loader-8.0.3" - sources."@graphql-tools/delegate-10.0.11" - sources."@graphql-tools/executor-1.2.6" - sources."@graphql-tools/executor-graphql-ws-1.1.2" - sources."@graphql-tools/executor-http-1.0.9" - sources."@graphql-tools/executor-legacy-ws-1.0.6" + sources."@graphql-tools/delegate-10.0.16" + sources."@graphql-tools/executor-1.3.0" + sources."@graphql-tools/executor-graphql-ws-1.2.0" + sources."@graphql-tools/executor-http-1.1.5" + sources."@graphql-tools/executor-legacy-ws-1.1.0" sources."@graphql-tools/graphql-file-loader-8.0.1" sources."@graphql-tools/graphql-tag-pluck-8.1.0" sources."@graphql-tools/import-7.0.1" @@ -74492,14 +71462,14 @@ in sources."@graphql-tools/merge-9.0.4" sources."@graphql-tools/schema-10.0.4" sources."@graphql-tools/url-loader-8.0.2" - sources."@graphql-tools/utils-10.2.2" + sources."@graphql-tools/utils-10.3.2" sources."@graphql-tools/wrap-10.0.5" sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@kamilkisiela/fast-url-parser-1.1.4" sources."@nodelib/fs.scandir-2.1.5" @@ -74508,51 +71478,55 @@ in sources."@pkgr/core-0.1.1" sources."@repeaterjs/repeater-3.0.6" sources."@types/estree-1.0.5" - sources."@types/node-20.14.2" - sources."@types/ws-8.5.10" + sources."@types/node-20.14.12" + sources."@types/ws-8.5.11" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.3" - (sources."@vue/compiler-core-3.4.29" // { + (sources."@vue/compiler-core-3.4.34" // { dependencies = [ + sources."estree-walker-2.0.2" sources."source-map-js-1.2.0" ]; }) - sources."@vue/compiler-dom-3.4.29" - (sources."@vue/compiler-sfc-3.4.29" // { + sources."@vue/compiler-dom-3.4.34" + (sources."@vue/compiler-sfc-3.4.34" // { dependencies = [ + sources."estree-walker-2.0.2" sources."source-map-js-1.2.0" ]; }) - sources."@vue/compiler-ssr-3.4.29" - sources."@vue/shared-3.4.29" + sources."@vue/compiler-ssr-3.4.34" + sources."@vue/shared-3.4.34" sources."@whatwg-node/events-0.1.1" sources."@whatwg-node/fetch-0.9.18" - sources."@whatwg-node/node-fetch-0.5.11" - sources."acorn-8.12.0" + sources."@whatwg-node/node-fetch-0.5.14" + sources."acorn-8.12.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."argparse-2.0.1" sources."aria-query-5.3.0" sources."array-union-2.1.0" sources."astrojs-compiler-sync-1.0.0" - sources."axobject-query-4.0.0" + sources."axobject-query-4.1.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001634" - sources."chalk-2.4.2" - sources."cliui-7.0.4" - (sources."code-red-1.0.4" // { + sources."caniuse-lite-1.0.30001643" + (sources."chalk-2.4.2" // { dependencies = [ - sources."estree-walker-3.0.3" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" ]; }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."cliui-7.0.4" + sources."code-red-1.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."core-js-2.6.12" @@ -74567,14 +71541,14 @@ in sources."dir-glob-3.0.1" sources."dotenv-10.0.0" sources."dset-3.1.3" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" - sources."estree-walker-2.0.2" + sources."estree-walker-3.0.3" sources."extract-files-11.0.0" sources."fast-decode-uri-component-1.0.1" sources."fast-glob-3.3.2" @@ -74588,14 +71562,14 @@ in sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."globby-11.1.0" - sources."graphql-16.8.2" + sources."graphql-16.9.0" (sources."graphql-config-5.0.3" // { dependencies = [ sources."minimatch-4.2.3" ]; }) sources."graphql-language-service-5.2.1" - sources."graphql-language-service-server-2.13.0" + sources."graphql-language-service-server-2.13.1" sources."graphql-ws-5.16.0" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" @@ -74623,7 +71597,7 @@ in sources."lines-and-columns-1.2.4" sources."locate-character-3.0.0" sources."lower-case-2.0.2" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."magic-string-0.30.10" sources."mdn-data-2.0.30" sources."merge2-1.4.1" @@ -74637,7 +71611,7 @@ in sources."node-abort-controller-3.1.1" sources."node-fetch-2.7.0" sources."node-gyp-build-4.8.1" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-path-2.1.1" sources."nullthrows-1.1.1" sources."once-1.4.0" @@ -74647,14 +71621,10 @@ in sources."pascal-case-3.1.2" sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" - (sources."periscopic-3.1.0" // { - dependencies = [ - sources."estree-walker-3.0.3" - ]; - }) + sources."periscopic-3.1.0" sources."picocolors-1.0.1" sources."picomatch-2.3.1" - (sources."postcss-8.4.38" // { + (sources."postcss-8.4.40" // { dependencies = [ sources."source-map-js-1.2.0" ]; @@ -74675,21 +71645,17 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - (sources."svelte-4.2.18" // { - dependencies = [ - sources."estree-walker-3.0.3" - ]; - }) - sources."svelte2tsx-0.7.9" - sources."synckit-0.9.0" + sources."svelte-4.2.18" + sources."svelte2tsx-0.7.13" + sources."synckit-0.9.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."unixify-1.0.0" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."urlpattern-polyfill-10.0.0" sources."utf-8-validate-6.0.4" sources."value-or-promise-1.0.12" @@ -74705,15 +71671,9 @@ in sources."vscode-uri-3.0.8" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.17.0" + sources."ws-8.18.0" sources."y18n-5.0.8" sources."yallist-3.1.1" sources."yargs-16.2.0" @@ -74733,10 +71693,10 @@ in grunt-cli = nodeEnv.buildNodePackage { name = "grunt-cli"; packageName = "grunt-cli"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz"; - sha512 = "9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ=="; + url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.5.0.tgz"; + sha512 = "rILKAFoU0dzlf22SUfDtq2R1fosChXXlJM5j7wI6uoW8gwmXDXzbUvirlKZSYCdXl3LXFbR+8xyS+WFo+b6vlA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -74761,7 +71721,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" @@ -74776,13 +71736,10 @@ in sources."make-iterator-1.0.1" sources."map-cache-0.2.2" sources."micromatch-4.0.7" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."parse-filepath-1.0.2" sources."parse-passwd-1.0.0" sources."path-parse-1.0.7" @@ -74795,7 +71752,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" sources."unc-path-regex-0.1.2" - sources."v8flags-3.2.0" + sources."v8flags-4.0.1" sources."which-1.3.1" ]; buildInputs = globalBuildInputs; @@ -74883,7 +71840,7 @@ in sources."minimist-1.2.8" sources."ms-2.1.3" sources."negotiator-0.6.3" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parseurl-1.3.3" @@ -74944,7 +71901,11 @@ in sources."braces-3.0.3" sources."buffer-6.0.3" sources."chalk-4.1.2" - sources."chokidar-3.6.0" + (sources."chokidar-3.6.0" // { + dependencies = [ + sources."glob-parent-5.1.2" + ]; + }) sources."cliui-7.0.4" sources."clone-2.1.2" sources."clone-stats-1.0.0" @@ -74972,12 +71933,8 @@ in sources."fs-mkdirp-stream-2.0.1" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."glob-parent-5.1.2" - (sources."glob-stream-8.0.2" // { - dependencies = [ - sources."glob-parent-6.0.2" - ]; - }) + sources."glob-parent-6.0.2" + sources."glob-stream-8.0.2" sources."glob-watcher-6.0.0" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -74995,7 +71952,7 @@ in sources."interpret-3.1.1" sources."is-absolute-1.0.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -75052,7 +72009,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."sver-1.8.4" sources."teex-1.0.1" - sources."text-decoder-1.1.0" + sources."text-decoder-1.1.1" sources."to-regex-range-5.0.1" sources."to-through-3.0.0" sources."unc-path-regex-0.1.2" @@ -75126,7 +72083,7 @@ in sources."ini-1.3.8" sources."interpret-3.1.1" sources."is-absolute-1.0.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -75573,7 +72530,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.7.1" - sources."jquery.terminal-2.42.0" + sources."jquery.terminal-2.42.2" sources."js-yaml-4.1.0" sources."keyboardevent-key-polyfill-1.1.0" sources."lcov-parse-1.0.0" @@ -75616,10 +72573,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.10.4"; + version = "1.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.10.4.tgz"; - sha512 = "YcSeqygon2uNn3GjQqxs3vSZQTvdbZ13WG54i+c0t6UcViEso/K5Vq9To/024h3OqCvJR2RlmunnEIuorvDqHg=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.11.5.tgz"; + sha512 = "3gi/wFkKMENtRrP5Vo/A+/rN/ywyqxtPwRVUMJJFbm2NOlk4eyq4XirbuOH7U9e4P/iBhdCvZrk+AF/HmsnnXw=="; }; dependencies = [ sources."@azure/abort-controller-2.1.2" @@ -75635,10 +72592,10 @@ in sources."@azure/abort-controller-1.1.0" ]; }) - sources."@azure/logger-1.1.2" + sources."@azure/logger-1.1.3" sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" - sources."@bmewburn/js-beautify-1.14.9" - sources."@bmewburn/vscode-html-languageserver-1.10.0" + sources."@bmewburn/js-beautify-1.15.2" + sources."@bmewburn/vscode-html-languageserver-1.11.0" sources."@isaacs/cliui-8.0.2" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ @@ -75646,17 +72603,18 @@ in sources."nopt-5.0.0" ]; }) - sources."@microsoft/applicationinsights-web-snippet-1.1.2" + sources."@microsoft/applicationinsights-web-snippet-1.2.1" + sources."@mixmark-io/domino-2.2.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@one-ini/wasm-0.1.1" sources."@opentelemetry/api-1.9.0" - sources."@opentelemetry/core-1.25.0" + sources."@opentelemetry/core-1.25.1" sources."@opentelemetry/instrumentation-0.41.2" - sources."@opentelemetry/resources-1.25.0" - sources."@opentelemetry/sdk-trace-base-1.25.0" - sources."@opentelemetry/semantic-conventions-1.25.0" + sources."@opentelemetry/resources-1.25.1" + sources."@opentelemetry/sdk-trace-base-1.25.1" + sources."@opentelemetry/semantic-conventions-1.25.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -75669,22 +72627,21 @@ in sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" sources."@tootallnate/once-2.0.0" - sources."@types/node-20.14.2" - sources."@types/shimmer-1.0.5" - sources."@vscode/l10n-0.0.16" + sources."@tootallnate/quickjs-emscripten-0.23.0" + sources."@types/node-20.14.12" + sources."@types/shimmer-1.2.0" + sources."@vscode/l10n-0.0.18" sources."abbrev-2.0.0" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" - sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" sources."applicationinsights-2.7.3" - sources."applicationinsights-native-metrics-0.0.10" + sources."applicationinsights-native-metrics-0.0.11" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" + sources."ast-types-0.13.4" sources."async-hook-jl-1.7.6" (sources."async-listener-0.6.10" // { dependencies = [ @@ -75692,13 +72649,10 @@ in ]; }) sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.13.0" sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" + sources."basic-ftp-5.0.5" sources."brace-expansion-2.0.1" sources."braces-3.0.3" - sources."caseless-0.12.0" sources."chownr-2.0.0" sources."cjs-module-lexer-1.3.1" (sources."cls-hooked-4.2.2" // { @@ -75715,11 +72669,11 @@ in sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."continuation-local-storage-3.2.1" - sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" - sources."dashdash-1.14.1" + sources."data-uri-to-buffer-6.0.2" sources."debug-4.3.5" sources."deepmerge-4.3.1" + sources."degenerator-5.0.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.3" @@ -75728,30 +72682,23 @@ in sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" sources."domhandler-5.0.3" - sources."domino-2.1.6" sources."domutils-3.1.0" sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - (sources."editorconfig-1.0.4" // { - dependencies = [ - sources."minimatch-9.0.1" - ]; - }) + sources."editorconfig-1.0.4" sources."emitter-listener-1.1.2" sources."emoji-regex-9.2.2" sources."encoding-0.1.13" sources."entities-4.5.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" + sources."escodegen-2.1.0" + sources."esprima-4.0.1" + sources."estraverse-5.3.0" + sources."esutils-2.0.3" sources."fast-glob-3.3.2" - sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" - sources."forever-agent-0.6.1" + sources."foreground-child-3.2.1" sources."form-data-4.0.0" - sources."fs-extra-11.1.1" + sources."fs-extra-11.2.0" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" @@ -75767,42 +72714,39 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."getpass-0.1.7" - sources."glob-10.4.1" + sources."get-uri-6.0.3" + (sources."glob-10.4.5" // { + dependencies = [ + sources."minimatch-9.0.5" + ]; + }) sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."hasown-2.0.2" sources."html-to-text-9.0.5" sources."htmlparser2-8.0.2" sources."http-proxy-agent-5.0.0" - sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" sources."import-in-the-middle-1.4.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.13.1" + sources."ip-address-9.0.5" + sources."is-core-module-2.15.0" 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-typedarray-1.0.0" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jackspeak-3.4.0" - 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."jackspeak-3.4.3" + sources."js-cookie-3.0.5" + sources."jsbn-1.1.0" sources."jsonfile-6.1.0" - sources."jsprim-1.4.2" sources."leac-0.6.0" sources."long-5.2.3" - sources."lru-cache-10.0.3" + sources."lru-cache-10.2.2" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -75812,7 +72756,7 @@ in sources."micromatch-4.0.7" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-9.0.4" + sources."minimatch-9.0.1" sources."minipass-7.1.2" (sources."minizlib-2.1.2" // { dependencies = [ @@ -75823,37 +72767,41 @@ in sources."module-details-from-path-1.0.3" sources."ms-2.1.2" sources."nan-2.20.0" + sources."netmask-2.0.2" sources."node-fetch-2.7.0" sources."nopt-7.2.1" sources."npmlog-5.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" + (sources."pac-proxy-agent-7.0.2" // { + dependencies = [ + sources."agent-base-7.1.1" + sources."http-proxy-agent-7.0.2" + sources."https-proxy-agent-7.0.5" + ]; + }) + sources."pac-resolver-7.0.1" + sources."package-json-from-dist-1.0.0" sources."parseley-0.12.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" - (sources."path-scurry-1.11.1" // { - dependencies = [ - sources."lru-cache-10.2.2" - ]; - }) + sources."path-scurry-1.11.1" sources."peberminta-0.9.0" - sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."proto-list-1.2.4" - sources."protobufjs-7.2.6" - sources."psl-1.9.0" - sources."punycode-2.3.1" - sources."qs-6.5.3" - sources."queue-microtask-1.2.3" - sources."readable-stream-3.6.2" - (sources."request-2.88.2" // { + sources."protobufjs-7.3.2" + (sources."proxy-agent-6.4.0" // { dependencies = [ - sources."form-data-2.3.3" - sources."uuid-3.4.0" + sources."agent-base-7.1.1" + sources."http-proxy-agent-7.0.2" + sources."https-proxy-agent-7.0.5" + sources."lru-cache-7.18.3" ]; }) + sources."proxy-from-env-1.1.0" + sources."queue-microtask-1.2.3" + sources."readable-stream-3.6.2" sources."require-in-the-middle-7.3.0" sources."resolve-1.22.8" sources."reusify-1.0.4" @@ -75868,17 +72816,21 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."selderee-0.11.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) + sources."semver-7.6.3" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shimmer-1.2.1" sources."signal-exit-4.1.0" - sources."sshpk-1.18.0" + sources."smart-buffer-4.2.0" + sources."socks-2.8.3" + (sources."socks-proxy-agent-8.0.4" // { + dependencies = [ + sources."agent-base-7.1.1" + ]; + }) + sources."source-map-0.6.1" + sources."sprintf-js-1.1.3" sources."stack-chain-1.3.7" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { @@ -75901,38 +72853,19 @@ in ]; }) sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tslib-2.6.3" - sources."tunnel-agent-0.6.0" - sources."turndown-7.1.3" + sources."turndown-7.2.0" sources."turndown-plugin-gfm-1.0.2" - sources."tweetnacl-0.14.5" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."universalify-2.0.1" - sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" - sources."verror-1.10.0" - (sources."vscode-css-languageservice-6.2.14" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - ]; - }) - (sources."vscode-html-languageservice-5.2.0" // { - dependencies = [ - sources."@vscode/l10n-0.0.18" - ]; - }) + sources."vscode-css-languageservice-6.3.0" + sources."vscode-html-languageservice-5.3.0" sources."vscode-jsonrpc-8.2.0" - (sources."vscode-languageserver-8.2.0-next.3" // { - dependencies = [ - sources."vscode-jsonrpc-8.2.0-next.2" - sources."vscode-languageserver-protocol-3.17.4-next.3" - sources."vscode-languageserver-types-3.17.4-next.2" - ]; - }) + sources."vscode-languageserver-9.0.1" sources."vscode-languageserver-protocol-3.17.5" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-languageserver-types-3.17.5" @@ -75972,13 +72905,13 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.14.1"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.14.1.tgz"; - sha512 = "OMg8OB1cx6MzGMUSvycBYu152vYz6BbtAnerEqxAvX2Jtlj7+RjuXYxJ0TgoV2BG43BaOqjzdr+BC5WFFp+Huw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-3.0.1.tgz"; + sha512 = "LxEwL+PuUcdcZ6Qi/otqyknl2kf9cE/DVnoiHnq6wgWGjccBOazp6kgIEOXSCOm5h1GZsLE+sJgEdeYYTEB3UQ=="; }; dependencies = [ - sources."@adobe/css-tools-4.3.2" + sources."@adobe/css-tools-4.3.3" (sources."@aws-crypto/crc32-3.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -76085,13 +73018,13 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - (sources."@aws-sdk/signature-v4-crt-3.598.0" // { + (sources."@aws-sdk/signature-v4-crt-3.617.0" // { dependencies = [ - sources."@aws-sdk/middleware-sdk-s3-3.598.0" - sources."@aws-sdk/signature-v4-multi-region-3.598.0" - sources."@aws-sdk/types-3.598.0" + sources."@aws-sdk/middleware-sdk-s3-3.617.0" + sources."@aws-sdk/signature-v4-multi-region-3.617.0" + sources."@aws-sdk/types-3.609.0" sources."@aws-sdk/util-arn-parser-3.568.0" - sources."@aws-sdk/util-user-agent-node-3.598.0" + sources."@aws-sdk/util-user-agent-node-3.614.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -76123,7 +73056,7 @@ in sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/util-waiter-3.296.0" sources."@aws-sdk/xml-builder-3.295.0" - sources."@babel/runtime-7.24.7" + sources."@babel/runtime-7.24.8" sources."@braintree/sanitize-url-6.0.4" sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" @@ -76136,50 +73069,55 @@ in sources."strip-ansi-7.1.0" ]; }) - sources."@joplin/fork-htmlparser2-4.1.51" - sources."@joplin/fork-sax-1.2.55" - sources."@joplin/fork-uslug-1.0.16" - sources."@joplin/htmlpack-2.14.1" - sources."@joplin/lib-2.14.1" - sources."@joplin/renderer-2.14.1" - sources."@joplin/turndown-4.0.73" - sources."@joplin/turndown-plugin-gfm-1.0.55" - (sources."@joplin/utils-2.14.1" // { + sources."@joplin/fork-htmlparser2-4.1.52" + sources."@joplin/fork-sax-1.2.56" + sources."@joplin/fork-uslug-1.0.17" + sources."@joplin/htmlpack-3.0.1" + sources."@joplin/lib-3.0.1" + sources."@joplin/renderer-3.0.1" + sources."@joplin/turndown-4.0.74" + sources."@joplin/turndown-plugin-gfm-1.0.56" + (sources."@joplin/utils-3.0.1" // { dependencies = [ sources."brace-expansion-2.0.1" sources."glob-10.3.10" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" + ]; + }) + (sources."@mapbox/node-pre-gyp-1.0.11" // { + dependencies = [ + sources."agent-base-6.0.2" + sources."https-proxy-agent-5.0.1" ]; }) - sources."@mapbox/node-pre-gyp-1.0.11" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@smithy/abort-controller-3.0.1" - sources."@smithy/fetch-http-handler-3.0.2" + sources."@smithy/abort-controller-3.1.1" + sources."@smithy/fetch-http-handler-3.2.3" sources."@smithy/is-array-buffer-3.0.0" - sources."@smithy/middleware-endpoint-3.0.2" - sources."@smithy/middleware-serde-3.0.1" - sources."@smithy/middleware-stack-3.0.1" - sources."@smithy/node-config-provider-3.1.1" - sources."@smithy/node-http-handler-3.0.1" - sources."@smithy/property-provider-3.1.1" - sources."@smithy/protocol-http-4.0.1" - sources."@smithy/querystring-builder-3.0.1" - sources."@smithy/querystring-parser-3.0.1" - sources."@smithy/shared-ini-file-loader-3.1.1" - sources."@smithy/signature-v4-3.1.0" - sources."@smithy/smithy-client-3.1.2" - sources."@smithy/types-3.1.0" - sources."@smithy/url-parser-3.0.1" + sources."@smithy/middleware-endpoint-3.1.0" + sources."@smithy/middleware-serde-3.0.3" + sources."@smithy/middleware-stack-3.0.3" + sources."@smithy/node-config-provider-3.1.4" + sources."@smithy/node-http-handler-3.1.4" + sources."@smithy/property-provider-3.1.3" + sources."@smithy/protocol-http-4.1.0" + sources."@smithy/querystring-builder-3.0.3" + sources."@smithy/querystring-parser-3.0.3" + sources."@smithy/shared-ini-file-loader-3.1.4" + sources."@smithy/signature-v4-4.1.0" + sources."@smithy/smithy-client-3.1.10" + sources."@smithy/types-3.3.0" + sources."@smithy/url-parser-3.0.3" sources."@smithy/util-base64-3.0.0" sources."@smithy/util-buffer-from-3.0.0" sources."@smithy/util-config-provider-3.0.0" sources."@smithy/util-hex-encoding-3.0.0" - sources."@smithy/util-middleware-3.0.1" - sources."@smithy/util-stream-3.0.2" + sources."@smithy/util-middleware-3.0.3" + sources."@smithy/util-stream-3.1.2" sources."@smithy/util-uri-escape-3.0.0" sources."@smithy/util-utf8-3.0.0" - sources."@tootallnate/once-2.0.0" + sources."@tootallnate/once-1.1.2" sources."@types/d3-scale-4.0.8" sources."@types/d3-scale-chromatic-3.0.3" sources."@types/d3-time-3.0.3" @@ -76187,12 +73125,11 @@ in sources."@types/mdast-3.0.15" sources."@types/ms-0.7.34" sources."@types/nanoid-3.0.0" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/unist-2.0.10" - sources."@types/ws-8.5.10" - sources."abab-2.0.6" + sources."@types/ws-8.5.11" sources."abbrev-1.1.1" - sources."agent-base-6.0.2" + sources."agent-base-7.1.1" sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" @@ -76231,11 +73168,7 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.13.0" - (sources."axios-1.7.2" // { - dependencies = [ - sources."follow-redirects-1.15.6" - ]; - }) + sources."axios-1.7.2" sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" @@ -76274,7 +73207,7 @@ in }) sources."character-entities-2.0.2" sources."charenc-0.0.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."chroma-js-2.4.2" sources."clean-css-4.2.4" @@ -76310,14 +73243,8 @@ in sources."crypto-js-4.2.0" sources."cssstyle-3.0.0" sources."cwise-compiler-1.1.3" - sources."cytoscape-3.29.2" + sources."cytoscape-3.30.1" sources."cytoscape-cose-bilkent-4.1.0" - (sources."cytoscape-fcose-2.2.0" // { - dependencies = [ - sources."cose-base-2.2.0" - sources."layout-base-2.0.1" - ]; - }) sources."d3-7.9.0" sources."d3-array-3.2.4" sources."d3-axis-3.0.0" @@ -76363,9 +73290,9 @@ in sources."d3-zoom-3.0.0" sources."dagre-d3-es-7.0.10" sources."dashdash-1.14.1" - sources."data-urls-4.0.0" + sources."data-urls-5.0.0" sources."datauri-4.1.0" - sources."dayjs-1.11.11" + sources."dayjs-1.11.12" sources."debug-4.3.5" sources."decimal.js-10.4.3" sources."decode-named-character-reference-1.0.2" @@ -76390,14 +73317,13 @@ in ]; }) sources."domelementtype-2.3.0" - sources."domexception-4.0.0" sources."domhandler-5.0.3" - sources."dompurify-3.1.5" + sources."dompurify-3.1.6" sources."domutils-3.1.0" sources."duplexify-3.7.1" sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - sources."elkjs-0.8.2" + sources."elkjs-0.9.3" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -76416,7 +73342,6 @@ in sources."err-code-2.0.3" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" - sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" sources."events-1.1.1" sources."execa-5.1.1" @@ -76431,12 +73356,12 @@ in sources."fill-range-7.1.1" sources."filter-obj-1.1.0" sources."find-up-2.1.0" - sources."follow-redirects-1.15.5" + sources."follow-redirects-1.15.6" sources."font-awesome-filetypes-2.1.0" sources."for-each-0.3.3" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" - (sources."foreground-child-3.2.0" // { + (sources."foreground-child-3.2.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -76457,7 +73382,6 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."gauge-3.0.2" sources."get-intrinsic-1.2.4" @@ -76493,14 +73417,14 @@ in }) sources."highlight.js-11.9.0" sources."hpagent-1.2.0" - sources."html-encoding-sniffer-3.0.0" + sources."html-encoding-sniffer-4.0.0" sources."html-entities-1.4.0" sources."html-minifier-4.0.0" sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" - sources."http-proxy-agent-5.0.0" + sources."http-proxy-agent-7.0.2" sources."http-signature-1.2.0" - sources."https-proxy-agent-5.0.1" + sources."https-proxy-agent-7.0.5" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -76584,13 +73508,13 @@ in sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" - sources."jsdom-22.1.0" + sources."jsdom-23.0.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.2" - (sources."katex-0.16.9" // { + (sources."katex-0.16.10" // { dependencies = [ sources."commander-8.3.0" ]; @@ -76623,8 +73547,9 @@ in }) (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."@tootallnate/once-1.1.2" + sources."agent-base-6.0.2" sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.1" sources."minipass-3.3.6" ]; }) @@ -76651,7 +73576,7 @@ in sources."mdast-util-to-string-3.2.0" sources."mdurl-1.0.1" sources."merge-stream-2.0.0" - sources."mermaid-10.6.1" + sources."mermaid-10.9.1" sources."micromark-3.2.0" sources."micromark-core-commonmark-1.1.0" sources."micromark-factory-destination-1.1.0" @@ -76719,7 +73644,7 @@ in sources."duplexify-4.1.3" sources."readable-stream-3.6.2" sources."utf-8-validate-5.0.10" - sources."ws-7.5.9" + sources."ws-7.5.10" ]; }) sources."mqtt-packet-6.10.0" @@ -76768,7 +73693,7 @@ in sources."npm-run-path-4.0.1" sources."npmlog-5.0.1" sources."number-allocator-1.0.14" - sources."nwsapi-2.2.10" + sources."nwsapi-2.2.12" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-to-arguments-0.0.8" // { @@ -76796,7 +73721,7 @@ in sources."path-key-3.1.1" (sources."path-scurry-1.11.1" // { dependencies = [ - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" ]; }) sources."performance-now-2.1.0" @@ -76863,7 +73788,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.4.1" sources."saxes-6.0.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."set-function-length-1.2.2" @@ -76891,7 +73816,11 @@ in }) sources."smart-buffer-4.2.0" sources."socks-2.8.3" - sources."socks-proxy-agent-6.2.1" + (sources."socks-proxy-agent-6.2.1" // { + dependencies = [ + sources."agent-base-6.0.2" + ]; + }) sources."source-map-0.6.1" sources."split-on-first-1.1.0" sources."split-skip-0.0.2" @@ -76911,7 +73840,7 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.3" sources."strict-uri-encode-2.0.0" - sources."string-kit-0.17.10" + sources."string-kit-0.18.3" sources."string-padding-1.0.2" (sources."string-to-stream-3.0.1" // { dependencies = [ @@ -76963,7 +73892,7 @@ in sources."debug-4.3.1" ]; }) - sources."terminal-kit-3.0.1" + sources."terminal-kit-3.0.2" (sources."tkwidgets-0.5.27" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -76983,7 +73912,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-4.1.4" - sources."tr46-4.1.1" + sources."tr46-5.0.0" sources."tree-kit-0.8.7" sources."ts-dedent-2.2.0" sources."tslib-2.6.3" @@ -76992,7 +73921,7 @@ in sources."typedarray-0.0.6" sources."typical-2.6.1" sources."uc.micro-1.0.6" - sources."uglify-js-3.18.0" + sources."uglify-js-3.19.0" sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" sources."undici-types-5.26.5" @@ -77021,12 +73950,12 @@ in sources."core-util-is-1.0.2" ]; }) - sources."w3c-xmlserializer-4.0.0" + sources."w3c-xmlserializer-5.0.0" sources."web-worker-1.3.0" sources."webidl-conversions-7.0.0" - sources."whatwg-encoding-2.0.0" - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-12.0.1" + sources."whatwg-encoding-3.1.1" + sources."whatwg-mimetype-4.0.0" + sources."whatwg-url-14.0.0" sources."which-2.0.2" sources."which-typed-array-1.1.15" sources."wide-align-1.1.5" @@ -77048,8 +73977,8 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.17.0" - sources."xml-name-validator-4.0.0" + sources."ws-8.18.0" + sources."xml-name-validator-5.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmlchars-2.2.0" @@ -77091,25 +74020,26 @@ in sources."eastasianwidth-0.2.0" sources."editorconfig-1.0.4" sources."emoji-regex-9.2.2" - sources."foreground-child-3.2.0" - (sources."glob-10.4.1" // { + sources."foreground-child-3.2.1" + (sources."glob-10.4.5" // { dependencies = [ - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" ]; }) sources."ini-1.3.8" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."js-cookie-3.0.5" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."minimatch-9.0.1" sources."minipass-7.1.2" sources."nopt-7.2.1" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-scurry-1.11.1" sources."proto-list-1.2.4" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -77177,10 +74107,10 @@ in sha512 = "Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw=="; }; dependencies = [ - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@jsdoc/salty-0.2.8" sources."@types/linkify-it-5.0.0" - sources."@types/markdown-it-14.1.1" + sources."@types/markdown-it-14.1.2" sources."@types/mdurl-2.0.0" sources."argparse-2.0.1" sources."bluebird-3.7.2" @@ -77201,7 +74131,7 @@ in sources."requizzle-0.2.4" sources."strip-json-comments-3.1.1" sources."uc.micro-2.1.0" - sources."underscore-1.13.6" + sources."underscore-1.13.7" sources."xmlcreate-2.0.4" ]; buildInputs = globalBuildInputs; @@ -77357,14 +74287,14 @@ in sources."mime-types-2.1.35" sources."ms-2.1.2" sources."native-promise-only-0.8.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.3.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."side-channel-1.0.6" sources."slash-3.0.0" @@ -77395,22 +74325,30 @@ in }; dependencies = [ sources."@polka/url-1.0.0-next.25" - sources."@tinyhttp/accepts-2.2.1" - sources."@tinyhttp/app-2.2.3" - sources."@tinyhttp/content-disposition-2.2.0" + (sources."@tinyhttp/accepts-2.2.2" // { + dependencies = [ + sources."mime-4.0.1" + ]; + }) + sources."@tinyhttp/app-2.3.0" + sources."@tinyhttp/content-disposition-2.2.1" sources."@tinyhttp/content-type-0.1.4" - sources."@tinyhttp/cookie-2.1.0" - sources."@tinyhttp/cookie-signature-2.1.0" - sources."@tinyhttp/cors-2.0.0" + sources."@tinyhttp/cookie-2.1.1" + sources."@tinyhttp/cookie-signature-2.1.1" + sources."@tinyhttp/cors-2.0.1" sources."@tinyhttp/encode-url-2.1.1" - sources."@tinyhttp/etag-2.1.1" - sources."@tinyhttp/forwarded-2.1.2" - sources."@tinyhttp/proxy-addr-2.1.3" - sources."@tinyhttp/req-2.2.2" - sources."@tinyhttp/res-2.2.2" + sources."@tinyhttp/etag-2.1.2" + sources."@tinyhttp/forwarded-2.1.1" + sources."@tinyhttp/proxy-addr-2.2.0" + sources."@tinyhttp/req-2.2.3" + sources."@tinyhttp/res-2.2.3" sources."@tinyhttp/router-2.2.2" - sources."@tinyhttp/send-2.2.1" - sources."@tinyhttp/type-is-2.2.2" + sources."@tinyhttp/send-2.2.2" + (sources."@tinyhttp/type-is-2.2.3" // { + dependencies = [ + sources."mime-4.0.1" + ]; + }) sources."@tinyhttp/url-2.1.1" sources."@tinyhttp/vary-0.1.3" sources."anymatch-3.1.3" @@ -77420,7 +74358,6 @@ in sources."chokidar-3.6.0" sources."dot-prop-9.0.0" sources."es-escape-html-0.1.1" - sources."es-vary-0.1.2" sources."eta-3.4.0" sources."fill-range-7.1.1" sources."glob-parent-5.1.2" @@ -77434,7 +74371,7 @@ in sources."json5-2.2.3" sources."lowdb-7.0.1" sources."milliparsec-2.3.0" - sources."mime-4.0.1" + sources."mime-4.0.0-beta.1" sources."mrmime-2.0.0" sources."negotiator-0.6.3" sources."normalize-path-3.0.0" @@ -77451,7 +74388,7 @@ in sources."steno-4.0.2" sources."to-regex-range-5.0.1" sources."totalist-3.0.1" - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" ]; buildInputs = globalBuildInputs; meta = { @@ -77682,7 +74619,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-data-descriptor-1.0.1" sources."is-descriptor-1.0.3" sources."is-dotfile-1.0.3" @@ -77775,7 +74712,7 @@ in sources."is-descriptor-0.1.7" ]; }) - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -78168,7 +75105,7 @@ in sources."natural-orderby-2.0.3" sources."next-tick-1.1.0" sources."node-downloader-helper-1.0.19" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-treeify-1.1.33" sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" @@ -78182,7 +75119,7 @@ in sources."picomatch-2.3.1" sources."pkg-up-3.1.0" sources."punycode-2.3.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" sources."restore-cursor-3.1.0" @@ -78195,7 +75132,7 @@ in ]; }) sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -78235,10 +75172,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.16.10"; + version = "0.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz"; - sha512 = "ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA=="; + url = "https://registry.npmjs.org/katex/-/katex-0.16.11.tgz"; + sha512 = "RQrI8rlHY92OLf3rho/Ts8i/XvjgguEjOkO1BEXcU3N8BqPpSzBNwV/G0Ukr+P/l3ivvJUE/Fa/CwbS6HesGNQ=="; }; dependencies = [ sources."commander-8.3.0" @@ -78263,17 +75200,22 @@ in }; dependencies = [ sources."@ampproject/remapping-2.3.0" - sources."@babel/cli-7.24.7" + (sources."@babel/cli-7.24.8" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."semver-5.7.2" + ]; + }) sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { + sources."@babel/compat-data-7.24.9" + (sources."@babel/core-7.24.9" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.7" + sources."@babel/generator-7.24.10" sources."@babel/helper-annotate-as-pure-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { + (sources."@babel/helper-compilation-targets-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; @@ -78282,38 +75224,34 @@ in sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" - sources."@babel/helper-plugin-utils-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" + sources."@babel/helper-plugin-utils-7.24.8" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helpers-7.24.8" sources."@babel/highlight-7.24.7" - sources."@babel/node-7.24.7" - sources."@babel/parser-7.24.7" + sources."@babel/node-7.24.8" + sources."@babel/parser-7.24.8" sources."@babel/plugin-syntax-jsx-7.24.7" sources."@babel/plugin-transform-react-jsx-7.24.7" - sources."@babel/register-7.24.6" + (sources."@babel/register-7.24.6" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."semver-5.7.2" + ]; + }) sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" + sources."@babel/traverse-7.24.8" + sources."@babel/types-7.24.9" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - (sources."@mapbox/node-pre-gyp-1.0.11" // { - dependencies = [ - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."semver-7.6.2" - ]; - }) + sources."@mapbox/node-pre-gyp-1.0.11" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -78348,12 +75286,16 @@ in sources."@xmpp/stream-management-0.13.1" sources."@xmpp/tcp-0.13.1" sources."@xmpp/tls-0.13.1" - sources."@xmpp/websocket-0.13.1" + (sources."@xmpp/websocket-0.13.1" // { + dependencies = [ + sources."ws-8.18.0" + ]; + }) sources."@xmpp/xml-0.13.1" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.12.0" + sources."acorn-8.12.1" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -78382,13 +75324,11 @@ in sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" - sources."bitwise-xor-0.0.0" sources."bl-4.1.0" sources."bn.js-4.12.0" (sources."body-parser-1.20.2" // { dependencies = [ sources."debug-2.6.9" - sources."iconv-lite-0.4.24" sources."ms-2.0.0" ]; }) @@ -78396,13 +75336,13 @@ in sources."braces-3.0.3" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -78434,13 +75374,7 @@ in sources."cssom-0.3.8" ]; }) - (sources."data-urls-2.0.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) + sources."data-urls-2.0.0" sources."data-view-buffer-1.0.1" sources."data-view-byte-length-1.0.1" sources."data-view-byte-offset-1.0.0" @@ -78465,10 +75399,14 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - sources."encoding-0.1.13" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."end-of-stream-1.4.4" sources."enquirer-2.4.1" sources."es-abstract-1.23.3" @@ -78505,7 +75443,12 @@ in sources."ms-2.0.0" ]; }) - sources."find-cache-dir-2.1.0" + (sources."find-cache-dir-2.1.0" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."semver-5.7.2" + ]; + }) sources."find-up-3.0.0" sources."follow-redirects-1.15.6" sources."for-each-0.3.3" @@ -78529,7 +75472,6 @@ in (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."fs-readdir-recursive-1.1.0" @@ -78570,7 +75512,7 @@ in sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.3.1" sources."inflight-1.0.6" @@ -78580,7 +75522,11 @@ in sources."into-stream-6.0.0" sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" - sources."irc-upd-0.11.0" + (sources."irc-upd-0.11.0" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."is-array-buffer-3.0.4" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -78609,15 +75555,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" - (sources."jsdom-16.7.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."utf-8-validate-5.0.10" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - sources."ws-7.5.9" - ]; - }) + sources."jsdom-16.7.0" sources."jsesc-2.5.2" sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { @@ -78629,9 +75567,17 @@ in sources."koa-compose-4.2.0" sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."lru-cache-5.1.1" + (sources."lru-cache-5.1.1" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) sources."ltx-3.0.0" - sources."make-dir-2.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.1" + ]; + }) sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -78650,7 +75596,6 @@ in (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."mkdirp-1.0.4" @@ -78660,31 +75605,33 @@ in sources."nan-2.20.0" sources."napi-build-utils-1.0.2" sources."negotiator-0.6.3" - (sources."node-abi-3.65.0" // { + sources."node-abi-3.65.0" + (sources."node-environment-flags-1.0.6" // { dependencies = [ - sources."semver-7.6.2" + sources."semver-5.7.2" ]; }) - sources."node-environment-flags-1.0.6" - sources."node-fetch-2.7.0" - sources."node-gyp-build-4.8.1" - (sources."node-notifier-10.0.1" // { + (sources."node-fetch-2.7.0" // { dependencies = [ - sources."semver-7.6.2" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" ]; }) - sources."node-releases-2.0.14" + sources."node-gyp-build-4.8.1" + sources."node-notifier-10.0.1" + sources."node-releases-2.0.18" sources."nopt-5.0.0" sources."npmlog-5.0.1" - sources."nwsapi-2.2.10" + sources."nwsapi-2.2.12" sources."object-assign-4.1.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."object.getownpropertydescriptors-2.1.8" sources."on-finished-2.4.1" sources."once-1.4.0" - sources."openpgp-5.11.1" + sources."openpgp-5.11.2" sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -78722,7 +75669,6 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."semver-7.6.2" sources."supports-color-7.2.0" ]; }) @@ -78748,11 +75694,7 @@ in sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."raw-body-2.5.2" sources."rc-1.2.8" sources."readable-stream-3.6.2" sources."regenerator-runtime-0.14.1" @@ -78761,7 +75703,7 @@ in sources."requires-port-1.0.0" (sources."resolve-1.22.8" // { dependencies = [ - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" ]; }) sources."reusify-1.0.4" @@ -78774,10 +75716,10 @@ in sources."safer-buffer-2.1.2" sources."sasl-anonymous-0.1.0" sources."sasl-plain-0.1.0" - sources."sasl-scram-sha-1-1.2.1" + sources."sasl-scram-sha-1-1.3.0" sources."saslmechanisms-0.1.1" sources."saxes-5.0.1" - sources."semver-5.7.2" + sources."semver-7.6.3" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -78824,11 +75766,7 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" - (sources."tar-6.2.1" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."tar-6.2.1" (sources."tar-fs-2.1.1" // { dependencies = [ sources."chownr-1.1.4" @@ -78839,7 +75777,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-4.1.4" - sources."tr46-0.0.3" + sources."tr46-2.1.0" sources."tslib-2.6.3" sources."tunnel-agent-0.6.0" sources."type-is-1.6.18" @@ -78850,9 +75788,9 @@ in sources."unbox-primitive-1.0.2" sources."universalify-0.2.0" sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.4" + sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -78863,14 +75801,10 @@ in sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" sources."webcrypto-core-1.8.0" - sources."webidl-conversions-3.0.1" - (sources."whatwg-encoding-1.0.5" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) + sources."webidl-conversions-6.1.0" + sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-5.0.0" + sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-typed-array-1.1.15" @@ -78883,11 +75817,11 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.17.0" + sources."ws-7.5.10" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -78958,10 +75892,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "8.1.3"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-8.1.3.tgz"; - sha512 = "Dg/r1dGnRCXKsOUC3lol7o6ggYTA6WWiPQzZJNKqyygn4fzYGuA3Dro2d5677pajaqFnFA72mdCjzSyF16Vi2Q=="; + url = "https://registry.npmjs.org/lerna/-/lerna-8.1.7.tgz"; + sha512 = "v2kkBn8Vqtroo30Pr5/JQ9MygRhnCsoI1jSOf3DxWmcTbkpC5U7c6rGr+7NPK6QrxKbC0/Cj4kuIBMb/7f79sQ=="; }; dependencies = [ sources."@babel/code-frame-7.24.7" @@ -78976,48 +75910,76 @@ in sources."supports-color-5.5.0" ]; }) + sources."@babel/runtime-7.24.8" + sources."@emnapi/core-1.2.0" + sources."@emnapi/runtime-1.2.0" + sources."@emnapi/wasi-threads-1.0.1" sources."@hutson/parse-repository-url-3.0.2" (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."@isaacs/string-locale-compare-1.1.0" sources."@jest/schemas-29.6.3" - sources."@lerna/create-8.1.3" + sources."@lerna/create-8.1.7" + sources."@napi-rs/wasm-runtime-0.2.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/agent-2.2.2" + (sources."@npmcli/arborist-7.5.3" // { + dependencies = [ + sources."json-parse-even-better-errors-3.0.2" + sources."minimatch-9.0.5" + ]; + }) sources."@npmcli/fs-3.1.1" - (sources."@npmcli/git-5.0.7" // { + (sources."@npmcli/git-5.0.8" // { dependencies = [ + sources."ini-4.1.3" sources."isexe-3.1.1" sources."which-4.0.0" ]; }) sources."@npmcli/installed-package-contents-2.1.0" + (sources."@npmcli/map-workspaces-3.0.6" // { + dependencies = [ + sources."minimatch-9.0.5" + ]; + }) + (sources."@npmcli/metavuln-calculator-7.1.1" // { + dependencies = [ + sources."json-parse-even-better-errors-3.0.2" + ]; + }) + sources."@npmcli/name-from-folder-2.0.0" sources."@npmcli/node-gyp-3.0.0" + (sources."@npmcli/package-json-5.2.0" // { + dependencies = [ + sources."json-parse-even-better-errors-3.0.2" + ]; + }) (sources."@npmcli/promise-spawn-7.0.2" // { dependencies = [ sources."isexe-3.1.1" sources."which-4.0.0" ]; }) - sources."@npmcli/redact-1.1.0" - (sources."@npmcli/run-script-7.0.2" // { + sources."@npmcli/query-3.1.0" + sources."@npmcli/redact-2.0.1" + (sources."@npmcli/run-script-8.1.0" // { dependencies = [ sources."isexe-3.1.1" sources."which-4.0.0" ]; }) - sources."@nrwl/devkit-19.3.0" - sources."@nrwl/tao-19.3.0" - (sources."@nx/devkit-19.3.0" // { + sources."@nrwl/devkit-19.5.3" + sources."@nrwl/tao-19.5.3" + (sources."@nx/devkit-19.5.3" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -79055,23 +76017,24 @@ in sources."@sigstore/tuf-2.3.4" sources."@sigstore/verify-1.2.1" sources."@sinclair/typebox-0.27.8" - sources."@swc-node/core-1.13.1" - sources."@swc-node/register-1.9.2" - sources."@swc-node/sourcemap-support-0.5.0" - sources."@swc/core-1.5.29" + sources."@swc-node/core-1.13.3" + sources."@swc-node/register-1.10.9" + sources."@swc-node/sourcemap-support-0.5.1" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@tootallnate/once-2.0.0" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" sources."@tufjs/canonical-json-2.0.0" (sources."@tufjs/models-2.0.1" // { dependencies = [ - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" ]; }) + sources."@tybys/wasm-util-0.9.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.5" sources."@types/normalize-package-data-2.4.4" + sources."@types/parse-json-4.0.2" sources."@yarnpkg/lockfile-1.1.0" (sources."@yarnpkg/parsers-3.0.0-rc.46" // { dependencies = [ @@ -79087,14 +76050,12 @@ in sources."abbrev-2.0.0" sources."add-stream-1.0.0" sources."agent-base-7.1.1" - sources."agentkeepalive-4.5.0" sources."aggregate-error-3.1.0" sources."ansi-colors-4.1.3" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" + sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" sources."argparse-1.0.10" sources."array-differ-3.0.0" sources."array-ify-1.0.0" @@ -79103,21 +76064,25 @@ in sources."async-3.2.5" sources."asynckit-0.4.0" sources."axios-1.7.2" + (sources."babel-plugin-macros-3.1.0" // { + dependencies = [ + sources."cosmiconfig-7.1.0" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" + sources."bin-links-4.0.4" sources."bl-4.1.0" sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."buffer-5.7.1" sources."buffer-from-1.1.2" - sources."builtins-1.0.3" sources."byte-size-8.1.1" - (sources."cacache-18.0.3" // { + (sources."cacache-18.0.4" // { dependencies = [ sources."fs-minipass-3.0.3" sources."minipass-7.1.2" - sources."ssri-10.0.6" ]; }) sources."callsites-3.1.0" @@ -79134,13 +76099,14 @@ in sources."cliui-8.0.1" sources."clone-1.0.4" sources."clone-deep-4.0.1" - sources."cmd-shim-6.0.1" + sources."cmd-shim-6.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colorette-2.0.20" sources."columnify-1.6.0" sources."combined-stream-1.0.8" + sources."common-ancestor-path-1.0.1" sources."compare-func-2.0.0" sources."concat-map-0.0.1" sources."concat-stream-2.0.0" @@ -79161,6 +76127,7 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.3.6" sources."cross-spawn-7.0.3" + sources."cssesc-3.0.0" sources."dargs-7.0.0" sources."dateformat-3.0.3" sources."debug-4.3.5" @@ -79170,22 +76137,21 @@ in sources."map-obj-1.0.1" ]; }) - sources."dedent-0.7.0" + sources."dedent-1.5.3" sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" sources."deprecation-2.3.1" sources."detect-indent-5.0.0" sources."diff-sequences-29.6.3" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" - sources."dotenv-16.3.2" - sources."dotenv-expand-10.0.0" + sources."dotenv-16.4.5" + sources."dotenv-expand-11.0.6" sources."duplexer-0.1.2" sources."eastasianwidth-0.2.0" sources."ejs-3.1.10" - sources."emoji-regex-8.0.0" + sources."emoji-regex-9.2.2" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -79194,7 +76160,7 @@ in sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."env-paths-2.2.1" - sources."envinfo-7.8.1" + sources."envinfo-7.13.0" sources."err-code-2.0.3" sources."error-ex-1.3.2" sources."escalade-3.1.2" @@ -79208,7 +76174,11 @@ in sources."tmp-0.0.33" ]; }) - sources."fast-glob-3.3.2" + (sources."fast-glob-3.3.2" // { + dependencies = [ + sources."glob-parent-5.1.2" + ]; + }) sources."fastq-1.17.1" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -79220,7 +76190,7 @@ in sources."find-up-4.1.0" sources."flat-5.0.2" sources."follow-redirects-1.15.6" - (sources."foreground-child-3.2.0" // { + (sources."foreground-child-3.2.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; @@ -79240,7 +76210,6 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."gauge-4.0.4" sources."get-caller-file-2.0.5" (sources."get-pkg-repo-4.2.1" // { dependencies = [ @@ -79261,15 +76230,15 @@ in }) sources."git-semver-tags-5.0.1" sources."git-up-7.0.0" - sources."git-url-parse-13.1.0" + sources."git-url-parse-14.0.0" sources."gitconfiglocal-1.0.0" - (sources."glob-10.4.1" // { + (sources."glob-10.4.5" // { dependencies = [ - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" ]; }) - sources."glob-parent-5.1.2" + sources."glob-parent-6.0.2" sources."globby-11.1.0" sources."graceful-fs-4.2.11" sources."handlebars-4.7.8" @@ -79280,15 +76249,14 @@ in sources."hosted-git-info-7.0.2" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" + sources."https-proxy-agent-7.0.5" sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.3.1" (sources."ignore-walk-6.0.5" // { dependencies = [ - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" ]; }) (sources."import-fresh-3.3.0" // { @@ -79299,17 +76267,9 @@ in sources."import-local-3.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-1.3.8" - (sources."init-package-json-5.0.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - sources."lru-cache-7.18.3" - sources."npm-package-arg-10.1.0" - sources."proc-log-3.0.0" - ]; - }) + sources."init-package-json-6.0.3" (sources."inquirer-8.2.6" // { dependencies = [ sources."chalk-4.1.2" @@ -79324,7 +76284,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -79343,8 +76303,8 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jackspeak-3.4.0" - (sources."jake-10.9.1" // { + sources."jackspeak-3.4.3" + (sources."jake-10.9.2" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" @@ -79360,55 +76320,20 @@ in }) sources."jsbn-1.1.0" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-3.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-stringify-nice-1.1.4" sources."json-stringify-safe-5.0.1" sources."json5-2.2.3" sources."jsonc-parser-3.2.0" sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" + sources."just-diff-6.0.2" + sources."just-diff-apply-5.5.0" sources."kind-of-6.0.3" - (sources."libnpmaccess-7.0.2" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - sources."lru-cache-7.18.3" - sources."npm-package-arg-10.1.0" - sources."proc-log-3.0.0" - ]; - }) - (sources."libnpmpublish-7.3.0" // { + sources."libnpmaccess-8.0.6" + (sources."libnpmpublish-9.0.9" // { dependencies = [ - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@tufjs/canonical-json-1.0.0" - sources."@tufjs/models-1.0.4" - sources."agent-base-6.0.2" - sources."cacache-17.1.4" - sources."fs-minipass-3.0.3" - sources."hosted-git-info-6.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-11.1.1" // { - dependencies = [ - sources."minipass-5.0.0" - ]; - }) - sources."minimatch-9.0.4" - sources."minipass-7.1.2" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."normalize-package-data-5.0.0" - sources."npm-package-arg-10.1.0" - sources."proc-log-3.0.0" - sources."sigstore-1.9.0" - sources."socks-proxy-agent-7.0.0" - sources."ssri-10.0.6" - sources."tuf-js-1.1.7" + sources."ci-info-4.0.0" ]; }) sources."lines-and-columns-2.0.4" @@ -79422,12 +76347,11 @@ in sources."lodash-4.17.21" sources."lodash.ismatch-4.4.0" sources."log-symbols-4.1.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."make-dir-4.0.0" (sources."make-fetch-happen-13.0.1" // { dependencies = [ sources."minipass-7.1.2" - sources."ssri-10.0.6" ]; }) sources."map-obj-4.3.0" @@ -79487,11 +76411,6 @@ in 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" @@ -79515,76 +76434,28 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-fetch-2.6.7" - (sources."node-gyp-10.1.0" // { + (sources."node-gyp-10.2.0" // { dependencies = [ sources."isexe-3.1.1" - sources."proc-log-3.0.0" sources."which-4.0.0" ]; }) sources."node-machine-id-1.1.12" sources."nopt-7.2.1" - sources."normalize-package-data-6.0.1" + sources."normalize-package-data-6.0.2" sources."npm-bundled-3.0.1" sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" - (sources."npm-package-arg-8.1.1" // { - dependencies = [ - sources."hosted-git-info-3.0.8" - sources."lru-cache-6.0.0" - sources."validate-npm-package-name-3.0.0" - ]; - }) - (sources."npm-packlist-5.1.1" // { - dependencies = [ - sources."glob-8.1.0" - sources."ignore-walk-5.0.1" - sources."minimatch-5.1.6" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - ]; - }) - (sources."npm-pick-manifest-9.0.1" // { - dependencies = [ - sources."npm-package-arg-11.0.2" - ]; - }) - (sources."npm-registry-fetch-14.0.5" // { + sources."npm-package-arg-11.0.2" + sources."npm-packlist-8.0.2" + sources."npm-pick-manifest-9.1.0" + (sources."npm-registry-fetch-17.1.0" // { dependencies = [ - sources."agent-base-6.0.2" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) - sources."hosted-git-info-6.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."npm-package-arg-10.1.0" - sources."proc-log-3.0.0" - sources."socks-proxy-agent-7.0.0" - (sources."ssri-10.0.6" // { - dependencies = [ - sources."minipass-7.1.2" - ]; - }) + sources."minipass-7.1.2" ]; }) sources."npm-run-path-4.0.1" - sources."npmlog-6.0.2" - (sources."nx-19.3.0" // { + (sources."nx-19.5.3" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -79594,6 +76465,7 @@ in sources."open-8.4.2" sources."ora-5.3.0" sources."os-tmpdir-1.0.2" + sources."oxc-resolver-1.10.2" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -79605,21 +76477,21 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - (sources."pacote-17.0.7" // { + sources."package-json-from-dist-1.0.0" + (sources."pacote-18.0.6" // { dependencies = [ sources."fs-minipass-3.0.3" sources."minipass-7.1.2" - sources."npm-package-arg-11.0.2" - sources."npm-packlist-8.0.2" - sources."npm-registry-fetch-16.2.1" - sources."read-package-json-7.0.1" - sources."ssri-10.0.6" ]; }) sources."parent-module-1.0.1" + (sources."parse-conflict-json-3.0.1" // { + dependencies = [ + sources."json-parse-even-better-errors-3.0.2" + ]; + }) (sources."parse-json-5.2.0" // { dependencies = [ - sources."json-parse-even-better-errors-2.3.1" sources."lines-and-columns-1.2.4" ]; }) @@ -79635,6 +76507,7 @@ in sources."pify-5.0.0" sources."pirates-4.0.6" sources."pkg-dir-4.2.0" + sources."postcss-selector-parser-6.1.1" (sources."pretty-format-29.7.0" // { dependencies = [ sources."ansi-styles-5.2.0" @@ -79642,33 +76515,28 @@ in }) sources."proc-log-4.2.0" sources."process-nextick-args-2.0.1" + sources."proggy-2.0.0" + sources."promise-all-reject-late-1.0.1" + sources."promise-call-limit-3.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - (sources."promzard-1.0.2" // { - dependencies = [ - sources."mute-stream-1.0.0" - sources."read-3.0.1" - ]; - }) + sources."promzard-1.0.2" sources."protocols-2.0.1" sources."proxy-from-env-1.1.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."react-is-18.3.1" - (sources."read-2.1.0" // { + (sources."read-3.0.1" // { dependencies = [ sources."mute-stream-1.0.0" ]; }) sources."read-cmd-shim-4.0.0" - (sources."read-package-json-6.0.4" // { + (sources."read-package-json-fast-3.0.2" // { dependencies = [ - sources."hosted-git-info-6.1.1" - sources."lru-cache-7.18.3" - sources."normalize-package-data-5.0.0" + sources."json-parse-even-better-errors-3.0.2" ]; }) - sources."read-package-json-fast-3.0.2" (sources."read-pkg-3.0.0" // { dependencies = [ sources."hosted-git-info-2.8.9" @@ -79692,6 +76560,7 @@ in }) sources."readable-stream-3.6.2" sources."redent-3.0.0" + sources."regenerator-runtime-0.14.1" sources."require-directory-2.1.1" sources."resolve-1.22.8" sources."resolve-cwd-3.0.0" @@ -79711,7 +76580,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-blocking-2.0.0" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" @@ -79721,7 +76590,7 @@ in sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.3" + sources."socks-proxy-agent-8.0.4" sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" @@ -79732,16 +76601,32 @@ in sources."split-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" - (sources."ssri-9.0.1" // { + (sources."ssri-10.0.6" // { dependencies = [ - sources."minipass-3.3.6" + sources."minipass-7.1.2" + ]; + }) + (sources."string-width-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + ]; + }) + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" ]; }) - 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-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + (sources."strip-ansi-cjs-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -79763,27 +76648,25 @@ in sources."tmp-0.2.3" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" + sources."treeverse-3.0.0" sources."trim-newlines-3.0.1" sources."tsconfig-paths-4.2.0" sources."tslib-2.6.3" sources."tuf-js-2.2.1" sources."type-fest-0.21.3" sources."typedarray-0.0.6" - sources."typescript-5.4.5" - sources."uglify-js-3.18.0" + sources."typescript-5.5.4" + sources."uglify-js-3.19.0" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" sources."upath-2.0.1" sources."util-deprecate-1.0.2" - sources."uuid-9.0.1" + sources."uuid-10.0.0" sources."validate-npm-package-license-3.0.4" - (sources."validate-npm-package-name-5.0.0" // { - dependencies = [ - sources."builtins-5.1.0" - ]; - }) + sources."validate-npm-package-name-5.0.1" + sources."walk-up-path-3.0.1" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -79814,6 +76697,7 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" + sources."yaml-1.10.2" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; @@ -79867,22 +76751,20 @@ in less-plugin-clean-css = nodeEnv.buildNodePackage { name = "less-plugin-clean-css"; packageName = "less-plugin-clean-css"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz"; - sha512 = "Pc68AFHAEJO3aAoRvnUTW5iAiAv6y+TQsWLTTwVNqjiDno6xCvxz1AtfQl7Y0MZSpHPalFajM1EU4RB5UVINpw=="; + url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.6.0.tgz"; + sha512 = "jwXX6WlXT57OVCXa5oBJBaJq1b4s1BOKeEEoAL2UTeEitogQWfTcBbLT/vow9pl0N0MXV8Mb4KyhTGG0YbEKyQ=="; }; dependencies = [ - sources."amdefine-1.0.1" - sources."clean-css-3.4.28" - sources."commander-2.8.1" - sources."graceful-readlink-1.0.1" - sources."source-map-0.4.4" + sources."clean-css-5.3.3" + sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = "http://lesscss.org"; + homepage = "https://lesscss.org"; + license = "Apache-2.0"; }; production = true; bypassCache = true; @@ -80262,14 +77144,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.6.1" // { + (sources."engine.io-3.6.2" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.5.3" // { + (sources."engine.io-client-3.5.4" // { dependencies = [ sources."debug-3.1.0" ]; @@ -80424,7 +77306,7 @@ in sources."is-descriptor-0.1.7" ]; }) - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -80542,7 +77424,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."socket.io-2.5.0" // { + (sources."socket.io-2.5.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -80553,7 +77435,7 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.3" + sources."socket.io-parser-3.3.4" ]; }) (sources."socket.io-parser-3.4.3" // { @@ -80618,7 +77500,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."ws-7.4.6" + sources."ws-7.5.10" sources."xmlhttprequest-ssl-1.6.3" sources."yeast-0.1.2" ]; @@ -80703,7 +77585,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.8" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -80741,7 +77623,7 @@ in sources."mkdirp-0.3.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."requirejs-2.3.6" + sources."requirejs-2.3.7" sources."rimraf-3.0.2" sources."wrappy-1.0.2" ]; @@ -80842,7 +77724,7 @@ in sources."esniff-2.0.1" sources."espree-3.5.4" sources."esprima-4.0.1" - (sources."esquery-1.5.0" // { + (sources."esquery-1.6.0" // { dependencies = [ sources."estraverse-5.3.0" ]; @@ -80911,7 +77793,7 @@ in ]; }) sources."interpret-1.4.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-fullwidth-code-point-2.0.0" sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" @@ -81128,13 +78010,13 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "10.4.0"; + version = "10.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz"; - sha512 = "eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz"; + sha512 = "v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA=="; }; dependencies = [ - sources."ansi-colors-4.1.1" + sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" @@ -81150,17 +78032,17 @@ in sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - (sources."debug-4.3.4" // { + (sources."debug-4.3.5" // { dependencies = [ sources."ms-2.1.2" ]; }) sources."decamelize-4.0.0" - sources."diff-5.0.0" + sources."diff-5.2.0" sources."emoji-regex-8.0.0" sources."escalade-3.1.2" sources."escape-string-regexp-4.0.0" @@ -81168,7 +78050,6 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."get-caller-file-2.0.5" sources."glob-8.1.0" sources."glob-parent-5.1.2" @@ -81186,7 +78067,7 @@ in sources."js-yaml-4.1.0" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" - sources."minimatch-5.0.1" + sources."minimatch-5.1.6" sources."ms-2.1.3" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -81198,18 +78079,18 @@ in sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."safe-buffer-5.2.1" - sources."serialize-javascript-6.0.0" + sources."serialize-javascript-6.0.2" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" sources."to-regex-range-5.0.1" - sources."workerpool-6.2.1" + sources."workerpool-6.5.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yargs-16.2.0" - sources."yargs-parser-20.2.4" + sources."yargs-parser-20.2.9" sources."yargs-unparser-2.0.0" sources."yocto-queue-0.1.0" ]; @@ -81273,14 +78154,14 @@ in sources."mime-types-2.1.35" sources."ms-2.1.2" sources."native-promise-only-0.8.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.3.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."side-channel-1.0.6" sources."slash-3.0.0" @@ -81326,7 +78207,7 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.6.0" + sources."logform-2.6.1" sources."ms-2.1.3" sources."one-time-1.0.0" sources."readable-stream-3.6.2" @@ -81339,7 +78220,7 @@ in sources."triple-beam-1.4.1" sources."util-deprecate-1.0.2" sources."winston-3.11.0" - sources."winston-transport-4.7.0" + sources."winston-transport-4.7.1" ]; buildInputs = globalBuildInputs; meta = { @@ -81376,10 +78257,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "10.1.0"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz"; - sha512 = "B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz"; + sha512 = "sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -81392,7 +78273,7 @@ in sources."ansi-styles-6.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."cacache-18.0.3" + sources."cacache-18.0.4" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-convert-2.0.1" @@ -81408,28 +78289,24 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."exponential-backoff-3.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."fs-minipass-3.0.3" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."graceful-fs-4.2.11" sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" + sources."https-proxy-agent-7.0.5" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."ip-address-9.0.5" sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jsbn-1.1.0" - sources."lru-cache-10.2.2" - (sources."make-fetch-happen-13.0.1" // { - dependencies = [ - sources."proc-log-4.2.0" - ]; - }) - sources."minimatch-9.0.4" + sources."lru-cache-10.4.3" + sources."make-fetch-happen-13.0.1" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."minipass-collect-2.0.1" sources."minipass-fetch-3.0.5" @@ -81458,18 +78335,19 @@ in sources."negotiator-0.6.3" sources."nopt-7.2.1" sources."p-map-4.0.0" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-scurry-1.11.1" - sources."proc-log-3.0.0" + sources."proc-log-4.2.0" sources."promise-retry-2.0.1" sources."retry-0.12.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."smart-buffer-4.2.0" sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.3" + sources."socks-proxy-agent-8.0.4" sources."sprintf-js-1.1.3" sources."ssri-10.0.6" sources."string-width-5.1.2" @@ -81541,144 +78419,87 @@ in bypassCache = true; reconstructLock = true; }; - node-pre-gyp = nodeEnv.buildNodePackage { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz"; - sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A=="; - }; - dependencies = [ - sources."abbrev-1.1.1" - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."chownr-1.1.4" - sources."code-point-at-1.1.0" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - sources."debug-3.2.7" - sources."deep-extend-0.6.0" - sources."delegates-1.0.0" - sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.7" - sources."fs.realpath-1.0.0" - sources."gauge-2.7.4" - sources."glob-7.2.3" - sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-fullwidth-code-point-1.0.0" - sources."isarray-1.0.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.3" - sources."needle-2.9.1" - sources."nopt-4.0.3" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."path-is-absolute-1.0.1" - sources."process-nextick-args-2.0.1" - sources."rc-1.2.8" - sources."readable-stream-2.3.8" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - sources."semver-5.7.2" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - (sources."tar-4.4.19" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."util-deprecate-1.0.2" - sources."wide-align-1.1.5" - sources."wrappy-1.0.2" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Node.js native addon binary install tool"; - homepage = "https://github.com/mapbox/node-pre-gyp#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "3.1.10"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-3.1.10.tgz"; - sha512 = "EjjcdgWat7wNcSCyxmSc0uHM5UV2eXEJRbTCzR/xi87Dt0E1gSl/YDAopyu590sz1YybExNk3jQRLmQVjx0POw=="; + url = "https://registry.npmjs.org/node-red/-/node-red-4.0.2.tgz"; + sha512 = "19AC1zouBYxaobzkpPb5PdqQptgO1fI9NRcrasFAYoG6wB8S53khFeuy1qiNaggo2JFu6TSJk2zLR+y4wksU1w=="; }; dependencies = [ - sources."@babel/runtime-7.24.7" - sources."@mapbox/node-pre-gyp-1.0.11" - sources."@node-red/editor-api-3.1.10" - sources."@node-red/editor-client-3.1.10" - (sources."@node-red/nodes-3.1.10" // { + sources."@babel/runtime-7.24.8" + sources."@emnapi/core-1.2.0" + sources."@emnapi/runtime-1.2.0" + sources."@emnapi/wasi-threads-1.0.1" + (sources."@isaacs/cliui-8.0.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."strip-ansi-7.1.0" + ]; + }) + sources."@isaacs/fs-minipass-4.0.1" + sources."@napi-rs/wasm-runtime-0.2.4" + (sources."@node-red/editor-api-4.0.2" // { + dependencies = [ + sources."mime-3.0.0" + ]; + }) + sources."@node-red/editor-client-4.0.2" + (sources."@node-red/nodes-4.0.2" // { dependencies = [ - sources."cookie-0.5.0" sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" ]; }) - sources."@node-red/registry-3.1.10" - sources."@node-red/runtime-3.1.10" - sources."@node-red/util-3.1.10" + sources."@node-red/registry-4.0.2" + sources."@node-red/runtime-4.0.2" + sources."@node-red/util-4.0.2" + sources."@node-rs/bcrypt-1.10.4" + sources."@node-rs/bcrypt-android-arm-eabi-1.10.4" + sources."@node-rs/bcrypt-android-arm64-1.10.4" + sources."@node-rs/bcrypt-darwin-arm64-1.10.4" + sources."@node-rs/bcrypt-darwin-x64-1.10.4" + sources."@node-rs/bcrypt-freebsd-x64-1.10.4" + sources."@node-rs/bcrypt-linux-arm-gnueabihf-1.10.4" + sources."@node-rs/bcrypt-linux-arm64-gnu-1.10.4" + sources."@node-rs/bcrypt-linux-arm64-musl-1.10.4" + sources."@node-rs/bcrypt-linux-x64-gnu-1.10.4" + sources."@node-rs/bcrypt-linux-x64-musl-1.10.4" + sources."@node-rs/bcrypt-wasm32-wasi-1.10.4" + sources."@node-rs/bcrypt-win32-arm64-msvc-1.10.4" + sources."@node-rs/bcrypt-win32-ia32-msvc-1.10.4" + sources."@node-rs/bcrypt-win32-x64-msvc-1.10.4" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" + sources."@tybys/wasm-util-0.9.0" sources."@types/http-cache-semantics-4.0.4" + sources."@types/node-20.14.12" + (sources."@types/readable-stream-4.0.15" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."@types/ws-8.5.11" sources."abbrev-1.1.1" + sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.2" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.3" + sources."acorn-walk-8.3.2" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" ]; }) - sources."ajv-8.12.0" + sources."ajv-8.14.0" sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" + sources."ansi-styles-6.2.1" sources."append-field-1.0.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) sources."argparse-2.0.1" sources."array-flatten-1.1.1" - sources."async-mutex-0.4.0" + sources."async-mutex-0.5.0" sources."asynckit-0.4.0" sources."axios-1.7.2" sources."balanced-match-1.0.2" @@ -81688,17 +78509,12 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."bcrypt-5.1.0" sources."bcryptjs-2.4.3" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."bl-6.0.14" sources."body-parser-1.20.2" sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" + sources."brace-expansion-2.0.1" + sources."buffer-6.0.3" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."busboy-1.6.0" @@ -81708,19 +78524,22 @@ in sources."call-bind-1.0.7" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" - sources."chownr-2.0.0" + sources."chownr-3.0.0" sources."cli-table-0.3.11" sources."clone-2.1.2" - sources."color-support-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commist-1.1.0" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."console-control-strings-1.1.0" + sources."commist-3.2.0" + (sources."concat-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.2" + ]; + }) sources."content-disposition-0.5.4" sources."content-type-1.0.5" - sources."cookie-0.4.2" + sources."cookie-0.6.0" (sources."cookie-parser-1.4.6" // { dependencies = [ sources."cookie-0.4.1" @@ -81730,9 +78549,14 @@ in sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cronosjs-1.7.1" + sources."cross-spawn-7.0.3" sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."debug-2.6.9" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -81741,79 +78565,54 @@ in sources."defer-to-connect-2.0.1" sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" sources."denque-2.1.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."detect-libc-2.0.3" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" - (sources."duplexify-4.1.3" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" + sources."emoji-regex-9.2.2" 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."enquirer-2.4.1" sources."entities-2.2.0" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.19.2" // { + sources."event-target-shim-5.0.1" + sources."events-3.3.0" + sources."express-4.19.2" + (sources."express-session-1.18.0" // { dependencies = [ - sources."cookie-0.6.0" + sources."cookie-signature-1.0.7" ]; }) - sources."express-session-1.17.3" sources."fast-deep-equal-3.1.3" + sources."fast-unique-numbers-8.0.13" sources."finalhandler-1.2.0" sources."follow-redirects-1.15.6" + sources."foreground-child-3.2.1" sources."form-data-4.0.0" sources."form-data-encoder-2.1.4" sources."forwarded-0.2.0" sources."fresh-0.5.2" - (sources."fs-extra-11.1.1" // { - dependencies = [ - sources."universalify-2.0.1" - ]; - }) - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."fs.realpath-1.0.0" + sources."fs-extra-11.2.0" sources."function-bind-1.1.2" - sources."gauge-3.0.2" sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" - sources."glob-7.2.3" + sources."glob-10.4.5" sources."gopd-1.0.1" sources."got-12.6.0" sources."graceful-fs-4.2.11" sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.3" sources."has-symbols-1.0.3" - sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."hasown-2.0.2" - (sources."help-me-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) + sources."help-me-5.0.0" sources."hpagent-1.2.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" @@ -81828,87 +78627,77 @@ in sources."i18next-21.10.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ipaddr.js-1.9.1" sources."is-fullwidth-code-point-3.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."jackspeak-3.4.3" sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.7" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.1" - ]; - }) + sources."jsonata-2.0.5" + sources."jsonfile-6.1.0" sources."keyv-4.5.4" - sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-3.0.0" - sources."lru-cache-4.1.5" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) + sources."lru-cache-6.0.0" sources."media-typer-0.3.0" (sources."memorystore-1.6.7" // { dependencies = [ sources."debug-4.3.5" + sources."lru-cache-4.1.5" sources."ms-2.1.2" + sources."yallist-2.1.2" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-3.0.0" + sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-response-4.0.0" - sources."minimatch-3.1.2" + sources."minimatch-9.0.5" sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) + sources."minipass-7.1.2" + sources."minizlib-3.0.1" sources."mkdirp-0.5.6" - sources."moment-2.29.4" - sources."moment-timezone-0.5.43" - (sources."mqtt-4.3.7" // { + sources."moment-2.30.1" + sources."moment-timezone-0.5.45" + (sources."mqtt-5.7.0" // { dependencies = [ - sources."concat-stream-2.0.0" sources."debug-4.3.5" - sources."lru-cache-6.0.0" + sources."lru-cache-10.4.3" sources."ms-2.1.2" - sources."readable-stream-3.6.2" - sources."yallist-4.0.0" + sources."ws-8.18.0" ]; }) - (sources."mqtt-packet-6.10.0" // { + (sources."mqtt-packet-9.0.0" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" ]; }) - sources."ms-2.0.0" - sources."multer-1.4.5-lts.1" + sources."ms-2.1.3" + (sources."multer-1.4.5-lts.1" // { + dependencies = [ + sources."concat-stream-1.6.2" + sources."readable-stream-2.3.8" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."mustache-4.2.0" - sources."mute-stream-0.0.8" + sources."mute-stream-1.0.0" sources."negotiator-0.6.3" - sources."node-addon-api-5.1.0" - sources."node-fetch-2.7.0" sources."node-gyp-build-4.8.1" - sources."node-red-admin-3.1.3" + sources."node-red-admin-4.0.0" sources."node-watch-0.7.4" sources."nopt-5.0.0" sources."normalize-url-8.0.1" - sources."npmlog-5.0.1" sources."nth-check-2.1.1" (sources."number-allocator-1.0.14" // { dependencies = [ @@ -81916,29 +78705,34 @@ in sources."ms-2.1.2" ]; }) - sources."oauth2orize-1.11.1" + sources."oauth2orize-1.12.0" sources."object-assign-4.1.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" - sources."once-1.4.0" sources."p-cancelable-3.0.0" + sources."package-json-from-dist-1.0.0" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" - sources."passport-0.6.0" + sources."passport-0.7.0" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" sources."passport-strategy-1.0.0" - sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + (sources."path-scurry-1.11.1" // { + dependencies = [ + sources."lru-cache-10.4.3" + ]; + }) sources."path-to-regexp-0.1.7" sources."pause-0.0.1" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."pump-3.0.0" sources."punycode-2.3.1" sources."qs-6.11.0" sources."querystringify-2.2.0" @@ -81946,12 +78740,8 @@ in sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raw-body-2.5.2" - sources."read-1.0.7" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."read-3.0.1" + sources."readable-stream-4.5.2" sources."regenerator-runtime-0.14.1" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" @@ -81959,76 +78749,86 @@ in sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" sources."rfdc-1.4.1" - sources."rimraf-3.0.2" + sources."rimraf-5.0.9" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.4.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - sources."mime-1.6.0" - sources."ms-2.1.3" - ]; - }) + sources."semver-7.5.4" + sources."send-0.18.0" sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" sources."set-function-length-1.2.2" sources."setprototypeof-1.2.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."side-channel-1.0.6" - sources."signal-exit-3.0.7" - (sources."split2-3.2.2" // { + sources."signal-exit-4.1.0" + sources."split2-4.2.0" + sources."statuses-2.0.1" + sources."streamsearch-1.1.0" + (sources."string-width-5.1.2" // { dependencies = [ - sources."readable-stream-3.6.2" + sources."ansi-regex-6.0.1" + sources."strip-ansi-7.1.0" ]; }) - sources."statuses-2.0.1" - sources."stream-shift-1.0.3" - sources."streamsearch-1.1.0" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { + (sources."string-width-cjs-4.2.3" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."emoji-regex-8.0.0" ]; }) + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - (sources."tar-6.2.1" // { + sources."strip-ansi-cjs-6.0.1" + (sources."tar-7.2.0" // { dependencies = [ - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" + sources."mkdirp-3.0.1" + sources."yallist-5.0.0" ]; }) sources."toidentifier-1.0.1" - sources."tough-cookie-4.1.3" - sources."tr46-0.0.3" + (sources."tough-cookie-4.1.4" // { + dependencies = [ + sources."universalify-0.2.0" + ]; + }) sources."tslib-2.6.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.17.4" sources."uid-safe-2.1.5" sources."uid2-0.0.4" - sources."universalify-0.2.0" + sources."undici-types-5.26.5" + sources."universalify-2.0.1" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."url-parse-1.5.10" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-9.0.0" + sources."uuid-9.0.1" sources."vary-1.1.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" - sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."which-2.0.2" + sources."worker-timers-7.1.8" + sources."worker-timers-broker-6.1.8" + sources."worker-timers-worker-7.0.71" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."strip-ansi-7.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."ws-7.5.10" sources."xml2js-0.6.2" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" - sources."yallist-2.1.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -82108,7 +78908,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -82247,10 +79047,10 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "10.0.5"; + version = "10.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-10.0.5.tgz"; - sha512 = "Tu270vVvsh92uh6XDXrGS6D94PhzxQYqM8uUxftYVp0B8qXl78dJRYwQ9wfYMOBB9ynlF79eWlUtPUxPzKGddQ=="; + url = "https://registry.npmjs.org/np/-/np-10.0.7.tgz"; + sha512 = "vIPKQwOYKpQU40PU5x/vLfN2haj8ObxMvR1QGt7EZnBPWdm4WEbHdumYAnMV7AeR9kACsMqcqAP37sAo5cW5jA=="; }; dependencies = [ sources."@babel/code-frame-7.24.7" @@ -82261,8 +79061,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@inquirer/figures-1.0.3" - sources."@ljharb/through-2.3.13" + sources."@inquirer/figures-1.0.5" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -82274,9 +79073,6 @@ in }) sources."@pnpm/npm-conf-2.2.2" sources."@samverschueren/stream-to-observable-0.3.1" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.4" sources."@types/normalize-package-data-2.4.4" sources."aggregate-error-4.0.1" sources."ansi-align-3.0.1" @@ -82303,13 +79099,6 @@ in sources."braces-3.0.3" sources."buffer-5.7.1" sources."bundle-name-4.1.0" - sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.14" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."call-bind-1.0.7" sources."callsites-3.1.0" sources."camelcase-7.0.1" sources."chalk-5.3.0" @@ -82347,17 +79136,10 @@ in ]; }) sources."date-fns-1.30.1" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) sources."deep-extend-0.6.0" sources."default-browser-5.2.1" sources."default-browser-id-5.0.0" sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.4" sources."define-lazy-prop-3.0.0" sources."del-7.1.0" sources."dir-glob-3.0.1" @@ -82366,8 +79148,6 @@ in sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" sources."escape-goat-4.0.0" sources."escape-string-regexp-5.0.0" (sources."execa-8.0.1" // { @@ -82391,27 +79171,13 @@ in ]; }) sources."find-up-simple-1.0.0" - sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.4" sources."get-stream-8.0.1" sources."github-url-from-git-1.5.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."global-directory-4.0.1" - (sources."global-dirs-3.0.1" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) sources."globby-13.2.2" - sources."gopd-1.0.1" - (sources."got-12.6.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) sources."graceful-fs-4.2.11" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -82419,13 +79185,7 @@ in ]; }) sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."hasown-2.0.2" sources."hosted-git-info-7.0.2" - sources."http-cache-semantics-4.1.1" - sources."http2-wrapper-2.2.1" sources."human-signals-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -82433,12 +79193,12 @@ in (sources."ignore-walk-6.0.5" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" ]; }) sources."import-fresh-3.3.0" sources."import-lazy-4.0.0" - (sources."import-local-3.1.0" // { + (sources."import-local-3.2.0" // { dependencies = [ sources."pkg-dir-4.2.0" ]; @@ -82449,7 +79209,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" - sources."inquirer-9.2.23" + sources."inquirer-9.3.6" (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -82478,7 +79238,6 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" sources."is-docker-3.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -82508,11 +79267,9 @@ in sources."issue-regex-4.1.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.5.4" - sources."ky-1.3.0" - sources."latest-version-7.0.0" + sources."ky-1.4.0" + sources."latest-version-9.0.0" sources."lines-and-columns-1.2.4" (sources."listr-0.14.3" // { dependencies = [ @@ -82586,15 +79343,13 @@ in sources."wrap-ansi-3.0.1" ]; }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."meow-13.2.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.7" sources."mimic-fn-4.0.0" sources."mimic-function-5.0.1" - sources."mimic-response-4.0.0" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."mute-stream-1.0.0" @@ -82603,8 +79358,7 @@ in sources."type-fest-2.19.0" ]; }) - sources."normalize-package-data-6.0.1" - sources."normalize-url-8.0.1" + sources."normalize-package-data-6.0.2" (sources."npm-name-8.0.0" // { dependencies = [ sources."p-map-7.0.2" @@ -82634,7 +79388,6 @@ in }) sources."org-regex-1.0.0" sources."os-tmpdir-1.0.2" - sources."p-cancelable-3.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-5.5.0" @@ -82645,7 +79398,7 @@ in }) sources."p-timeout-6.1.2" sources."p-try-2.2.0" - sources."package-json-8.1.1" + sources."package-json-10.0.1" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-exists-5.0.0" @@ -82658,7 +79411,6 @@ in sources."proto-list-1.2.4" sources."pupa-3.1.0" sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -82666,26 +79418,24 @@ in }) (sources."read-package-up-11.0.0" // { dependencies = [ - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" ]; }) (sources."read-pkg-9.0.1" // { dependencies = [ sources."parse-json-8.1.0" - sources."type-fest-4.20.0" + sources."type-fest-4.23.0" ]; }) sources."readable-stream-3.6.2" sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" - sources."resolve-alpn-1.2.1" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" ]; }) sources."resolve-from-4.0.0" - sources."responselike-3.0.0" (sources."restore-cursor-3.1.0" // { dependencies = [ sources."mimic-fn-2.1.0" @@ -82706,9 +79456,8 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scoped-regex-3.0.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."semver-diff-4.0.0" - sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -82743,15 +79492,10 @@ in sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."unicorn-magic-0.1.0" sources."unique-string-3.0.0" - (sources."update-notifier-7.0.0" // { - dependencies = [ - sources."is-installed-globally-0.4.0" - sources."is-path-inside-3.0.3" - ]; - }) + sources."update-notifier-7.1.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.1" @@ -82779,6 +79523,7 @@ in ]; }) sources."xdg-basedir-5.1.0" + sources."yoctocolors-cjs-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -82793,10 +79538,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "10.8.1"; + version = "10.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.8.1.tgz"; - sha512 = "Dp1C6SvSMYQI7YHq/y2l94uvI+59Eqbu1EpuKQHQ8p16txXRuRit5gH3Lnaagk2aXDIjg/Iru9pd05bnneKgdw=="; + url = "https://registry.npmjs.org/npm/-/npm-10.8.2.tgz"; + sha512 = "x/AIjFIKRllrhcb48dqUNAAZl0ig9+qMuN91RpZo3Cb2+zuibfh+KISl6+kVVyktDz230JKc208UkQwwMqyB+w=="; }; buildInputs = globalBuildInputs; meta = { @@ -82865,10 +79610,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.30.2"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.30.2.tgz"; - sha512 = "bmMfFv9N2iPFAyHxKHVPz9VCJIG4nZI5JnandGCp+W8IqRdVE4M6+XxLS6XTQR0K6pRBhaZYnj/NmCO85qYdgQ=="; + url = "https://registry.npmjs.org/orval/-/orval-6.31.0.tgz"; + sha512 = "515KTDQ4VRJCT+4DsMrK/QROWRq4PXrjgxAoEx3jmP7j+aQBGbx8WhidIF6aX1UgbTxw47Lq7QVp9mbnD0lnWA=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -82877,7 +79622,7 @@ in sources."@apidevtools/swagger-parser-10.1.0" sources."@asyncapi/specs-4.3.1" sources."@exodus/schemasafe-1.3.0" - sources."@ibm-cloud/openapi-ruleset-1.17.1" + sources."@ibm-cloud/openapi-ruleset-1.18.2" sources."@ibm-cloud/openapi-ruleset-utilities-1.3.2" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" @@ -82885,17 +79630,17 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.30.2" - sources."@orval/axios-6.30.2" - sources."@orval/core-6.30.2" - sources."@orval/fetch-6.30.2" - sources."@orval/hono-6.30.2" - sources."@orval/mock-6.30.2" - sources."@orval/query-6.30.2" - sources."@orval/swr-6.30.2" - sources."@orval/zod-6.30.2" + sources."@orval/angular-6.31.0" + sources."@orval/axios-6.31.0" + sources."@orval/core-6.31.0" + sources."@orval/fetch-6.31.0" + sources."@orval/hono-6.31.0" + sources."@orval/mock-6.31.0" + sources."@orval/query-6.31.0" + sources."@orval/swr-6.31.0" + sources."@orval/zod-6.31.0" sources."@stoplight/better-ajv-errors-1.0.3" - sources."@stoplight/json-3.21.0" + sources."@stoplight/json-3.21.4" (sources."@stoplight/json-ref-readers-1.2.2" // { dependencies = [ sources."tslib-1.14.1" @@ -82934,11 +79679,11 @@ in sources."@stoplight/yaml-ast-parser-0.0.50" sources."@types/es-aggregate-error-1.0.6" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/urijs-1.19.25" sources."abort-controller-3.0.0" - sources."acorn-8.12.0" - sources."ajv-8.16.0" + sources."acorn-8.12.1" + sources."ajv-8.17.1" sources."ajv-draft-04-1.0.0" sources."ajv-errors-3.0.0" sources."ajv-formats-2.1.1" @@ -82964,7 +79709,7 @@ in sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."compare-versions-6.1.0" + sources."compare-versions-6.1.1" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."data-view-buffer-1.0.1" @@ -82996,6 +79741,7 @@ in sources."fast-glob-3.3.2" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" + sources."fast-uri-3.0.1" sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."find-up-5.0.0" @@ -83049,7 +79795,7 @@ in sources."isarray-2.0.5" sources."isexe-2.0.0" sources."js-yaml-3.14.1" - sources."jsep-1.3.8" + sources."jsep-1.3.9" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-2.2.1" sources."jsonfile-6.1.0" @@ -83089,14 +79835,14 @@ in sources."oas-resolver-2.5.6" sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."onetime-5.1.2" sources."openapi-types-12.1.3" (sources."openapi3-ts-4.2.2" // { dependencies = [ - sources."yaml-2.4.5" + sources."yaml-2.5.0" ]; }) sources."p-limit-3.1.0" @@ -83107,7 +79853,6 @@ in sources."picomatch-2.3.1" sources."pony-cause-1.1.1" sources."possible-typed-array-names-1.0.0" - sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" @@ -83152,11 +79897,10 @@ in sources."typed-array-byte-length-1.0.1" sources."typed-array-byte-offset-1.0.2" sources."typed-array-length-1.0.6" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."unbox-primitive-1.0.2" sources."undici-types-5.26.5" sources."universalify-2.0.1" - sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.11.0" sources."validator-13.12.0" @@ -83208,7 +79952,7 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@lezer/common-1.2.1" sources."@lezer/lr-1.4.1" @@ -83289,7 +80033,7 @@ in (sources."@parcel/watcher-2.4.1" // { dependencies = [ sources."detect-libc-1.0.3" - sources."node-addon-api-7.1.0" + sources."node-addon-api-7.1.1" ]; }) sources."@parcel/watcher-android-arm64-2.4.1" @@ -83305,14 +80049,14 @@ in sources."@parcel/watcher-win32-ia32-2.4.1" sources."@parcel/watcher-win32-x64-2.4.1" sources."@parcel/workers-2.12.0" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.12.0" + sources."acorn-8.12.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -83331,17 +80075,17 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.13.0" sources."balanced-match-1.0.2" - sources."base-x-3.0.9" + sources."base-x-3.0.10" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" sources."brace-expansion-2.0.1" sources."braces-3.0.3" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chrome-trace-event-1.0.4" @@ -83360,8 +80104,8 @@ in sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-7.0.2" - sources."cssnano-preset-default-7.0.2" + sources."cssnano-7.0.4" + sources."cssnano-preset-default-7.0.4" sources."cssnano-utils-5.0.0" sources."csso-4.2.0" sources."cssom-0.3.8" @@ -83384,7 +80128,7 @@ in sources."dotenv-expand-5.1.0" sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-9.2.2" sources."entities-3.0.1" sources."env-paths-2.2.1" @@ -83401,13 +80145,13 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" sources."get-port-4.2.0" sources."getpass-0.1.7" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."globals-13.24.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -83454,7 +80198,7 @@ in sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -83482,25 +80226,26 @@ in sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."mdn-data-2.0.14" sources."micromatch-4.0.7" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" - sources."msgpackr-1.10.2" + sources."msgpackr-1.11.0" sources."nanoid-3.3.7" sources."node-addon-api-6.1.0" sources."node-gyp-build-optional-packages-5.1.1" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" - sources."nwsapi-2.2.10" + sources."nwsapi-2.2.12" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."optionator-0.8.3" sources."ordered-binary-1.5.1" + sources."package-json-from-dist-1.0.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."parse5-5.1.0" @@ -83511,33 +80256,33 @@ in sources."picocolors-1.0.1" sources."picomatch-2.3.1" sources."pn-1.1.0" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-calc-10.0.0" - sources."postcss-colormin-7.0.0" - sources."postcss-convert-values-7.0.0" - sources."postcss-discard-comments-7.0.0" + sources."postcss-colormin-7.0.1" + sources."postcss-convert-values-7.0.2" + sources."postcss-discard-comments-7.0.1" sources."postcss-discard-duplicates-7.0.0" sources."postcss-discard-empty-7.0.0" sources."postcss-discard-overridden-7.0.0" - sources."postcss-merge-longhand-7.0.1" - sources."postcss-merge-rules-7.0.1" + sources."postcss-merge-longhand-7.0.2" + sources."postcss-merge-rules-7.0.2" sources."postcss-minify-font-values-7.0.0" sources."postcss-minify-gradients-7.0.0" - sources."postcss-minify-params-7.0.0" - sources."postcss-minify-selectors-7.0.1" + sources."postcss-minify-params-7.0.1" + sources."postcss-minify-selectors-7.0.2" sources."postcss-normalize-charset-7.0.0" sources."postcss-normalize-display-values-7.0.0" sources."postcss-normalize-positions-7.0.0" sources."postcss-normalize-repeat-style-7.0.0" sources."postcss-normalize-string-7.0.0" sources."postcss-normalize-timing-functions-7.0.0" - sources."postcss-normalize-unicode-7.0.0" + sources."postcss-normalize-unicode-7.0.1" sources."postcss-normalize-url-7.0.0" sources."postcss-normalize-whitespace-7.0.0" - sources."postcss-ordered-values-7.0.0" - sources."postcss-reduce-initial-7.0.0" + sources."postcss-ordered-values-7.0.1" + sources."postcss-reduce-initial-7.0.1" sources."postcss-reduce-transforms-7.0.0" - sources."postcss-selector-parser-6.1.0" + sources."postcss-selector-parser-6.1.1" (sources."postcss-svgo-7.0.1" // { dependencies = [ sources."css-select-5.1.0" @@ -83584,7 +80329,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -83608,12 +80353,12 @@ in ]; }) sources."strip-ansi-cjs-6.0.1" - sources."stylehacks-7.0.1" + sources."stylehacks-7.0.2" sources."supports-color-7.2.0" sources."svgo-2.8.0" sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.31.1" // { + (sources."terser-5.31.3" // { dependencies = [ sources."commander-2.20.3" ]; @@ -83627,7 +80372,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-fest-0.20.2" - sources."typescript-5.4.5" + sources."typescript-5.5.4" (sources."uncss-0.17.3" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -83640,7 +80385,7 @@ in ]; }) sources."uniq-1.0.1" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utility-types-3.11.0" @@ -83668,7 +80413,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.2" + sources."ws-6.2.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" ]; @@ -83857,7 +80602,7 @@ in sources."neo-async-2.6.2" sources."node-gyp-build-4.8.1" sources."oauth-sign-0.9.0" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."on-finished-2.4.1" @@ -83918,7 +80663,7 @@ in sources."serve-static-1.15.0" (sources."service-runner-2.9.0" // { dependencies = [ - sources."semver-7.6.2" + sources."semver-7.6.3" sources."yargs-14.2.3" ]; }) @@ -83941,7 +80686,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.18.0" + sources."uglify-js-3.19.0" sources."unix-dgram-2.0.6" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -84041,7 +80786,7 @@ in sources."path-key-3.1.1" sources."picomatch-2.3.1" sources."rimraf-2.7.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -84052,7 +80797,7 @@ in sources."universalify-2.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yaml-2.4.5" + sources."yaml-2.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -84207,7 +80952,7 @@ in sources."ipaddr.js-2.2.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-date-object-1.0.5" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -84326,6 +81071,7 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."safe-buffer-5.0.1" + sources."ultron-1.1.1" sources."ws-2.3.1" ]; }) @@ -84363,7 +81109,7 @@ in }) sources."trim-newlines-1.0.0" sources."typedarray-0.0.6" - sources."ultron-1.1.1" + sources."ultron-1.0.2" sources."uniq-1.0.1" sources."util-deprecate-1.0.2" sources."utp-0.0.7" @@ -84371,11 +81117,7 @@ in sources."winreg-1.2.4" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - (sources."ws-1.1.5" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) + sources."ws-1.1.5" sources."xmlbuilder-4.0.0" sources."xmldom-0.1.31" sources."xtend-4.0.2" @@ -84430,7 +81172,6 @@ in (sources."bittorrent-tracker-7.7.0" // { dependencies = [ sources."bencode-0.8.0" - sources."ultron-1.0.2" sources."ws-1.1.5" ]; }) @@ -84500,14 +81241,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.1" // { + (sources."engine.io-3.6.2" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" sources."ms-2.1.3" ]; }) - (sources."engine.io-client-3.5.3" // { + (sources."engine.io-client-3.5.4" // { dependencies = [ sources."debug-3.1.0" ]; @@ -84635,7 +81376,7 @@ in sources."node-gyp-build-4.8.1" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -84711,10 +81452,11 @@ in dependencies = [ sources."readable-stream-2.3.8" sources."safe-buffer-5.0.1" + sources."ultron-1.1.1" sources."ws-2.3.1" ]; }) - (sources."socket.io-2.5.0" // { + (sources."socket.io-2.5.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" @@ -84725,7 +81467,7 @@ in dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" - sources."socket.io-parser-3.3.3" + sources."socket.io-parser-3.3.4" ]; }) (sources."socket.io-parser-3.4.3" // { @@ -84764,7 +81506,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uid-safe-2.1.5" - sources."ultron-1.1.1" + sources."ultron-1.0.2" sources."uniq-1.0.1" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -84781,7 +81523,7 @@ in }) sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.6" + sources."ws-7.5.10" sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -84828,10 +81570,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.38"; + version = "8.4.40"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz"; - sha512 = "Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz"; + sha512 = "YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q=="; }; dependencies = [ sources."nanoid-3.3.7" @@ -84880,9 +81622,9 @@ in sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" - sources."get-tsconfig-4.7.5" + sources."get-tsconfig-4.7.6" sources."glob-parent-5.1.2" - sources."globby-14.0.1" + sources."globby-14.0.2" sources."graceful-fs-4.2.11" sources."ignore-5.3.1" sources."is-binary-path-2.1.0" @@ -84901,7 +81643,7 @@ in sources."picocolors-1.0.1" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-load-config-5.1.0" sources."postcss-reporter-7.1.0" sources."pretty-hrtime-1.0.3" @@ -84918,12 +81660,12 @@ in sources."strip-ansi-6.0.1" sources."thenby-1.3.4" sources."to-regex-range-5.0.1" - sources."tsx-4.15.4" + sources."tsx-4.16.2" sources."unicorn-magic-0.1.0" sources."universalify-2.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; @@ -84970,7 +81712,7 @@ in sources."rc-1.2.8" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" sources."string_decoder-1.3.0" @@ -84994,10 +81736,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz"; - sha512 = "rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz"; + sha512 = "i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew=="; }; buildInputs = globalBuildInputs; meta = { @@ -85020,7 +81762,7 @@ in dependencies = [ sources."@taplo/core-0.1.1" sources."@taplo/lib-0.4.0-alpha.2" - sources."prettier-3.3.2" + sources."prettier-3.3.3" ]; buildInputs = globalBuildInputs; meta = { @@ -85035,17 +81777,17 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-5.15.0.tgz"; - sha512 = "JA81ACQSCi3a7NUOgonOIkdx8PAVkO+HbUOxmd00Yb8DgIIEpr2V9+Qe/j6MLxIgWtE/OtVQ54rVjfYRbZsCfw=="; + url = "https://registry.npmjs.org/prisma/-/prisma-5.17.0.tgz"; + sha512 = "m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA=="; }; dependencies = [ - sources."@prisma/debug-5.15.0" - sources."@prisma/engines-5.15.0" - sources."@prisma/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" - sources."@prisma/fetch-engine-5.15.0" - sources."@prisma/get-platform-5.15.0" + sources."@prisma/debug-5.17.0" + sources."@prisma/engines-5.17.0" + sources."@prisma/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" + sources."@prisma/fetch-engine-5.17.0" + sources."@prisma/get-platform-5.17.0" ]; buildInputs = globalBuildInputs; meta = { @@ -85060,14 +81802,14 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "5.15.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.15.0.tgz"; - sha512 = "hcYw8VCycw1TPrTVZGs9AaAXepj8tmsyDE7RaOUD8Csydbz9g4fqeNo/zHrY9KPjiTMwVvTNVknArt5nWCvPYQ=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.17.0.tgz"; + sha512 = "4XXTBGpwJBUFqvY2WxL/4W1q/OOstxCJER4TYftNgMGjKjnsFkQNme567QTlPwWp7VGw2jcNmyTFOcP4HdohIg=="; }; dependencies = [ - sources."@prisma/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" - sources."@prisma/schema-files-loader-5.15.0" + sources."@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" + sources."@prisma/schema-files-loader-5.17.0" sources."@types/js-levenshtein-1.1.3" sources."fs-extra-11.1.1" sources."graceful-fs-4.2.11" @@ -85116,13 +81858,13 @@ in }) sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" - (sources."glob-10.4.1" // { + (sources."glob-10.4.5" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" ]; }) (sources."globule-1.3.4" // { @@ -85134,13 +81876,14 @@ in sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."keypress-0.2.1" sources."lodash-4.17.21" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."minimatch-3.0.8" sources."minipass-7.1.2" sources."once-1.4.0" + sources."package-json-from-dist-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-scurry-1.11.1" @@ -85277,7 +82020,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.5" // { + (sources."elliptic-6.5.6" // { dependencies = [ sources."bn.js-4.12.0" ]; @@ -85329,7 +82072,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -85363,7 +82106,7 @@ in }) sources."mute-stream-0.0.8" sources."node-static-0.7.11" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."object-keys-1.1.1" sources."object.assign-4.1.5" sources."once-1.4.0" @@ -85394,7 +82137,7 @@ in ]; }) sources."punycode-1.4.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" @@ -85506,10 +82249,10 @@ in purescript-psa = nodeEnv.buildNodePackage { name = "purescript-psa"; packageName = "purescript-psa"; - version = "0.8.2"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.8.2.tgz"; - sha512 = "4Olf0aQQrNCfcDLXQI3gJgINEQ+3U+4QPLmQ2LHX2L/YOXSwM7fOGIUs/wMm/FQnwERUyQmHKQTJKB4LIjE2fg=="; + url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.9.0.tgz"; + sha512 = "yKsPiF4x/LjxOAzeUFIr/f0PtBgRK3IBwh4fNY6Ndz+p12QOEjReeJxqt5wIUo1O6RHPJLmb1Dro2xxc8I9w9w=="; }; buildInputs = globalBuildInputs; meta = { @@ -85606,7 +82349,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -85722,10 +82465,10 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "5.0.7"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz"; - sha512 = "nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz"; + sha512 = "9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -85738,16 +82481,17 @@ in sources."cross-spawn-7.0.3" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" - sources."foreground-child-3.2.0" - sources."glob-10.4.1" + sources."foreground-child-3.2.1" + sources."glob-11.0.0" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" - sources."lru-cache-10.2.2" - sources."minimatch-9.0.4" + sources."jackspeak-4.0.1" + sources."lru-cache-11.0.0" + sources."minimatch-10.0.1" sources."minipass-7.1.2" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" - sources."path-scurry-1.11.1" + sources."path-scurry-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -85788,10 +82532,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "4.18.0"; + version = "4.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz"; - sha512 = "QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.19.0.tgz"; + sha512 = "5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA=="; }; dependencies = [ sources."@types/estree-1.0.5" @@ -85809,7 +82553,7 @@ in "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.3.1850"; + version = "0.3.2029"; src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps; dependencies = [ sources."@azure/abort-controller-1.1.0" @@ -85823,33 +82567,32 @@ in sources."@azure/abort-controller-2.1.2" ]; }) - (sources."@azure/core-rest-pipeline-1.16.0" // { + (sources."@azure/core-rest-pipeline-1.16.2" // { dependencies = [ sources."@azure/abort-controller-2.1.2" ]; }) sources."@azure/core-tracing-1.1.2" - (sources."@azure/core-util-1.9.0" // { + (sources."@azure/core-util-1.9.1" // { dependencies = [ sources."@azure/abort-controller-2.1.2" ]; }) - sources."@azure/identity-4.2.1" - sources."@azure/logger-1.1.2" - sources."@azure/msal-browser-3.17.0" - sources."@azure/msal-common-14.12.0" - sources."@azure/msal-node-2.9.2" + sources."@azure/identity-4.4.0" + sources."@azure/logger-1.1.3" + sources."@azure/msal-browser-3.20.0" + sources."@azure/msal-common-14.14.0" + sources."@azure/msal-node-2.12.0" sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.10.1" + sources."@eslint-community/regexpp-4.11.0" (sources."@eslint/eslintrc-2.1.4" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" - sources."strip-json-comments-3.1.1" ]; }) sources."@eslint/js-8.57.0" - sources."@hpcc-js/wasm-2.16.2" + sources."@hpcc-js/wasm-2.18.0" (sources."@humanwhocodes/config-array-0.11.14" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -85858,6 +82601,16 @@ in }) sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.3" + (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."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -85879,8 +82632,8 @@ in sources."@typescript-eslint/utils-6.21.0" sources."@typescript-eslint/visitor-keys-6.21.0" sources."@ungap/structured-clone-1.2.0" - sources."@vscode/test-electron-2.4.0" - (sources."@vscode/vsce-2.27.0" // { + sources."@vscode/test-electron-2.4.1" + (sources."@vscode/vsce-2.31.1" // { dependencies = [ sources."ansi-styles-3.2.1" sources."brace-expansion-1.1.11" @@ -85901,7 +82654,7 @@ in sources."@vscode/vsce-sign-linux-x64-2.0.2" sources."@vscode/vsce-sign-win32-arm64-2.0.2" sources."@vscode/vsce-sign-win32-x64-2.0.2" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-jsx-5.3.2" sources."agent-base-7.1.1" sources."ajv-6.12.6" @@ -85930,12 +82683,11 @@ in sources."chalk-5.3.0" sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" - sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.9.2" sources."cliui-8.0.1" - sources."cockatiel-3.1.3" + sources."cockatiel-3.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -85978,14 +82730,11 @@ in sources."d3-transition-3.0.1" sources."d3-zoom-3.0.0" sources."debug-4.3.5" - sources."decompress-response-6.0.0" - sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" sources."delaunator-5.0.1" sources."delayed-stream-1.0.0" - sources."detect-libc-2.0.3" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."dom-serializer-2.0.0" @@ -85995,7 +82744,6 @@ in sources."eastasianwidth-0.2.0" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" sources."entities-4.5.0" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" @@ -86016,12 +82764,11 @@ in sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" - sources."esquery-1.5.0" + sources."esquery-1.6.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."events-3.3.0" - sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" @@ -86034,17 +82781,19 @@ in sources."flat-cache-3.2.0" sources."flatted-3.3.1" sources."follow-redirects-1.15.6" + (sources."foreground-child-3.2.1" // { + dependencies = [ + sources."signal-exit-4.1.0" + ]; + }) sources."form-data-4.0.0" - sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.4" - sources."github-from-package-0.0.0" - (sources."glob-7.2.3" // { + (sources."glob-11.0.0" // { dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" + sources."minimatch-10.0.1" ]; }) sources."glob-parent-5.1.2" @@ -86057,10 +82806,14 @@ in sources."has-proto-1.0.3" sources."has-symbols-1.0.3" sources."hasown-2.0.2" - sources."hosted-git-info-4.1.0" + (sources."hosted-git-info-4.1.0" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."htmlparser2-8.0.2" sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" + sources."https-proxy-agent-7.0.5" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.3.1" @@ -86069,7 +82822,6 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" sources."internmap-2.0.3" sources."is-ci-2.0.0" sources."is-docker-2.2.1" @@ -86083,24 +82835,21 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."jackspeak-4.0.1" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."jsonc-parser-3.2.1" + sources."jsonc-parser-3.3.1" (sources."jsonwebtoken-9.0.2" // { dependencies = [ + sources."jwa-1.4.1" sources."jws-3.2.2" ]; }) sources."jszip-3.10.1" - sources."jwa-1.4.1" - (sources."jws-4.0.0" // { - dependencies = [ - sources."jwa-2.0.0" - ]; - }) - sources."keytar-7.9.0" + sources."jwa-2.0.0" + sources."jws-4.0.0" sources."keyv-4.5.4" sources."leven-3.1.0" sources."levn-0.4.1" @@ -86116,7 +82865,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."log-symbols-5.1.0" - sources."lru-cache-6.0.0" + sources."lru-cache-11.0.0" (sources."markdown-it-12.3.2" // { dependencies = [ sources."entities-2.1.0" @@ -86129,18 +82878,13 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - sources."mimic-response-3.1.0" sources."minimatch-5.1.6" - sources."minimist-1.2.8" - sources."mkdirp-classic-0.5.3" + sources."minipass-7.1.2" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - sources."node-abi-3.65.0" - sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.2" @@ -86160,6 +82904,7 @@ in }) sources."p-limit-3.1.0" sources."p-locate-5.0.0" + sources."package-json-from-dist-1.0.0" sources."pako-1.0.11" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { @@ -86172,69 +82917,64 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-scurry-2.0.0" sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.1" - sources."prebuild-install-7.1.2" sources."prelude-ls-1.2.1" - sources."prettier-3.3.2" + sources."prettier-3.3.3" sources."process-nextick-args-2.0.1" - sources."pump-3.0.0" sources."punycode-2.3.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."queue-microtask-1.2.3" - sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.8" sources."require-directory-2.1.1" sources."resolve-from-4.0.0" sources."restore-cursor-4.0.0" sources."reusify-1.0.4" - sources."rimraf-3.0.2" + (sources."rimraf-3.0.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.3" + sources."minimatch-3.1.2" + ]; + }) sources."robust-predicates-3.0.2" sources."run-parallel-1.2.0" sources."rw-1.3.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.4.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.6" sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" sources."slash-3.0.0" sources."stdin-discarder-0.1.0" sources."stoppable-1.1.0" sources."string-width-4.2.3" + sources."string-width-cjs-4.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" + sources."strip-ansi-cjs-6.0.1" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."bl-4.1.0" - sources."buffer-5.7.1" - sources."readable-stream-3.6.2" - ]; - }) sources."text-table-0.2.0" sources."tmp-0.2.3" sources."to-regex-range-5.0.1" sources."ts-api-utils-1.3.0" sources."tslib-2.6.3" sources."tunnel-0.0.6" - sources."tunnel-agent-0.6.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.11" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."uc.micro-1.0.6" - sources."underscore-1.13.6" + sources."underscore-1.13.7" sources."uri-js-4.4.1" sources."url-join-4.0.1" sources."util-deprecate-1.0.2" @@ -86246,6 +82986,7 @@ in sources."which-2.0.2" 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."xml2js-0.5.0" sources."xmlbuilder-11.0.1" @@ -86267,10 +83008,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.77.5"; + version = "1.77.8"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz"; - sha512 = "oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz"; + sha512 = "4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -86279,7 +83020,7 @@ in sources."chokidar-3.6.0" sources."fill-range-7.1.1" sources."glob-parent-5.1.2" - sources."immutable-4.3.6" + sources."immutable-4.3.7" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -86303,10 +83044,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.6.2"; + version = "7.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz"; - sha512 = "FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"; + sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -86332,10 +83073,12 @@ in sources."ajv-8.12.0" (sources."ansi-align-3.0.1" // { dependencies = [ + sources."ansi-regex-5.0.1" sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."ansi-regex-5.0.1" + sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" sources."arch-2.2.0" sources."arg-5.0.2" @@ -86414,12 +83157,10 @@ in sources."signal-exit-3.0.7" (sources."string-width-5.1.2" // { dependencies = [ - sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" - sources."strip-ansi-7.1.0" ]; }) - sources."strip-ansi-6.0.1" + sources."strip-ansi-7.1.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" @@ -86429,12 +83170,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."strip-ansi-7.1.0" - ]; - }) + sources."wrap-ansi-8.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -86593,7 +83329,7 @@ in sources."negotiator-0.6.3" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.4.1" sources."options-0.0.6" sources."parsejson-0.0.1" @@ -86883,27 +83619,27 @@ in sources."@socket.io/component-emitter-3.1.2" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.17" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.5" - sources."engine.io-6.5.4" - sources."engine.io-parser-5.2.2" + sources."engine.io-6.5.5" + sources."engine.io-parser-5.2.3" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."ms-2.1.2" sources."negotiator-0.6.3" sources."node-gyp-build-4.8.1" sources."object-assign-4.1.1" - sources."socket.io-adapter-2.5.4" + sources."socket.io-adapter-2.5.5" sources."socket.io-parser-4.2.4" sources."undici-types-5.26.5" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.4" sources."vary-1.1.2" - sources."ws-8.11.0" + sources."ws-8.17.1" ]; buildInputs = globalBuildInputs; meta = { @@ -86982,7 +83718,7 @@ in sources."indent-string-5.0.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-2.0.0" sources."is-plain-obj-1.1.0" @@ -87026,7 +83762,7 @@ in sources."round-to-6.0.0" sources."safe-buffer-5.2.1" sources."sax-1.4.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ @@ -87082,10 +83818,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "15.3.1"; + version = "15.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.1.tgz"; - sha512 = "L/dqan+Hrt0PpPdCbHcI9bdfOvqaQZR7v5c5SWMJ3bUGQSezK09Mm9q2I3B4iObjaq7FyoldIM+fDSmfzGRXCA=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.2.tgz"; + sha512 = "pNxSMf5DtwhpZ8gUcOGCGZIWtCcyAUx9oLgAtlO4ag7DvlfnETL0BGqXaISc84pNrXvTWmt8Wal1FWKxdTsL3Q=="; }; dependencies = [ sources."argparse-2.0.1" @@ -87129,24 +83865,24 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.8.0"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.0.tgz"; - sha512 = "7Nxn+3X97oIvMzYJ7t27w00qUf1Y52irE2RU2dQAd5PyvfGp4E7NLhFKVhb6PV2fx7dCRMpNKDIuazmGthjpSQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.4.tgz"; + sha512 = "61aHMkdinWyH8BkkTX9jPLYxYzaAAz/FK/VQqdr2FiCQQ/q04WCwDlpGbHff1GdrMYTmW8chlTFvRWL9k0A8vg=="; }; dependencies = [ sources."@ampproject/remapping-2.3.0" sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { + sources."@babel/compat-data-7.24.9" + (sources."@babel/core-7.24.9" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { + sources."@babel/generator-7.24.10" + (sources."@babel/helper-compilation-targets-7.24.8" // { dependencies = [ sources."semver-6.3.1" ]; @@ -87155,56 +83891,52 @@ in sources."@babel/helper-function-name-7.24.7" sources."@babel/helper-hoist-variables-7.24.7" sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" + sources."@babel/helper-module-transforms-7.24.9" sources."@babel/helper-simple-access-7.24.7" sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" + sources."@babel/helper-string-parser-7.24.8" sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helpers-7.24.7" + sources."@babel/helper-validator-option-7.24.8" + sources."@babel/helpers-7.24.8" sources."@babel/highlight-7.24.7" - sources."@babel/parser-7.24.7" + sources."@babel/parser-7.24.8" sources."@babel/template-7.24.7" - (sources."@babel/traverse-7.24.7" // { + (sources."@babel/traverse-7.24.8" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.24.7" + sources."@babel/types-7.24.9" sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" sources."@types/estree-1.0.5" sources."@types/pug-2.0.10" sources."acorn-7.4.1" (sources."acorn-typescript-1.4.13" // { dependencies = [ - sources."acorn-8.12.0" + sources."acorn-8.12.1" ]; }) sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" sources."aria-query-5.3.0" sources."asap-2.0.6" - sources."assert-never-1.2.1" + sources."assert-never-1.3.0" sources."atob-2.1.2" - sources."axobject-query-4.0.0" + sources."axobject-query-4.1.0" sources."babel-walk-3.0.0-canary-5" sources."balanced-match-1.0.2" sources."binary-extensions-2.3.0" sources."brace-expansion-1.1.11" sources."braces-3.0.3" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-crc32-1.0.0" sources."call-bind-1.0.7" - sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.6.0" @@ -87222,7 +83954,7 @@ in sources."dequal-2.0.3" sources."detect-indent-6.1.0" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."errno-0.1.8" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" @@ -87232,14 +83964,12 @@ in sources."escape-string-regexp-1.0.5" sources."esm-env-1.0.0" sources."esrap-1.2.2" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" sources."get-intrinsic-1.2.4" - sources."get-tsconfig-4.7.5" + sources."get-tsconfig-4.7.6" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -87253,12 +83983,11 @@ in sources."hasown-2.0.2" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.3.6" - sources."import-fresh-3.3.0" + sources."immutable-4.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-expression-4.0.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -87279,8 +84008,6 @@ in sources."lru-cache-5.1.1" sources."magic-string-0.30.10" sources."make-dir-2.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" sources."mime-1.6.0" sources."min-indent-1.0.1" sources."minimatch-3.1.2" @@ -87290,18 +84017,17 @@ in sources."ms-2.0.0" sources."nanoid-3.3.7" sources."needle-3.3.1" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."parent-module-1.0.1" sources."parse-node-version-1.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."picocolors-1.0.1" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-load-config-5.1.0" sources."promise-7.3.1" sources."prr-1.0.1" @@ -87317,18 +84043,14 @@ in sources."pug-runtime-3.0.1" sources."pug-strip-comments-2.0.0" sources."pug-walk-2.0.0" - sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."resolve-1.22.8" - sources."resolve-from-4.0.0" sources."resolve-pkg-maps-1.0.0" - sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."run-parallel-1.2.0" sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.77.5" + sources."sass-1.77.8" sources."sax-1.4.1" sources."semver-5.7.2" sources."set-function-length-1.2.2" @@ -87348,9 +84070,9 @@ in sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svelte-5.0.0-next.155" // { + (sources."svelte-5.0.0-next.198" // { dependencies = [ - sources."acorn-8.12.0" + sources."acorn-8.12.1" ]; }) sources."svelte-preprocess-5.1.4" @@ -87358,14 +84080,14 @@ in sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."tslib-2.6.3" - sources."tsx-4.15.4" - sources."typescript-5.4.5" - sources."update-browserslist-db-1.0.16" + sources."tsx-4.16.2" + sources."typescript-5.5.4" + sources."update-browserslist-db-1.1.0" sources."void-elements-3.1.0" sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."zimmerframe-1.1.2" ]; buildInputs = globalBuildInputs; @@ -87425,10 +84147,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.4.4"; + version = "3.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz"; - sha512 = "ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz"; + sha512 = "1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA=="; }; dependencies = [ sources."@alloc/quick-lru-5.2.0" @@ -87441,22 +84163,22 @@ in sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" @@ -87491,33 +84213,34 @@ in }) sources."fastq-1.17.1" sources."fill-range-7.1.1" - sources."foreground-child-3.2.0" + sources."foreground-child-3.2.1" sources."function-bind-1.1.2" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."glob-parent-6.0.2" sources."hasown-2.0.2" sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" 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."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jiti-1.21.6" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.7" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."mz-2.7.0" sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" + sources."package-json-from-dist-1.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.11.1" @@ -87525,7 +84248,7 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.38" + sources."postcss-8.4.40" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { @@ -87533,8 +84256,8 @@ in sources."lilconfig-3.1.2" ]; }) - sources."postcss-nested-6.0.1" - sources."postcss-selector-parser-6.1.0" + sources."postcss-nested-6.2.0" + sources."postcss-selector-parser-6.1.1" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."read-cache-1.0.0" @@ -87571,7 +84294,7 @@ in ]; }) sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" @@ -87585,7 +84308,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.5" + sources."yaml-2.5.0" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -87690,7 +84413,7 @@ in sources."@types/cors-2.8.17" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/responselike-1.0.3" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" @@ -87896,10 +84619,11 @@ in sources."ms-2.1.2" ]; }) - (sources."socket.io-adapter-2.5.4" // { + (sources."socket.io-adapter-2.5.5" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" + sources."ws-8.17.1" ]; }) (sources."socket.io-parser-4.2.4" // { @@ -88252,7 +84976,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."on-finished-2.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -88276,7 +85000,7 @@ in sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.3.1" - sources."qs-6.12.1" + sources."qs-6.12.3" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -88330,7 +85054,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.1.3" - (sources."socket.io-parser-3.3.3" // { + (sources."socket.io-parser-3.3.4" // { dependencies = [ sources."component-emitter-1.3.1" sources."debug-3.1.0" @@ -88393,7 +85117,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.19.1" @@ -88658,7 +85382,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -89029,7 +85753,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.0.0" - (sources."socket.io-parser-3.3.3" // { + (sources."socket.io-parser-3.3.4" // { dependencies = [ sources."component-emitter-1.3.1" sources."debug-3.1.0" @@ -89098,7 +85822,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -89129,7 +85853,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -89500,7 +86224,7 @@ in sources."base64-arraybuffer-0.1.5" sources."debug-4.1.1" sources."ms-2.0.0" - (sources."socket.io-parser-3.3.3" // { + (sources."socket.io-parser-3.3.4" // { dependencies = [ sources."component-emitter-1.3.1" sources."debug-3.1.0" @@ -89569,7 +86293,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.9" + sources."ws-7.5.10" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -89984,10 +86708,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.3.3"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.3.3.tgz"; - sha512 = "PkgVfZNpFFHyMmfFw91igXOJn8Z7IWg3NGXOX5EBqJwzGNeYYOIUg4FqCNsWoqBece20HxtkDue/vTf2jDtdZQ=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.3.5.tgz"; + sha512 = "8pTmnQdkcHbol9D86Op7OGK4sGDqm19HWT2qgpSxPHfDG0yJ2rSBUTRuOMuh9GoPP0Tcz9+1Pe8A1m6pvd/zYQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -90035,7 +86759,7 @@ in sources."supports-color-2.0.0" sources."temp-0.8.4" sources."tslib-1.14.1" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" ]; @@ -90060,26 +86784,26 @@ in dependencies = [ sources."@cspotcode/source-map-support-0.8.1" sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tsconfig/node10-1.0.11" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.14.2" - sources."acorn-8.12.0" + sources."@types/node-20.14.12" + sources."acorn-8.12.1" sources."acorn-walk-8.3.3" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" sources."make-error-1.3.6" sources."tslib-2.6.3" - sources."typescript-5.4.5" + sources."typescript-5.5.4" sources."undici-types-5.26.5" sources."v8-compile-cache-lib-3.0.1" sources."yn-3.1.1" @@ -90128,14 +86852,27 @@ in sources."@babel/helper-validator-identifier-7.24.7" sources."@babel/highlight-7.24.7" sources."@isaacs/cliui-8.0.2" - sources."@npmcli/config-8.3.3" + sources."@npmcli/config-8.3.4" + (sources."@npmcli/git-5.0.8" // { + dependencies = [ + sources."isexe-3.1.1" + sources."which-4.0.0" + ]; + }) sources."@npmcli/map-workspaces-3.0.6" sources."@npmcli/name-from-folder-2.0.0" + sources."@npmcli/package-json-5.2.0" + (sources."@npmcli/promise-spawn-7.0.2" // { + dependencies = [ + sources."isexe-3.1.1" + sources."which-4.0.0" + ]; + }) sources."@types/concat-stream-2.0.3" sources."@types/debug-4.1.12" sources."@types/is-empty-1.2.3" sources."@types/ms-0.7.34" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/supports-color-8.1.3" sources."@types/unist-3.0.2" sources."abbrev-2.0.0" @@ -90159,13 +86896,15 @@ in sources."debug-4.3.5" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" + sources."err-code-2.0.3" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."find-up-6.3.0" - sources."foreground-child-3.2.0" - sources."glob-10.4.1" + sources."foreground-child-3.2.1" + sources."glob-10.4.5" sources."has-flag-3.0.0" + sources."hosted-git-info-7.0.2" sources."ignore-5.3.1" sources."import-meta-resolve-4.1.0" sources."inherits-2.0.4" @@ -90175,33 +86914,45 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-4.1.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.2" sources."lines-and-columns-2.0.4" sources."load-plugin-6.0.3" sources."locate-path-7.2.0" - sources."lru-cache-10.2.2" - sources."minimatch-9.0.4" + sources."lru-cache-10.4.3" + sources."minimatch-9.0.5" sources."minipass-7.1.2" sources."ms-2.1.2" sources."nopt-7.2.1" + sources."normalize-package-data-6.0.2" + sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" + sources."npm-package-arg-11.0.3" + sources."npm-pick-manifest-9.1.0" sources."p-limit-4.0.0" sources."p-locate-6.0.0" + sources."package-json-from-dist-1.0.0" sources."parse-json-7.1.1" sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."path-scurry-1.11.1" sources."picocolors-1.0.1" sources."proc-log-4.2.0" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.2" + sources."retry-0.12.0" sources."safe-buffer-5.2.1" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" + sources."spdx-correct-3.2.0" + sources."spdx-exceptions-2.5.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.18" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -90222,11 +86973,13 @@ in sources."typedarray-0.0.6" sources."undici-types-5.26.5" sources."unified-engine-11.2.1" - sources."unist-util-inspect-8.0.0" + sources."unist-util-inspect-8.1.0" sources."unist-util-lsp-2.1.0" sources."unist-util-stringify-position-4.0.0" sources."util-deprecate-1.0.2" - sources."vfile-6.0.1" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-5.0.1" + sources."vfile-6.0.2" sources."vfile-message-4.0.2" (sources."vfile-reporter-8.1.1" // { dependencies = [ @@ -90253,8 +87006,8 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."yaml-2.4.5" - sources."yocto-queue-1.0.0" + sources."yaml-2.5.0" + sources."yocto-queue-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -90269,10 +87022,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.29.0.tgz"; - sha512 = "ndiQEjHrV0DkT7nWEroQerAuZwNZC3c9SZlmVh8a19vY9s/GsPfNdOq2apAN44mtruMtD3tzgajLLxEii7/wEA=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.30.0.tgz"; + sha512 = "qHlVNh6SU/sV96Zys30t7jtVlDKAn+2Ex2EuiU8xK+DLDB8h2t0IK5/FwR8CxE9rLWHYYXDOuCxkzRqFRzSMQQ=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" @@ -90367,7 +87120,7 @@ in sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -90383,7 +87136,7 @@ in }) sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.29.0" + sources."vega-5.30.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.2" sources."vega-dataflow-5.7.6" @@ -90392,25 +87145,25 @@ in sources."vega-expression-5.1.1" sources."vega-force-4.2.1" sources."vega-format-1.1.2" - sources."vega-functions-5.14.0" + sources."vega-functions-5.15.0" sources."vega-geo-4.4.2" sources."vega-hierarchy-4.1.2" - sources."vega-label-1.2.1" + sources."vega-label-1.3.0" sources."vega-loader-4.5.2" - sources."vega-parser-6.3.0" + sources."vega-parser-6.4.0" sources."vega-projection-1.6.1" - sources."vega-regression-1.2.0" - sources."vega-runtime-6.1.4" + sources."vega-regression-1.3.0" + sources."vega-runtime-6.2.0" sources."vega-scale-7.4.1" - sources."vega-scenegraph-4.12.0" + sources."vega-scenegraph-4.13.0" sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.2" - sources."vega-transforms-4.11.1" - sources."vega-typings-1.1.0" + sources."vega-transforms-4.12.0" + sources."vega-typings-1.3.1" sources."vega-util-1.17.2" - sources."vega-view-5.12.1" - sources."vega-view-transforms-4.5.9" + sources."vega-view-5.13.0" + sources."vega-view-transforms-4.6.0" sources."vega-voronoi-4.2.3" sources."vega-wordcloud-4.1.5" sources."webidl-conversions-3.0.1" @@ -90542,10 +87295,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "34.2.7"; + version = "35.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-34.2.7.tgz"; - sha512 = "cc6NmaPeLhg7UJuuI6jKu92xppVYbuZRtQib/hDEaEPFSZgiUNw0sbtRfbzvXUZjxzJeLNeSGKLwazBbpXOvkQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-35.2.0.tgz"; + sha512 = "ZEdRDfw3kIhcryMOZvVMrFSSS5fkK2qpYr1QNOswW3sHtowuQglpVcvvyqNHrNLAbtETiO/svjNnFKEF22/fhg=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -90556,7 +87309,7 @@ in sources."@edge-runtime/vm-3.2.0" sources."@fastify/busboy-2.1.1" sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.9" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ @@ -90581,11 +87334,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@swc/core-1.5.29" + sources."@swc/core-1.7.1" sources."@swc/counter-0.1.3" - sources."@swc/helpers-0.5.11" - sources."@swc/types-0.1.8" - sources."@swc/wasm-1.5.29" + sources."@swc/helpers-0.5.12" + sources."@swc/types-0.1.12" + sources."@swc/wasm-1.7.1" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -90598,11 +87351,11 @@ in sources."@tsconfig/node16-1.0.4" sources."@types/json-schema-7.0.15" sources."@types/node-16.18.11" - sources."@vercel/build-utils-8.2.2" + sources."@vercel/build-utils-8.3.5" sources."@vercel/error-utils-2.0.2" sources."@vercel/fun-1.1.0" sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11" - (sources."@vercel/gatsby-plugin-vercel-builder-2.0.33" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.39" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" @@ -90610,10 +87363,10 @@ in ]; }) sources."@vercel/go-3.1.1" - sources."@vercel/hydrogen-1.0.2" - sources."@vercel/next-4.2.17" - sources."@vercel/nft-0.27.2" - (sources."@vercel/node-3.1.7" // { + sources."@vercel/hydrogen-1.0.4" + sources."@vercel/next-4.3.6" + sources."@vercel/nft-0.27.3" + (sources."@vercel/node-3.2.7" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" @@ -90621,12 +87374,12 @@ in ]; }) sources."@vercel/python-4.3.0" - (sources."@vercel/redwood-2.0.10" // { + (sources."@vercel/redwood-2.1.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.1.7" + sources."@vercel/remix-builder-2.2.1" (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" @@ -90635,10 +87388,10 @@ in ]; }) sources."@vercel/ruby-2.1.0" - sources."@vercel/static-build-2.5.11" + sources."@vercel/static-build-2.5.17" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" sources."acorn-walk-8.3.3" sources."agent-base-6.0.2" @@ -90846,7 +87599,7 @@ in sources."tslib-2.6.3" sources."typescript-4.9.5" sources."uid-promise-1.0.0" - sources."undici-5.26.5" + sources."undici-5.28.4" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -90900,7 +87653,7 @@ in ]; }) sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.10.1" + sources."@eslint-community/regexpp-4.11.0" sources."@eslint/eslintrc-2.1.4" sources."@eslint/js-8.57.0" sources."@humanwhocodes/config-array-0.11.14" @@ -90910,7 +87663,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@ungap/structured-clone-1.2.0" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -90939,12 +87692,12 @@ in sources."es-errors-1.3.0" sources."escape-string-regexp-4.0.0" sources."eslint-8.57.0" - sources."eslint-plugin-vue-9.26.0" + sources."eslint-plugin-vue-9.27.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" sources."esprima-4.0.1" - sources."esquery-1.5.0" + sources."esquery-1.6.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -90975,7 +87728,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" (sources."is-expression-4.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -91013,7 +87766,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."picocolors-1.0.1" - sources."postcss-selector-parser-6.1.0" + sources."postcss-selector-parser-6.1.1" sources."prelude-ls-1.2.1" sources."prettier-2.8.8" sources."pug-error-2.1.0" @@ -91025,7 +87778,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."set-function-length-1.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -91088,7 +87841,7 @@ in sources."es6-promisify-5.0.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-3.2.1" + sources."jsonc-parser-3.3.1" sources."ms-2.0.0" sources."request-light-0.4.0" (sources."vscode-json-languageservice-4.2.1" // { @@ -91126,7 +87879,7 @@ in sha512 = "KX07T/WHnXfmoo2wvjLlx0eKeGIotB0C5GnfWVHylPfSa7BuNo0bktRCL2+zJ3g72IKc1psuRIGZIn7/soexag=="; }; dependencies = [ - (sources."@babel/runtime-7.24.7" // { + (sources."@babel/runtime-7.24.8" // { dependencies = [ sources."regenerator-runtime-0.14.1" ]; @@ -91175,6 +87928,7 @@ in sources."btoa-1.2.1" sources."buffer-5.7.1" sources."buffer-equal-0.0.1" + sources."centra-2.7.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -91184,6 +87938,7 @@ in sources."estraverse-5.3.0" sources."exif-parser-0.1.12" sources."file-type-16.5.4" + sources."follow-redirects-1.15.6" sources."fs-extra-11.2.0" sources."get-caller-file-2.0.5" sources."gifwrap-0.9.4" @@ -91198,7 +87953,11 @@ in sources."jpeg-js-0.4.4" sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."load-bmfont-1.4.1" + (sources."load-bmfont-1.4.2" // { + dependencies = [ + sources."phin-3.7.1" + ]; + }) sources."logidrom-0.3.1" sources."mime-1.6.0" sources."min-document-2.19.0" @@ -91258,23 +88017,23 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz"; - sha512 = "Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz"; + sha512 = "Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.5" sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@types/eslint-8.56.10" + sources."@types/eslint-9.6.0" sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -91292,18 +88051,18 @@ in sources."@webassemblyjs/wast-printer-1.12.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."chrome-trace-event-1.0.4" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.802" - sources."enhanced-resolve-5.17.0" - sources."es-module-lexer-1.5.3" + sources."electron-to-chromium-1.5.1" + sources."enhanced-resolve-5.17.1" + sources."es-module-lexer-1.5.4" sources."escalade-3.1.2" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -91326,7 +88085,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."picocolors-1.0.1" sources."punycode-2.3.1" sources."randombytes-2.1.0" @@ -91337,13 +88096,13 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.1" + sources."terser-5.31.3" sources."terser-webpack-plugin-5.3.10" sources."undici-types-5.26.5" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" sources."watchpack-2.4.1" - sources."webpack-5.92.0" + sources."webpack-5.93.0" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -91370,13 +88129,13 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" - sources."@types/eslint-8.56.10" + sources."@types/eslint-9.6.0" sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -91397,22 +88156,22 @@ in sources."@webpack-cli/serve-2.0.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."chrome-trace-event-1.0.4" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.802" - sources."enhanced-resolve-5.17.0" + sources."electron-to-chromium-1.5.1" + sources."enhanced-resolve-5.17.1" sources."envinfo-7.13.0" - sources."es-module-lexer-1.5.3" + sources."es-module-lexer-1.5.4" sources."escalade-3.1.2" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -91432,9 +88191,9 @@ in sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."hasown-2.0.2" - sources."import-local-3.1.0" + sources."import-local-3.2.0" sources."interpret-3.1.1" - sources."is-core-module-2.13.1" + sources."is-core-module-2.15.0" sources."is-plain-object-2.0.4" sources."isexe-2.0.0" sources."isobject-3.0.1" @@ -91448,7 +88207,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -91474,17 +88233,17 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.31.1" // { + (sources."terser-5.31.3" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."terser-webpack-plugin-5.3.10" sources."undici-types-5.26.5" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" sources."watchpack-2.4.1" - sources."webpack-5.92.0" + sources."webpack-5.93.0" sources."webpack-cli-5.1.4" sources."webpack-merge-5.10.0" sources."webpack-sources-3.2.3" @@ -91515,26 +88274,26 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@jsonjoy.com/base64-1.1.2" sources."@jsonjoy.com/json-pack-1.0.4" - sources."@jsonjoy.com/util-1.1.3" + sources."@jsonjoy.com/util-1.2.0" sources."@leichtgewicht/ip-codec-2.0.5" sources."@types/body-parser-1.19.5" sources."@types/bonjour-3.5.13" sources."@types/connect-3.4.38" sources."@types/connect-history-api-fallback-1.5.4" - sources."@types/eslint-8.56.10" + sources."@types/eslint-9.6.0" sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/express-4.17.21" - sources."@types/express-serve-static-core-4.19.3" + sources."@types/express-serve-static-core-4.19.5" sources."@types/http-errors-2.0.4" sources."@types/http-proxy-1.17.14" sources."@types/json-schema-7.0.15" sources."@types/mime-1.3.5" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@types/node-forge-1.3.11" sources."@types/qs-6.9.15" sources."@types/range-parser-1.2.7" @@ -91543,7 +88302,7 @@ in sources."@types/serve-index-1.9.4" sources."@types/serve-static-1.15.7" sources."@types/sockjs-0.3.36" - sources."@types/ws-8.5.10" + sources."@types/ws-8.5.11" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -91562,9 +88321,9 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" @@ -91577,19 +88336,20 @@ in sources."binary-extensions-2.3.0" (sources."body-parser-1.20.2" // { dependencies = [ - sources."bytes-3.1.2" + sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."bonjour-service-1.2.1" sources."brace-expansion-2.0.1" sources."braces-3.0.3" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bundle-name-4.1.0" - sources."bytes-3.0.0" + sources."bytes-3.1.2" sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."chokidar-3.6.0" sources."chrome-trace-event-1.0.4" sources."color-convert-2.0.1" @@ -91597,7 +88357,13 @@ in sources."colorette-2.0.20" sources."commander-2.20.3" sources."compressible-2.0.18" - sources."compression-1.7.4" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."connect-history-api-fallback-2.0.0" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -91609,7 +88375,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" - sources."debug-2.6.9" + sources."debug-4.3.5" sources."default-browser-5.2.1" sources."default-browser-id-5.0.0" sources."default-gateway-6.0.3" @@ -91621,13 +88387,13 @@ in sources."dns-packet-5.6.1" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.802" + sources."electron-to-chromium-1.5.1" sources."emoji-regex-9.2.2" sources."encodeurl-1.0.2" - sources."enhanced-resolve-5.17.0" + sources."enhanced-resolve-5.17.1" sources."es-define-property-1.0.0" sources."es-errors-1.3.0" - sources."es-module-lexer-1.5.3" + sources."es-module-lexer-1.5.4" sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."eslint-scope-5.1.1" @@ -91640,29 +88406,37 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" - sources."execa-5.1.1" + (sources."execa-5.1.1" // { + dependencies = [ + sources."signal-exit-3.0.7" + ]; + }) (sources."express-4.19.2" // { dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" sources."safe-buffer-5.2.1" ]; }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" + sources."fast-uri-3.0.1" sources."faye-websocket-0.11.4" sources."fill-range-7.1.1" - sources."finalhandler-1.2.0" - sources."follow-redirects-1.15.6" - (sources."foreground-child-3.2.0" // { + (sources."finalhandler-1.2.0" // { dependencies = [ - sources."signal-exit-4.1.0" + sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) + sources."follow-redirects-1.15.6" + sources."foreground-child-3.2.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.2" sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" - sources."glob-10.4.1" + sources."glob-10.4.5" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."gopd-1.0.1" @@ -91702,15 +88476,15 @@ in sources."is-wsl-3.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."jackspeak-3.4.0" + sources."jackspeak-3.4.3" sources."jest-worker-27.5.1" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."launch-editor-2.6.1" + sources."launch-editor-2.8.0" sources."loader-runner-4.3.0" - sources."lru-cache-10.2.2" + sources."lru-cache-10.4.3" sources."media-typer-0.3.0" - sources."memfs-4.9.2" + sources."memfs-4.9.4" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."methods-1.1.2" @@ -91720,24 +88494,25 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-9.0.4" + sources."minimatch-9.0.5" sources."minipass-7.1.2" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."multicast-dns-7.2.5" sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."node-forge-1.3.1" sources."node-gyp-build-4.8.1" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - sources."object-inspect-1.13.1" + sources."object-inspect-1.13.2" sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."onetime-5.1.2" sources."open-10.1.0" sources."p-retry-6.2.0" + sources."package-json-from-dist-1.0.0" sources."parseurl-1.3.3" sources."path-key-3.1.1" sources."path-scurry-1.11.1" @@ -91754,17 +88529,13 @@ in sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) + sources."raw-body-2.5.2" sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" sources."retry-0.13.1" - sources."rimraf-5.0.7" + sources."rimraf-5.0.9" sources."run-applescript-7.0.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -91773,15 +88544,22 @@ in sources."selfsigned-2.4.1" (sources."send-0.18.0" // { dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."ms-2.1.3" ]; }) sources."serialize-javascript-6.0.2" (sources."serve-index-1.9.1" // { dependencies = [ + sources."debug-2.6.9" sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" + sources."ms-2.0.0" sources."setprototypeof-1.1.0" sources."statuses-1.5.0" ]; @@ -91793,23 +88571,12 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" sources."side-channel-1.0.6" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sockjs-0.3.24" - sources."sonic-forest-1.0.3" sources."source-map-0.6.1" sources."source-map-support-0.5.21" - (sources."spdy-4.0.2" // { - dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" - ]; - }) - (sources."spdy-transport-3.0.0" // { - dependencies = [ - sources."debug-4.3.5" - sources."ms-2.1.2" - ]; - }) + sources."spdy-4.0.2" + sources."spdy-transport-3.0.0" sources."statuses-2.0.1" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { @@ -91828,7 +88595,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.1" + sources."terser-5.31.3" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -91841,12 +88608,12 @@ in sources."thunky-1.1.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tree-dump-1.0.1" + sources."tree-dump-1.0.2" sources."tslib-2.6.3" sources."type-is-1.6.18" sources."undici-types-5.26.5" sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" sources."utf-8-validate-6.0.4" sources."util-deprecate-1.0.2" @@ -91855,7 +88622,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.1" sources."wbuf-1.7.3" - (sources."webpack-5.92.0" // { + (sources."webpack-5.93.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -91863,7 +88630,7 @@ in sources."schema-utils-3.3.0" ]; }) - sources."webpack-dev-middleware-7.2.1" + sources."webpack-dev-middleware-7.3.0" sources."webpack-sources-3.2.3" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" @@ -91877,7 +88644,7 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."ws-8.17.0" + sources."ws-8.18.0" ]; buildInputs = globalBuildInputs; meta = { @@ -91902,17 +88669,17 @@ in sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.2.1" sources."@jridgewell/source-map-0.3.6" - sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/sourcemap-codec-1.5.0" sources."@jridgewell/trace-mapping-0.3.25" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/merge-streams-2.3.0" - sources."@types/eslint-8.56.10" + sources."@types/eslint-9.6.0" sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.14.2" + sources."@types/node-20.14.12" sources."@webassemblyjs/ast-1.12.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -91930,20 +88697,20 @@ in sources."@webassemblyjs/wast-printer-1.12.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.12.0" + sources."acorn-8.12.1" sources."acorn-import-attributes-1.9.5" - sources."ajv-8.16.0" + sources."ajv-8.17.1" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.3" - sources."browserslist-4.23.1" + sources."browserslist-4.23.2" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001634" + sources."caniuse-lite-1.0.30001643" sources."chrome-trace-event-1.0.4" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.802" - sources."enhanced-resolve-5.17.0" - sources."es-module-lexer-1.5.3" + sources."electron-to-chromium-1.5.1" + sources."enhanced-resolve-5.17.1" + sources."es-module-lexer-1.5.4" sources."escalade-3.1.2" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -91960,11 +88727,12 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" + sources."fast-uri-3.0.1" sources."fastq-1.17.1" sources."fill-range-7.1.1" sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" - sources."globby-14.0.1" + sources."globby-14.0.2" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."ignore-5.3.1" @@ -91981,7 +88749,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.14" + sources."node-releases-2.0.18" sources."normalize-path-3.0.0" sources."path-type-5.0.0" sources."picocolors-1.0.1" @@ -92000,7 +88768,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.31.1" + sources."terser-5.31.3" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -92012,10 +88780,10 @@ in sources."to-regex-range-5.0.1" sources."undici-types-5.26.5" sources."unicorn-magic-0.1.0" - sources."update-browserslist-db-1.0.16" + sources."update-browserslist-db-1.1.0" sources."uri-js-4.4.1" sources."watchpack-2.4.1" - (sources."webpack-5.92.0" // { + (sources."webpack-5.93.0" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -92051,20 +88819,20 @@ in sources."xml2js-0.6.2" ]; }) - sources."@thaunknown/idb-chunk-store-1.0.2" - (sources."@thaunknown/simple-peer-10.0.7" // { + sources."@thaunknown/idb-chunk-store-1.0.4" + (sources."@thaunknown/simple-peer-10.0.10" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" ]; }) - (sources."@thaunknown/simple-websocket-9.1.1" // { + (sources."@thaunknown/simple-websocket-9.1.3" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" ]; }) - sources."@thaunknown/thirty-two-1.0.3" + sources."@thaunknown/thirty-two-1.0.5" sources."@webtorrent/http-node-1.3.0" sources."abort-controller-3.0.0" sources."addr-to-ip-port-2.0.0" @@ -92091,15 +88859,14 @@ in ]; }) sources."bittorrent-peerid-1.3.6" - (sources."bittorrent-protocol-4.1.12" // { + (sources."bittorrent-protocol-4.1.13" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-11.1.0" // { + (sources."bittorrent-tracker-11.1.1" // { dependencies = [ - sources."clone-2.1.2" sources."debug-4.3.5" sources."ip-2.0.1" sources."ms-2.1.2" @@ -92140,7 +88907,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-6.0.17" + sources."create-torrent-6.0.18" sources."cross-fetch-ponyfill-1.0.3" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-4.0.1" @@ -92195,9 +88962,9 @@ in sources."he-1.2.0" sources."http-parser-js-0.4.13" sources."human-signals-2.1.0" - sources."hybrid-chunk-store-1.2.4" + sources."hybrid-chunk-store-1.2.6" sources."iconv-lite-0.4.24" - sources."idb-6.1.5" + sources."idb-7.1.1" sources."ieee754-1.2.1" sources."immediate-chunk-store-2.2.0" sources."inherits-2.0.4" @@ -92253,7 +89020,7 @@ in sources."netmask-2.0.2" sources."network-address-1.1.2" sources."node-abi-3.65.0" - (sources."node-datachannel-0.9.1" // { + (sources."node-datachannel-0.10.1" // { dependencies = [ sources."node-domexception-2.0.1" ]; @@ -92311,7 +89078,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-7.6.2" + sources."semver-7.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -92323,7 +89090,7 @@ in sources."speed-limiter-1.0.2" sources."split-1.0.1" sources."sprintf-js-1.1.3" - sources."streamx-2.18.0" + sources."streamx-2.17.0" sources."string-width-4.2.3" sources."string2compact-2.0.1" sources."string_decoder-1.1.1" @@ -92337,13 +89104,12 @@ in sources."readable-stream-3.6.2" ]; }) - sources."text-decoder-1.1.0" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."throughput-1.0.1" sources."thunky-0.1.0" sources."tmp-0.0.33" - (sources."torrent-discovery-11.0.6" // { + (sources."torrent-discovery-11.0.7" // { dependencies = [ sources."debug-4.3.5" sources."ms-2.1.2" @@ -92371,22 +89137,22 @@ in sources."vlc-command-1.2.0" sources."wcwidth-1.0.1" sources."web-streams-polyfill-3.3.3" - sources."webrtc-polyfill-1.1.6" - (sources."webtorrent-2.4.1" // { + sources."webrtc-polyfill-1.1.8" + (sources."webtorrent-2.4.12" // { dependencies = [ sources."bep53-range-2.0.0" sources."debug-4.3.5" sources."get-stdin-9.0.0" sources."magnet-uri-7.0.5" sources."ms-2.1.2" - sources."parse-torrent-11.0.16" + sources."parse-torrent-11.0.17" ]; }) sources."which-2.0.2" sources."winreg-1.2.5" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-8.17.0" + sources."ws-8.18.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" @@ -92403,129 +89169,6 @@ in bypassCache = true; reconstructLock = true; }; - wrangler = nodeEnv.buildNodePackage { - name = "wrangler"; - packageName = "wrangler"; - version = "3.60.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.60.3.tgz"; - sha512 = "a6zn/KFnYaYp3nxJR/aP0TeaBvJDkrrfI89KoxUtx28H7zpya/5/VLu3CxQ3PRspEojJGF0s6f3/pddRy3F+BQ=="; - }; - dependencies = [ - sources."@cloudflare/kv-asset-handler-0.3.2" - sources."@cloudflare/workers-types-4.20240605.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@esbuild-plugins/node-globals-polyfill-0.2.3" - sources."@esbuild-plugins/node-modules-polyfill-0.2.2" - sources."@esbuild/android-arm-0.17.19" - sources."@esbuild/android-arm64-0.17.19" - sources."@esbuild/android-x64-0.17.19" - sources."@esbuild/darwin-arm64-0.17.19" - sources."@esbuild/darwin-x64-0.17.19" - sources."@esbuild/freebsd-arm64-0.17.19" - sources."@esbuild/freebsd-x64-0.17.19" - sources."@esbuild/linux-arm-0.17.19" - sources."@esbuild/linux-arm64-0.17.19" - sources."@esbuild/linux-ia32-0.17.19" - sources."@esbuild/linux-loong64-0.17.19" - sources."@esbuild/linux-mips64el-0.17.19" - sources."@esbuild/linux-ppc64-0.17.19" - sources."@esbuild/linux-riscv64-0.17.19" - sources."@esbuild/linux-s390x-0.17.19" - sources."@esbuild/linux-x64-0.17.19" - sources."@esbuild/netbsd-x64-0.17.19" - sources."@esbuild/openbsd-x64-0.17.19" - sources."@esbuild/sunos-x64-0.17.19" - sources."@esbuild/win32-arm64-0.17.19" - sources."@esbuild/win32-ia32-0.17.19" - sources."@esbuild/win32-x64-0.17.19" - sources."@fastify/busboy-2.1.1" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@types/node-20.14.2" - sources."@types/node-forge-1.3.11" - sources."acorn-8.12.0" - sources."acorn-walk-8.3.3" - sources."anymatch-3.1.3" - sources."as-table-1.0.55" - sources."binary-extensions-2.3.0" - sources."blake3-wasm-2.1.5" - sources."braces-3.0.3" - sources."bufferutil-4.0.8" - sources."capnp-ts-0.7.0" - sources."chokidar-3.6.0" - sources."consola-3.2.3" - sources."cookie-0.5.0" - sources."data-uri-to-buffer-2.0.2" - sources."debug-4.3.5" - sources."defu-6.1.4" - sources."esbuild-0.17.19" - sources."escape-string-regexp-4.0.0" - sources."estree-walker-0.6.1" - sources."exit-hook-2.2.1" - sources."fill-range-7.1.1" - sources."fsevents-2.3.3" - sources."function-bind-1.1.2" - sources."get-source-2.0.12" - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."hasown-2.0.2" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."magic-string-0.25.9" - sources."mime-3.0.0" - sources."miniflare-3.20240610.0" - sources."ms-2.1.2" - sources."mustache-4.2.0" - sources."nanoid-3.3.7" - sources."node-fetch-native-1.6.4" - sources."node-forge-1.3.1" - sources."node-gyp-build-4.8.1" - sources."normalize-path-3.0.0" - sources."path-parse-1.0.7" - sources."path-to-regexp-6.2.2" - sources."pathe-1.1.2" - sources."picomatch-2.3.1" - sources."printable-characters-1.0.42" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."resolve.exports-2.0.2" - sources."rollup-plugin-inject-3.0.2" - sources."rollup-plugin-node-polyfills-0.2.1" - sources."rollup-pluginutils-2.8.2" - sources."selfsigned-2.4.1" - sources."source-map-0.6.1" - sources."sourcemap-codec-1.4.8" - sources."stacktracey-2.1.8" - sources."stoppable-1.1.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."to-regex-range-5.0.1" - sources."tslib-2.6.3" - sources."ufo-1.5.3" - sources."undici-5.28.4" - sources."undici-types-5.26.5" - sources."unenv-1.10.0-1717606461.a117952" - sources."utf-8-validate-6.0.4" - sources."workerd-1.20240610.1" - sources."ws-8.17.0" - sources."xxhash-wasm-1.0.2" - sources."youch-3.3.3" - sources."zod-3.23.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command-line interface for all things Cloudflare Workers"; - homepage = "https://github.com/cloudflare/workers-sdk#readme"; - license = "MIT OR Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wring = nodeEnv.buildNodePackage { name = "wring"; packageName = "wring"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index dfb64749fb924..82f19774f06cc 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -23,6 +23,13 @@ final: prev: { prePatch = '' export NG_CLI_ANALYTICS=false ''; + nativeBuildInputs = [ pkgs.installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash zsh; do + installShellCompletion --cmd ng \ + --$shell <($out/bin/ng completion script) + done + ''; }; "@electron-forge/cli" = prev."@electron-forge/cli".override { @@ -61,14 +68,6 @@ final: prev: { ''; }; - grammarly-languageserver = prev.grammarly-languageserver.override (old: { - meta = old.meta // { - # requires EOL Node.js 16 - # https://github.com/znck/grammarly/issues/334 - broken = true; - }; - }); - graphql-language-service-cli = prev.graphql-language-service-cli.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' @@ -96,6 +95,7 @@ final: prev: { joplin = prev.joplin.override (oldAttrs:{ nativeBuildInputs = [ pkgs.pkg-config + (pkgs.python3.withPackages (ps: [ ps.setuptools ])) ] ++ lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; @@ -106,7 +106,7 @@ final: prev: { libsecret final.node-gyp-build - final.node-pre-gyp + node-pre-gyp pixman cairo @@ -129,6 +129,11 @@ final: prev: { }; } ] ++ oldAttrs.dependencies; + + meta = oldAttrs.meta // { + # ModuleNotFoundError: No module named 'distutils' + broken = stdenv.isDarwin; # still broken on darwin + }; }); jsonplaceholder = prev.jsonplaceholder.override { @@ -174,7 +179,7 @@ final: prev: { }; node-red = prev.node-red.override { - buildInputs = [ final.node-pre-gyp ]; + buildInputs = [ pkgs.node-pre-gyp ]; }; node2nix = prev.node2nix.override { @@ -199,6 +204,11 @@ final: prev: { url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch"; hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU="; }) + # Use top-level cctools in generated files - PR svanderburg/node2nix#334 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/31c308bba5f39ea0105f66b9f40dbe57fed7a292.patch"; + hash = "sha256-DdNRteonMvyffPh0uo0lUbsohKYnyqv0QcD9vjN6aXE="; + }) ]; in '' ${lib.concatStringsSep "\n" (map (patch: "patch -d $out/lib/node_modules/node2nix -p1 < ${patch}") patches)} @@ -278,7 +288,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-136nEfCJjLLUMO3TZhVrltfqv8nU2fA14+L0JLe6Zfk="; + hash = "sha256-TlwKCuDQRFM6+Hhx9eFCfXbtLZq6RwBTIFCWzE4D8N8="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ @@ -339,15 +349,15 @@ final: prev: { }); thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override { - nativeBuildInputs = [ final.node-pre-gyp ]; + nativeBuildInputs = [ pkgs.node-pre-gyp ]; }; thelounge-plugin-giphy = prev.thelounge-plugin-giphy.override { - nativeBuildInputs = [ final.node-pre-gyp ]; + nativeBuildInputs = [ pkgs.node-pre-gyp ]; }; thelounge-theme-flat-blue = prev.thelounge-theme-flat-blue.override { - nativeBuildInputs = [ final.node-pre-gyp ]; + nativeBuildInputs = [ pkgs.node-pre-gyp ]; # TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x) preRebuild = '' rm -r node_modules/node-gyp @@ -355,7 +365,7 @@ final: prev: { }; thelounge-theme-flat-dark = prev.thelounge-theme-flat-dark.override { - nativeBuildInputs = [ final.node-pre-gyp ]; + nativeBuildInputs = [ pkgs.node-pre-gyp ]; # TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x) preRebuild = '' rm -r node_modules/node-gyp @@ -385,7 +395,7 @@ final: prev: { vega-cli = prev.vega-cli.override { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ - final.node-pre-gyp + node-pre-gyp pixman cairo pango @@ -412,7 +422,7 @@ final: prev: { }; wavedrom-cli = prev.wavedrom-cli.override { - nativeBuildInputs = [ pkgs.pkg-config final.node-pre-gyp ]; + nativeBuildInputs = [ pkgs.pkg-config pkgs.node-pre-gyp ]; # These dependencies are required by # https://github.com/Automattic/node-canvas. buildInputs = with pkgs; [ @@ -428,63 +438,4 @@ final: prev: { webtorrent-cli = prev.webtorrent-cli.override { buildInputs = [ final.node-gyp-build ]; }; - - wrangler = prev.wrangler.override (oldAttrs: - let - workerdVersion = (lib.findFirst (dep: dep.name == "workerd") null oldAttrs.dependencies).version; - linuxWorkerd = { - name = "_at_cloudflare_slash_workerd-linux-64"; - packageName = "@cloudflare/workerd-linux-64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-${workerdVersion}.tgz"; - sha512 = "sha512-E8mj+HPBryKwaJAiNsYzXtVjKCL0KvUBZbtxJxlWM4mLSQhT+uwGT3nydb/hFY59rZnQgZslw0oqEWht5TEYiQ=="; - }; - }; - linuxWorkerdArm = { - name = "_at_cloudflare_slash_workerd-linux-arm64"; - packageName = "@cloudflare/workerd-linux-arm64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-${workerdVersion}.tgz"; - sha512 = "sha512-/Fr1W671t2triNCDCBWdStxngnbUfZunZ/2e4kaMLzJDJLYDtYdmvOUCBDzUD4ssqmIMbn9RCQQ0U+CLEoqBqw=="; - }; - }; - darwinWorkerd = { - name = "_at_cloudflare_slash_workerd-darwin-64"; - packageName = "@cloudflare/workerd-darwin-64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-${workerdVersion}.tgz"; - sha512 = "sha512-ATaXjefbTsrv4mpn4Fdua114RRDXcX5Ky+Mv+f4JTUllgalmqC4CYMN4jxRz9IpJU/fNMN8IEfvUyuJBAcl9Iw=="; - }; - }; - darwinWorkerdArm = { - name = "_at_cloudflare_slash_workerd-darwin-arm64"; - packageName = "@cloudflare/workerd-darwin-arm64"; - # Should be same version as workerd - version = workerdVersion; - src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-${workerdVersion}.tgz"; - sha512 = "sha512-wnbsZI4CS0QPCd+wnBHQ40C28A/2Qo4ESi1YhE2735G3UNcc876MWksZhsubd+XH0XPIra6eNFqyw6wRMpQOXA=="; - }; - }; - - in - { - meta = oldAttrs.meta // { broken = before "16.13"; }; - buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook; - preFixup = '' - # patch elf is trying to patch binary for sunos - rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 - ''; - dependencies = oldAttrs.dependencies - ++ lib.optional (stdenv.isLinux && stdenv.isx86_64) linuxWorkerd - ++ lib.optional (stdenv.isLinux && stdenv.isAarch64) linuxWorkerdArm - ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) darwinWorkerd - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwinWorkerdArm; - }); } diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index f9f07aed0fbad..c921509907b94 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,20 +1,14 @@ -{ lib, buildDunePackage, fetchurl, fetchpatch +{ lib, buildDunePackage, fetchurl , astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims }: buildDunePackage rec { pname = "alcotest"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; - hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8="; - }; - - # Fix tests with OCaml 5.2 - patches = fetchpatch { - url = "https://github.com/mirage/alcotest/commit/aa437168b258db97680021116af176c55e1bd53b.patch"; - hash = "sha256-cytuJFg4Mft47LsAEcz2zvzyy1wNzMdeLK+cjaFANpo="; + hash = "sha256-y6G9AXB8jFW0dkuw34yccyvjIeHxwalqQG5W2NvKHQ4="; }; nativeBuildInputs = [ ocaml-syntax-shims ]; diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index cffac7b674d74..44fb987c47793 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, alcotest, logs, lwt, fmt +{ buildDunePackage, alcotest, logs, lwt, fmt , re, cmdliner }: diff --git a/pkgs/development/ocaml-modules/algaeff/default.nix b/pkgs/development/ocaml-modules/algaeff/default.nix index a146e0f53f518..b8c6a5f0cfd4b 100644 --- a/pkgs/development/ocaml-modules/algaeff/default.nix +++ b/pkgs/development/ocaml-modules/algaeff/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { pname = "algaeff"; - version = "1.1.0"; + version = "2.0.0"; minimalOCamlVersion = "5.0"; @@ -15,7 +15,7 @@ buildDunePackage rec { owner = "RedPRL"; repo = pname; rev = version; - hash = "sha256-7kwQmoT8rpQWPHc+BZQi9fcZhgHxS99158ebXAXlpQ8="; + hash = "sha256-VRZfULbXKRcExU1bnEu/X1KPX+L+dzcRYZVD985rQT4="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/asai/default.nix b/pkgs/development/ocaml-modules/asai/default.nix index fd7c9c4e5c637..77904b4ceb44d 100644 --- a/pkgs/development/ocaml-modules/asai/default.nix +++ b/pkgs/development/ocaml-modules/asai/default.nix @@ -1,29 +1,21 @@ { lib, fetchFromGitHub, buildDunePackage , algaeff , bwd -, eio -, eio_main -, lsp -, notty }: buildDunePackage rec { pname = "asai"; - version = "0.1.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "RedPRL"; repo = pname; rev = version; - hash = "sha256-Jd90WhSjK4K2amFA5uyGF57NzsgHA8QiccX6qtxO1rQ="; + hash = "sha256-Rp4TvSbRz+5+X4XJ1tKUDDgldpLzHHtaF7G7AG6HgKU="; }; propagatedBuildInputs = [ algaeff bwd - lsp - eio - eio_main - notty ]; meta = { diff --git a/pkgs/development/ocaml-modules/asetmap/default.nix b/pkgs/development/ocaml-modules/asetmap/default.nix index 976de44959f6f..40152ef5cbf42 100644 --- a/pkgs/development/ocaml-modules/asetmap/default.nix +++ b/pkgs/development/ocaml-modules/asetmap/default.nix @@ -1,5 +1,4 @@ -{ lib -, fetchurl +{ fetchurl , buildDunePackage , topkg , findlib diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index 60bca80fa6f4d..6df0e4822634b 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, biniou, re, yojson +{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, re , python3 }: diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 6a4ed92cc079a..9cdc9e4cad2a0 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -2,7 +2,7 @@ , ppx_sexp_conv , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk , x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct -, rresult, mtime, logs, fmt, cmdliner, base64 +, mtime, logs, fmt, cmdliner, base64 , zarith }: diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 2d013da25683e..610973b5769c5 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams +{ lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams , doCheck ? lib.versionAtLeast ocaml.version "4.08" }: diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 1e5d2baed0c96..ac7c6e5a51585 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat, pkg-config }: +{ lib, fetchFromGitHub, buildDunePackage, alcotest, pkg-config }: buildDunePackage rec { pname = "bigstringaf"; diff --git a/pkgs/development/ocaml-modules/biotk/default.nix b/pkgs/development/ocaml-modules/biotk/default.nix index 33a98f71cb672..b120e8008819c 100644 --- a/pkgs/development/ocaml-modules/biotk/default.nix +++ b/pkgs/development/ocaml-modules/biotk/default.nix @@ -6,11 +6,11 @@ , ocaml-crunch , camlzip , core_kernel -, core_unix -, csvfields +, core_unix ? null +, csvfields ? null , fmt , gsl -, ppx_csv_conv +, ppx_csv_conv ? null , ppx_deriving , rresult , tyxml @@ -20,13 +20,13 @@ buildDunePackage rec { pname = "biotk"; - version = "0.2.0"; + version = "0.3"; minimalOCamlVersion = "4.13"; src = fetchurl { url = "https://github.com/pveber/biotk/releases/download/v${version}/biotk-${version}.tbz"; - hash = "sha256-FQvbVj5MmraSN6AmOckKgJ/LB14E/pCsPvPvNppcv7A="; + hash = "sha256-9eRd3qYteUxu/xNEUER/DHodr6cTCuPtSKr38x32gig="; }; nativeBuildInputs = [ ocaml-crunch ]; diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index ae70482fd4b2e..f814cba26b1dd 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { description = "Bisect_ppx is a code coverage tool for OCaml and Reason. It helps you test thoroughly by showing what's not tested"; homepage = "https://github.com/aantron/bisect_ppx"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "bisect-ppx-report"; }; } diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index bb424a5ce9aeb..5444c74cb14ba 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -16,19 +16,15 @@ buildDunePackage rec { pname = "bistro"; - version = "unstable-2022-05-07"; - - duneVersion = "3"; + version = "unstable-2024-05-17"; src = fetchFromGitHub { owner = "pveber"; repo = pname; - rev = "d363bd2d8257babbcb6db15bd83fd6465df7c268"; - sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm"; + rev = "d44c44b52148e58ca3842c3efedf3115e376d800"; + sha256 = "sha256-naoCEVBfydqSeGGbXYBXfg0PP+Fzk05jFoul7XAz/tM="; }; - patches = [ ./janestreet-0.16.patch ]; - propagatedBuildInputs = [ base64 bos @@ -43,7 +39,7 @@ buildDunePackage rec { tyxml ]; - minimalOCamlVersion = "4.12"; + minimalOCamlVersion = "4.14"; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch b/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch deleted file mode 100644 index bf3b41eb4ac82..0000000000000 --- a/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/lib/engine/scheduler.ml b/lib/engine/scheduler.ml -index e32bd0f..93b566b 100644 ---- a/lib/engine/scheduler.ml -+++ b/lib/engine/scheduler.ml -@@ -601,7 +601,7 @@ module Make(Backend : Backend) = struct - ) - ) - | Trywith tw -> ( -- match Table.find sched.traces (Workflow.id tw.w) with -+ match Hashtbl.find sched.traces (Workflow.id tw.w) with - | Some eventual_trace -> ( - eventual_trace >>= function - | Ok (Run r) -> -@@ -667,10 +667,10 @@ module Make(Backend : Backend) = struct - let register_build sched ~id ~build_trace = - let open Eval_thread.Infix in - ( -- match Table.find sched.traces id with -+ match Hashtbl.find sched.traces id with - | None -> - let trace = build_trace () in -- Table.set sched.traces ~key:id ~data:trace ; -+ Hashtbl.set sched.traces ~key:id ~data:trace ; - trace - | Some trace -> trace - ) >>= fun trace -> -@@ -854,7 +854,7 @@ module Make(Backend : Backend) = struct - Eval_thread.join l.elts ~f:(build ?target sched) - | Trywith tw -> ( - build sched ?target tw.w >> fun w_result -> -- match Table.find sched.traces (Workflow.id tw.w) with -+ match Hashtbl.find sched.traces (Workflow.id tw.w) with - | Some eventual_trace -> ( - eventual_trace >> function - | Ok (Run r) when run_trywith_recovery r.details -> -diff --git a/lib/multinode/bistro_multinode.ml b/lib/multinode/bistro_multinode.ml -index 01dc5ac..3fc6b0e 100644 ---- a/lib/multinode/bistro_multinode.ml -+++ b/lib/multinode/bistro_multinode.ml -@@ -130,7 +130,7 @@ module Server = struct - let search (type s) (table : s String.Table.t) ~f = - let module M = struct exception Found of string * s end in - try -- String.Table.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; -+ Hashtbl.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; - None - with M.Found (k, v) -> Some (k, v) - -@@ -145,7 +145,7 @@ module Server = struct - match allocation_attempt with - | None -> Some elt - | Some (worker_id, (Resource curr)) -> -- String.Table.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; -+ Hashtbl.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; - Lwt.wakeup u (worker_id, Resource { np ; mem }) ; - None - ) -@@ -163,12 +163,12 @@ module Server = struct - t - - let add_worker pool (Worker { id ; np ; mem ; _ }) = -- match String.Table.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with -+ match Hashtbl.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with - | `Ok -> allocation_pass pool - | `Duplicate -> failwith "A worker has been added twice" - - let release pool worker_id (Allocator.Resource { np ; mem }) = -- String.Table.update pool.available worker_id ~f:(function -+ Hashtbl.update pool.available worker_id ~f:(function - | None -> failwith "Tried to release resources of inexistent worker" - | Some (Resource r) -> Resource { np = r.np + np ; mem = r.mem + mem } - ) -@@ -235,13 +235,13 @@ module Server = struct - | Subscript { np ; mem } -> - let id = new_id () in - let w = create_worker ~np ~mem id in -- String.Table.set state.workers ~key:id ~data:w ; -+ Hashtbl.set state.workers ~key:id ~data:w ; - Worker_allocator.add_worker state.alloc w ; - log (Logger.Debug (sprintf "new worker %s" id)) ; - Lwt.return (Client_id id) - - | Get_job { client_id } -> ( -- match String.Table.find state.workers client_id with -+ match Hashtbl.find state.workers client_id with - | None -> Lwt.return None - | Some (Worker worker) -> - Lwt.choose [ -@@ -250,22 +250,22 @@ module Server = struct - ] >>= function - | `Job wp -> - let workflow_id = workflow_id_of_job_waiter wp in -- String.Table.set worker.running_jobs ~key:workflow_id ~data:wp ; -+ Hashtbl.set worker.running_jobs ~key:workflow_id ~data:wp ; - Lwt.return (Some (job_of_job_waiter wp)) - | `Stop -> Lwt.return None - ) - - | Plugin_result r -> -- let Worker worker = String.Table.find_exn state.workers r.client_id in -+ let Worker worker = Hashtbl.find_exn state.workers r.client_id in - Lwt.return ( -- match String.Table.find_exn worker.running_jobs r.workflow_id with -+ match Hashtbl.find_exn worker.running_jobs r.workflow_id with - | Waiting_plugin wp -> Lwt.wakeup wp.waiter r.result - | Waiting_shell_command _ -> assert false (* should never happen *) - ) - | Shell_command_result r -> -- let Worker worker = String.Table.find_exn state.workers r.client_id in -+ let Worker worker = Hashtbl.find_exn state.workers r.client_id in - Lwt.return ( -- match String.Table.find_exn worker.running_jobs r.workflow_id with -+ match Hashtbl.find_exn worker.running_jobs r.workflow_id with - | Waiting_plugin _ -> assert false (* should never happen *) - | Waiting_shell_command wp -> Lwt.wakeup wp.waiter r.result - ) -@@ -307,7 +307,7 @@ module Server = struct - - let request_resource backend req = - Worker_allocator.request backend.state.alloc req >|= fun (worker_id, resource) -> -- String.Table.find_exn backend.state.workers worker_id, resource -+ Hashtbl.find_exn backend.state.workers worker_id, resource - - let release_resource backend worker_id res = - Worker_allocator.release backend.state.alloc worker_id res -@@ -334,7 +334,7 @@ module Server = struct - * loop () *) - - let eval backend { worker_id ; workflow_id } f x = -- let Worker worker = String.Table.find_exn backend.state.workers worker_id in -+ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in - let f () = f x in - let t, u = Lwt.wait () in - let job_waiter = Waiting_plugin { waiter = u ; f ; workflow_id } in -@@ -342,7 +342,7 @@ module Server = struct - t - - let run_shell_command backend { worker_id ; workflow_id } cmd = -- let Worker worker = String.Table.find_exn backend.state.workers worker_id in -+ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in - let t, u = Lwt.wait () in - let job = Waiting_shell_command { waiter = u ; cmd ; workflow_id } in - Lwt_queue.push worker.pending_jobs job ; -diff --git a/lib/utils/dot_output.ml b/lib/utils/dot_output.ml -index 90c299f..d13fceb 100644 ---- a/lib/utils/dot_output.ml -+++ b/lib/utils/dot_output.ml -@@ -24,7 +24,7 @@ module G = struct - (* let successors g u = fold_succ (fun h t -> h :: t) g u [] *) - - let rec of_workflow_aux seen acc u = -- if S.mem seen u then (seen, acc) -+ if Set.mem seen u then (seen, acc) - else ( - let deps = W.Any.deps u in - let seen, acc = -@@ -34,7 +34,7 @@ module G = struct - in - let acc = add_vertex acc u in - let acc = List.fold deps ~init:acc ~f:(fun acc v -> add_edge acc u v) in -- let seen = S.add seen u in -+ let seen = Set.add seen u in - seen, acc - ) - -@@ -109,7 +109,7 @@ let dot_output ?db oc g ~needed = - ] - in - let vertex_attributes u = -- let needed = (match db with None -> true | Some _ -> false) || S.mem needed u in -+ let needed = (match db with None -> true | Some _ -> false) || Set.mem needed u in - let color = if needed then black else light_gray in - let shape = `Shape (shape u) in - let W.Any w = u in -@@ -141,7 +141,7 @@ let dot_output ?db oc g ~needed = - | _ -> [] - in - let color = -- if (match db with None -> true | Some _ -> false) || (S.mem needed u && not (already_done u)) -+ if (match db with None -> true | Some _ -> false) || (Set.mem needed u && not (already_done u)) - then black else light_gray in - style @ [ `Color color ] - in -diff --git a/lib/utils/repo.ml b/lib/utils/repo.ml -index 06abcd5..206a99e 100644 ---- a/lib/utils/repo.ml -+++ b/lib/utils/repo.ml -@@ -160,7 +160,7 @@ let protected_set repo = - | Select s -> fold_path_workflow acc (W.Any s.dir) - | Input _ -> acc - | Shell _ -- | Plugin _ -> String.Set.add acc (W.id w) -+ | Plugin _ -> Set.add acc (W.id w) - | Trywith tw -> - fold_path_workflow (fold_path_workflow acc (W.Any tw.w)) (W.Any tw.failsafe) - | Ifelse ie -> -@@ -187,7 +187,7 @@ let cache_clip_fold ~bistro_dir repo ~f ~init = - let protected = protected_set repo in - let db = Db.init_exn bistro_dir in - Db.fold_cache db ~init ~f:(fun acc id -> -- f db acc (if String.Set.mem protected id then `Protected id else `Unprotected id) -+ f db acc (if Set.mem protected id then `Protected id else `Unprotected id) - ) - - let cache_clip_dry_run ~bistro_dir repo = diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 65b1a476f9dd3..f5e7bbbb6f6d2 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "cryptography/ocaml-bls12-381"; rev = version; - sha256 = "sha256-z2ZSOrXgm+XjdrY91vqxXSKhA0DyJz6JkkNljDZznX8="; + hash = "sha256-z2ZSOrXgm+XjdrY91vqxXSKhA0DyJz6JkkNljDZznX8="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index 688d78e4c8d45..e0057f07464e1 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -29,7 +29,7 @@ buildDunePackage rec { * stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function. ''; homepage = "https://github.com/briskml/brisk-reconciler"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/bytestring/default.nix b/pkgs/development/ocaml-modules/bytestring/default.nix index 3714846ee6b5c..8ed2a3ec47a0c 100644 --- a/pkgs/development/ocaml-modules/bytestring/default.nix +++ b/pkgs/development/ocaml-modules/bytestring/default.nix @@ -39,7 +39,7 @@ buildDunePackage rec { description = "Efficient, immutable, pattern-matchable, UTF friendly byte strings"; homepage = "https://github.com/riot-ml/riot"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix index 7e5f256a1a743..dbe915468d9f9 100644 --- a/pkgs/development/ocaml-modules/bz2/default.nix +++ b/pkgs/development/ocaml-modules/bz2/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library"; downloadPage = "https://gitlab.com/irill/camlbz2"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/camlimages/camlimages.patch b/pkgs/development/ocaml-modules/camlimages/camlimages.patch new file mode 100644 index 0000000000000..eeeaa723c2069 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlimages/camlimages.patch @@ -0,0 +1,103 @@ +diff --git a/config/xConfigurator.ml b/config/xConfigurator.ml +index 268df4a..73e1850 100644 +--- a/config/xConfigurator.ml ++++ b/config/xConfigurator.ml +@@ -8,7 +8,7 @@ let (!%) fmt = Printf.sprintf fmt + module Configurator = struct + include Configurator.V1 + +- let ( ^/ ) = Caml.Filename.concat ++ let ( ^/ ) = Stdlib.Filename.concat + + let path_sep = + if Sys.win32 then +@@ -19,7 +19,7 @@ module Configurator = struct + let exe = if Sys.win32 then ".exe" else "" + + let get_path () = +- match Caml.Sys.getenv "PATH" with ++ match Stdlib.Sys.getenv "PATH" with + | exception Not_found -> [] + | s -> String.split ~on:path_sep s + +@@ -27,7 +27,7 @@ module Configurator = struct + List.find_map dirs ~f:(fun dir -> + List.find_map bases ~f:(fun base -> + let path = dir ^/ base in +- if Caml.Sys.file_exists path then Some path else None)) ++ if Stdlib.Sys.file_exists path then Some path else None)) + + let find_program prog = + let prog = prog ^ exe in +@@ -45,13 +45,13 @@ module Configurator = struct + | s -> + (* findlib 1.7.3 installs META file for graphics + even when there is no graphics library installed. *) +- let dest = Caml.Filename.temp_file "test" ".cma" in +- let res = match Caml.Sys.command & !% "ocamlfind ocamlc -package %s -o %s -linkpkg" n dest with ++ let dest = Stdlib.Filename.temp_file "test" ".cma" in ++ let res = match Stdlib.Sys.command & !% "ocamlfind ocamlc -package %s -o %s -linkpkg" n dest with + | 0 -> Some s + | _ -> None + | exception _ -> None + in +- (try Caml.Sys.remove dest with _ -> ()); ++ (try Stdlib.Sys.remove dest with _ -> ()); + res + | exception Findlib.No_such_package _ -> None + +@@ -83,14 +83,14 @@ type item = + module Make(A : sig val name : string end) = struct + let t = create A.name + +- let log fmt = Caml.Format.eprintf fmt ++ let log fmt = Stdlib.Format.eprintf fmt + + module Package_conf = Package_conf + open Package_conf + + let extract_package_conf xs = +- Caml.List.fold_left merge empty +- (Caml.List.map (fun item -> match item with ++ Stdlib.List.fold_left merge empty ++ (Stdlib.List.map (fun item -> match item with + | Library (Some pkc) -> pkc + | _ -> empty) xs) + +@@ -167,8 +167,8 @@ module Make(A : sig val name : string end) = struct + let by_cc ~c_flags ~link_flags ~headers ~functions:fnames () = + log "Checking library %s by using C compiler... " (String.concat ~sep:" " link_flags); + let headers = "stdio.h" :: headers in +- let includes = Caml.List.map (!% "#include <%s>") headers in +- let fcalls = Caml.List.map (!% " ( (void(*)()) (%s) )();") fnames in ++ let includes = Stdlib.List.map (!% "#include <%s>") headers in ++ let fcalls = Stdlib.List.map (!% " ( (void(*)()) (%s) )();") fnames in + let code = + String.concat ~sep:"\n" + & includes +diff --git a/core/images.ml b/core/images.ml +index 563ab7e..a53a6a4 100644 +--- a/core/images.ml ++++ b/core/images.ml +@@ -102,7 +102,7 @@ let get_extension s = + | _ -> s, "" + + let guess_extension s = +- let s = String.lowercase s in ++ let s = String.lowercase_ascii s in + match s with + | "gif" -> Gif + | "bmp" -> Bmp +diff --git a/core/units.ml b/core/units.ml +index 634bc9c..ddd6eae 100644 +--- a/core/units.ml ++++ b/core/units.ml +@@ -30,7 +30,7 @@ let parse_length s = (* return in pt *) + let digit,unit = + if l > 2 then String.sub s 0 2, String.sub s (l-2) 2 else "", "" in + try +- (List.assoc (String.lowercase unit) units) *. float_of_string digit ++ (List.assoc (String.lowercase_ascii unit) units) *. float_of_string digit + with + | Not_found -> (* think it is in "pt" *) + float_of_string s in diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index b1d3d51c86660..c9f523d098d70 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -15,9 +15,8 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - postPatch = '' - substituteInPlace core/{images,units}.ml --replace String.lowercase String.lowercase_ascii - ''; + # stdio v0.17 compatibility; also replaces `String.lowercase` with `String.lowercase_ascii` + patches = [ ./camlimages.patch ]; nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator findlib graphics lablgtk stdio ]; diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 22755be193df6..a0f3fb035646b 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, async_kernel, async_unix, caqti, core_kernel }: +{ buildDunePackage, async_kernel, async_unix, caqti, core_kernel }: buildDunePackage { pname = "caqti-async"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index bff515eff381e..5a6199de3ccc3 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, mariadb }: +{ buildDunePackage, caqti, mariadb }: buildDunePackage { pname = "caqti-driver-mariadb"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index f33e38fab8df2..fc440d2a1384d 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, postgresql }: +{ buildDunePackage, caqti, postgresql }: buildDunePackage { pname = "caqti-driver-postgresql"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index ddac07f7fcfb3..362707025ee7f 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, ocaml_sqlite3, alcotest }: +{ buildDunePackage, caqti, ocaml_sqlite3, alcotest }: buildDunePackage { pname = "caqti-driver-sqlite3"; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 3dd94fc0e3108..3450a6311efd2 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, findlib }: +{ buildDunePackage, caqti, findlib }: buildDunePackage { pname = "caqti-dynload"; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index d06421136280f..35aebaebae5ae 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, caqti, logs, lwt }: +{ buildDunePackage, caqti, logs, lwt }: buildDunePackage { pname = "caqti-lwt"; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index 26b0887f20e8a..9f71bd1d164c0 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, calendar, caqti }: +{ buildDunePackage, calendar, caqti }: buildDunePackage { pname = "caqti-type-calendar"; diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix index b361ee1447b20..97055067bc4a2 100644 --- a/pkgs/development/ocaml-modules/carton/git.nix +++ b/pkgs/development/ocaml-modules/carton/git.nix @@ -1,8 +1,6 @@ { buildDunePackage, carton, carton-lwt , bigstringaf, lwt, fpath, result , fmt, decompress, astring -, alcotest, alcotest-lwt, cstruct, logs -, mirage-flow, rresult, ke }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index ba69c40de016d..204128adec226 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; - patches = [ ./git_commit.patch ./janestreet-0.16.patch ]; + patches = [ ./git_commit.patch ./janestreet-0.17.patch ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch b/pkgs/development/ocaml-modules/cfstream/janestreet-0.17.patch index afc665f304269..55d0349557bcf 100644 --- a/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch +++ b/pkgs/development/ocaml-modules/cfstream/janestreet-0.17.patch @@ -1,7 +1,29 @@ +diff --git a/app/cfstream_test.ml b/app/cfstream_test.ml +index 457c5e5..c6a01a5 100644 +--- a/app/cfstream_test.ml ++++ b/app/cfstream_test.ml +@@ -73,7 +73,7 @@ let test_uncombine () = + let test_partition () = + let f x = x mod 2 = 0 in + let l = List.init 100 ~f:(fun _ -> Random.int 10) in +- let r1 = Caml.List.partition f l in ++ let r1 = Stdlib.List.partition f l in + let r2 = of_list l |> partition ~f |> fun (a, b) -> to_list a, to_list b in + assert_equal + ~printer:int_list_tuple_printer diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml -index 25c0e5a..94da2e3 100644 +index 25c0e5a..835791c 100644 --- a/lib/CFStream_stream.ml +++ b/lib/CFStream_stream.ml +@@ -83,7 +83,7 @@ let find xs ~f = find_map xs ~f:(fun x -> if f x then Some x else None) + let find_exn xs ~f = + match find xs ~f with + | Some x -> x +- | None -> raise Caml.Not_found ++ | None -> raise Stdlib.Not_found + ;; + + let exists xs ~f = @@ -287,7 +287,7 @@ let group_aux xs map eq = ;; diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix index 57f8023f79f15..61acb189242d6 100644 --- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -13,7 +13,7 @@ buildDunePackage (rec { owner = "nomadic-labs/cryptography"; repo = "ocaml-chia-vdf"; rev = "v${version}"; - sha256 = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs="; + hash = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix index 0265ed18ecb36..62efd4a11eee1 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_0.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_0.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ lib, stdenv, fetchurl, ocaml }: assert (lib.versionAtLeast ocaml.version "4.03"); diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix index 67d55bc756a9e..b9639438c414f 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +{ lib, stdenv, fetchurl, ocaml }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "cmdliner 1.1 is not available for OCaml ${ocaml.version}" diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 3236d47750702..78367fcaba99a 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , ppx_sexp_conv , base , async diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index f95c44f66725f..6f89c670c6b96 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, buildDunePackage , ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp -, ocaml, fmt, alcotest +, fmt, alcotest , crowbar }: diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix b/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix index 611abb7751ba7..a1d349b647d50 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , cohttp, cohttp-lwt, logs, lwt, js_of_ocaml, js_of_ocaml-ppx, js_of_ocaml-lwt , nodejs, lwt_ppx }: diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index b360cf0e587ea..e7fecbefb91a0 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp-lwt +{ buildDunePackage, cohttp-lwt , conduit-lwt-unix, conduit-lwt, ppx_sexp_conv , cmdliner, fmt, logs, magic-mime , ounit diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 42e1d38086394..7d0678d8251d3 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }: +{ buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }: buildDunePackage { pname = "cohttp-lwt"; diff --git a/pkgs/development/ocaml-modules/cohttp/top.nix b/pkgs/development/ocaml-modules/cohttp/top.nix index 0a8f54871b1b7..1ed6de0b304cf 100644 --- a/pkgs/development/ocaml-modules/cohttp/top.nix +++ b/pkgs/development/ocaml-modules/cohttp/top.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp }: +{ buildDunePackage, cohttp }: buildDunePackage { pname = "cohttp-top"; diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index 3b746ccfbdce3..b79a69e432136 100644 --- a/pkgs/development/ocaml-modules/coin/default.nix +++ b/pkgs/development/ocaml-modules/coin/default.nix @@ -30,7 +30,7 @@ buildDunePackage rec { description = "Library to normalize an KOI8-{U,R} input to Unicode"; homepage = "https://github.com/mirage/coin"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; mainProgram = "coin.generate"; }; } diff --git a/pkgs/development/ocaml-modules/colors/default.nix b/pkgs/development/ocaml-modules/colors/default.nix index 00ae0ff7cfe15..2b7f5fbee3f47 100644 --- a/pkgs/development/ocaml-modules/colors/default.nix +++ b/pkgs/development/ocaml-modules/colors/default.nix @@ -30,6 +30,6 @@ buildDunePackage rec { homepage = "https://github.com/leostera/colors"; changelog = "https://github.com/leostera/colors/blob/${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 9522dc552e8d9..76e5cfb09cfaf 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit +{ buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit , core, ipaddr, ipaddr-sexp, sexplib }: diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index df0a530e062f1..f13e239a795ca 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -20,6 +20,6 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-dune/csexp"; changelog = "https://github.com/ocaml-dune/csexp/raw/${version}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix index 1fe020f6490b6..53762abcc860b 100644 --- a/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/pkgs/development/ocaml-modules/cstruct/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, async_unix, async, core }: +{ buildDunePackage, cstruct, async_unix, async, core }: buildDunePackage rec { pname = "cstruct-async"; diff --git a/pkgs/development/ocaml-modules/csv/csvtool.nix b/pkgs/development/ocaml-modules/csv/csvtool.nix index f5a6f458bfa2e..d1705e9fd5cf9 100644 --- a/pkgs/development/ocaml-modules/csv/csvtool.nix +++ b/pkgs/development/ocaml-modules/csv/csvtool.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: let inherit (ocamlPackages) buildDunePackage csv uutf; in diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix index 8e91decfd65f0..7dfe01d137e57 100644 --- a/pkgs/development/ocaml-modules/csv/lwt.nix +++ b/pkgs/development/ocaml-modules/csv/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, csv, lwt }: +{ buildDunePackage, csv, lwt }: buildDunePackage { pname = "csv-lwt"; diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index c8913ce9bb0b4..84565e8007e05 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = pname; rev = version; - sha256 = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs="; + hash = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs="; }; propagatedBuildInputs = [ integers_stubs_js ]; diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 1be0a0e49ce22..dae074b05fac5 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -27,6 +27,6 @@ buildDunePackage rec { homepage = "https://www.mancoosi.org/cudf/"; downloadPage = "https://gforge.inria.fr/projects/cudf/"; license = licenses.lgpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 03918c0d4829a..5d5cdb360f475 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildDunePackage, fetchurl, ocaml -, result, alcotest, cohttp-lwt-unix, odoc, curl, cacert +, result, alcotest, cohttp-lwt-unix, curl, cacert }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index c9a102366fdcd..75490c9648db8 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -9,8 +9,6 @@ , hex , json-data-encoding , json-data-encoding-bson -, alcotest -, crowbar , ppx_expect }: diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix index 664cb5dead17c..91981fd735cb4 100644 --- a/pkgs/development/ocaml-modules/dbf/default.nix +++ b/pkgs/development/ocaml-modules/dbf/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "dbf"; - version = "0.1.1"; + version = "0.2.0"; minimalOCamlVersion = "4.08"; @@ -12,8 +12,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "pveber"; repo = "dbf"; - rev = version; - hash = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; + rev = "v${version}"; + hash = "sha256-096GodM3J/4dsVdylG+6xz/p6ogUkhDGdFjiPwl/jLQ="; }; buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index 4bdc9f2e5ca2a..9f859b182831a 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,23 +1,22 @@ { lib, ocaml, fetchurl, buildDunePackage , eqaf -, alcotest, astring, bos, findlib, fpath +, alcotest, astring, bos, crowbar, findlib, fpath }: buildDunePackage rec { pname = "digestif"; - version = "1.1.4"; + version = "1.2.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-${version}.tbz"; - hash = "sha256-w3k+cg8NqAVPYobFRcghp/6+iC5/TlSX7ImxWjU1EeE="; + hash = "sha256-wwFoyv4nmmZTZ4BrPl5jmP10dPHlJg52gm1eydOypQg="; }; propagatedBuildInputs = [ eqaf ]; - checkInputs = [ alcotest astring bos fpath ]; + checkInputs = [ alcotest astring bos crowbar fpath ]; doCheck = true; postCheck = '' diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix index f17b8ed0759c7..5e07afe0e0122 100644 --- a/pkgs/development/ocaml-modules/dns/client-lwt.nix +++ b/pkgs/development/ocaml-modules/dns/client-lwt.nix @@ -1,9 +1,8 @@ -{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time -, mirage-random, mirage-crypto-rng, mtime, randomconv -, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest -, ca-certs, ca-certs-nss +{ buildDunePackage, dns, dns-client, lwt +, mirage-crypto-rng, mtime +, ipaddr, alcotest +, ca-certs , happy-eyeballs -, tcpip , tls-lwt }: diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix index 2e0768d2b7ca7..f236ac425da2a 100644 --- a/pkgs/development/ocaml-modules/dns/client-mirage.nix +++ b/pkgs/development/ocaml-modules/dns/client-mirage.nix @@ -1,7 +1,7 @@ -{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time -, mirage-random, mirage-crypto-rng, mtime, randomconv -, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest -, ca-certs, ca-certs-nss +{ buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time +, mirage-random +, domain-name, ipaddr +, ca-certs-nss , happy-eyeballs , tcpip , tls, tls-mirage diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index bc859945e4e98..78dcd400d185e 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -1,10 +1,6 @@ -{ lib, buildDunePackage, dns, lwt, mirage-clock, mirage-time -, mirage-random, mirage-crypto-rng, mtime, randomconv -, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest -, ca-certs, ca-certs-nss -, happy-eyeballs -, tcpip -, tls, tls-mirage +{ buildDunePackage, dns +, mirage-crypto-rng, mtime, randomconv +, domain-name, alcotest }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 4210dde025c0a..3baf5ab62ff68 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "irill"; repo = "dose3"; rev = version; - sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; + hash = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; minimalOCamlVersion = "4.07"; diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix index a2dd8bd9d2a9e..2b781a8631f87 100644 --- a/pkgs/development/ocaml-modules/dscheck/default.nix +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dscheck"; - version = "0.4.0"; + version = "0.5.0"; minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; - hash = "sha256-WWqa2O1y7krpIcxG7KLprn9SIQoWGSD3lgpXLZ9P9kA="; + hash = "sha256-9Rm2DmdvVeCkgAWCvkYdQTj94wmU7JkY8UI3fReIaG0="; }; propagatedBuildInputs = [ containers oseq ]; diff --git a/pkgs/development/ocaml-modules/dune-rpc/default.nix b/pkgs/development/ocaml-modules/dune-rpc/default.nix index 569be123794c2..3e83d04d5d7e4 100644 --- a/pkgs/development/ocaml-modules/dune-rpc/default.nix +++ b/pkgs/development/ocaml-modules/dune-rpc/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { meta = with lib; { description = "Library to connect and control a running dune instance"; inherit (dune_3.meta) homepage; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix index f17cdd60d2e14..fc99f4213e150 100644 --- a/pkgs/development/ocaml-modules/dune-site/default.nix +++ b/pkgs/development/ocaml-modules/dune-site/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { meta = with lib; { description = "Library for embedding location information inside executable and libraries"; inherit (dune_3.meta) homepage; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/dyn/default.nix b/pkgs/development/ocaml-modules/dyn/default.nix index 81b9e0d745fb6..ae1218b844ce6 100644 --- a/pkgs/development/ocaml-modules/dyn/default.nix +++ b/pkgs/development/ocaml-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, ordering }: +{ buildDunePackage, dune_3, ordering }: buildDunePackage { pname = "dyn"; diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index a679ee1ed4fd2..5d292607e24a1 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocaml, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 9d6c3664822d3..7c3bbc8014252 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocaml, buildDunePackage +{ lib, fetchFromGitHub, buildDunePackage , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson , ppx_optcomp , gitUpdater diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index 60e09d35db7b1..3b3c728fb0c3e 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -5,7 +5,6 @@ , bigstringaf , cstruct , domain-local-await -, dune-configurator , fetchurl , fmt , hmap diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix index 44764033d6a21..0a70be2c4fee0 100644 --- a/pkgs/development/ocaml-modules/emile/default.nix +++ b/pkgs/development/ocaml-modules/emile/default.nix @@ -1,7 +1,6 @@ { lib , buildDunePackage , fetchurl -, ocaml , angstrom , ipaddr , base64 diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index 18d1b76f043fd..d6ee91cacabb0 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, lib, faraday, core_unix ? null, async }: +{ buildDunePackage, faraday, core_unix ? null, async }: buildDunePackage rec { pname = "faraday-async"; diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix index 38ef4bb475a68..da2647ef2392a 100644 --- a/pkgs/development/ocaml-modules/faraday/default.nix +++ b/pkgs/development/ocaml-modules/faraday/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigstringaf }: +{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }: buildDunePackage rec { pname = "faraday"; diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix index bffec212b93e3..9eb8a8e23db15 100644 --- a/pkgs/development/ocaml-modules/ff/default.nix +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }: +{ buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }: buildDunePackage rec { pname = "ff"; diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix index fe8234c2572c0..3d0c8e7a8081f 100644 --- a/pkgs/development/ocaml-modules/ff/pbt.nix +++ b/pkgs/development/ocaml-modules/ff/pbt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, zarith, ff-sig, alcotest }: +{ buildDunePackage, zarith, ff-sig, alcotest }: buildDunePackage { pname = "ff-pbt"; diff --git a/pkgs/development/ocaml-modules/ff/sig.nix b/pkgs/development/ocaml-modules/ff/sig.nix index 4043c45ceecfe..41d95cf993227 100644 --- a/pkgs/development/ocaml-modules/ff/sig.nix +++ b/pkgs/development/ocaml-modules/ff/sig.nix @@ -7,7 +7,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "cryptography/ocaml-ff"; rev = version; - sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; + hash = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index 1ceea8a75f690..91da782b232b9 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, callPackage +{ buildDunePackage, callPackage , ffmpeg-base ? callPackage ./base.nix { } , ffmpeg-avutil , ffmpeg-avcodec diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix index 69bd4a067e274..a99f10899e583 100644 --- a/pkgs/development/ocaml-modules/fiber/default.nix +++ b/pkgs/development/ocaml-modules/fiber/default.nix @@ -2,7 +2,6 @@ , buildDunePackage , dyn , fetchurl -, ocaml , ppx_expect , stdune }: @@ -27,7 +26,7 @@ buildDunePackage rec { meta = with lib; { description = "Structured concurrency library"; homepage = "https://github.com/ocaml-dune/fiber"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/flex/default.nix b/pkgs/development/ocaml-modules/flex/default.nix index b8a56d5224fca..99af6da926809 100644 --- a/pkgs/development/ocaml-modules/flex/default.nix +++ b/pkgs/development/ocaml-modules/flex/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { meta = with lib; { description = "Native Reason implementation of CSS Flexbox layout. An Yoga project port"; homepage = "https://github.com/jordwalke/flex"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 1db8180934bfb..f8d6c02e54334 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchFromGitHub, buildDunePackage , camlp-streams, cppo, cryptokit, ocurl, yojson , ounit2 }: diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index 14537c24c8bb1..338e1dd770c44 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -17,6 +17,9 @@ buildDunePackage rec { propagatedBuildInputs = [ base fmt ]; + # base v0.17 compatibility + patches = [ ./genspio.patch ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/genspio/genspio.patch b/pkgs/development/ocaml-modules/genspio/genspio.patch new file mode 100644 index 0000000000000..8aa912c8aef0e --- /dev/null +++ b/pkgs/development/ocaml-modules/genspio/genspio.patch @@ -0,0 +1,714 @@ +diff --git a/src/examples/downloader.ml b/src/examples/downloader.ml +index 93638e5..a785549 100644 +--- a/src/examples/downloader.ml ++++ b/src/examples/downloader.ml +@@ -1,5 +1,5 @@ + open! Base +-module Filename = Caml.Filename ++module Filename = Stdlib.Filename + + let downloader () = + let open Genspio.EDSL in +@@ -154,7 +154,7 @@ let downloader () = + ; string " -> not HTTP(s) or FTP: NOT IMPLEMENTED" ] ] ) ] ) + + let () = +- match Caml.Sys.argv |> Array.to_list |> List.tl_exn with ++ match Stdlib.Sys.argv |> Array.to_list |> List.tl_exn with + | ["make"; path] -> ( + let script = Genspio.Compile.to_many_lines (downloader ()) in + let content = +@@ -163,12 +163,12 @@ let () = + match path with + | "-" -> Fmt.pr "\n`````\n%s`````\n%!" content + | other -> +- let o = Caml.open_out other in +- Caml.Printf.fprintf o "%s%!" content ; +- Caml.close_out o ) ++ let o = Stdlib.open_out other in ++ Stdlib.Printf.fprintf o "%s%!" content ; ++ Stdlib.close_out o ) + | other -> + Fmt.epr "Wrong command line: [%s]\n" + (List.map ~f:(Fmt.str "%S") other |> String.concat ~sep:"; ") ; + Fmt.epr "Usage:\n%s make <path>\n Create the downloader script.\n%!" +- Caml.Sys.argv.(0) ; +- Caml.exit 1 ++ Stdlib.Sys.argv.(0) ; ++ Stdlib.exit 1 +diff --git a/src/examples/multigit.ml b/src/examples/multigit.ml +index e05885c..b0e5fd2 100644 +--- a/src/examples/multigit.ml ++++ b/src/examples/multigit.ml +@@ -7,7 +7,7 @@ + $genspio_multigit $BINNPATH + *) + open! Base +-module Filename = Caml.Filename ++module Filename = Stdlib.Filename + + let ( // ) = Filename.concat + let msg fmt = Fmt.kstr (Fmt.epr "%s\n%!") fmt +@@ -62,7 +62,7 @@ end + + let version_string = + Fmt.str "%s (Genspio: %s)" +- (try Caml.Sys.getenv "multigit_version" with _ -> "0") ++ (try Stdlib.Sys.getenv "multigit_version" with _ -> "0") + Genspio.Meta.version + + module Multi_status = struct +@@ -504,7 +504,7 @@ end + let cmdf fmt = + Fmt.kstr + (fun s -> +- match Caml.Sys.command s with ++ match Stdlib.Sys.command s with + | 0 -> () + | other -> Fmt.kstr failwith "CMD: %S failed with %d" s other ) + fmt +@@ -531,13 +531,13 @@ module Meta_repository = struct + let cmd_to_string_list cmd = + let i = Unix.open_process_in cmd in + let rec loop acc = +- try loop (Caml.input_line i :: acc) +- with _ -> Caml.close_in i ; List.rev acc in ++ try loop (Stdlib.input_line i :: acc) ++ with _ -> Stdlib.close_in i ; List.rev acc in + loop [] + + let readme_md ~path:_ ~output = +- let o = Caml.open_out output in +- let open Caml.Format in ++ let o = Stdlib.open_out output in ++ let open Stdlib.Format in + let fmt = formatter_of_out_channel o in + let out f = fprintf fmt f in + let sec c s = out "%s\n%s\n\n" s (String.make (String.length s) c) in +@@ -591,7 +591,7 @@ module Meta_repository = struct + par "" ; + section "Authors / Making-of" ; + par +- "This repository is generated by an OCaml program which itself was \ ++ "This repository is generated by an OStdlib.program which itself was \ + written by [Seb Mondet](https://seb.mondet.org), it uses the \ + [Genspio](https://smondet.gitlab.io/genspio-doc/) EDSL library, and \ + serves as one of its examples of usage, see also its \ +@@ -599,7 +599,7 @@ module Meta_repository = struct + par + "Similarly, you may check out the <https://github.com/smondet/cosc> \ + repository, which is also a bunch of shell scripts maintained by an \ +- OCaml program." ; ++ OStdlib.program." ; + section "Example Session / Demo" ; + let git_repos_top = "/tmp/git-repos-example" in + let git_repos_hammerlab = git_repos_top // "hammerlab" in +@@ -724,21 +724,21 @@ end + *) + + let () = +- let path = Caml.Sys.argv.(1) in ++ let path = Stdlib.Sys.argv.(1) in + cmdf "mkdir -p %s" (Filename.quote path) ; + let repomode = +- try String.(Caml.Sys.getenv "repomode" = "true") with _ -> false in ++ try String.(Stdlib.Sys.getenv "repomode" = "true") with _ -> false in + let output filename script long_description = + let gms = if repomode then path // "bin" // filename else path // filename in + msg "Outputting %S" gms ; + cmdf "mkdir -p %s" Filename.(quote (dirname gms)) ; +- let o = Caml.open_out gms in +- Caml.Format.( ++ let o = Stdlib.open_out gms in ++ Stdlib.Format.( + fprintf + (formatter_of_out_channel o) + "#!/bin/sh\n\n%s\n\n%a\n" + ( long_description () +- @ [ "The following is generated by an OCaml program using the \ ++ @ [ "The following is generated by an OStdlib.program using the \ + Genspio EDSL."; "See <https://smondet.gitlab.io/genspio-doc/>." + ] + |> List.map ~f:(Fmt.str "# %s") +@@ -746,7 +746,7 @@ let () = + Genspio.Compile.To_slow_flow.Script.pp_posix + (Genspio.Compile.To_slow_flow.compile + (script () |> Genspio.Transform.Constant_propagation.process) )) ; +- Caml.close_out o ; ++ Stdlib.close_out o ; + cmdf "chmod +x %s" (Filename.quote gms) in + Multi_status.(output name script long_description) ; + Activity_report.(output name script long_description) ; +diff --git a/src/examples/service_composer.ml b/src/examples/service_composer.ml +index ef3c69b..b52969f 100644 +--- a/src/examples/service_composer.ml ++++ b/src/examples/service_composer.ml +@@ -36,7 +36,7 @@ + `cosc config show` is actually able to call `cosc-configuration-display`. + *) + open! Base +-module Filename = Caml.Filename ++module Filename = Stdlib.Filename + + let ( // ) = Filename.concat + let msg fmt = Fmt.kstr (Fmt.epr "%s\n%!") fmt +@@ -46,7 +46,7 @@ module Gedsl = Genspio.EDSL + let cmdf fmt = + Fmt.kstr + (fun s -> +- match Caml.Sys.command s with ++ match Stdlib.Sys.command s with + | 0 -> () + | other -> Fmt.kstr failwith "CMD: %S failed with %d" s other ) + fmt +@@ -87,24 +87,24 @@ module Script = struct + output_path // String.concat ~sep:"-" (root :: t.relative_path) + ``` + +- The function `write` is the only real I/O of this whole OCaml program. ++ The function `write` is the only real I/O of this whole OStdlib.program. + *) + let write ?(compiler = `Slow_flow) t ~output_path ~root = + let path = output_path // String.concat ~sep:"-" (root :: t.relative_path) in +- let o = Caml.open_out path in ++ let o = Stdlib.open_out path in + msg "Outputting “%s” to %s\n%!" t.description path ; + ( match compiler with + | `Slow_flow -> + Fmt.( + pf +- (Caml.Format.formatter_of_out_channel o) ++ (Stdlib.Format.formatter_of_out_channel o) + "#!/bin/sh\n\n%a\n" Genspio.Compile.To_slow_flow.Script.pp_posix + (Genspio.Compile.To_slow_flow.compile + (t.make ~root |> Genspio.Transform.Constant_propagation.process) )) + | `Standard -> +- Caml.Printf.fprintf o "#!/bin/sh\n\n%s\n" ++ Stdlib.Printf.fprintf o "#!/bin/sh\n\n%s\n" + (Genspio.Compile.to_many_lines (t.make ~root)) ) ; +- Caml.close_out o ; cmdf "chmod +x %s" path ++ Stdlib.close_out o ; cmdf "chmod +x %s" path + end + + (*md Configuration of the scripts is bootstrapped with an environment +@@ -275,7 +275,7 @@ module Manual = struct + (Environment.var_configuration_path env) + env.Environment.default_configuration_path root root + @ par +- "The scripts are generated by an OCaml program which uses the \ ++ "The scripts are generated by an OStdlib.program which uses the \ + [Genspio](https://smondet.gitlab.io/genspio-doc) EDSL/library. \ + The code generator serves as one of the usage examples of the \ + library, see its \ +@@ -341,7 +341,7 @@ module Manual = struct + let image = "smondet/genspio-doc-dockerfiles:apps406" in + Fmt.kstr par + "If you have [`opam`](https://opam.ocaml.org), setting up the \ +- genspio repository is easy (only simple, pure OCaml \ ++ genspio repository is easy (only simple, pure OStdlib.\ + dependencies), if not, or if you just like Docker™, the \ + generator is available in the `%s` image, see:" + image +@@ -912,7 +912,7 @@ module Example_script = struct + let basic env root = + let call s = Fmt.str "%s %s" root s in + let conf = "/tmp/example-basic.d" in +- let cmt fmt = Fmt.str Caml.("# " ^^ fmt) in ++ let cmt fmt = Fmt.str Stdlib.("# " ^^ fmt) in + ( "basic" + , [ cmt "We setup the configuration root path:" + ; Fmt.str "export %s=%s" (Environment.var_configuration_path env) conf +@@ -1051,13 +1051,13 @@ let make ?default_configuration_path ?default_screen_name ~name ~output_path () + let () = + let anon = ref [] in + let anon_fun p = anon := p :: !anon in +- let usage = Fmt.str "%s [-help] <path>" Caml.Sys.argv.(0) in ++ let usage = Fmt.str "%s [-help] <path>" Stdlib.Sys.argv.(0) in + let name = ref None in + let output_path = ref None in + let config_path = ref None in + let screen_name = ref None in + let output_readme = ref false in +- let module Arg = Caml.Arg in ++ let module Arg = Stdlib.Arg in + let args = + Arg.align + [ ( "--name" +@@ -1077,7 +1077,7 @@ let () = + , Fmt.str "<script-name> Where to write the scripts." ) ] in + Arg.parse args anon_fun usage ; + List.iter !anon ~f:(msg "Ignoring %s") ; +- let die () = Caml.exit 2 in ++ let die () = Stdlib.exit 2 in + let need opt = function + | Some o -> o + | None -> +diff --git a/src/examples/small.ml b/src/examples/small.ml +index f6e4504..8c776a6 100644 +--- a/src/examples/small.ml ++++ b/src/examples/small.ml +@@ -1,10 +1,10 @@ + open! Base + +-let examples = ref ([] : (Caml.out_channel -> unit) list) ++let examples = ref ([] : (Stdlib.out_channel -> unit) list) + + let example ?show name description code = + let f o = +- Caml.Printf.fprintf o ++ Stdlib.Printf.fprintf o + "let () = examples := Example.make ~ocaml:%S %s %S %S %s :: !examples\n" + code + (match show with None -> "" | Some s -> Fmt.str "~show:%s" s) +@@ -303,7 +303,7 @@ Genspio.EDSL.( + (******************************************************************************) + + let () = +- let open Caml in ++ let open Stdlib.in + let open Printf in + let o = open_out Sys.argv.(1) in + fprintf o "%s" +@@ -318,7 +318,7 @@ let examples = ref [] + fprintf o "%s" + {ocaml| + let () = +- List.iter (List.rev !examples) ~f:(Example.run Caml.Format.std_formatter) ++ List.iter (List.rev !examples) ~f:(Example.run Stdlib.Format.std_formatter) + |ocaml} ; + close_out o ; + printf "%s: Done.\n%!" Sys.argv.(0) +diff --git a/src/examples/vm_tester.ml b/src/examples/vm_tester.ml +index f8272b9..59c81e0 100644 +--- a/src/examples/vm_tester.ml ++++ b/src/examples/vm_tester.ml +@@ -1,5 +1,5 @@ + open! Base +-module Filename = Caml.Filename ++module Filename = Stdlib.Filename + + let ( // ) = Filename.concat + +@@ -18,7 +18,7 @@ module Shell_script = struct + try String.sub ~pos:0 ~len:40 m with _ -> m + + let path {name; content; _} = +- let open Caml in ++ let open Stdlib.in + let hash = Marshal.to_string content [] |> Digest.string |> Digest.to_hex in + let tag = String.sub hash 0 8 in + "_scripts" // Fmt.str "%s_%s.sh" (sanitize_name name) tag +@@ -54,7 +54,7 @@ module Run_environment = struct + + let tmp_name_of_url = function + | Http (url, ext) -> +- ("_cache" // Caml.Digest.(string url |> to_hex)) ++ ("_cache" // Stdlib.Digest.(string url |> to_hex)) + ^ Option.value_map ~default:"" ext ~f:(fun `Xz -> ".xz") + + let make_files files = +@@ -410,14 +410,14 @@ end + let cmdf fmt = + Fmt.kstr + (fun cmd -> +- match Caml.Sys.command cmd with ++ match Stdlib.Sys.command cmd with + | 0 -> () + | other -> Fmt.kstr failwith "Command %S did not return 0: %d" cmd other + ) + fmt + + let write_lines p l = +- let open Caml in ++ let open Stdlib.in + let o = open_out p in + Base.List.iter l ~f:(Printf.fprintf o "%s\n") ; + close_out o +@@ -427,7 +427,7 @@ let () = + Fmt.kstr + (fun s -> + Fmt.epr "Wrong CLI: %s\n%!" s ; +- Caml.exit 2 ) ++ Stdlib.exit 2 ) + fmt in + let example = ref None in + let path = ref None in +@@ -458,7 +458,7 @@ let () = + with + | Some s -> s + | None -> fail "Don't know VM %S" arg ) in +- let module Arg = Caml.Arg in ++ let module Arg = Stdlib.Arg in + let args = + Arg.align + [ ( "--ssh-port" +diff --git a/src/lib/EDSL.ml b/src/lib/EDSL.ml +index 9663489..9d31805 100644 +--- a/src/lib/EDSL.ml ++++ b/src/lib/EDSL.ml +@@ -5,7 +5,7 @@ type c_string = Language.c_string + type byte_array = Language.byte_array + type fd_redirection = Language.fd_redirection + +-let ( // ) = Caml.Filename.concat ++let ( // ) = Stdlib.Filename.concat + + open Language.Construct + include Language.Construct.Base +@@ -109,7 +109,7 @@ let tmp_file ?tmp_dir name : file = + [ get_tmp_dir; str "/" + ; str + (Fmt.str "genspio-tmp-file-%s-%s" clean +- Caml.Digest.(string name |> to_hex) ) ] in ++ Stdlib.Digest.(string name |> to_hex) ) ] in + let tmp = Str.concat_list [path; string "-tmp"] in + object (_self) + method get = get_stdout (call [string "cat"; path]) +@@ -172,7 +172,7 @@ module Command_line = struct + let variable {switches; _} = + Fmt.str "%s_%s" prefix + ( String.concat ~sep:"" switches +- |> Caml.Digest.string |> Caml.Digest.to_hex ) in ++ |> Stdlib.Digest.string |> Stdlib.Digest.to_hex ) in + let inits = ref [] in + let to_init s = inits := s :: !inits in + let cases = ref [] in +@@ -331,7 +331,7 @@ let fresh_name suf = + object + method v = 42 + end in +- Fmt.str "g-%d-%d-%s" (Caml.Oo.id x) (Random.int 100_000) suf ++ Fmt.str "g-%d-%d-%s" (Stdlib.Oo.id x) (Random.int 100_000) suf + + let sanitize_name n = + String.map n ~f:(function +diff --git a/src/lib/EDSL_v0.ml b/src/lib/EDSL_v0.ml +index 1ac12de..dd82023 100644 +--- a/src/lib/EDSL_v0.ml ++++ b/src/lib/EDSL_v0.ml +@@ -5,7 +5,7 @@ type c_string = Language.c_string + type byte_array = Language.byte_array + type fd_redirection = Language.fd_redirection + +-let ( // ) = Caml.Filename.concat ++let ( // ) = Stdlib.Filename.concat + + include Language.Construct + +@@ -63,7 +63,7 @@ let tmp_file ?tmp_dir name : file = + [ get_tmp_dir; c_string "/" + ; c_string + (Fmt.str "genspio-tmp-file-%s-%s" clean +- Caml.Digest.(string name |> to_hex) ) ] in ++ Stdlib.Digest.(string name |> to_hex) ) ] in + let tmp = C_string.concat_list [path; string "-tmp"] in + object (self) + method get = get_stdout (call [string "cat"; path]) +@@ -127,7 +127,7 @@ module Command_line = struct + let variable {switches; _} = + Fmt.str "%s_%s" prefix + ( String.concat ~sep:"" switches +- |> Caml.Digest.string |> Caml.Digest.to_hex ) in ++ |> Stdlib.Digest.string |> Stdlib.Digest.to_hex ) in + let inits = ref [] in + let to_init s = inits := s :: !inits in + let cases = ref [] in +@@ -139,7 +139,7 @@ module Command_line = struct + let bool_of_var var = getenv (string var) |> Bool.of_string in + let anon_tmp = + Fmt.kstr tmp_file "parse-cli-%s" +- Caml.(Marshal.to_string options [] |> Digest.string |> Digest.to_hex) ++ Stdlib.(Marshal.to_string options [] |> Digest.string |> Digest.to_hex) + in + let anon = anon_tmp#get |> Elist.deserialize_to_c_string_list in + let applied_action = +@@ -293,7 +293,7 @@ let fresh_name suf = + object + method v = 42 + end in +- Fmt.str "g-%d-%d-%s" (Caml.Oo.id x) (Random.int 100_000) suf ++ Fmt.str "g-%d-%d-%s" (Stdlib.Oo.id x) (Random.int 100_000) suf + + let sanitize_name n = + String.map n ~f:(function +diff --git a/src/lib/common.ml b/src/lib/common.ml +index fe9cfee..d98d697 100644 +--- a/src/lib/common.ml ++++ b/src/lib/common.ml +@@ -4,7 +4,7 @@ module Unique_name = struct + let x = ref 0 + + let create prefix = +- Caml.incr x ; ++ Stdlib.incr x ; + Fmt.str "%s_%d_%d" prefix !x (Random.int 100_000) + + let variable = create +diff --git a/src/lib/compile.ml b/src/lib/compile.ml +index 12cc836..d365e37 100644 +--- a/src/lib/compile.ml ++++ b/src/lib/compile.ml +@@ -53,7 +53,7 @@ module To_posix = struct + (fun ppf s -> pf ppf "@[`%s`@]" s) ) + more ) + () +- |> Caml.Filename.quote in ++ |> Stdlib.Filename.quote in + str " printf -- '%%s\\n' %s >&2 " msg_str + + let one_liner = +@@ -116,7 +116,7 @@ let to_many_lines ?max_argument_length ?no_trap e = + to_legacy `Multi_line ?max_argument_length ?no_trap e + + let quick_run_exn ?max_argument_length ?no_trap e = +- match to_many_lines ?max_argument_length ?no_trap e |> Caml.Sys.command with ++ match to_many_lines ?max_argument_length ?no_trap e |> Stdlib.Sys.command with + | 0 -> () + | other -> Fmt.failwith "Command returned %d" other + +@@ -125,7 +125,7 @@ let to_string_hum e = Fmt.str "%a" pp_hum e + + let to_one_line_hum e = + let buf = Buffer.create 42 in +- let formatter = Caml.Format.formatter_of_buffer buf in +- Caml.Format.pp_set_margin formatter 10_000_000 ; +- Caml.Format.fprintf formatter "@[<h>%a@]@?" pp_hum e ; ++ let formatter = Stdlib.Format.formatter_of_buffer buf in ++ Stdlib.Format.pp_set_margin formatter 10_000_000 ; ++ Stdlib.Format.fprintf formatter "@[<h>%a@]@?" pp_hum e ; + Buffer.contents buf +diff --git a/src/lib/language.ml b/src/lib/language.ml +index cf7b810..6f71027 100644 +--- a/src/lib/language.ml ++++ b/src/lib/language.ml +@@ -1,7 +1,7 @@ + open Common + + (* Here we use the legacy module (too much code to change at once): *) +-module Format = Caml.Format ++module Format = Stdlib.Format + + type c_string = C_string + type byte_array = Byte_Array +diff --git a/src/lib/standard_compiler.ml b/src/lib/standard_compiler.ml +index 7e639c6..bc8848b 100644 +--- a/src/lib/standard_compiler.ml ++++ b/src/lib/standard_compiler.ml +@@ -147,7 +147,7 @@ let rec to_ir : type a. _ -> _ -> a Language.t -> internal_representation = + match c_str with + | Byte_array_to_c_string (Literal (Literal.String s)) + when Literal.Str.easy_to_escape s -> +- argument (Caml.Filename.quote s |> check_length) ++ argument (Stdlib.Filename.quote s |> check_length) + | Byte_array_to_c_string (Literal (Literal.String s)) + when Literal.Str.impossible_to_escape_for_variable s -> + error ~comment_backtrace:comments (`Not_a_c_string s) +diff --git a/src/lib/to_slow_flow.ml b/src/lib/to_slow_flow.ml +index e1305ce..0f812aa 100644 +--- a/src/lib/to_slow_flow.ml ++++ b/src/lib/to_slow_flow.ml +@@ -33,10 +33,10 @@ let expand_octal_command ~remove_l s = + let m = ref 0 + + let var_name ?expression ?script tag = +- Caml.incr m ; ++ Stdlib.incr m ; + let stag = String.map tag ~f:(function '-' -> '_' | a -> a) in + Fmt.str "genspio_%s_%d_%d_%s" stag (Random.int 100_000_000) !m +- Caml.( ++ Stdlib.( + Marshal.to_string (expression, script) [Marshal.Closures] + |> Digest.string |> Digest.to_hex) + +@@ -49,7 +49,7 @@ module Tmp_db = struct + let make ?(deletion_grouping = 20) how = + let default_tmpdir = + match how with +- | `Fresh -> Caml.Filename.concat "/tmp" (var_name "tmpdir") ++ | `Fresh -> Stdlib.Filename.concat "/tmp" (var_name "tmpdir") + | `Use p -> p in + {default_tmpdir; tmp_file_db= []; deletion_grouping} + +@@ -122,10 +122,10 @@ module Script = struct + let v = Fmt.str "$(%s)" (expand_octal_command ~remove_l:false oct) in + if not arithmetic then Fmt.str "\"%s\"" v else v + | Literal_value s -> +- let v = Caml.Filename.quote s in ++ let v = Stdlib.Filename.quote s in + if arithmetic then Fmt.str "$(printf -- %s)" v else v + | File s -> +- let v = Fmt.str "$(cat %s)" (Caml.Filename.quote s) in ++ let v = Fmt.str "$(cat %s)" (Stdlib.Filename.quote s) in + if not arithmetic then Fmt.str "\"%s\"" v else v + | Tmp_file_in_variable s -> + (* Parameters.(tmp_file_db := s :: !tmp_file_db) ; *) +@@ -150,7 +150,7 @@ module Script = struct + | Literal_value s -> string_to_octal s + | File f -> + Fmt.str "$(cat %s | od -t o1 -An -v | tr -d ' \\n')" +- (Caml.Filename.quote f) ++ (Stdlib.Filename.quote f) + | Tmp_file_in_variable f -> + (* Parameters.(tmp_file_db := f :: !tmp_file_db) ; *) + Fmt.str "$(cat \"${%s}\" | od -t o1 -An -v | tr -d ' \\n')" f +@@ -162,7 +162,7 @@ module Script = struct + | Unit -> assert false + | Raw_inline s -> s + | Literal_value _ -> assert false +- | File f -> Caml.Filename.quote f ++ | File f -> Stdlib.Filename.quote f + | Tmp_file_in_variable f -> + (* Parameters.(tmp_file_db := f :: !tmp_file_db) ; *) + Fmt.str "\"${%s}\"" f +@@ -343,7 +343,7 @@ let rec to_ir : type a. fail_commands:_ -> tmpdb:_ -> a t -> Script.t = + let esc = string_to_octal v ~prefix:"\\" in + mk (rawf "printf -- '%s' > %s" esc tmparg, tmp) + | Literal_value v -> +- mk (rawf "printf -- '%%s' %s > %s" (Caml.Filename.quote v) tmparg, tmp) ++ mk (rawf "printf -- '%%s' %s > %s" (Stdlib.Filename.quote v) tmparg, tmp) + | File p -> mk (rawf ":", make [] (File p)) + | Tmp_file_in_variable p -> mk (rawf "cp \"${%s}\" %s" p tmparg, tmp) + | Raw_inline s -> mk (rawf "printf -- '%%s' %s > %s" s tmparg, tmp) +@@ -725,7 +725,7 @@ let compile ?(default_tmpdir = `Fresh) ?(signal_name = "USR1") + let fail_commands s = + match trap with + | `Exit_with _ -> +- [ rawf "printf '%%s\\n' %s > %s " (Caml.Filename.quote s) tmparg ++ [ rawf "printf '%%s\\n' %s > %s " (Stdlib.Filename.quote s) tmparg + ; rawf "kill -s %s ${%s}" signal_name pid ] + | `None -> + failwith "You cannot use the `fail` construct with no `trap` strategy" +@@ -851,9 +851,9 @@ let test () = + let ir = compile expr in + fprintf std_formatter "==== TEST %d ====\n%a\n%!" idx Script.pp_posix ir ; + let script_file = Fmt.str "/tmp/script-%d.sh" idx in +- let o = Caml.open_out script_file in ++ let o = Stdlib.open_out script_file in + fprintf (formatter_of_out_channel o) "\n%a\n%!" Script.pp_posix ir ; +- Caml.flush o ; +- Caml.close_out o ; +- let res = Fmt.kstr Caml.Sys.command "sh %s" script_file in ++ Stdlib.flush o ; ++ Stdlib.close_out o ; ++ let res = Fmt.kstr Stdlib.Sys.command "sh %s" script_file in + fprintf std_formatter "\nRESULT: %d\n" res ) +diff --git a/src/lib/transform.ml b/src/lib/transform.ml +index a1f16a3..78bb202 100644 +--- a/src/lib/transform.ml ++++ b/src/lib/transform.ml +@@ -370,7 +370,7 @@ module Constant_propagation = struct + let count = ref 0 in + let check ?trace name e res = + let p = process ?trace e in +- Caml.incr count ; ++ Stdlib.incr count ; + match Poly.(p = res) with + | true -> () + | false -> +diff --git a/src/test-lib/test_lib.ml b/src/test-lib/test_lib.ml +index eba7adf..ecf765d 100644 +--- a/src/test-lib/test_lib.ml ++++ b/src/test-lib/test_lib.ml +@@ -1,9 +1,9 @@ + open! Base + +-let ( // ) = Caml.Filename.concat ++let ( // ) = Stdlib.Filename.concat + +-module Filename = Caml.Filename +-module Sys = Caml.Sys ++module Filename = Stdlib.Filename ++module Sys = Stdlib.Sys + + module Test = struct + type t = +@@ -82,7 +82,7 @@ module Shell_directory = struct + if String.length long > 30 then String.sub long ~pos:0 ~len:30 + else long ) + (List.length args) returns +- Caml.( ++ Stdlib.( + Marshal.to_string script [Marshal.Closures] + |> Digest.string |> Digest.to_hex + |> fun s -> String.sub s 0 10) +@@ -358,9 +358,9 @@ module Example = struct + ( match Genspio.Compile.To_posix.(string ~options:multi_line) code with + | Ok script -> + let tmp = Filename.temp_file "genspio-example" ".sh" in +- let o = Caml.open_out tmp in +- Caml.Printf.fprintf o "\n%s\n" script ; +- Caml.close_out o ; ++ let o = Stdlib.open_out tmp in ++ Stdlib.Printf.fprintf o "\n%s\n" script ; ++ Stdlib.close_out o ; + (* ff fmt "@[<hov 2>* Compiled:@ `%s`@ (%d bytes)@]@\n" tmp (String.length script); *) + let out = Filename.temp_file "genspio-example" ".out" in + let err = Filename.temp_file "genspio-example" ".err" in +@@ -371,10 +371,10 @@ module Example = struct + let show_file name path = + let fence = String.make 50 '`' in + ff fmt "@\n%s:@\n@\n%s@\n" name fence ; +- let i = Caml.open_in path in ++ let i = Stdlib.open_in path in + let rec loop () = + try +- ff fmt "%c" @@ Caml.input_char i ; ++ ff fmt "%c" @@ Stdlib.input_char i ; + loop () + with _ -> () in + loop () ; ff fmt "@\n%s@\n@\n" fence in +diff --git a/src/test/main.ml b/src/test/main.ml +index 3374bdf..44d4e3f 100644 +--- a/src/test/main.ml ++++ b/src/test/main.ml +@@ -1,5 +1,5 @@ + open! Base +-module Filename = Caml.Filename ++module Filename = Stdlib.Filename + open Tests.Test_lib + module Compile = Genspio.Language + module Construct = Genspio.EDSL_v0 +@@ -635,7 +635,7 @@ let () = + @@ exits ~name:"getenv" 25 + (let open Construct in + let alternate_get_env v = +- (* We cannot use OCaml's Sys.getenv because the compilation output may ++ (* We cannot use OStdlib.s Sys.getenv because the compilation output may + be run on a different host/system (through SSH or alike). *) + exec ["sh"; "-c"; Fmt.str "echo ${%s} | tr -d '\\n'" v] + |> get_stdout |> Byte_array.to_c in +@@ -1224,14 +1224,14 @@ let () = + Fmt.kstr + (fun s -> + Fmt.epr "Error: %s\nUsage: %s\n%!" s usage ; +- Caml.exit 1 ) ++ Stdlib.exit 1 ) + fmt in + let anon_fun p = anon := p :: !anon in + let no_compilation_tests = ref false in + let extra_slow_flow_tests = ref false in + let extra_transform_cp_tests = ref false in + let filter_tests = ref None in +- let module Arg = Caml.Arg in ++ let module Arg = Stdlib.Arg in + let args = + Arg.align + [ ( "--important-shells" +@@ -1294,13 +1294,13 @@ let () = + let todo = Test_directory.contents testdir ~path testlist in + List.iter todo ~f:(function + | `File (p, v) -> +- let mo = Caml.open_out p in +- Caml.Printf.fprintf mo "%s\n" v ; +- Caml.close_out mo ++ let mo = Stdlib.open_out p in ++ Stdlib.Printf.fprintf mo "%s\n" v ; ++ Stdlib.close_out mo + | `Directory v -> Fmt.kstr Sys.command "mkdir -p '%s'" v |> ignore ) ) ; + let errors = + if !no_compilation_tests then false else compilation_error_tests () in + if !extra_slow_flow_tests then Genspio.To_slow_flow.test () ; + if !extra_transform_cp_tests then + Genspio.Transform.Constant_propagation.test () ; +- Caml.exit (if errors then 23 else 0) ++ Stdlib.exit (if errors then 23 else 0) diff --git a/pkgs/development/ocaml-modules/get-activity/default.nix b/pkgs/development/ocaml-modules/get-activity/default.nix new file mode 100644 index 0000000000000..dbd585f57800e --- /dev/null +++ b/pkgs/development/ocaml-modules/get-activity/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildDunePackage, + get-activity-lib, + ppx_expect, + cmdliner, + dune-build-info, + fmt, + logs, + alcotest +}: + +buildDunePackage rec { + pname = "get-activity"; + inherit (get-activity-lib) version src; + + minimalOCamlVersion = "4.08"; + + buildInputs = [ + get-activity-lib + cmdliner + dune-build-info + fmt + logs + ]; + + checkInputs = [ ppx_expect alcotest ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/tarides/get-activity"; + description = "Collect activity and format as markdown for a journal"; + license = lib.licenses.mit; + changelog = "https://github.com/tarides/get-activity/releases/tag/${version}"; + maintainers = with lib.maintainers; [ zazedd ]; + }; +} diff --git a/pkgs/development/ocaml-modules/get-activity/lib.nix b/pkgs/development/ocaml-modules/get-activity/lib.nix new file mode 100644 index 0000000000000..7f3fe161a6d2b --- /dev/null +++ b/pkgs/development/ocaml-modules/get-activity/lib.nix @@ -0,0 +1,52 @@ +{ + lib, + buildDunePackage, + fetchFromGitHub, + ppx_expect, + astring, + curly, + fmt, + logs, + ppx_yojson_conv, + ppx_yojson_conv_lib, + yojson, + alcotest +}: + +buildDunePackage rec { + pname = "get-activity-lib"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "tarides"; + repo = "get-activity"; + rev = version; + hash = "sha256-QU/LPIxcem5nFvSxcNApOuBu6UHqLHIXVSOJ2UT0eKA="; + }; + + minimalOCamlVersion = "4.08"; + + buildInputs = [ ppx_yojson_conv ]; + + propagatedBuildInputs = [ + astring + curly + fmt + logs + ppx_yojson_conv_lib + yojson + ]; + + checkInputs = [ ppx_expect alcotest ]; + + doCheck = true; + + meta = { + homepage = "https://github.com/tarides/get-activity"; + description = "Collect activity and format as markdown for a journal (lib)"; + license = lib.licenses.mit; + changelog = "https://github.com/tarides/get-activity/releases/tag/${version}"; + maintainers = with lib.maintainers; [ zazedd ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix index 28c49b70b1837..2ae56da0428e0 100644 --- a/pkgs/development/ocaml-modules/git/mirage.nix +++ b/pkgs/development/ocaml-modules/git/mirage.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , git , mimic , mimic-happy-eyeballs diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 9f38f0c8606a7..09e64bb064a37 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , git , mimic , paf diff --git a/pkgs/development/ocaml-modules/github/data.nix b/pkgs/development/ocaml-modules/github/data.nix index 803642b509dd5..9b8c207e91acc 100644 --- a/pkgs/development/ocaml-modules/github/data.nix +++ b/pkgs/development/ocaml-modules/github/data.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, github +{ buildDunePackage, github , yojson, atdgen }: diff --git a/pkgs/development/ocaml-modules/github/jsoo.nix b/pkgs/development/ocaml-modules/github/jsoo.nix index d387d2fbde018..e5860fd1d72e2 100644 --- a/pkgs/development/ocaml-modules/github/jsoo.nix +++ b/pkgs/development/ocaml-modules/github/jsoo.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, github +{ buildDunePackage, github , cohttp, cohttp-lwt-jsoo, js_of_ocaml-lwt }: diff --git a/pkgs/development/ocaml-modules/github/unix.nix b/pkgs/development/ocaml-modules/github/unix.nix index 342be1069ce93..4d3205452094a 100644 --- a/pkgs/development/ocaml-modules/github/unix.nix +++ b/pkgs/development/ocaml-modules/github/unix.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, github +{ buildDunePackage, github , cohttp, cohttp-lwt-unix, stringext, cmdliner, lwt }: diff --git a/pkgs/development/ocaml-modules/gitlab/jsoo.nix b/pkgs/development/ocaml-modules/gitlab/jsoo.nix index 60929f60b3b20..c6bcfb6ae39e4 100644 --- a/pkgs/development/ocaml-modules/gitlab/jsoo.nix +++ b/pkgs/development/ocaml-modules/gitlab/jsoo.nix @@ -1,5 +1,4 @@ { - lib, buildDunePackage, gitlab, cohttp, diff --git a/pkgs/development/ocaml-modules/gitlab/unix.nix b/pkgs/development/ocaml-modules/gitlab/unix.nix index b914e67b54c91..1bb5ac6525ae1 100644 --- a/pkgs/development/ocaml-modules/gitlab/unix.nix +++ b/pkgs/development/ocaml-modules/gitlab/unix.nix @@ -1,5 +1,4 @@ { - lib, buildDunePackage, gitlab, cmdliner, diff --git a/pkgs/development/ocaml-modules/gluten/eio.nix b/pkgs/development/ocaml-modules/gluten/eio.nix index 9c78b1d73cd4c..ceeb8f7294279 100644 --- a/pkgs/development/ocaml-modules/gluten/eio.nix +++ b/pkgs/development/ocaml-modules/gluten/eio.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, gluten, eio }: +{ buildDunePackage, gluten, eio }: buildDunePackage { pname = "gluten-eio"; diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index e8d9d42ff602a..f65aeaf0e4615 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -1,7 +1,5 @@ { buildDunePackage -, lib , fetchFromGitHub -, ocaml , hpack , angstrom , faraday diff --git a/pkgs/development/ocaml-modules/hacl-star/default.nix b/pkgs/development/ocaml-modules/hacl-star/default.nix index 18d3076555849..558146c3dd4b5 100644 --- a/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }: +{ buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }: buildDunePackage { diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index b4b8c17415359..15dde10e7f260 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -2,11 +2,9 @@ , which , stdenv , fetchzip -, opaline , cmake , ocaml , findlib -, hacl-star , ctypes , cppo }: diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index b47c153a4974a..49f92b87e015e 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "hidapi"; - version = "1.1.2"; + version = "1.2.1"; duneVersion = "3"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "vbmithr"; repo = "ocaml-hidapi"; rev = version; - hash = "sha256-SNQ1/i5wJJgcslIUBe+z5QgHns/waHnILyMUJ46cUwg="; + hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix index 9b78d7bf6401b..46490def6f8e0 100644 --- a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , httpaf , faraday-lwt-unix , lwt diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 10509f1e75007..3533a7880e3e0 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -1,7 +1,6 @@ { lib , fetchurl , buildDunePackage -, ocaml , decompress , stdlib-shims , alcotest diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index cbad2d73e545f..8471d9c4e8dc1 100644 --- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , ipaddr, cstruct }: diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index d579c22de1345..b30da4c5aaa09 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { doCheck = true; meta = macaddr.meta // { - description = "Library for manipulation of IP (and MAC) address representations "; + description = "Library for manipulation of IP (and MAC) address representations"; maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 9484f8203cec9..0a05c7fbadd66 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , ipaddr, ipaddr-cstruct, ounit2, ppx_sexp_conv }: diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix index 3e7f3c2a1b705..ce955265a2f88 100644 --- a/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, irmin, irmin-test, fmt, logs, lwt, alcotest }: +{ buildDunePackage, irmin, irmin-test, fmt, logs, lwt, alcotest }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index fdd18aa5abe5c..da8531a9dec28 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,5 +1,5 @@ -{ lib, buildDunePackage -, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri +{ buildDunePackage +, astring, digestif, fmt, jsonm, logs, ocamlgraph, uri , repr, ppx_irmin, bheap, uutf, mtime, lwt, optint , vector, hex, alcotest, qcheck-alcotest }: diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index 8d56e90fad8bb..093a68fe78ef0 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, irmin, astring, logs, lwt +{ buildDunePackage, irmin, astring, logs, lwt , alcotest, irmin-test, irmin-watcher }: diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix index 1e4397e89298b..1fde734d9c264 100644 --- a/pkgs/development/ocaml-modules/irmin/git.nix +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , git, irmin, ppx_irmin, git-unix, irmin-watcher , digestif, cstruct, fmt, astring, fpath, logs, lwt, uri , cohttp-lwt-unix, mimic diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 1b5ecb51396fb..93b5c939e8fa1 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cohttp-lwt, cohttp-lwt-unix, graphql-cohttp, graphql-lwt, irmin, git-unix +{ buildDunePackage, cohttp-lwt, cohttp-lwt-unix, graphql-cohttp, graphql-lwt, irmin, git-unix , alcotest, alcotest-lwt, logs, yojson, cacert }: diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 3a00c5e99f5f0..bb1a65354fb71 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , index, ppx_irmin, irmin, optint, fmt, logs, lwt, mtime, cmdliner, checkseum, rusage , alcotest, alcotest-lwt, astring, irmin-test }: diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix new file mode 100644 index 0000000000000..35f49bf6d02fb --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -0,0 +1,1985 @@ +{ + self, + bash, + fzf, + lib, + openssl, + zstd, +}: + +with self; + +{ + + abstract_algebra = janePackage { + pname = "abstract_algebra"; + hash = "sha256-W2rSSbppNkulCgGeTiovzP5zInPWIVfflDxWkGpEOFA="; + meta.description = "A small library describing abstract algebra concepts"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + accessor = janePackage { + pname = "accessor"; + hash = "sha256-1inoFwDDhnfhW+W3aAkcFNUkf5Umy8BDGDEbMty+Fts="; + meta.description = "A library that makes it nicer to work with nested functional data structures"; + propagatedBuildInputs = [ higher_kinded ]; + }; + + accessor_async = janePackage { + pname = "accessor_async"; + hash = "sha256-EYyxZur+yshYaX1EJbWc/bCaAa9PDKiuK87fIeqhspo="; + meta.description = "Accessors for Async types, for use with the Accessor library"; + propagatedBuildInputs = [ + accessor_core + async_kernel + ]; + }; + + accessor_base = janePackage { + pname = "accessor_base"; + hash = "sha256-6LJ8dKPAuaxWinArkPl4OE0eYPqvM7+Ao6jff8jhjXc="; + meta.description = "Accessors for Base types, for use with the Accessor library"; + propagatedBuildInputs = [ ppx_accessor ]; + }; + + accessor_core = janePackage { + pname = "accessor_core"; + hash = "sha256-ku83ZfLtVI8FvQhrKcnJmhmoNlYcVMKx1tor5N8Nq7M="; + meta.description = "Accessors for Core types, for use with the Accessor library"; + propagatedBuildInputs = [ + accessor_base + core_kernel + ]; + }; + + async = janePackage { + pname = "async"; + hash = "sha256-CwRPH5tFZHJqptdmNwdZvKvSJ1Qr21gV1jaxsa/vFBU="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ + async_rpc_kernel + async_log + async_unix + textutils + ]; + doCheck = false; # we don't have netkit_sockets + }; + + async_durable = janePackage { + pname = "async_durable"; + hash = "sha256-CAU54j3K47p4hQqAtHJYuAQ0IvZPMQZKFp5J7G+xtjM="; + meta.description = "Durable connections for use with async"; + propagatedBuildInputs = [ + async_kernel + async_rpc_kernel + core + core_kernel + ppx_jane + ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "sha256-rZUROyYrvtgnI+leTMXuGcw71MfVhqdkfp9EIhAFUnM="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "sha256-byvLJvhq7606gKP1kjLRYe3eonkAG3Vz6wQcsjJOiOE="; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + async_inotify = janePackage { + pname = "async_inotify"; + hash = "sha256-608G8OKQxqrQdYc1Cfrd8g8WLX6QwSeMUz8ORuSbmA8="; + meta.description = "Async wrapper for inotify"; + propagatedBuildInputs = [ + async_find + inotify + ]; + }; + + async_interactive = janePackage { + pname = "async_interactive"; + hash = "sha256-hC7mLDLtvIEMKLMeDOC5ADiAGJlJqYF35RDI+porsKA="; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + + async_js = janePackage { + pname = "async_js"; + hash = "sha256-4t7dJ04lTQ0b6clf8AvtyC8ip43vIcEBXgHJLiRbuGM="; + meta.description = "A small library that provide Async support for JavaScript platforms"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ + async_rpc_kernel + js_of_ocaml + uri-sexp + ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "sha256-fEbo7EeOJHnBqTYvC/o2a2x69XPnANbe15v/yv29l/4="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_log = janePackage { + pname = "async_log"; + hash = "sha256-XeWC3oC0n4or3EDLrNLWXMWhyhH6kcah0Mdb56rZ5lA="; + meta.description = "Logging library built on top of Async_unix"; + propagatedBuildInputs = [ + async_kernel + async_unix + core + core_kernel + ppx_jane + timezone + ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "sha256-zSqmRgybvWhS9XiNIqgxUjQU8xc9aXM69ZaBq4+r+HA="; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ + async_kernel + protocol_version_header + ]; + }; + + async_rpc_websocket = janePackage { + pname = "async_rpc_websocket"; + hash = "sha256-pbgG872Av6rX/CH2sOKgTVR42XpP0xhzdR/Bqoq7bSU="; + meta.description = "Library to serve and dispatch Async RPCs over websockets"; + propagatedBuildInputs = [ + async_rpc_kernel + async_websocket + cohttp_async_websocket + ]; + }; + + async_sendfile = janePackage { + pname = "async_sendfile"; + hash = "sha256-x2chts7U9hoGW6uvyfpHMkSwCx1JXhHX601Xg92Wk3U="; + meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files"; + propagatedBuildInputs = [ async_unix ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "sha256-/wqfuKiQQufs/KhNtBn8C9AzX7GbP8s8cyWGynJ0m1M="; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ + async + shell + ]; + }; + + async_smtp = janePackage { + pname = "async_smtp"; + hash = "sha256-RWtbg6Vpp71ock8Duya5j9Y89OUY4wRXh0pDOxM1NT4="; + meta.description = "SMTP client and server"; + propagatedBuildInputs = [ + async_extra + async_inotify + async_sendfile + async_shell + async_ssl + email_message + resource_cache + re2_stable + sexp_macro + ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "sha256-7obEoeckwydi2wHBkBmX0LynY1QVCb3sQ/U945eteJo="; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + async + ctypes + ctypes-foreign + openssl + ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "sha256-fA1e5AnNe/tMTMZ60jtGUofRi4rh+MmVx81kfhfaBaQ="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ + async_kernel + core_unix + cstruct + ]; + }; + + async_websocket = janePackage { + pname = "async_websocket"; + hash = "sha256-22N+QO9hpkKHv3n9WkvtmJouxb/nuauv1UXdVV0zOGA="; + meta.description = "A library that implements the websocket protocol on top of Async"; + propagatedBuildInputs = [ + async + cryptokit + ]; + }; + + babel = janePackage { + pname = "babel"; + hash = "sha256-mRSlLXtaGj8DcdDZGUZbi16qQxtfb+fXkwxz6AXxN3o="; + meta.description = "A library for defining Rpcs that can evolve over time without breaking backward compatibility"; + propagatedBuildInputs = [ + async_rpc_kernel + core + ppx_jane + streamable + tilde_f + ]; + }; + + base = janePackage { + pname = "base"; + version = "0.17.1"; + hash = "sha256-5wqBpOHhiIy9JUuxb3OnpZHrHSM7VODuLSihaIyeFn0="; + meta.description = "Full standard library replacement for OCaml"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + sexplib0 + ocaml_intrinsics_kernel + ]; + checkInputs = [ alcotest ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "sha256-tGDtkVOU10GzNsJ4wZtbqyIMjY5lHM4+rA3+w34TYOE="; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ + int_repr + ppx_jane + ]; + }; + + base_trie = janePackage { + pname = "base_trie"; + hash = "sha256-KuVDLJiEIjbvLCNI51iFLlsMli+hspWMyhrMk5pSL58="; + meta.description = "Trie data structure library"; + propagatedBuildInputs = [ + base + core + expect_test_helpers_core + ppx_jane + ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "sha256-jDxO+/9Qnntt6ZNX1xvaWvoJ0JpnPqeq8X8nsYpeqsY="; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ + ppx_base + ppx_fields_conv + ppx_let + ppx_sexp_value + splittable_random + ]; + }; + + bidirectional_map = janePackage { + pname = "bidirectional_map"; + hash = "sha256-LnslyNdgQpa9DOAkwb0qq9/NdRvKNocUTIP+Dni6oYc="; + meta.description = "A library for bidirectional maps and multimaps"; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "sha256-QhVEZ97n/YUBBXYCshDa5UnZpv0BKK6xRN1kXabY3Es="; + propagatedBuildInputs = [ + core_kernel + zarith + zarith_stubs_js + ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "sha256-5QeK8Cdu+YjNE/MLiQps6SSf5bRJ/eYZYsJH7oYSarg="; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ + ppx_compare + ppx_custom_printf + ppx_fields_conv + ppx_optcomp + ppx_stable_witness + ppx_variants_conv + ]; + postPatch = '' + patchShebangs xen/cflags.sh + ''; + }; + + bonsai = janePackage { + pname = "bonsai"; + hash = "sha256-rr87o/w/a6NtCrDIIYmk2a5IZ1WJM/qJUeDqTLN1Gr4="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ ppx_pattern_bind ]; + nativeBuildInputs = [ + ppx_css + js_of_ocaml-compiler + ocaml-embed-file + ]; + propagatedBuildInputs = [ + async + async_durable + async_extra + async_rpc_websocket + babel + cohttp-async + core_bench + fuzzy_match + incr_dom + indentation_buffer + js_of_ocaml-ppx + ordinal_abbreviation + patdiff + polling_state_rpc + ppx_css + ppx_quick_test + ppx_typed_fields + profunctor + sexp_grammar + textutils + versioned_polling_state_rpc + ]; + }; + + capitalization = janePackage { + pname = "capitalization"; + hash = "sha256-wq8SO+SXF+UQhSu+ElVYv9erZ8S54G3SzJd0HX/Vwyk="; + meta.description = "Naming conventions for multiple-word identifiers"; + propagatedBuildInputs = [ + base + ppx_base + ]; + }; + + cinaps = janePackage { + pname = "cinaps"; + version = "0.15.1"; + hash = "sha256-LycruanldSP251uYJjQqIfI76W0UQ6o5i5u8XjszBT0="; + meta.description = "Trivial metaprogramming tool"; + minimalOCamlVersion = "4.04"; + propagatedBuildInputs = [ re ]; + # doCheck fails because ppx_base doesn't include ppx_js_style, and this is + # needed for the ppx executable to parse `-allow-toplevel-expression` flag. + doCheck = false; + }; + + codicons = janePackage { + pname = "codicons"; + hash = "sha256-S4VrMObA5+SNeL/XsWU6SoSD/0TVvuqHjthUaQCDoRU="; + meta.description = "Icons from VS code"; + propagatedBuildInputs = [ + core + ppx_jane + virtual_dom + ]; + }; + + cohttp_async_websocket = janePackage { + pname = "cohttp_async_websocket"; + hash = "sha256-0InGCF34LWQes9S4OgbR6w+6cylThYuj1Dj0aQyTnuY="; + meta.description = "Websocket library for use with cohttp and async"; + propagatedBuildInputs = [ + async_websocket + cohttp-async + ppx_jane + uri-sexp + ]; + }; + + cohttp_static_handler = janePackage { + pname = "cohttp_static_handler"; + hash = "sha256-RB/sUq1tL8A3m9YhHHx2LFqoExTX187VeZI9MRb1NeA="; + meta.description = "A library for easily creating a cohttp handler for static files"; + propagatedBuildInputs = [ cohttp-async ]; + }; + + content_security_policy = janePackage { + pname = "content_security_policy"; + hash = "sha256-AQN2JJA+5B0PERNNOA9FXX6rIeej40bwJtQmHP6GKw4="; + meta.description = "A library for building content-security policies"; + propagatedBuildInputs = [ + base64 + cryptokit + core + ppx_jane + ]; + }; + + core = janePackage { + pname = "core"; + version = "0.17.1"; + hash = "sha256-XkABcvglVJLVnWJmvfr5eVywyclPSDqanVOLQNqdNtQ="; + meta.description = "Industrial strength alternative to OCaml's standard library"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ + base + base_bigstring + base_quickcheck + ppx_diff + ppx_jane + time_now + ]; + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "sha256-oXE3FuCCIbX2M0r4Ds2BMUU6g1bqe9E87lDo2CcMtMU="; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ + core_extended + delimited_parsing + textutils + ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "sha256-Xl6czD1gdnvHkXDz+qa7TWZq6dm8wlDqywxEIi2R6bI="; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ + core_unix + record_builder + ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + hash = "sha256-l7U0edUCNHTroYMBHiEMDx5sl7opEmmmeo2Z06tCMts="; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ + base_bigstring + core + int_repr + sexplib + uopt + ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + core_unix = janePackage { + pname = "core_unix"; + hash = "sha256-eqBMiEJ5xUrgFJTMZoEDxqkhedQxxbbf0DedZKHprww="; + meta.description = "Unix-specific portions of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ + core_kernel + expect_test_helpers_core + ocaml_intrinsics + ppx_jane + timezone + spawn + ]; + postPatch = '' + patchShebangs unix_pseudo_terminal/src/discover.sh + ''; + doCheck = false; # command_validate_parsing.exe is not specified in test build deps + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "sha256-hCH2NGQIRTU5U3TUOYHao6Kz5PhnLbySmzic4ytppEc="; + propagatedBuildInputs = [ + core + num + ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + dedent = janePackage { + pname = "dedent"; + hash = "sha256-Scir/gaIhmNowXZ0tv57M/Iv1GXQIkyDks1sU1DAoIQ="; + propagatedBuildInputs = [ + base + ppx_jane + stdio + ]; + meta.description = "A library for improving redability of multi-line string constants in code"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "sha256-bgt99kQvaU7FPK1+K1UOAUbSaaaCB1DV23Cuo3A68M0="; + propagatedBuildInputs = [ + async + core_extended + ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + + legacy_diffable = janePackage { + pname = "legacy_diffable"; + hash = "sha256-wUSG04bHCnwqXpWKgkceAORs1inxexiPKZIR9fEVmCo="; + propagatedBuildInputs = [ + core + ppx_jane + stored_reversed + streamable + ]; + meta.description = "An interface for diffs"; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "sha256-CEroXMEIAfvXD603bnIVwzcrE3KbVaOOhGZastkQcdU="; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ + async + expect_test_helpers_core + ]; + }; + + email_message = janePackage { + pname = "email_message"; + hash = "sha256-1OJ6bQb/rdyfAgMyuKT/ylpa8qBldZV5kEm0B45Ej1w="; + meta.description = "E-mail message parser"; + propagatedBuildInputs = [ + angstrom + async + base64 + cryptokit + magic-mime + re2 + ]; + }; + + env_config = janePackage { + pname = "env_config"; + hash = "sha256-vG309p7xqanTnrnHBwvuCO3YD4tVbTNa7F1F9sZDZE0="; + meta.description = "Helper library for retrieving configuration from an environment variable"; + propagatedBuildInputs = [ + async + core + core_unix + ppx_jane + ]; + }; + + expect_test_helpers_async = janePackage { + pname = "expect_test_helpers_async"; + hash = "sha256-oInNgNISqOrmQUXVxzjDy+mS06yPEeFPGIvaKnCETjk="; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ + async + expect_test_helpers_core + ]; + }; + + expect_test_helpers_core = janePackage { + pname = "expect_test_helpers_core"; + hash = "sha256-vnlDZ8k3JFCdN6WGiaG9OEEdQJnw0/eMogFCfTXIu2Y="; + meta.description = "Helpers for writing expectation tests"; + propagatedBuildInputs = [ + core_kernel + sexp_pretty + ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "sha256-Zfnc32SghjZYTlnSdo6JPm4WCb7BPVjrWNDfeMZHaiU="; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + file_path = janePackage { + pname = "file_path"; + hash = "sha256-XSLfYasn6qMZmDzAUGssOM9EX09n2W9/imTgNoSBEyk="; + meta.description = "A library for typed manipulation of UNIX-style file paths"; + propagatedBuildInputs = [ + async + core + core_kernel + core_unix + expect_test_helpers_async + expect_test_helpers_core + ppx_jane + ]; + }; + + fuzzy_match = janePackage { + pname = "fuzzy_match"; + hash = "sha256-XB1U4mY0LcdsKYRnmV0SR4ODTIZynZetBk5X5SdHs44="; + meta.description = "A library for fuzzy string matching"; + propagatedBuildInputs = [ + core + ppx_jane + ]; + }; + + fzf = janePackage { + pname = "fzf"; + hash = "sha256-yHdvC3cB5sVXsZQbtNzUZkaaqOe/7y8pDHgLwugAlQg="; + meta.description = "A library for running the fzf command line tool"; + propagatedBuildInputs = [ + async + core_kernel + ppx_jane + ]; + postPatch = '' + substituteInPlace src/fzf.ml --replace /usr/bin/fzf ${fzf}/bin/fzf + ''; + }; + + gel = janePackage { + pname = "gel"; + hash = "sha256-zGDlxbJINXD1qG7EifZGDfKbQpehdHyR/WLRJRYlwUg="; + meta.description = "A library to mark non-record fields global"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + hex_encode = janePackage { + pname = "hex_encode"; + hash = "sha256-5DqaCJllphdEreOpzAjT61qb3M6aN9b2xhiUjHVLrvE="; + meta.description = "Hexadecimal encoding library"; + propagatedBuildInputs = [ + core + ppx_jane + ounit + ]; + }; + + higher_kinded = janePackage { + pname = "higher_kinded"; + hash = "sha256-6aZxgGzltRs2aS4MYJh23Gpoqcko6xJxU11T6KixXno="; + meta.description = "A library with an encoding of higher kinded types in OCaml"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + incr_dom = janePackage { + pname = "incr_dom"; + hash = "sha256-dkF7+aq5Idw1ltDgGEjGYspdmOXjXqv8AA27b4M7U8A="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ + async_js + incr_map + incr_select + virtual_dom + ]; + }; + + incr_map = janePackage { + pname = "incr_map"; + hash = "sha256-qNahlxe3Pe1EEcFz1bAKUw3vBaNjgDlahQeuj/+VqbI="; + meta.description = "Helpers for incremental operations on map like data structures"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ + abstract_algebra + bignum + legacy_diffable + incremental + streamable + ]; + }; + + incr_select = janePackage { + pname = "incr_select"; + hash = "sha256-/VCNiE8Y7LBL0OHd5V+tB/b3HGKhfSvreU6LZgurYAg="; + meta.description = "Handling of large set of incremental outputs from a single input"; + propagatedBuildInputs = [ incremental ]; + }; + + incremental = janePackage { + pname = "incremental"; + hash = "sha256-siBN36Vv0Bktyxh+8tL6XkUGLqSYMxqvd0UWuTRgAnI="; + meta.description = "Library for incremental computations"; + propagatedBuildInputs = [ + core_kernel + lru_cache + ]; + }; + + indentation_buffer = janePackage { + pname = "indentation_buffer"; + hash = "sha256-/IUZyRkcxUsddzGGIoaLpXbpCxJ1satK79GkzPxSPSc="; + meta.description = "A library for building strings with indentation"; + propagatedBuildInputs = [ + core + ppx_jane + ]; + }; + + int_repr = janePackage { + pname = "int_repr"; + hash = "sha256-yeaAzw95zB1wow9Alg18CU+eemZVxjdLiO/wVRitDwE="; + meta.description = "Integers of various widths"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + janestreet_cpuid = janePackage { + pname = "janestreet_cpuid"; + hash = "sha256-3ZwEZQSkJJyFW5/+C9x8nW6+GrfVwccNFPlcs7qNcjQ="; + meta.description = "A library for parsing CPU capabilities out of the `cpuid` instruction"; + propagatedBuildInputs = [ + core + core_kernel + ppx_jane + ]; + }; + + janestreet_csv = janePackage { + pname = "janestreet_csv"; + hash = "sha256-at7ywGDaYIDsqhxxLYJhB8a697ccfPtKKI8LvCmRgG8="; + propagatedBuildInputs = [ + async + bignum + core_kernel + core_unix + csvfields + delimited_parsing + fieldslib + numeric_string + ppx_jane + re2 + textutils + tyxml + ocaml_pcre + ]; + meta.description = "Tools for working with CSVs on the command line"; + }; + + jane_rope = janePackage { + pname = "jane_rope"; + hash = "sha256-Lo4+ZUX9R2EGrz4BN+LqdJgVXB3hQqNifgwsjFC1Hfs="; + meta.description = "String representation with cheap concatenation"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "sha256-nEa40utpXA3KiFhp9inWurKyDF4Jw1Jlln6fiW5MAkM="; + meta.description = "Jane Street C header files"; + }; + + js_of_ocaml_patches = janePackage { + pname = "js_of_ocaml_patches"; + hash = "sha256-N61IEZLGfCU3ZX+sw35DAUqUh3u8RaCFcNlXxU1dvL8="; + meta.description = "Additions to js_of_ocaml's standard library that are required by Jane Street libraries"; + propagatedBuildInputs = [ + js_of_ocaml + js_of_ocaml-ppx + ]; + patches = [ ./js_of_ocaml_patches.patch ]; + }; + + jsonaf = janePackage { + pname = "jsonaf"; + hash = "sha256-MMIDHc40cmPpO0n8yREIGMyFndw3NfvGUhy6vHnn40w="; + meta.description = "A library for parsing, manipulating, and serializing data structured as JSON"; + propagatedBuildInputs = [ + base + ppx_jane + angstrom + faraday + ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "sha256-xwQ+q2Hsduu2vWMWFcjoj3H8Es00N7Mv9LwIZG4hw7c="; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ + dune-configurator + ppx_assert + stdio + ]; + }; + + lru_cache = janePackage { + pname = "janestreet_lru_cache"; + hash = "sha256-/UMSccN9yGAXF7/g6ueSnsfPSnF1fm0zJIRFsThZvH8="; + meta.description = "An LRU Cache implementation"; + propagatedBuildInputs = [ + core_kernel + ppx_jane + ]; + }; + + man_in_the_middle_debugger = janePackage { + pname = "man_in_the_middle_debugger"; + hash = "sha256-ImEzn/EssgW63vdGhLMp4NB/FW0SsCMQ32ZNAs7bDg4="; + meta.description = "Man-in-the-middle debugging library"; + propagatedBuildInputs = [ + async + core + ppx_jane + angstrom + angstrom-async + ]; + }; + + n_ary = janePackage { + pname = "n_ary"; + hash = "sha256-xg4xK3m7SoO1P+rBHvPqFMLx9JXnADEeyU58UmAqW6s="; + meta.description = "A library for N-ary datatypes and operations"; + propagatedBuildInputs = [ + base + expect_test_helpers_core + ppx_compare + ppx_enumerate + ppx_hash + ppx_jane + ppx_sexp_conv + ppx_sexp_message + ]; + }; + + numeric_string = janePackage { + pname = "numeric_string"; + hash = "sha256-cU5ETGfavkkiqZOjehCYg06YdDk8W+ZDqz17FGWHey8="; + meta.description = "A comparison function for strings that sorts numeric fragments of strings according to their numeric value"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + ocaml-compiler-libs = janePackage ( + { + pname = "ocaml-compiler-libs"; + minimalOCamlVersion = "4.04.1"; + meta.description = "OCaml compiler libraries repackaged"; + } + // ( + if lib.versionAtLeast ocaml.version "5.2" then + { + version = "0.17.0"; + hash = "sha256-QaC6BWrpFblra6X1+TrlK+J3vZxLvLJZ2b0427DiQzM="; + } + else + { + version = "0.12.4"; + hash = "sha256-W+KUguz55yYAriHRMcQy8gRPzh2TZSJnexG1JI8TLgI="; + } + ) + ); + + ocaml-embed-file = janePackage { + pname = "ocaml-embed-file"; + hash = "sha256-7fyZ5DNcRHud0rd4dLUv9Vyf3lMwMVxgkl9jVUn1/lw="; + propagatedBuildInputs = [ + async + ppx_jane + ]; + meta.description = "Files contents as module constants"; + }; + + ocaml_intrinsics_kernel = janePackage { + pname = "ocaml_intrinsics_kernel"; + hash = "sha256-utD9HE0P3vPgSXDW8Bz0FxgEy+lNkIAlN/+JkfDqb9A="; + meta.description = "A kernel library of intrinsics for OCaml"; + buildInputs = [ dune-configurator ]; + }; + + ocaml_intrinsics = janePackage { + pname = "ocaml_intrinsics"; + hash = "sha256-Ndt6ZPJamBYzr1YA941BLwvRgkkbD8AEQR/JjjR38xI="; + meta.description = "A library of intrinsics for OCaml"; + buildInputs = [ + dune-configurator + ocaml_intrinsics_kernel + ]; + }; + + ocaml_openapi_generator = janePackage { + pname = "ocaml_openapi_generator"; + hash = "sha256-HCq9fylcVjBMs8L6E860nw+EonWEQadlyEKpQI6mynU="; + meta.description = " An OpenAPI 3 to OCaml client generator"; + buildInputs = [ + async + core + core_kernel + core_unix + jsonaf + ppx_jane + ppx_jsonaf_conv + httpaf + jingoo + uri + ]; + nativeBuildInputs = [ ocaml-embed-file ]; + }; + + of_json = janePackage { + pname = "of_json"; + hash = "sha256-pZCiwXRwZK6ohsGz/WLacgo48ekdT35uD4VESvGxH8A="; + meta.description = "A friendly applicative interface for Jsonaf"; + buildInputs = [ + core + core_extended + jsonaf + ppx_jane + ]; + }; + + ordinal_abbreviation = janePackage { + pname = "ordinal_abbreviation"; + hash = "sha256-kmTGnGbhdiUoXXw2DEAeZJL2sudEf8BRRt2RHCdL7HU="; + meta.description = "A minimal library for generating ordinal names of integers"; + buildInputs = [ + base + ppx_jane + ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "sha256-iKrZ6XDLM6eRl7obaniDKK6X8R7Kxry6HD7OQBwh3NU="; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ + base + sexplib0 + ]; + }; + + patdiff = janePackage { + pname = "patdiff"; + hash = "sha256-iphpQ0b8i+ItY57zM4xL9cID9GYuTCMZN7SYa7TDprI="; + + # Used by patdiff-git-wrapper. Providing it here also causes the shebang + # line to be automatically patched. + buildInputs = [ bash ]; + propagatedBuildInputs = [ + core_unix + patience_diff + ocaml_pcre + ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; + postPatch = '' + patchShebangs test/bin/setup.sh + ''; + doCheck = false; # test rules broken + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "sha256-sn/8SvMt7kzzuYUwhB/uH/3mO1aIKHw/oRYRzA7goFU="; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + polling_state_rpc = janePackage { + pname = "polling_state_rpc"; + hash = "sha256-fZKGva11ztuM+q0Lc6rr9NEH/Qo+wFmE6Rr1/TJm7rA="; + meta.description = "An RPC which tracks state on the client and server so it only needs to send diffs across the wire"; + propagatedBuildInputs = [ + async_kernel + async_rpc_kernel + babel + core + core_kernel + legacy_diffable + ppx_jane + ]; + }; + + posixat = janePackage { + pname = "posixat"; + hash = "sha256-G+5q8x1jfG3wEwNzX2tkcC2Pm4E5/ZYxQyBwCUNXIrw="; + propagatedBuildInputs = [ + ppx_optcomp + ppx_sexp_conv + ]; + meta.description = "Binding to the posix *at functions"; + }; + + ppx_accessor = janePackage { + pname = "ppx_accessor"; + hash = "sha256-vK6lA0J98bDGtVthIdU76ckzH+rpNUD1cQ3vMzHy0Iw="; + meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; + propagatedBuildInputs = [ accessor ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "sha256-o9ywdFH6+qoJ3eWb29/gGlkWkHDMuBx626mNxrT1D8A="; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ + ppx_cold + ppx_compare + ppx_here + ppx_sexp_conv + ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "sha256-/s7c8vfLIO1pPajNldMgurBKXsSzQ8yxqFI6QZCHm5I="; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ + ppx_cold + ppx_enumerate + ppx_globalize + ppx_hash + ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "sha256-y4nL/wwjJUL2Fa7Ne0f7SR5flCjT1ra9M1uBHOUZWCg="; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "sha256-nQps/+Csx3+6H6KBzIm/dLCGWJ9fcRD7JxB4P2lky0o="; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ + bin_prot + ppx_here + ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "sha256-fFZqlcbUS7D+GjnxSjGYckkQtx6ZcPNtOIsr6Rt6D9A="; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "sha256-uAXB9cba0IBl+cA2CAuGVVxuos4HXH5jlB6Qjxx44Y0="; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ + ppxlib + ppxlib_jane + base + ]; + }; + + ppx_conv_func = janePackage { + pname = "ppx_conv_func"; + hash = "sha256-PJ8T0u8VkxefaxojwrmbMXDjqyfAIxKe92B8QqRY2JU="; + meta.description = "Part of the Jane Street's PPX rewriters collection"; + propagatedBuildInputs = [ + ppxlib + base + ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "sha256-DFgDb9MIFCqglYoMgPUN0zEaxkr7VJAXgLxq1yp8ap4="; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + ppx_css = janePackage { + pname = "ppx_css"; + hash = "sha256-mzLMVtNTy9NrVaNgsRa+oQynxXnh2qlHJCfr3FLFJ2I="; + meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; + propagatedBuildInputs = [ + async + async_unix + core_kernel + core_unix + ppxlib + js_of_ocaml + js_of_ocaml-ppx + sedlex + virtual_dom + ]; + }; + + ppx_csv_conv = janePackage { + pname = "ppx_csv_conv"; + hash = "sha256-NtqfagLIYiuyBjEAxilAhATx8acJwD7LykHBzfr+yAc="; + meta.description = "Generate functions to read/write records in csv format"; + propagatedBuildInputs = [ + csvfields + ppx_conv_func + ]; + }; + + ppx_demo = janePackage { + pname = "ppx_demo"; + hash = "sha256-blD96GhicOj3b6jYNniSpq6fBR+ul9Y2kn0ZmfbeVMo="; + meta.description = "PPX that exposes the source code string of an expression/module structure"; + propagatedBuildInputs = [ + core + dedent + ppx_jane + ppxlib + ]; + }; + + ppx_derive_at_runtime = janePackage { + pname = "ppx_derive_at_runtime"; + hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI="; + meta.description = "Define a new ppx deriver by naming a runtime module"; + propagatedBuildInputs = [ + base + expect_test_helpers_core + ppx_jane + ppxlib + ]; + }; + + ppx_diff = janePackage { + pname = "ppx_diff"; + hash = "sha256-MAn+vcU6vLR8g16Wq1sORyLcLgWxLsazMQY1syY6HsA="; + meta.description = "Generation of diffs and update functions for ocaml types"; + propagatedBuildInputs = [ + base + gel + ppx_compare + ppx_enumerate + ppx_jane + ]; + }; + + ppx_disable_unused_warnings = janePackage { + pname = "ppx_disable_unused_warnings"; + hash = "sha256-KHWIufXU+k6xCLf8l50Pp/1JZ2wFrKnKT/aQYpadlmU="; + meta.description = ''Expands [@disable_unused_warnings] into [@warning "-20-26-32-33-34-35-36-37-38-39-60-66-67"]''; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_embed_file = janePackage { + pname = "ppx_embed_file"; + hash = "sha256-Ew6/X7oAq81ldERU37QWXQdgReEtPD/lxbku8WZNJ6A="; + meta.description = "A PPX that allows embedding files directly into executables/libraries as strings or bytes"; + propagatedBuildInputs = [ + core + ppx_jane + shell + ppxlib + ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "sha256-YqBrxp2fe91k8L3aQVW6egoDPj8onGSRueQkE2Icdu4="; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ + ppxlib + ppxlib_jane + ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "sha256-m4Nr48ZET632I6vw5RjpNA0elW3lpN3aPmfA3RzsEn8="; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ + ppx_here + ppx_inline_test + re + ]; + doCheck = false; # test build rules broken + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "sha256-FA7hDgqJMJ2obsVwzwaGnNLPvjP0SkTec8Nh3znuNDQ="; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ + fieldslib + ppxlib + ]; + }; + + ppx_fixed_literal = janePackage { + pname = "ppx_fixed_literal"; + hash = "sha256-Xq+btvZQ/+6bcHoH9DcrrhD5CkwpFeedn7YEFHeLzsU="; + meta.description = "Simpler notation for fixed point literals"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_globalize = janePackage { + pname = "ppx_globalize"; + hash = "sha256-LKV5zfaf6AXn3NzOhN2ka8NtjItPTIsfmoJVBw5bYi8="; + meta.description = "A ppx rewriter that generates functions to copy local values to the global heap"; + propagatedBuildInputs = [ + base + ppxlib + ppxlib_jane + ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "sha256-GADCLoF2GjZkvAiezn0xyReCs1avrUgjJGSS/pMNq38="; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ + ppx_compare + ppx_sexp_conv + ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "sha256-ybwOcv82uDRPTlfaQgaBJHVq6xBxIRUj07CXP131JsM="; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + doCheck = false; # test build rules broken + }; + + ppx_ignore_instrumentation = janePackage { + pname = "ppx_ignore_instrumentation"; + hash = "sha256-73dp8XKfsLO0Z6A1p5/K7FjxgeUPMBkScx0IjfbOV+w="; + meta.description = "Ignore Jane Street specific instrumentation extensions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "sha256-pNdrmAlT3MUbuPUcMmCRcUIXv4fZ/o/IofJmnUKf8Cs="; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ + ppxlib + time_now + ]; + doCheck = false; # test build rules broken + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "sha256-HgIob7iJkV0HcGi6IjjSUWdKOAu2TsC3GMyzpjYS1cs="; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ + base_quickcheck + ppx_bin_prot + ppx_disable_unused_warnings + ppx_expect + ppx_fixed_literal + ppx_ignore_instrumentation + ppx_log + ppx_module_timer + ppx_optcomp + ppx_optional + ppx_pipebang + ppx_stable + ppx_string + ppx_string_conv + ppx_tydi + ppx_typerep_conv + ppx_variants_conv + ]; + }; + + ppx_jsonaf_conv = janePackage { + pname = "ppx_jsonaf_conv"; + hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM="; + meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions"; + propagatedBuildInputs = [ + base + jsonaf + ppx_jane + ppxlib + ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "sha256-7jRzxe4bLyZ2vnHeqWiLlCUvOlNUAk0dwCfBFhrykUU="; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ + octavius + ppxlib + ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "sha256-JkNQgbPHVDH659m4Xy9ipcZ/iqGtj5q1qQn1P+O7TUY="; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ + ppxlib + ppx_here + ]; + }; + + ppx_log = janePackage { + pname = "ppx_log"; + hash = "sha256-llnjWeJH4eg5WtegILRxdwO3RWGWTFeCIKr6EbrUDI4="; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ + base + ppx_compare + ppx_enumerate + ppx_expect + ppx_fields_conv + ppx_here + ppx_let + ppx_sexp_conv + ppx_sexp_message + ppx_sexp_value + ppx_string + ppx_variants_conv + sexplib + ]; + doCheck = false; # test build rules broken + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "sha256-OWo1Ij9JAxsk9HlTlaz9Qw2+4YCvXDmIvytAOgFCLPI="; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "sha256-H9oTzhJx9IGRkcwY2YEvcvNgeJ8ETNO95qKcjTXJBwk="; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "sha256-SHw2zh6lG1N9zWF2b3VWeYzRHUx4jUxyOYgHd2/N9wE="; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ + ppxlib + ppxlib_jane + ]; + }; + + ppx_pattern_bind = janePackage { + pname = "ppx_pattern_bind"; + hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA="; + meta.description = "A ppx for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "sha256-GBa1zzNChZOQfVSHyUeDEMFxuNUT3lj/pIQi/l1J35M="; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_python = janePackage { + pname = "ppx_python"; + hash = "sha256-WqTYH5Zz/vRak/CL1ha8oUbQ8+XRuUu9610uj8II74o="; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + propagatedBuildInputs = [ + ppx_base + ppxlib + pyml + ]; + doCheck = false; # test rules broken + }; + + ppx_quick_test = janePackage { + pname = "ppx_quick_test"; + hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY="; + meta.description = "Spiritual equivalent of let%expect_test, but for property based tests"; + propagatedBuildInputs = [ + async + async_kernel + base + base_quickcheck + core + core_kernel + expect_test_helpers_core + ppx_expect + ppx_here + ppx_jane + ppx_sexp_conv + ppx_sexp_message + ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "sha256-hUi0I50SODK1MpL86xy8eM8yn8f4q1Hv4LP9zFnnr70="; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ + ppxlib + ppxlib_jane + sexplib0 + base + ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "sha256-SNgTvsTUgFzjqHpyIYk4YuA4c5MbA9e77YUEsDaKTeA="; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ + ppx_here + ppx_sexp_conv + ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "sha256-f96DLNFI+s3TKsOj01i6xUoM9L+qRgAXbbepNis397I="; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ + ppx_here + ppx_sexp_conv + ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "sha256-N5oPjjQcLgiO9liX8Z0vg0IbQXaGZ4BqOgwvuIKSKaA="; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_stable_witness = janePackage { + pname = "ppx_stable_witness"; + hash = "sha256-k45uR/OMPRsi5450CuUo592EVc82DPhO8TvBPjgJTh0="; + meta.description = "Ppx extension for deriving a witness that a type is intended to be stable"; + propagatedBuildInputs = [ + base + ppxlib + ]; + }; + + ppx_string = janePackage { + pname = "ppx_string"; + hash = "sha256-taAvJas9DvR5CIiFf38IMdNqLJ0QJmnIdcNJAaVILgA="; + meta.description = "Ppx extension for string interpolation"; + propagatedBuildInputs = [ + ppx_base + ppxlib + stdio + ]; + }; + + ppx_string_conv = janePackage { + pname = "ppx_string_conv"; + hash = "sha256-r+XubSXjxVyCsra99D6keJ/lmXeK5SZbI6h/IFghvPQ="; + meta.description = "Ppx to help derive of_string and to_string, primarily for variant types"; + propagatedBuildInputs = [ + capitalization + ppx_let + ppx_string + ]; + }; + + ppx_tydi = janePackage { + pname = "ppx_tydi"; + hash = "sha256-PM89fP6Rb6M99HgEzQ7LfpW1W5adw6J/E1LFQJtdd0U="; + meta.description = "Let expressions, inferring pattern type from expression"; + propagatedBuildInputs = [ + base + ppxlib + ]; + }; + + ppx_typed_fields = janePackage { + pname = "ppx_typed_fields"; + hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8="; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ + core + ppx_jane + ppxlib + ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "sha256-V9yOSy3cj5/bz9PvpO3J+aeFu1G+qGQ8AR3gSczUZbY="; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ + ppxlib + typerep + ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "sha256-Av2F699LzVCpwcdji6qG0jt5DVxCnIY4eBLaPK1JC10="; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ + variantslib + ppxlib + ]; + }; + + ppxlib_jane = janePackage { + pname = "ppxlib_jane"; + hash = "sha256-8NC8CHh3pSdFuRDQCuuhc2xxU+84UAsGFJbbJoKwd0U="; + meta.description = "A library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree"; + propagatedBuildInputs = [ ppxlib ]; + }; + + profunctor = janePackage { + pname = "profunctor"; + hash = "sha256-WYPJLt3kYvIzh88XcPpw2xvSNjNX63/LvWwIDK+Xr0Q="; + meta.description = "A library providing a signature for simple profunctors and traversal of a record"; + propagatedBuildInputs = [ + base + ppx_jane + record_builder + ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "sha256-WKy4vahmmj6o82/FbzvFYfJFglgNMrka0XhtCMUyct4="; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "sha256-0VCSOzrVouMRVZJumcqv0F+HQFXlFfVEFIhYq7Tfhrg="; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ + core_kernel + jane_rope + regex_parser_intf + ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + re2_stable = janePackage { + pname = "re2_stable"; + version = "0.14.0"; + hash = "sha256-gyet2Pzn7ZIqQ+UP2J51pRmwaESY2LSGTqCMZZwDTE4="; + meta.description = "Re2_stable adds an incomplete but stable serialization of Re2"; + propagatedBuildInputs = [ + core + re2 + ]; + }; + + record_builder = janePackage { + pname = "record_builder"; + hash = "sha256-NQ0Wizxi/wD8BCwt8hxZWnEpLBTn3XkaG+96ooOKIFE="; + meta.description = "A library which provides traversal of records with an applicative"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + redis-async = janePackage { + pname = "redis-async"; + hash = "sha256-bwKPEnK2uJq5H65BDAL1Vk3qSr5kUwaCEiFsgaCdHw8="; + meta.description = "Redis client for Async applications"; + propagatedBuildInputs = [ + async + bignum + core + core_kernel + ppx_jane + ]; + }; + + regex_parser_intf = janePackage { + pname = "regex_parser_intf"; + hash = "sha256-j6zWJf5c5qWphMqb9JpEAMGDDsrzV+NU2zrGmZHSAgk="; + meta.description = "Interface shared by Re_parser and Re2.Parser"; + propagatedBuildInputs = [ base ]; + }; + + resource_cache = janePackage { + pname = "resource_cache"; + hash = "sha256-1WEjvdnl47rjCCMvGxqDKAb2ny6pJDlvDfZhKp+40Jg="; + meta.description = "General resource cache"; + propagatedBuildInputs = [ async_rpc_kernel ]; + }; + + semantic_version = janePackage { + pname = "semantic_version"; + hash = "sha256-2Z2C+1bfI6W7Pw7SRYw8EkaVVwQkkm+knCrJIfsJhPE="; + meta.description = "Semantic versioning"; + propagatedBuildInputs = [ + core + ppx_jane + re + ]; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "sha256-89SNb0MeJbetRRbA5qbBQPXIcLQ0QCeSf8p9v5yUTP0="; + propagatedBuildInputs = [ + async + core + csvfields + jsonaf + re2 + sexp_diff + sexp_macro + sexp_pretty + sexp_select + shell + ]; + meta.description = "S-expression swiss knife"; + }; + + sexp_grammar = janePackage { + pname = "sexp_grammar"; + hash = "sha256-yagp8bEZvc4joV81w56hAb17mUbnekuzECVcwLIvYoE="; + propagatedBuildInputs = [ + core + ppx_bin_prot + ppx_compare + ppx_hash + ppx_let + ppx_sexp_conv + ppx_sexp_message + zarith + ]; + meta.description = "Helpers for manipulating [Sexplib.Sexp_grammar] values"; + }; + + sexp_diff = janePackage { + pname = "sexp_diff"; + hash = "sha256-0p1+jMa2b/GJu+JtN+XUuR04lFQchxMeu9ikfgErqMU="; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "sha256-KXJ+6uR38ywkr8uT8n2bWk10W7vW2ntMgxgF4ZvzzWU="; + propagatedBuildInputs = [ + async + sexplib + ]; + meta.description = "Sexp macros"; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "sha256-DcgLlwp3AMC1QzFYPzi7aHA+VhnhbG6p/fLDTMx8ATc="; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ + ppx_base + re + sexplib + ]; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "sha256-3AUFRtNe32TEB7lItcu7XlEv+3k+4QTitcTnT0kg28Y="; + propagatedBuildInputs = [ + base + core_kernel + ppx_jane + ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "sha256-Q53wEhRet/Ou9Kr0TZNTyXT5ASQpsVLPz5n/I+Fhy+g="; + minimalOCamlVersion = "4.14.0"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "sha256-DxTMAQbskZ87pMVQnxYc3opGGCzmUKGCZfszr/Z9TGA="; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ + num + parsexp + ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "sha256-MJerTFLGrUaR3y3mnKVrH5EQHYBXZyuVL+n2wJZ9HoU="; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ textutils ]; + checkInputs = [ ounit ]; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "sha256-tf9HqZ01gMWxfcpe3Pl3rdPTPgIEdb59iwzwThznqAc="; + propagatedBuildInputs = [ + posixat + spawn + ]; + meta.description = "Process library and s-expression based shell"; + }; + + spawn = janePackage { + pname = "spawn"; + minimalOCamlVersion = "4.05"; + version = "0.15.1"; + hash = "sha256-6vAkRjTZQGiPhYBWX4MBO3GxEDmAE+18vpMWXMcvWJk="; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + splay_tree = janePackage { + pname = "splay_tree"; + hash = "sha256-gRHRqUKjFEgkL1h8zSbqJkf+gHxhh61AtAT+mkPcz+k="; + meta.description = "A splay tree implementation"; + propagatedBuildInputs = [ core_kernel ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "sha256-LlaCxL17GBZc33spn/JnunpaMQ47n+RXS8CShBlaRWA="; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ + base + ppx_assert + ppx_bench + ppx_sexp_message + ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "sha256-N4VMUq6zWdYiJarVECSadxnoXJKh6AsIIaChmHFSbdA="; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + stored_reversed = janePackage { + pname = "stored_reversed"; + hash = "sha256-FPyQxXaGAzFWW6GiiqKQgU+6/lAZhEQwhNnXsmqKkzg="; + meta.description = "A library for representing a list temporarily stored in reverse order"; + propagatedBuildInputs = [ + core + ppx_jane + ]; + }; + + streamable = janePackage { + pname = "streamable"; + hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg="; + meta.description = "A collection of types suitable for incremental serialization"; + propagatedBuildInputs = [ + async_kernel + async_rpc_kernel + base + core + core_kernel + ppx_jane + ppxlib + ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "sha256-J58sqp9fkx3JyjnH6oJLCyEC0ZvnuDfqLVl+dt3tEgA="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ + core_unix + textutils_kernel + ]; + }; + + textutils_kernel = janePackage { + pname = "textutils_kernel"; + hash = "sha256-B5ExbKMRSw4RVJ908FVGob2soHFnJ6Ajsdn0q8lDhio="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ + core + ppx_jane + uutf + ]; + }; + + tilde_f = janePackage { + pname = "tilde_f"; + hash = "sha256-tuddvOmhk0fikB4dHNdXamBx6xfo4DCvivs44QXp5RQ="; + meta.description = "Provides a let-syntax for continuation-passing style"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "sha256-bTPWE9+x+zmdLdzLc1naDlRErPZ8m4WXDJL2iLErdqk="; + meta.description = "Reports the current time"; + buildInputs = [ + jst-config + ppx_optcomp + ]; + propagatedBuildInputs = [ + jane-street-headers + base + ppx_base + ]; + }; + + timezone = janePackage { + pname = "timezone"; + hash = "sha256-/6OLWMrkyQSVTNJ24zRy6v4DObt9q99s75QRS/VVxXE="; + meta.description = "Time-zone handling"; + propagatedBuildInputs = [ core_kernel ]; + }; + + topological_sort = janePackage { + pname = "topological_sort"; + hash = "sha256-jLkJnh5lasrphI6BUKv7oVPrKyGqNm6VIGYthNs04iU="; + meta.description = "Topological sort algorithm"; + propagatedBuildInputs = [ + ppx_jane + stdio + ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "sha256-0KwJdWtibgjxghFmOYKyPrcOAfoLpxYGBZm2KpH8tgA="; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + uopt = janePackage { + pname = "uopt"; + hash = "sha256-t0SFJVF0ScyFFwziBZOYCOsmhRd6J5H3s0Kk9NKorcM="; + meta.description = "An [option]-like type that incurs no allocation"; + propagatedBuildInputs = [ + base + ppx_jane + ]; + }; + + username_kernel = janePackage { + pname = "username_kernel"; + hash = "sha256-1lxWSv7CbmucurNw8ws18N9DYqo4ik2KZBc5GtNmmeU="; + meta.description = "An identifier for a user"; + propagatedBuildInputs = [ + core + ppx_jane + ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "sha256-v/p718POQlFsB7N7WmMCDnmQDB2sP1263pSQIuvlLt8="; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + vcaml = janePackage { + pname = "vcaml"; + hash = "sha256-z3v0Uqb+jE19+EN/b6qQvAx+FaK5HmbdHnxEkYGSmS8="; + meta.description = "OCaml bindings for the Neovim API"; + propagatedBuildInputs = [ + angstrom-async + async_extra + base_trie + expect_test_helpers_async + faraday + jsonaf + man_in_the_middle_debugger + semantic_version + ]; + doCheck = false; # tests depend on nvim + }; + + versioned_polling_state_rpc = janePackage { + pname = "versioned_polling_state_rpc"; + hash = "sha256-Ba+Pevc/cvvY9FnQ2oTUxTekxypVkEy4MfrpRKmJhZ0="; + meta.description = "Helper functions for creating stable/versioned `Polling_state_rpc.t`s with babel"; + propagatedBuildInputs = [ + async_rpc_kernel + babel + core + polling_state_rpc + ppx_jane + ]; + }; + + virtual_dom = janePackage { + pname = "virtual_dom"; + hash = "sha256-5T+/N1fELa1cR9mhWLUgS3Fwr1OQXJ3J6T3YaHT9q7U="; + meta.description = "OCaml bindings for the virtual-dom library"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ + base64 + core_kernel + gen_js_api + js_of_ocaml + js_of_ocaml_patches + lambdasoup + tyxml + uri + ]; + }; + + virtual_dom_toplayer = janePackage { + pname = "virtual_dom_toplayer"; + hash = "sha256-trTSWzWsXkV4RtQvVCyXqJN5/wftaFuooaehNekP9H0="; + meta.description = "OCaml bindings for the floating positioning library for 'toplevel' virtual dom components"; + propagatedBuildInputs = [ + core + js_of_ocaml_patches + ppx_css + ppx_jane + virtual_dom + gen_js_api + js_of_ocaml + js_of_ocaml-ppx + ]; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "sha256-QNhs9rHZetwgKAOftgQQa6aU8cOux8JOe3dBRrLJVh0="; + meta.description = "Javascripts stubs for the Zarith library"; + propagatedBuildInputs = [ ppx_jane ]; + doCheck = false; # some test sources unavailable + }; + + zstandard = janePackage { + pname = "zstandard"; + hash = "sha256-EUI7fnN8ZaM1l0RBsgSAMWO+VXA8VoCv/lO5kcj+j4E="; + meta.description = "OCaml bindings to Zstandard"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ + core_kernel + ctypes + zstd + ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix new file mode 100644 index 0000000000000..f366d6d1db8ab --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, + defaultVersion ? "0.17.0", +}: + +{ + pname, + version ? defaultVersion, + hash, + minimalOCamlVersion ? "5.1", + doCheck ? true, + buildInputs ? [ ], + ... +}@args: + +buildDunePackage ( + args + // { + inherit version buildInputs; + + inherit minimalOCamlVersion; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + inherit doCheck; + + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; + } +) diff --git a/pkgs/development/ocaml-modules/janestreet/js_of_ocaml_patches.patch b/pkgs/development/ocaml-modules/janestreet/js_of_ocaml_patches.patch new file mode 100644 index 0000000000000..c14ada4c676d0 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/js_of_ocaml_patches.patch @@ -0,0 +1,24 @@ +diff --git a/js_of_ocaml_patches.ml b/js_of_ocaml_patches.ml +index 58dd9d5..964b55e 100644 +--- a/js_of_ocaml_patches.ml ++++ b/js_of_ocaml_patches.ml +@@ -15,6 +15,6 @@ module Dom_html = struct + inherit Js_of_ocaml.Dom_html.canvasRenderingContext2D + + method ellipse : +- float -> float -> float -> float -> float -> float -> float -> unit meth ++ float -> float -> float -> float -> float -> float -> float -> bool t -> unit meth + end + end +diff --git a/js_of_ocaml_patches.mli b/js_of_ocaml_patches.mli +index 4aecc41..8ed5d50 100644 +--- a/js_of_ocaml_patches.mli ++++ b/js_of_ocaml_patches.mli +@@ -14,6 +14,6 @@ module Dom_html : sig + inherit Js_of_ocaml.Dom_html.canvasRenderingContext2D + + method ellipse : +- float -> float -> float -> float -> float -> float -> float -> unit meth ++ float -> float -> float -> float -> float -> float -> float -> bool t -> unit meth + end + end diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index 46810ab1566be..4430746a7adda 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar, alcotest }: +{ buildDunePackage, json-data-encoding, ocplib-endian, crowbar, alcotest }: buildDunePackage { pname = "json-data-encoding-bson"; diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index ff3c31519ed45..b9ab63ac84c5f 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -19,7 +19,7 @@ buildDunePackage (rec { meta = with lib; { description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; homepage = "https://github.com/Khady/ocaml-junit"; }; }) diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix index 35f083a876ee6..db5bcd5e80a36 100644 --- a/pkgs/development/ocaml-modules/ke/default.nix +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -1,5 +1,4 @@ -{ lib, buildDunePackage, fetchurl -, bigarray-compat, fmt +{ lib, buildDunePackage, fetchurl, fmt , alcotest, bigstringaf }: diff --git a/pkgs/development/ocaml-modules/kqueue/default.nix b/pkgs/development/ocaml-modules/kqueue/default.nix index 6666d58cfb1f1..2ea64493f948e 100644 --- a/pkgs/development/ocaml-modules/kqueue/default.nix +++ b/pkgs/development/ocaml-modules/kqueue/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "kqueue"; - version = "0.3.0"; + version = "0.4.0"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${version}/kqueue-${version}.tbz"; - hash = "sha256-MKRCyN6q9euTEgHIhldGGH8FwuLblWYNG+SiCMWBP6Y="; + hash = "sha256-fJHhmAp0EFzR9JH93a+EHy1auwSBKZV/XcBQLCedJLc="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix index 807589e19b57b..da4bb54d2bf5d 100644 --- a/pkgs/development/ocaml-modules/lastfm/default.nix +++ b/pkgs/development/ocaml-modules/lastfm/default.nix @@ -1,8 +1,6 @@ { lib , buildDunePackage , fetchFromGitHub -, pkg-config -, dune-configurator , re , xmlplaylist }: diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix index 1e797cbb7cb16..a020d2ab692fc 100644 --- a/pkgs/development/ocaml-modules/lem/default.nix +++ b/pkgs/development/ocaml-modules/lem/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , lib -, ncurses , makeWrapper , ocamlbuild , findlib diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index 0b20eb5c3e6ad..c3807a04061a7 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , letsencrypt , letsencrypt-dns , cmdliner diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 3eb8c2c08b558..a5e0c8a6ffd28 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -10,7 +10,6 @@ , mirage-crypto , mirage-crypto-ec , mirage-crypto-pk -, mirage-crypto-rng , x509 , yojson , ounit diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix index 4f2f04843163e..26802cf0cb348 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , letsencrypt , logs , fmt diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix index 28f2bc105d157..dc7ee48358013 100644 --- a/pkgs/development/ocaml-modules/linol/default.nix +++ b/pkgs/development/ocaml-modules/linol/default.nix @@ -1,22 +1,15 @@ -{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib, trace }: +{ lib, fetchurl, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib, trace }: buildDunePackage rec { pname = "linol"; - version = "0.5"; + version = "0.6"; minimalOCamlVersion = "4.14"; - src = fetchFromGitHub { - owner = "c-cube"; - repo = "linol"; - rev = "v${version}"; - hash = "sha256-ULPOB/hb+2VXDB/eK66WDDh/wj0bOwUt0tZsiIXqndo="; - }; - - patches = fetchpatch { - url = "https://github.com/c-cube/linol/commit/d8ebcf9a60f1e7251d14cdcd0b2ebd5b7f8eec6d.patch"; - hash = "sha256-JHR0P0X3ep5HvDWW43dMb452/WsFKS4e+5Qhk4MzaxQ="; + src = fetchurl { + url = "https://github.com/c-cube/linol/releases/download/v${version}/linol-${version}.tbz"; + hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo="; }; propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ]; diff --git a/pkgs/development/ocaml-modules/linol/lwt.nix b/pkgs/development/ocaml-modules/linol/lwt.nix index 67b0b7b07fbca..b8d16b023041f 100644 --- a/pkgs/development/ocaml-modules/linol/lwt.nix +++ b/pkgs/development/ocaml-modules/linol/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, linol, jsonrpc, lwt, yojson }: +{ buildDunePackage, linol, jsonrpc, lwt, yojson }: buildDunePackage { pname = "linol-lwt"; diff --git a/pkgs/development/ocaml-modules/lun/default.nix b/pkgs/development/ocaml-modules/lun/default.nix index c7303d0a00810..17dcaead3c22c 100644 --- a/pkgs/development/ocaml-modules/lun/default.nix +++ b/pkgs/development/ocaml-modules/lun/default.nix @@ -15,6 +15,6 @@ buildDunePackage rec { description = "Optics in OCaml"; homepage = "https://git.robur.coop/robur/lun"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix index db94ce3d62d1d..624b59b811b78 100644 --- a/pkgs/development/ocaml-modules/lwt-watcher/default.nix +++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k="; + hash = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k="; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 61cf05151a309..773b0ea81eba5 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, libev, buildDunePackage -, ocaml, cppo, dune-configurator, ocplib-endian +, cppo, dune-configurator, ocplib-endian }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index f6f2bc0f4ef3c..492bad6470859 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, cppo, lwt, react }: +{ buildDunePackage, fetchFromGitHub, cppo, lwt, react }: buildDunePackage { pname = "lwt_react"; diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 9fb3ce304d952..db77c9fb2c568 100644 --- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , macaddr, cstruct }: diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 62e2acba4d3e2..63a93efab2ed0 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , macaddr, ppx_sexp_conv, macaddr-cstruct, ounit2 }: diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index 8a2f195c9445f..2c0fa7186e84a 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -2,17 +2,15 @@ buildDunePackage rec { pname = "mccs"; - version = "1.1+13"; + version = "1.1+17"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; rev = version; - sha256 = "sha256-K249E9qkWNK4BC+ynaR3bVEyu9Tk8iCE7GptKk/aVJc="; + hash = "sha256-0NZF2W/eWwZRXnMJh9LmOdbE/CRDYeLUUx6ty4irP6U="; }; - useDune2 = true; - propagatedBuildInputs = [ cudf ]; @@ -24,6 +22,6 @@ buildDunePackage rec { downloadPage = "https://github.com/AltGr/ocaml-mccs"; homepage = "https://www.i3s.unice.fr/~cpjm/misc/"; license = with licenses; [ lgpl21 gpl3 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix index ddb610f5570b5..de57b3d44d326 100644 --- a/pkgs/development/ocaml-modules/mec/default.nix +++ b/pkgs/development/ocaml-modules/mec/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, buildDunePackage, ocaml +{ lib, fetchzip, buildDunePackage , zarith, eqaf, bigarray-compat, hex, ff-sig, ff , alcotest, bisect_ppx }: diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix index 2d9ea0da8deb7..4fc86d1194700 100644 --- a/pkgs/development/ocaml-modules/metadata/default.nix +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: +{ lib, buildDunePackage, fetchFromGitHub }: buildDunePackage rec { pname = "metadata"; @@ -15,7 +15,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/savonet/ocaml-metadata"; - description = "Library to read metadata from files in various formats. "; + description = "Library to read metadata from files in various formats."; license = licenses.gpl3Plus; maintainers = with maintainers; [ dandellion ]; }; diff --git a/pkgs/development/ocaml-modules/metrics/rusage.nix b/pkgs/development/ocaml-modules/metrics/rusage.nix index ed944fb6dfc98..fcc188f7db4b2 100644 --- a/pkgs/development/ocaml-modules/metrics/rusage.nix +++ b/pkgs/development/ocaml-modules/metrics/rusage.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, metrics +{ buildDunePackage, metrics , fmt, logs }: diff --git a/pkgs/development/ocaml-modules/miou/default.nix b/pkgs/development/ocaml-modules/miou/default.nix index 7dd83aaae3775..0a5970fe73911 100644 --- a/pkgs/development/ocaml-modules/miou/default.nix +++ b/pkgs/development/ocaml-modules/miou/default.nix @@ -16,6 +16,6 @@ buildDunePackage rec { homepage = "https://git.robur.coop/robur/miou"; changelog = "https://git.robur.coop/robur/miou/src/tag/v${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/mirage-clock/solo5.nix b/pkgs/development/ocaml-modules/mirage-clock/solo5.nix index d787c08e1bb03..e13fc60e97bdf 100644 --- a/pkgs/development/ocaml-modules/mirage-clock/solo5.nix +++ b/pkgs/development/ocaml-modules/mirage-clock/solo5.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , mirage-clock }: diff --git a/pkgs/development/ocaml-modules/mirage-console/unix.nix b/pkgs/development/ocaml-modules/mirage-console/unix.nix index ca8c2aeac5e31..341df7927ed3c 100644 --- a/pkgs/development/ocaml-modules/mirage-console/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-console/unix.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, mirage-console, lwt, cstruct, cstruct-lwt }: +{ buildDunePackage, mirage-console, cstruct, cstruct-lwt }: buildDunePackage { pname = "mirage-console-unix"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index b17182a5efda6..f1312f58146d4 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -1,5 +1,4 @@ { lib -, ocaml , buildDunePackage , mirage-crypto , dune-configurator diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index b9979b446d202..bc94e33313164 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , mirage-crypto, mirage-crypto-rng , dune-configurator, async, logs }: diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index 5500d0551253a..290787bf639fd 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }: +{ buildDunePackage, mirage-flow, lwt, logs, cstruct, mirage-clock }: buildDunePackage { pname = "mirage-flow-combinators"; diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index be9592fb374bd..ef842ec7318f2 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,23 +1,23 @@ { lib, fetchurl, buildDunePackage -, logs, lwt, mirage-clock, ptime -, alcotest +, logs, fmt, ptime, mirage-clock, cmdliner +, lwt, alcotest }: buildDunePackage rec { pname = "mirage-logs"; - version = "1.3.0"; + version = "2.1.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz"; - hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA="; + hash = "sha256-rorCsgw7QCQmjotr465KShQGWdoUM88djpwgqwBGnLs="; }; - propagatedBuildInputs = [ logs lwt mirage-clock ptime ]; + propagatedBuildInputs = [ logs fmt ptime mirage-clock cmdliner ]; doCheck = true; - checkInputs = [ alcotest ]; + checkInputs = [ lwt alcotest ]; meta = { description = "Reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; diff --git a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix index e03e17905faaf..766db21c90abb 100644 --- a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , netchannel , ppx_sexp_conv , lwt diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 6342184e805db..3317a51cf3a49 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ocaml, alcotest +{ buildDunePackage, ocaml, alcotest , functoria, mirage-runtime, bos , ipaddr, astring, logs, stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 6a74ef4cec82d..b66617f7d2860 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -64,6 +64,6 @@ buildDunePackage rec { homepage = "https://github.com/logseq/mldoc"; description = "Another Emacs Org-mode and Markdown parser"; license = licenses.agpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix new file mode 100644 index 0000000000000..8f084ef9618d0 --- /dev/null +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -0,0 +1,80 @@ +{ + lib, + buildDunePackage, + fetchFromGitLab, + clang, + libclang, + libllvm, + flint, + mpfr, + pplite, + ocaml, + menhir, + apron, + camlidl, + yojson, + zarith, +}: + +buildDunePackage rec { + pname = "mopsa"; + version = "1.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchFromGitLab { + owner = "mopsa"; + repo = "mopsa-analyzer"; + rev = "v${version}"; + hash = "sha256-nGnWwV7g3SYgShbXGUMooyOdFwXFrQHnQvlc8x9TAS4="; + }; + + nativeBuildInputs = [ + clang + libllvm + menhir + ]; + + buildInputs = [ + camlidl + flint + libclang + mpfr + pplite + ]; + + propagatedBuildInputs = [ + apron + yojson + zarith + ]; + + postPatch = '' + patchShebangs bin + ''; + + buildPhase = '' + runHook preBuild + dune build --profile release -p mopsa + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + dune install --profile release --prefix=$bin --libdir=$out/lib/ocaml/${ocaml.version}/site-lib + runHook postInstall + ''; + + outputs = [ + "bin" + "out" + ]; + + meta = { + license = lib.licenses.lgpl3Plus; + homepage = "https://mopsa.lip6.fr/"; + description = "A Modular and Open Platform for Static Analysis using Abstract Interpretation"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix index 2871e774f3fe2..a766f24913667 100644 --- a/pkgs/development/ocaml-modules/msgpck/default.nix +++ b/pkgs/development/ocaml-modules/msgpck/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = true; meta = { - description = "Fast MessagePack (http://msgpack.org) library "; + description = "Fast MessagePack (http://msgpack.org) library"; license = lib.licenses.isc; homepage = "https://github.com/vbmithr/ocaml-msgpck"; maintainers = [ lib.maintainers.ulrikstrid ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index a8178c6ef7177..9e512e35f3047 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,4 +1,5 @@ { lib +, ocaml , buildDunePackage , lsp , xdg @@ -11,18 +12,30 @@ , merlin-lib , astring , camlp-streams +, base }: +# Freeze ocaml-lsp-version at 1.17.0 for OCaml 5.0 +# for which merlin 4.16 is not available +let lsp_v = + if lib.versions.majorMinor ocaml.version == "5.0" + then lsp.override { version = "1.17.0"; } + else lsp +; in + +let lsp = lsp_v; in + buildDunePackage rec { pname = "ocaml-lsp-server"; inherit (lsp) version src preBuild; - duneVersion = "3"; buildInputs = lsp.buildInputs ++ [ lsp re ] ++ lib.optional (lib.versionAtLeast version "1.9") spawn ++ lib.optionals (lib.versionAtLeast version "1.10") [ fiber xdg ] ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc - ++ lib.optionals (lib.versionAtLeast version "1.17.0") [ astring camlp-streams merlin-lib ]; + ++ lib.optionals (lib.versionAtLeast version "1.17.0") [ astring camlp-streams merlin-lib ] + ++ lib.optional (lib.versionAtLeast version "1.18.0") base + ; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index aee22a26bd181..6ad8420fc134a 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -9,7 +9,7 @@ , ocaml , version ? if lib.versionAtLeast ocaml.version "4.14" then - "1.17.0" + "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" else if lib.versionAtLeast ocaml.version "4.12" then @@ -19,6 +19,11 @@ }: let params = { + "1.18.0" = { + name = "lsp"; + minimalOCamlVersion = "4.14"; + sha256 = "sha256-tZ2kPM/S/9J3yeX2laDjnHLA144b8svy9iwae32nXwM="; + }; "1.17.0" = { name = "lsp"; minimalOCamlVersion = "4.14"; @@ -54,7 +59,6 @@ buildDunePackage rec { inherit (params) sha256; }; - duneVersion = "3"; inherit (params) minimalOCamlVersion; buildInputs = @@ -73,6 +77,6 @@ buildDunePackage rec { description = "Jsonrpc protocol implementation in OCaml"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 49a6db7a118e9..c77d1ed40453c 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -14,7 +14,6 @@ , re , stdune , chrome-trace -, dune_3 , csexp , result , pp @@ -24,7 +23,7 @@ , ocaml , version ? if lib.versionAtLeast ocaml.version "4.14" then - "1.17.0" + "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" else if lib.versionAtLeast ocaml.version "4.12" then @@ -39,7 +38,6 @@ let jsonrpc_v = jsonrpc.override { buildDunePackage rec { pname = "lsp"; inherit (jsonrpc_v) version src; - duneVersion = "3"; minimalOCamlVersion = if lib.versionAtLeast version "1.7.0" then "4.12" diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix index 5180b58601af2..21add50c60617 100644 --- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { buildInputs = [ dune-build-info bos ]; meta = with lib; { - description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form "; + description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form"; homepage = "https://github.com/${author}/${pname}"; license = lib.licenses.isc; maintainers = [ lib.maintainers.nerdypepper ]; diff --git a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 51ca531b0140e..717f5755ebac6 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage +{ buildDunePackage , pbrt , stdlib-shims }: diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index f8f8c9d991956..d9dfd6dc1b1ee 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -1,6 +1,7 @@ { lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk -, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }: +, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf +, janeStreet_0_15, ... }: # The ocamlformat package have been split into two in version 0.25.1: # one for the library and one for the executable. @@ -42,8 +43,12 @@ rec { cmdliner_v = if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0; - library_deps = [ - base + base_v = if lib.versionAtLeast version "0.25.1" then base else janeStreet_0_15.base; + + stdio_v =if lib.versionAtLeast version "0.25.1" then stdio else janeStreet_0_15.stdio; + + library_deps= [ + base_v cmdliner_v dune-build-info fix @@ -51,7 +56,7 @@ rec { menhirLib menhirSdk ocp-indent - stdio + stdio_v uuseg uutf ] ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 8607a2a50344d..c34fb91f5e73b 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs9"; + version = "2.7.1_cvs11"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; rev = "v${version}"; - hash = "sha256-cOObHUAYiI2mN1qjsxcK6kHAmawuaGQOUNHqWioIvjM="; + hash = "sha256-D/Gn+02Kq4mqEpNZrYYw/NXSJce2joGhl3wUZDhVDYo="; }; postPatch = '' diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index c075fc59be1ce..92b625a4ab47b 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -19,6 +19,6 @@ buildDunePackage rec { homepage = "https://github.com/backtracking/ocamlgraph"; description = "Graph library for OCaml"; license = licenses.gpl2Oss; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index b770c0d7d5d7a..c475ebdecd26a 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -17,7 +17,7 @@ let caml_ld_library_path = ; in buildDunePackage rec { - version = "5.1.0"; + version = "5.1.2"; pname = "ocsigenserver"; minimalOCamlVersion = "4.08"; @@ -26,7 +26,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "ocsigenserver"; rev = "refs/tags/${version}"; - hash = "sha256-6xO+4eYSp6rlgPT09L7cvlaz6kYYuUPRa3K/TgZmaqE="; + hash = "sha256-piWHA4RMO370TETC9FtISyBvS1Uhk5CAGAtZleJTpjU="; }; nativeBuildInputs = [ makeWrapper which ]; diff --git a/pkgs/development/ocaml-modules/odig/default.nix b/pkgs/development/ocaml-modules/odig/default.nix index 5ea3730c7ff4c..3fe26e5b90ddb 100644 --- a/pkgs/development/ocaml-modules/odig/default.nix +++ b/pkgs/development/ocaml-modules/odig/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildTopkgPackage, cmdliner, odoc, b0 }: +{ lib, fetchurl, buildTopkgPackage, cmdliner, odoc, b0 }: buildTopkgPackage rec { pname = "odig"; diff --git a/pkgs/development/ocaml-modules/opam-core/default.nix b/pkgs/development/ocaml-modules/opam-core/default.nix index 3106fe83fd70f..8f9c4bf37a31e 100644 --- a/pkgs/development/ocaml-modules/opam-core/default.nix +++ b/pkgs/development/ocaml-modules/opam-core/default.nix @@ -1,15 +1,13 @@ -{ lib, buildDunePackage, unzip -, opam, ocamlgraph, re, cppo }: +{ lib, buildDunePackage, opam +, jsonm, ocamlgraph, re, sha, swhid_core, uutf +}: buildDunePackage rec { pname = "opam-core"; inherit (opam) src version; - useDune2 = true; - - nativeBuildInputs = [ unzip cppo ]; - propagatedBuildInputs = [ ocamlgraph re ]; + propagatedBuildInputs = [ jsonm ocamlgraph uutf re sha swhid_core ]; # get rid of check for curl at configure time # opam-core does not call curl at run time diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix index 1360c62816360..00d0b146fb71f 100644 --- a/pkgs/development/ocaml-modules/opam-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-format/default.nix @@ -1,19 +1,14 @@ -{ lib, buildDunePackage, unzip, opam-core, opam-file-format }: +{ lib, buildDunePackage, opam-core, opam-file-format }: buildDunePackage rec { pname = "opam-format"; - useDune2 = true; - inherit (opam-core) src version; - minimalOCamlVersion = "4.02.3"; - # get rid of check for curl at configure time # opam-format does not call curl at run time configureFlags = [ "--disable-checks" ]; - nativeBuildInputs = [ unzip ]; propagatedBuildInputs = [ opam-core opam-file-format ]; meta = opam-core.meta // { diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix index 008cc2812453c..c23db8c79f0e0 100644 --- a/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -1,25 +1,20 @@ -{ lib, buildDunePackage, unzip, opam-format, curl }: +{ lib, buildDunePackage, opam-format, curl }: buildDunePackage rec { pname = "opam-repository"; - minimalOCamlVersion = "4.02"; - - useDune2 = true; - inherit (opam-format) src version; patches = [ ./download-tool.patch ]; postPatch = '' substituteInPlace src/repository/opamRepositoryConfig.ml \ - --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" + --replace-fail "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" ''; - strictDeps = true; - - nativeBuildInputs = [ unzip curl ]; propagatedBuildInputs = [ opam-format ]; + configureFlags = [ "--disable-checks" ]; + meta = opam-format.meta // { description = "OPAM repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends"; maintainers = with lib.maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/opam-state/default.nix b/pkgs/development/ocaml-modules/opam-state/default.nix index d841631dfd07c..a0f2332783d7f 100644 --- a/pkgs/development/ocaml-modules/opam-state/default.nix +++ b/pkgs/development/ocaml-modules/opam-state/default.nix @@ -1,18 +1,15 @@ -{ lib, buildDunePackage, unzip, opam, opam-repository }: +{ lib, buildDunePackage, opam, opam-repository, spdx_licenses }: buildDunePackage rec { pname = "opam-state"; inherit (opam) src version; - useDune2 = true; - # get rid of check for curl at configure time # opam-state does not call curl at run time configureFlags = [ "--disable-checks" ]; - nativeBuildInputs = [ unzip ]; - propagatedBuildInputs = [ opam-repository ]; + propagatedBuildInputs = [ opam-repository spdx_licenses ]; meta = opam.meta // { description = "OPAM development library handling the ~/.opam hierarchy, repository and switch states"; diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix index 8613ccf9ae088..7776c0462d05f 100644 --- a/pkgs/development/ocaml-modules/ordering/default.nix +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3 }: +{ buildDunePackage, dune_3 }: buildDunePackage { pname = "ordering"; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 61c1615b58578..1d629daef8751 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,4 +1,4 @@ -{ lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: +{ lib, buildDunePackage, fetchurl, seq, stdlib-shims }: buildDunePackage rec { minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index 0300076b52158..e5f21b9ea3b2d 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , paf , cohttp-lwt , domain-name diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 76856024c09a6..dd99947db1f58 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,7 +1,6 @@ { lib , buildDunePackage , fetchurl -, ppx_deriving , bppsuite , alcotest , angstrom-unix @@ -12,16 +11,15 @@ , menhir , menhirLib , printbox-text -, yojson }: buildDunePackage rec { pname = "phylogenetics"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz"; - hash = "sha256-JFpYp3pyW7PrBjqCwwDZxkJPA84dp6Qs8rOPvHPY92o="; + hash = "sha256-3oZ9fMAXqOQ02rQ+8W8PZJWXOJLNe2qERrGOeTk3BKg="; }; minimalOCamlVersion = "4.08"; @@ -36,9 +34,7 @@ buildDunePackage rec { gsl lacaml menhirLib - ppx_deriving printbox-text - yojson ]; checkPhase = '' diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 46bb62a246692..cc964df9ffbd1 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -6,12 +6,9 @@ , gluten-lwt-unix , lib , logs -, lwt_ssl , magic-mime , mrmime -, pecu , psq -, ssl , uri }: diff --git a/pkgs/development/ocaml-modules/polynomial/default.nix b/pkgs/development/ocaml-modules/polynomial/default.nix index cd56175d72d9b..791aa7b7fabde 100644 --- a/pkgs/development/ocaml-modules/polynomial/default.nix +++ b/pkgs/development/ocaml-modules/polynomial/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "cryptography/ocaml-polynomial"; rev = version; - sha256 = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU="; + hash = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU="; }; propagatedBuildInputs = [ zarith ff-sig ]; diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix index c998965a6189f..4c3c6cc0f02b8 100644 --- a/pkgs/development/ocaml-modules/posix/socket.nix +++ b/pkgs/development/ocaml-modules/posix/socket.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, posix-base }: +{ buildDunePackage, posix-base }: buildDunePackage { pname = "posix-socket"; diff --git a/pkgs/development/ocaml-modules/posix/types.nix b/pkgs/development/ocaml-modules/posix/types.nix index c346ea86ac76a..8672a7dc29f8d 100644 --- a/pkgs/development/ocaml-modules/posix/types.nix +++ b/pkgs/development/ocaml-modules/posix/types.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, posix-base }: +{ buildDunePackage, posix-base }: buildDunePackage { pname = "posix-types"; diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix index 5412f8955d76c..19f446ad85d51 100644 --- a/pkgs/development/ocaml-modules/pp/default.nix +++ b/pkgs/development/ocaml-modules/pp/default.nix @@ -21,6 +21,6 @@ buildDunePackage rec { "A an alternative pretty printing library to the Format module of the OCaml standard library"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/prettym/default.nix b/pkgs/development/ocaml-modules/prettym/default.nix index a229eb9f35f16..8d6a855fe74fc 100644 --- a/pkgs/development/ocaml-modules/prettym/default.nix +++ b/pkgs/development/ocaml-modules/prettym/default.nix @@ -42,6 +42,6 @@ buildDunePackage rec { description = "Simple bounded encoder to serialize human readable values and respect the 80-column constraint"; license = lib.licenses.mit; homepage = "https://github.com/dinosaure/prettym"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index edc9e1c6dcbd2..6fd6a7d8b9c24 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -23,6 +23,6 @@ buildDunePackage rec { homepage = "https://www.lri.fr/~filliatr/software.en.html"; description = "Maps over integers implemented as Patricia trees"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/qcheck/bytes.patch b/pkgs/development/ocaml-modules/qcheck/bytes.patch deleted file mode 100644 index 7e5e5f2efedcd..0000000000000 --- a/pkgs/development/ocaml-modules/qcheck/bytes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/alcotest/dune b/src/alcotest/dune -index 220a8b3..df1ffe0 100644 ---- a/src/alcotest/dune -+++ b/src/alcotest/dune -@@ -3,6 +3,6 @@ - (name qcheck_alcotest) - (public_name qcheck-alcotest) - (wrapped false) -- (libraries unix bytes qcheck-core qcheck-core.runner alcotest) -+ (libraries unix qcheck-core qcheck-core.runner alcotest) - (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string) - ) -diff --git a/src/core/dune b/src/core/dune -index ad0939f..42dc8ac 100644 ---- a/src/core/dune -+++ b/src/core/dune -@@ -3,6 +3,6 @@ - (name qcheck_core) - (public_name qcheck-core) - (wrapped false) -- (libraries unix bytes) -+ (libraries unix) - (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string) - ) -diff --git a/src/ounit/dune b/src/ounit/dune -index 2fadb7a..41f8d4b 100644 ---- a/src/ounit/dune -+++ b/src/ounit/dune -@@ -3,6 +3,6 @@ - (name qcheck_ounit) - (public_name qcheck-ounit) - (wrapped false) -- (libraries unix bytes qcheck-core qcheck-core.runner ounit2) -+ (libraries unix qcheck-core qcheck-core.runner ounit2) - (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string) - ) diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index a688e9e595eca..9817bedafff18 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.21.2"; + version = "0.22"; minimalOCamlVersion = "4.08"; @@ -10,11 +10,9 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = "v${version}"; - hash = "sha256-a+sjpvpQZbXjQgyx69hhVAmRCfDMMhFlg965dK5UN6Q="; + hash = "sha256-JXnrfce/V7Bdu8uH98ZJCLjIHZoONiQ02ltFx6Fbvhg="; }; - patches = [ ./bytes.patch ]; - meta = { description = "Core qcheck library"; homepage = "https://c-cube.github.io/qcheck/"; diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix index c6c5abfb7f9a3..ebce5ad277f27 100644 --- a/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -19,6 +19,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native"; homepage = "https://reason-native.com/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix index 38d95a0c0f396..6bede4e59e50a 100644 --- a/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/pkgs/development/ocaml-modules/reason-native/console.nix @@ -19,6 +19,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; homepage = "https://reason-native.com/docs/console/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix index 6cd04ece01f6b..9b166beb40cb3 100644 --- a/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -18,6 +18,6 @@ buildDunePackage { description = "Library that provides a consistent API for common system, user and application directories consistently on all platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index 462b667921c1b..8cfd60d144bf3 100644 --- a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -20,6 +20,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; homepage = "https://reason-native.com/docs/file-context-printer/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix index 35a099771dc64..5cf7c3d417dea 100644 --- a/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -14,6 +14,6 @@ buildDunePackage { description = "Library for creating and operating on file paths consistently on multiple platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/frame.nix b/pkgs/development/ocaml-modules/reason-native/frame.nix index dc845db552498..78ccdd2a87932 100644 --- a/pkgs/development/ocaml-modules/reason-native/frame.nix +++ b/pkgs/development/ocaml-modules/reason-native/frame.nix @@ -19,6 +19,6 @@ buildDunePackage { description = "Reason Native text layout library"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/frame"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/fs.nix b/pkgs/development/ocaml-modules/reason-native/fs.nix index c553f6a6ad989..fc65551a2481e 100644 --- a/pkgs/development/ocaml-modules/reason-native/fs.nix +++ b/pkgs/development/ocaml-modules/reason-native/fs.nix @@ -18,7 +18,7 @@ buildDunePackage { description = "Reason Native file system API"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fs"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index 1a424fad5401a..82a3ff55057f0 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -20,6 +20,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; homepage = "https://reason-native.com/docs/pastel/console"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix index d8a4d7e0f9ca5..473c6a09e5faa 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -21,6 +21,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; homepage = "https://reason-native.com/docs/pastel/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index 4006df5d90c8b..c58782260385d 100644 --- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -20,6 +20,6 @@ buildDunePackage { description = "Library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 3f320fd2364d6..b24fd7c527f3f 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -22,6 +22,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; homepage = "https://reason-native.com/docs/refmterr/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 46097c45ebdf9..92743f4c2ecba 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -26,6 +26,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; homepage = "https://reason-native.com/docs/rely/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix index e3ca4b9ad5e9c..e9870f92b33c0 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -22,6 +22,6 @@ buildDunePackage { downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; homepage = "https://reason-native.com/docs/rely/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix index 1b80ae2a71fd3..bb2bbef3c4a16 100644 --- a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix +++ b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix @@ -14,6 +14,6 @@ buildDunePackage { description = "Configuration used to generate the @reason-native/unicode library"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode-config"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/unicode.nix b/pkgs/development/ocaml-modules/reason-native/unicode.nix index 544367424d0b7..7ce536a6e2138 100644 --- a/pkgs/development/ocaml-modules/reason-native/unicode.nix +++ b/pkgs/development/ocaml-modules/reason-native/unicode.nix @@ -14,6 +14,6 @@ buildDunePackage { description = "Easy to use and well documented Unicode symbols"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/utf8.nix b/pkgs/development/ocaml-modules/reason-native/utf8.nix index 40c874b5b41f7..0a18e68a15419 100644 --- a/pkgs/development/ocaml-modules/reason-native/utf8.nix +++ b/pkgs/development/ocaml-modules/reason-native/utf8.nix @@ -14,7 +14,7 @@ buildDunePackage { description = "Utf8 logic with minimal dependencies"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/utf8"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix index 6a871069eb6af..ce2e9d3aad707 100644 --- a/pkgs/development/ocaml-modules/rebez/default.nix +++ b/pkgs/development/ocaml-modules/rebez/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { description = "Cubic bezier implementation in Reason / OCaml"; homepage = "https://github.com/jchavarri/rebez/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "RebezApp.exe"; }; } diff --git a/pkgs/development/ocaml-modules/reperf/default.nix b/pkgs/development/ocaml-modules/reperf/default.nix index 10c6ee65626c8..ce3164fa19a23 100644 --- a/pkgs/development/ocaml-modules/reperf/default.nix +++ b/pkgs/development/ocaml-modules/reperf/default.nix @@ -35,7 +35,7 @@ buildDunePackage rec { Outputs a JSON performance report, and compare it with previous iterations - and fail if a regression is detected. ''; homepage = "https://github.com/bryphe/reperf"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index cd3bf78eadda5..71fab69b08d11 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: +{ buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: buildDunePackage { pname = "ppx_repr"; diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 92a1b751ed5d7..e96f9471b1b23 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, resto, uri }: +{ buildDunePackage, resto, uri }: buildDunePackage { pname = "resto-acl"; diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index fac4ce7422ac1..ccce7af29d9c1 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , resto , resto-directory , resto-acl diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 6347b8628b398..8a528b561a955 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , resto , resto-directory , resto-acl diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 43735de3e5068..56f4f8f30323a 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - sha256 = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; + hash = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index efbb7cb608e78..d23b645789241 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, resto, resto-json, lwt }: +{ buildDunePackage, resto, lwt }: buildDunePackage { pname = "resto-directory"; diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix index c0f9b00d6ad7a..f1ca0c49bb99e 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: +{ buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: buildDunePackage { pname = "resto-json"; diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix index 4920a2910b8fe..bdc9e07c0411c 100644 --- a/pkgs/development/ocaml-modules/ringo/default.nix +++ b/pkgs/development/ocaml-modules/ringo/default.nix @@ -2,12 +2,12 @@ buildDunePackage rec { pname = "ringo"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ringo"; rev = "v${version}"; - sha256 = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU="; + hash = "sha256-8dThhY7TIjd0lLdCt6kxr0yhgVGDyN6ZMSx0Skfbcwk="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index f7ead9e0a194e..7be8d9c21caf1 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -38,6 +38,6 @@ buildDunePackage rec { homepage = "https://github.com/leostera/riot"; changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index c6260d713bc16..975595808ad09 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -28,6 +28,6 @@ buildDunePackage { homepage = "https://github.com/Chris00/ocaml-rope"; description = "Ropes (“heavyweight strings”) in OCaml"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix index 492e01ce5d59d..8e366bda1d657 100644 --- a/pkgs/development/ocaml-modules/rosetta/default.nix +++ b/pkgs/development/ocaml-modules/rosetta/default.nix @@ -29,6 +29,6 @@ buildDunePackage rec { description = "Universal decoder of an encoded flow (UTF-7, ISO-8859 and KOI8) to Unicode"; license = lib.licenses.mit; homepage = "https://github.com/mirage/rosetta"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix index a4a3e06bf1009..ce02d4b1e66b3 100644 --- a/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , rpclib , lwt , alcotest-lwt diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix index a01afe5904a5e..c7df6ef503086 100644 --- a/pkgs/development/ocaml-modules/sail/default.nix +++ b/pkgs/development/ocaml-modules/sail/default.nix @@ -10,9 +10,7 @@ , pprint , makeWrapper , lem -, z3 , linksem -, num , yojson }: diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index b7303a425d623..53a3c718ed6e6 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , fetchurl , buildDunePackage -, ocaml , gen , ppxlib , uchar diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index dc34be8ed746e..0dd8d819611da 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , shared-memory-ring , ppx_cstruct , cstruct diff --git a/pkgs/development/ocaml-modules/spdx_licenses/default.nix b/pkgs/development/ocaml-modules/spdx_licenses/default.nix new file mode 100644 index 0000000000000..807de8387fee5 --- /dev/null +++ b/pkgs/development/ocaml-modules/spdx_licenses/default.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchurl, + buildDunePackage, +}: + +buildDunePackage rec { + pname = "spdx_licenses"; + version = "1.2.0"; + + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/kit-ty-kate/spdx_licenses/releases/download/v${version}/spdx_licenses-${version}.tar.gz"; + hash = "sha256-9ViB7PRDz70w3RJczapgn2tJx9wTWgAbdzos6r3J2r4="; + }; + + meta = { + homepage = "https://github.com/kit-ty-kate/spdx_licenses"; + description = "A library providing a strict SPDX License Expression parser"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/spices/default.nix b/pkgs/development/ocaml-modules/spices/default.nix index a1d6b06d156bb..263d1441e35b9 100644 --- a/pkgs/development/ocaml-modules/spices/default.nix +++ b/pkgs/development/ocaml-modules/spices/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { homepage = "https://github.com/leostera/minttea"; changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 329dd01f02ea9..5d7e3fe2c35fd 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -34,7 +34,7 @@ buildDunePackage rec { meta = { homepage = "http://savonet.rastageeks.org/"; - description = "OCaml bindings for libssl "; + description = "OCaml bindings for libssl"; license = "LGPL+link exception"; maintainers = with lib.maintainers; [ anmonteiro dandellion maggesi ]; }; diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix index 5e0b798772de2..ffb73941f0bdc 100644 --- a/pkgs/development/ocaml-modules/stdune/default.nix +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, dune_3, dyn, ordering, csexp }: +{ buildDunePackage, dune_3, dyn, ordering, csexp }: buildDunePackage { pname = "stdune"; diff --git a/pkgs/development/ocaml-modules/swhid_core/default.nix b/pkgs/development/ocaml-modules/swhid_core/default.nix new file mode 100644 index 0000000000000..bc9998be2dc2d --- /dev/null +++ b/pkgs/development/ocaml-modules/swhid_core/default.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + buildDunePackage, +}: + +buildDunePackage rec { + pname = "swhid_core"; + version = "0.1"; + + minimalOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = "swhid_core"; + rev = version; + hash = "sha256-uLnVbptCvmBeNbOjGjyAWAKgzkKLDTYVFY6SNH2zf0A="; + }; + + meta = { + description = "OCaml library to work with swhids"; + homepage = "https://github.com/ocamlpro/swhid_core"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/syslog-message/default.nix b/pkgs/development/ocaml-modules/syslog-message/default.nix index e33194809526b..5d1000c3182e0 100644 --- a/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl -, astring, ptime, rresult, qcheck +, ptime, qcheck }: buildDunePackage rec { diff --git a/pkgs/development/ocaml-modules/tar/unix.nix b/pkgs/development/ocaml-modules/tar/unix.nix index 92b5a9237f5de..ed12dd57536a0 100644 --- a/pkgs/development/ocaml-modules/tar/unix.nix +++ b/pkgs/development/ocaml-modules/tar/unix.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , tar , cstruct-lwt , lwt diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix index 1feff4e0a39b3..2cec5ccc5e5ea 100644 --- a/pkgs/development/ocaml-modules/tcslib/default.nix +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, extlib, num }: +{ lib, fetchFromGitHub, buildOasisPackage, extlib, num }: buildOasisPackage rec { pname = "tcslib"; diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix index 4dcf81d965213..b8d8f7b520172 100644 --- a/pkgs/development/ocaml-modules/tdigest/default.nix +++ b/pkgs/development/ocaml-modules/tdigest/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, nix-update-script , buildDunePackage -, core +, base +, ppx_sexp_conv }: buildDunePackage rec { @@ -14,10 +15,14 @@ buildDunePackage rec { sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic="; }; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.14"; + + # base v0.17 compatibility + patches = [ ./tdigest.patch ]; propagatedBuildInputs = [ - core + base + ppx_sexp_conv ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/ocaml-modules/tdigest/tdigest.patch b/pkgs/development/ocaml-modules/tdigest/tdigest.patch new file mode 100644 index 0000000000000..a4f0f76b8e1a1 --- /dev/null +++ b/pkgs/development/ocaml-modules/tdigest/tdigest.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmap.ml b/src/cmap.ml +index 69f447b..3afb2b6 100644 +--- a/src/cmap.ml ++++ b/src/cmap.ml +@@ -173,6 +173,12 @@ end = struct + let of_list_with_key_multi list ~get_key = + Using_comparator.of_list_with_key_multi ~comparator list ~get_key + ++ let of_list_with_key_fold list ~get_key ~init ~f = ++ failwith "Map.of_list_with_key_fold: not implemented yet" ++ ++ let of_list_with_key_reduce list ~get_key ~f = ++ failwith "Map.of_list_with_key_reduce: not implemented yet" ++ + let of_alist alist = Using_comparator.of_alist ~comparator alist + + let of_alist_or_error alist = Using_comparator.of_alist_or_error ~comparator alist diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix index ed0dc49fa9e18..31eccdcaa6e54 100644 --- a/pkgs/development/ocaml-modules/telegraml/default.nix +++ b/pkgs/development/ocaml-modules/telegraml/default.nix @@ -33,6 +33,6 @@ buildDunePackage rec { description = "OCaml library implementing the Telegram bot API"; homepage = "https://github.com/nv-vn/TelegraML/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix index 8daf53abdb502..1e43b2f8ee2a2 100644 --- a/pkgs/development/ocaml-modules/terminal/default.nix +++ b/pkgs/development/ocaml-modules/terminal/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "terminal"; - version = "0.2.2"; + version = "0.4.0"; minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; - hash = "sha256-M0HCGSOiHNa1tc+p7DmB9ZVyw2eUD+XgJFBTPftBELU="; + hash = "sha256-i+RJVTN5uy3F6LeYBcgER2kKA9yj6a7pWf7PRtgnj7c="; }; propagatedBuildInputs = [ stdlib-shims uutf uucp ]; diff --git a/pkgs/development/ocaml-modules/timed/default.nix b/pkgs/development/ocaml-modules/timed/default.nix index 988cb3f5487fe..f3e925f4eefaa 100644 --- a/pkgs/development/ocaml-modules/timed/default.nix +++ b/pkgs/development/ocaml-modules/timed/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, ocaml , buildDunePackage }: diff --git a/pkgs/development/ocaml-modules/timedesc/tzdb.nix b/pkgs/development/ocaml-modules/timedesc/tzdb.nix index 95fab02d11a04..d335ee4c315de 100644 --- a/pkgs/development/ocaml-modules/timedesc/tzdb.nix +++ b/pkgs/development/ocaml-modules/timedesc/tzdb.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , timedesc }: diff --git a/pkgs/development/ocaml-modules/timedesc/tzlocal.nix b/pkgs/development/ocaml-modules/timedesc/tzlocal.nix index 6dcbfd741075b..780ba7f8bda2d 100644 --- a/pkgs/development/ocaml-modules/timedesc/tzlocal.nix +++ b/pkgs/development/ocaml-modules/timedesc/tzlocal.nix @@ -1,5 +1,4 @@ -{ lib -, buildDunePackage +{ buildDunePackage , timedesc }: diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index d4bdb84d685d7..338658cabbdbf 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: +{ buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: buildDunePackage rec { pname = "tls-async"; diff --git a/pkgs/development/ocaml-modules/tls/lwt.nix b/pkgs/development/ocaml-modules/tls/lwt.nix index d7db822182d3d..b86f41aeaa07d 100644 --- a/pkgs/development/ocaml-modules/tls/lwt.nix +++ b/pkgs/development/ocaml-modules/tls/lwt.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, cmdliner, x509 }: +{ buildDunePackage, tls, lwt, mirage-crypto-rng-lwt, x509 }: buildDunePackage rec { pname = "tls-lwt"; diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix index 008822459cc15..cc9404ed193e2 100644 --- a/pkgs/development/ocaml-modules/tsdl-image/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix @@ -34,6 +34,6 @@ buildDunePackage rec { description = "OCaml SDL2_image bindings to go with Tsdl"; homepage = "https://github.com/sanette/tsdl-image"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index d2721c5398e24..888c88029d261 100644 --- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -34,6 +34,6 @@ buildDunePackage rec { description = "SDL2_mixer bindings to go with Tsdl"; homepage = "https://github.com/sanette/tsdl-mixer"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 086b0789a6a51..33f5f834e01aa 100644 --- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -34,6 +34,6 @@ buildDunePackage rec { description = "SDL2_ttf bindings for Ocaml with Tsdl"; homepage = "https://github.com/sanette/tsdl-ttf"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix index a5b364312d417..8db9abd3630b5 100644 --- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix +++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "unisim_archisec"; - version = "0.0.5"; + version = "0.0.8"; src = fetchurl { - url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.5/unisim_archisec-0.0.5.tbz"; - sha256 = "sha256-94Ky7rtR8oFTtWshTYaY6gyJdqrY3QKMF7qTkZQweXQ="; + url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.8/unisim_archisec-0.0.8.tbz"; + sha256 = "sha256-D8DumHaQnLsMaVHoUL7w8KgGRTh9Rk+22NNSa0a/qII="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/unstrctrd/default.nix b/pkgs/development/ocaml-modules/unstrctrd/default.nix index b9be734a40e87..e5959f803c8f9 100644 --- a/pkgs/development/ocaml-modules/unstrctrd/default.nix +++ b/pkgs/development/ocaml-modules/unstrctrd/default.nix @@ -41,6 +41,6 @@ buildDunePackage rec { description = "Library for parsing email headers"; homepage = "https://github.com/dinosaure/unstrctrd"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix index 52543175e07cc..b6260451965d7 100644 --- a/pkgs/development/ocaml-modules/xdg/default.nix +++ b/pkgs/development/ocaml-modules/xdg/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { meta = with lib; { description = "XDG Base Directory Specification"; inherit (dune_3.meta) homepage; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index acbf1c270ffa0..296597a6a6292 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -1,21 +1,23 @@ -{ lib, buildDunePackage, fetchurl -, cstruct, ppx_cstruct, lwt, ounit2 +{ + lib, + buildDunePackage, + fetchFromGitHub, + lwt, + ounit2, }: buildDunePackage rec { pname = "xenstore"; version = "2.3.0"; - minimalOCamlVersion = "4.08"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; - hash = "sha256-1jxrvLLTwpd2fYPAoPbdRs7P1OaR8c9cW2VURF7Bs/Q="; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-xenstore"; + rev = "v${version}"; + hash = "sha256-LaynsbCE/+2QfbQCOLZi8nw1rqmZtgrwAov9cSxYZw8="; }; - buildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ cstruct lwt ]; + propagatedBuildInputs = [ lwt ]; doCheck = true; checkInputs = [ ounit2 ]; @@ -23,7 +25,10 @@ buildDunePackage rec { meta = with lib; { description = "Xenstore protocol in pure OCaml"; license = licenses.lgpl21Only; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ + sternenseemann + sigmasquadron + ]; homepage = "https://github.com/mirage/ocaml-xenstore"; }; } diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index 051019c734796..44e111715db56 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +{ buildDunePackage, yaml, ppx_sexp_conv, sexplib , junit_alcotest }: diff --git a/pkgs/development/ocaml-modules/yuscii/default.nix b/pkgs/development/ocaml-modules/yuscii/default.nix index 3080cb772e9e3..a8b8d7640f7bd 100644 --- a/pkgs/development/ocaml-modules/yuscii/default.nix +++ b/pkgs/development/ocaml-modules/yuscii/default.nix @@ -34,6 +34,6 @@ buildDunePackage rec { description = "Simple mapper between UTF-7 to Unicode according RFC2152"; license = lib.licenses.mit; homepage = "https://github.com/mirage/yuscii"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix index 48c1fb471fadb..7b9b290662a66 100644 --- a/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -4,8 +4,8 @@ }: let params = if lib.versionAtLeast ocaml.version "5.0" then { - version = "5.1.0"; - hash = "sha256-J3qkytgJkk2gT83KJ47nNM4cXqVHbx4iTPK+fLwR7Wk="; + version = "5.2.0"; + hash = "sha256-DJzXjV5Tjf69FKUiRioeHghks72pOOHYd73vqhmecS8="; propagatedBuildInputs = [ algaeff bwd ]; } else { version = "2.0.0"; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index b260d946ce1e7..c09b5a828f925 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,20 +1,24 @@ { lib, stdenv, fetchFromGitHub , ocaml, findlib, pkg-config , gmp +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.14" else "1.13" }: if lib.versionOlder ocaml.version "4.04" then throw "zarith is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-zarith"; - version = "1.13"; + inherit version; src = fetchFromGitHub { owner = "ocaml"; repo = "Zarith"; rev = "release-${version}"; - sha256 = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; + hash = { + "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg="; + "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE="; + }."${finalAttrs.version}"; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; @@ -31,9 +35,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, arbitrary precision OCaml integers"; homepage = "https://github.com/ocaml/Zarith"; - changelog = "https://github.com/ocaml/Zarith/raw/${src.rev}/Changes"; + changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index abfe608055dfc..41d91b8cf5dbe 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, dune-configurator, czmq, stdint }: +{ lib, fetchurl, buildDunePackage, dune-configurator, czmq }: buildDunePackage rec { pname = "zmq"; diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix index 30d63eebe36d2..118537215f9fe 100644 --- a/pkgs/development/octave-modules/dicom/default.nix +++ b/pkgs/development/octave-modules/dicom/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "dicom"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-CFspqPJDSU1Pg+o6dub1/+g+mPDps9sPlus6keDj6h0="; + sha256 = "sha256-erUZudOknymgGprqUhCaSvN/WlmWZ1qgH8HDYrNOg2I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/financial/default.nix b/pkgs/development/octave-modules/financial/default.nix index 5fb6a00df78b0..d034718ab5b8d 100644 --- a/pkgs/development/octave-modules/financial/default.nix +++ b/pkgs/development/octave-modules/financial/default.nix @@ -1,8 +1,6 @@ { buildOctavePackage , lib , fetchurl -, io -, statistics }: buildOctavePackage rec { diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix index 154fa4feee30f..05f15cfb1519c 100644 --- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix +++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix @@ -1,19 +1,21 @@ { buildOctavePackage , lib -, fetchurl +, fetchFromGitHub }: buildOctavePackage rec { pname = "fuzzy-logic-toolkit"; - version = "0.4.6"; + version = "0.6.0"; - src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "126x0wjjqmwwgynsgjfdh5rlnww5bsl5hxq1xib15i58mrglh5cd"; + src = fetchFromGitHub { + owner = "lmarkowsky"; + repo = "fuzzy-logic-toolkit"; + rev = "refs/tags/${version}"; + sha256 = "sha256-veU+3DPFJ2IeGw5PkpxGO8Oo9qEyR890hs4IAzbfxls="; }; meta = with lib; { - homepage = "https://octave.sourceforge.io/fuzzy-logic-toolkit/index.html"; + homepage = "https://github.com/lmarkowsky/fuzzy-logic-toolkit"; license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Mostly MATLAB-compatible fuzzy logic toolkit for Octave"; diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix index 3cc0873e3813b..325ce0390ada5 100644 --- a/pkgs/development/octave-modules/level-set/default.nix +++ b/pkgs/development/octave-modules/level-set/default.nix @@ -1,5 +1,4 @@ { buildOctavePackage -, stdenv , lib , fetchgit , automake diff --git a/pkgs/development/octave-modules/miscellaneous/default.nix b/pkgs/development/octave-modules/miscellaneous/default.nix index db2f45a5ac3db..64edb8e9a4188 100644 --- a/pkgs/development/octave-modules/miscellaneous/default.nix +++ b/pkgs/development/octave-modules/miscellaneous/default.nix @@ -8,11 +8,11 @@ buildOctavePackage rec { pname = "miscellaneous"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "10n107njz24ln7v9a1l3dkh7s7vd6qwgbinrj1nl4wflxsir4l9k"; + sha256 = "sha256-VxIReiXTHRJmADZGpA6B59dCdDPCY2bkJt/6mrir1kg="; }; buildInputs = [ diff --git a/pkgs/development/octave-modules/ncarray/default.nix b/pkgs/development/octave-modules/ncarray/default.nix index c028ba7f1d3e0..0c5546ffd121d 100644 --- a/pkgs/development/octave-modules/ncarray/default.nix +++ b/pkgs/development/octave-modules/ncarray/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "ncarray"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-HhQWLUA/6wqYi6TP3PC+N2zgi4UojDxbG9pgQzFaQ8c="; + sha256 = "sha256-W6L2Esm7AdzntT7cimKylbeKYcZWKhHim96N5dM/qoE="; }; buildInputs = [ diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix index b2b7eeda42e92..280819806838d 100644 --- a/pkgs/development/octave-modules/netcdf/default.nix +++ b/pkgs/development/octave-modules/netcdf/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "netcdf"; - version = "1.0.16"; + version = "1.0.17"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Lr+6xLRXxSeUhM9+WdCUPFRZSWdxtAQlxpiv4CHJrs="; + sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk="; }; buildInputs = [ diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix index 552f7a4f8e37f..48fbb9a67c322 100644 --- a/pkgs/development/octave-modules/statistics/default.nix +++ b/pkgs/development/octave-modules/statistics/default.nix @@ -6,13 +6,13 @@ buildOctavePackage rec { pname = "statistics"; - version = "1.6.0"; + version = "1.6.7"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "statistics"; rev = "refs/tags/release-${version}"; - sha256 = "sha256-XJXDiVDg3Nw7a/ih49jtkYRmyvAhTfs3LbBQmw+87oc="; + hash = "sha256-cXAjUiv4xWPrWf7HQg9Y+JkR7ON9iefKFUGbEr9FGNA="; }; requiredOctavePackages = [ @@ -20,9 +20,9 @@ buildOctavePackage rec { ]; meta = with lib; { - homepage = "https://octave.sourceforge.io/statistics/index.html"; + homepage = "https://packages.octave.org/statistics"; license = with licenses; [ gpl3Plus publicDomain ]; maintainers = with maintainers; [ KarlJoad ]; - description = "Additional statistics functions for Octave"; + description = "Statistics package for GNU Octave"; }; } diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 6a115732e7108..8a86295dc45cb 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,5 +1,12 @@ -{ lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang -, DBDmysql, DBI, IOSocketSSL, TermReadKey +{ + lib, + fetchFromGitHub, + buildPerlPackage, + shortenPerlShebang, + DBDmysql, + DBI, + IOSocketSSL, + TermReadKey, }: buildPerlPackage rec { @@ -17,7 +24,12 @@ buildPerlPackage rec { nativeBuildInputs = [ shortenPerlShebang ]; - buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; + buildInputs = [ + DBDmysql + DBI + IOSocketSSL + TermReadKey + ]; postInstall = '' shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) @@ -26,6 +38,7 @@ buildPerlPackage rec { meta = { description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks"; homepage = "https://www.percona.com/software/database-tools/percona-toolkit"; + changelog = "https://docs.percona.com/percona-toolkit/release_notes.html"; license = with lib.licenses; [ gpl2Only ]; maintainers = with lib.maintainers; [ izorkin ]; }; diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 042d9a3a7d7f6..f15697fbf3792 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -101,6 +101,7 @@ buildPerlPackage rec { ./Build install for f in $out/bin/*; do substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl" + substituteInPlace $f --replace "exec perl" "exec ${perl}/bin/perl" done ''; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 4916c9619c617..cba9ef9863624 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -1,14 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, LWP, LWPProtocolHttps, DataDump, JSON }: +{ + stdenv, + lib, + fetchFromGitHub, + buildPerlPackage, + shortenPerlShebang, + LWP, + LWPProtocolHttps, + DataDump, + JSON, + gitUpdater, +}: buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.7.9"; + version = "3.11.2"; src = fetchFromGitHub { - owner = "trizen"; - repo = "youtube-viewer"; - rev = version; - sha256 = "16p0sa91h0zpqdpqmy348g6b9qj5f6qrbzrljn157vk00cg6mx18"; + owner = "trizen"; + repo = "youtube-viewer"; + rev = version; + sha256 = "9Z4fv2B0AnwtYsp7h9phnRMmHtBOMObIJvK8DmKQRxs="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -22,6 +33,8 @@ buildPerlPackage rec { shortenPerlShebang $out/bin/youtube-viewer ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Lightweight application for searching and streaming videos from YouTube"; homepage = "https://github.com/trizen/youtube-viewer"; diff --git a/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/pkgs/development/perl-modules/XML-LibXML-clang16.patch deleted file mode 100644 index 9a19e32bc401f..0000000000000 --- a/pkgs/development/perl-modules/XML-LibXML-clang16.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 16 Jan 2023 18:50:10 -0800 -Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers - -This is now detected with latest clang16+ - -Fixes -error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] - xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - perl-libxml-mm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c -index a3e78a2..ec2b5ea 100644 ---- a/perl-libxml-mm.c -+++ b/perl-libxml-mm.c -@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) - extern SV* PROXY_NODE_REGISTRY_MUTEX; - - /* Utility method used by PmmDumpRegistry */ --void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) -+void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) - { - LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; - ProxyNodePtr node = (ProxyNodePtr) lp->proxy; -@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) - /* PP: originally this was static inline void, but on AIX the compiler - did not chew it, so I'm removing the inline */ - static void --PmmRegistryHashDeallocator(void *payload, xmlChar *name) -+PmmRegistryHashDeallocator(void *payload, const xmlChar *name) - { - Safefree((LocalProxyNodePtr) payload); - } -@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) - * internal, used by PmmCloneProxyNodes - */ - void * --PmmRegistryHashCopier(void *payload, xmlChar *name) -+PmmRegistryHashCopier(void *payload, const xmlChar *name) - { - ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; - LocalProxyNodePtr lp; diff --git a/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch b/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch new file mode 100644 index 0000000000000..330ea88f0d36d --- /dev/null +++ b/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch @@ -0,0 +1,145 @@ +From bee8338fd1cbd7aad4bf60c2965833343b6ead6f Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer <wellnhofer@aevum.de> +Date: Tue, 21 May 2024 15:17:30 +0200 +Subject: [PATCH] Fix test suite with libxml2 2.13.0 + +--- + t/02parse.t | 7 ++++++- + t/08findnodes.t | 8 +++++++- + t/19die_on_invalid_utf8_rt_58848.t | 2 +- + t/25relaxng.t | 4 ++-- + t/26schema.t | 4 ++-- + t/60error_prev_chain.t | 8 ++++---- + 6 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/t/02parse.t b/t/02parse.t +index b111507b..40aa5f13 100644 +--- a/t/02parse.t ++++ b/t/02parse.t +@@ -884,7 +884,12 @@ EOXML + eval { + $doc2 = $parser->parse_string( $xmldoc ); + }; +- isnt($@, '', "error parsing $xmldoc"); ++ # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b717abdd ++ if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) { ++ isnt($@, '', "error parsing $xmldoc"); ++ } else { ++ is( $doc2->documentElement()->firstChild()->nodeName(), "foo" ); ++ } + + $parser->validation(1); + +diff --git a/t/08findnodes.t b/t/08findnodes.t +index 016c85a1..e9417bc5 100644 +--- a/t/08findnodes.t ++++ b/t/08findnodes.t +@@ -123,7 +123,13 @@ my $docstring = q{ + my @ns = $root->findnodes('namespace::*'); + # TEST + +-is(scalar(@ns), 2, ' TODO : Add test name' ); ++# https://gitlab.gnome.org/GNOME/libxml2/-/commit/aca16fb3 ++# fixed xmlCopyNamespace with XML namespace. ++if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) { ++ is(scalar(@ns), 2, ' TODO : Add test name' ); ++} else { ++ is(scalar(@ns), 3, ' TODO : Add test name' ); ++} + + # bad xpaths + # TEST:$badxpath=4; +diff --git a/t/19die_on_invalid_utf8_rt_58848.t b/t/19die_on_invalid_utf8_rt_58848.t +index aa8ad105..4160cb27 100644 +--- a/t/19die_on_invalid_utf8_rt_58848.t ++++ b/t/19die_on_invalid_utf8_rt_58848.t +@@ -16,7 +16,7 @@ use XML::LibXML; + my $err = $@; + + # TEST +- like ("$err", qr{parser error : Input is not proper UTF-8}, ++ like ("$err", qr{not proper UTF-8|Invalid bytes in character encoding}, + 'Parser error.', + ); + } +diff --git a/t/25relaxng.t b/t/25relaxng.t +index 93e61883..71383b2a 100644 +--- a/t/25relaxng.t ++++ b/t/25relaxng.t +@@ -132,7 +132,7 @@ print "# 6 check that no_network => 1 works\n"; + { + my $rng = eval { XML::LibXML::RelaxNG->new( location => $netfile, no_network => 1 ) }; + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $rng, 'RNG from file location with external import and no_network => 1 is not loaded.' ); + } +@@ -152,7 +152,7 @@ print "# 6 check that no_network => 1 works\n"; + </grammar> + EOF + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $rng, 'RNG from buffer with external import and no_network => 1 is not loaded.' ); + } +diff --git a/t/26schema.t b/t/26schema.t +index 17f641e4..c404cedd 100644 +--- a/t/26schema.t ++++ b/t/26schema.t +@@ -117,7 +117,7 @@ EOF + { + my $schema = eval { XML::LibXML::Schema->new( location => $netfile, no_network => 1 ) }; + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $schema, 'Schema from file location with external import and no_network => 1 is not loaded.' ); + } +@@ -129,7 +129,7 @@ EOF + </xsd:schema> + EOF + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $schema, 'Schema from buffer with external import and no_network => 1 is not loaded.' ); + } +diff --git a/t/60error_prev_chain.t b/t/60error_prev_chain.t +index e48215c4..55ac0b2e 100644 +--- a/t/60error_prev_chain.t ++++ b/t/60error_prev_chain.t +@@ -16,13 +16,11 @@ use XML::LibXML; + + { + my $parser = XML::LibXML->new(); +- $parser->validation(0); +- $parser->load_ext_dtd(0); + + eval + { + local $^W = 0; +- $parser->parse_file('example/JBR-ALLENtrees.htm'); ++ $parser->parse_string('<doc>“ ”</doc>'); + }; + + my $err = $@; +@@ -31,7 +29,7 @@ use XML::LibXML; + if( $err && !ref($err) ) { + plan skip_all => 'The local libxml library does not support errors as objects to $@'; + } +- plan tests => 1; ++ plan tests => 2; + + while (defined($err) && $count < 200) + { +@@ -44,6 +42,8 @@ use XML::LibXML; + + # TEST + ok ((!$err), "Reached the end of the chain."); ++ # TEST ++ is ($count, 3, "Correct number of errors reported") + } + + =head1 COPYRIGHT & LICENSE diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index 662588be521ce..027c80d02c86a 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.1.1"; + version = "1.1.2"; in buildPecl { inherit version; @@ -15,7 +15,7 @@ buildPecl { owner = "nikic"; repo = "php-ast"; rev = "v${version}"; - sha256 = "sha256-ulMLufhLf9E11Z6+rVBZ14CY3ILp/NrhMjRXmrUHnBA="; + sha256 = "sha256-9HP+hKcpkWmvsx335JiCVjFG+xyAMEm5dWxWC1nZPxU="; }; meta = with lib; { diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index e638d4c470abd..2ed284fe6079b 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -2,10 +2,8 @@ lib, buildPecl, fetchFromGitHub, - writeText, libcouchbase, zlib, - php, substituteAll, }: let diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 7e646e151cf2c..6b5e7e326ec57 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -20,7 +20,7 @@ buildPecl { repo = "php-gnupg"; rev = "gnupg-${version}"; fetchSubmodules = true; - sha256 = "sha256-kEc0883sYgmAf1mkH0zRjHzUASnZgQvdYE6VzT5X2RI="; + hash = "sha256-kEc0883sYgmAf1mkH0zRjHzUASnZgQvdYE6VzT5X2RI="; }; buildInputs = [ gpgme ]; diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 86252ec028e0a..b5d89ee6a0d26 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -9,13 +9,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-nckc7LPhXuUBJJvsqWEhH37K8fKdm9hIdkmVdiM3vcc="; + hash = "sha256-Jgl/sBWgP4N4rYloaGn78T6XWF/yTYYCsSC9Q6gD6Wg="; }; internalDeps = [ diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index af95847c37bf0..bfa5b81aa1b18 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -7,13 +7,13 @@ (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject (finalAttrs: { pname = "phan"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "phan"; repo = "phan"; rev = finalAttrs.version; - hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; + hash = "sha256-9kHTDuCvh0qV6Av6uLD0t4vJO5XLL9dgRAgaREsV7zM="; }; vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index b571de2b9b728..b702ba73c5cd8 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://phpinsights.com/"; license = lib.licenses.mit; mainProgram = "phpinsights"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; }) diff --git a/pkgs/development/php-packages/phpspy/default.nix b/pkgs/development/php-packages/phpspy/default.nix index 5cc936a63dd8f..63cd23efc8f15 100644 --- a/pkgs/development/php-packages/phpspy/default.nix +++ b/pkgs/development/php-packages/phpspy/default.nix @@ -2,6 +2,10 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, + gnugrep, + binutils, + makeBinaryWrapper, php, testers, phpPackages, @@ -9,29 +13,49 @@ stdenv.mkDerivation (finalAttrs: { pname = "phpspy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "adsr"; repo = "phpspy"; rev = "v${finalAttrs.version}"; - hash = "sha256-iQOeZLHRc5yUgXc6xz52t/6oc07eZfH5ZgzSdJBcaak="; + hash = "sha256-QphoDdnSFPVRvEro0WDUC/yRsOf4I5p5BpHq32olqJI="; fetchSubmodules = true; }; - nativeBuildInputs = [ php.unwrapped ]; + patches = [ + (fetchpatch { + url = "https://github.com/adsr/phpspy/commit/8854e60ac38cfd2455d4a3d797f283eb3940cb7b.patch"; + hash = "sha256-IMO9GV0Z8PDEAVhLevg5jGh/PHcbNq3f3fMGFaKoLL4="; + }) + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + php.unwrapped + ]; env.USE_ZEND = 1; installPhase = '' runHook preInstall - mkdir -p $out/bin - cp phpspy $out/bin + install -Dt "$out/bin" phpspy stackcollapse-phpspy.pl runHook postInstall ''; + postFixup = '' + wrapProgram "$out/bin/phpspy" \ + --prefix PATH : "${ + lib.makeBinPath [ + gnugrep + # for objdump + binutils + ] + }" + ''; + passthru.tests.version = testers.testVersion { version = "v${finalAttrs.version}"; package = phpPackages.phpspy; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index cf33c98c03dad..ddddfd7a87f59 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.11.6"; + version = "1.11.8"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-WQnzw/Tjc6viReO45nkMCL1a2eooWZSB77pY3lm+6wA="; + hash = "sha256-wF2OqJ0kg+wEjSq8mAyF5em5RAqjyXqKFkdAjxOrePM="; }; - vendorHash = "sha256-KkPeFTn2j9M0CcFpj9goecJEPBYcOoU1vkbvyaj2M94="; + vendorHash = "sha256-8WJg3zfPk0tFU5GZvjnqG8iS4p9oOoBWDX0jYhQ1AXw="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index 5fa060223d02a..caab4d59335a8 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.15"; + version = "0.4.16"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-gw6wbPt1Qy0vNfT0flq7bxpnGU3SgJvPVhk8H0Imvx4="; + hash = "sha256-1HOLMbCuV1bxi4DV26QOhi93VsBF3NJymk4SMn2ze4g="; }; configureFlags = [ "--with-zlib-dir=${zlib.dev}" ]; diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix deleted file mode 100644 index 0988fab6d2389..0000000000000 --- a/pkgs/development/python-modules/aadict/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - six, - pynose, - setuptools, -}: - -buildPythonPackage rec { - pname = "aadict"; - version = "0.2.3"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-p3MorFXbtXNdqZRBhwJRvv4TX2h6twenoXhWE2OydwQ="; - }; - - build-system = [ setuptools ]; - - dependencies = [ six ]; - - nativeCheckInputs = [ pynose ]; - - pythonImportsCheck = [ "aadict" ]; - - meta = with lib; { - description = "Auto-attribute dict (and a couple of other useful dict functions)"; - homepage = "https://github.com/metagriffin/aadict"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ glittershark ]; - }; -} diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix index 9ff530afdf741..a6af83806afe6 100644 --- a/pkgs/development/python-modules/abjad/default.nix +++ b/pkgs/development/python-modules/abjad/default.nix @@ -6,8 +6,10 @@ roman, uqbar, pythonOlder, + pythonAtLeast, pytestCheckHook, lilypond, + typing-extensions, }: buildPythonPackage rec { @@ -15,7 +17,9 @@ buildPythonPackage rec { version = "3.19"; format = "setuptools"; - disabled = pythonOlder "3.10"; + # see issue upstream indicating Python 3.12 support will come + # with version 3.20: https://github.com/Abjad/abjad/issues/1574 + disabled = pythonOlder "3.10" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; @@ -26,6 +30,7 @@ buildPythonPackage rec { ply roman uqbar + typing-extensions ]; buildInputs = [ lilypond ]; @@ -34,12 +39,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace abjad/io.py \ - --replace 'lilypond_path = self.get_lilypond_path()' \ + --replace-fail 'lilypond_path = self.get_lilypond_path()' \ 'lilypond_path = "${lilypond}/bin/lilypond"' # general invocations of binary for IO purposes substituteInPlace abjad/configuration.py \ - --replace '["lilypond"' '["${lilypond}/bin/lilypond"' + --replace-fail '["lilypond"' '["${lilypond}/bin/lilypond"' # get_lilypond_version_string ''; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 9447d53ae699c..4b1bfa9109816 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Abseil Python Common Libraries"; homepage = "https://github.com/abseil/abseil-py"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index fcee1327c2a27..f6d97b8eef72c 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.31.0"; + version = "0.33.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-1iLTmSyZzOHGeAr2xBW4mebbq1FZdNfJb8blCtbSqsI="; + hash = "sha256-SYhAYz180jdOUhzbe0iUFBuGRv4n4PmgfCVOEOZKBGA="; }; buildInputs = [ llvmPackages.openmp ]; diff --git a/pkgs/development/python-modules/accessible-pygments/default.nix b/pkgs/development/python-modules/accessible-pygments/default.nix index 74bd2d1e09a04..177b3529ecc64 100644 --- a/pkgs/development/python-modules/accessible-pygments/default.nix +++ b/pkgs/development/python-modules/accessible-pygments/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Quansight-Labs/accessible-pygments"; changelog = "https://github.com/Quansight-Labs/accessible-pygments/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 5fed3a33b44da..d8ac033eca285 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-QW5+npgjrIzyI2hztFovA5s6TMzgCCEiZx9aZREmYII="; + hash = "sha256-+bA/6CW/1k9JfkXBk/JKXgOlrVHcMcKggzOAHyjdkX0="; }; build-system = [ diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index e4069863bb21a..84fe61584547a 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -3,7 +3,6 @@ blockdiag, buildPythonPackage, fetchFromGitHub, - pynose, pytestCheckHook, pythonOlder, setuptools, @@ -23,14 +22,13 @@ buildPythonPackage rec { hash = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; }; + patches = [ ./fix_test_generate.patch ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ blockdiag ]; - nativeCheckInputs = [ - pynose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "src/actdiag/tests/" ]; diff --git a/pkgs/development/python-modules/actdiag/fix_test_generate.patch b/pkgs/development/python-modules/actdiag/fix_test_generate.patch new file mode 100644 index 0000000000000..95dbf5887268d --- /dev/null +++ b/pkgs/development/python-modules/actdiag/fix_test_generate.patch @@ -0,0 +1,22 @@ +diff --git a/src/actdiag/tests/test_generate_diagram.py b/src/actdiag/tests/test_generate_diagram.py +index c5ee3d5..a74a151 100644 +--- a/src/actdiag/tests/test_generate_diagram.py ++++ b/src/actdiag/tests/test_generate_diagram.py +@@ -16,16 +16,6 @@ + import os + + from blockdiag.tests.test_generate_diagram import (get_diagram_files, +- testcase_generator) ++ test_generate_with_separate) + +-import actdiag.command + +- +-def test_generate(): +- mainfunc = actdiag.command.main +- basepath = os.path.dirname(__file__) +- files = get_diagram_files(basepath) +- options = [] +- +- for testcase in testcase_generator(basepath, mainfunc, files, options): +- yield testcase diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index b9adcf95b0e9a..2614a9925fd8c 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.71.0"; + version = "3.73.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-sgXU1m3SuEP2HIgIOKM2Sz8noLGSruzFe+zf0dA9p2A="; + hash = "sha256-IwkJityP+Hs9mkpdOu6+P3t/VasOE9Get1/6hl82+rg="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 9025dd327fb8d..bb6b018fd8490 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Python module to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index ed62a53046186..a7347c080d787 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -9,7 +9,6 @@ libusb1, mock, pyasn1, - pythonAtLeast, pycryptodome, pytestCheckHook, rsa, diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index 233d5036dc98a..334a10de460ba 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Phlya"; repo = "adjusttext"; rev = "refs/tags/v${version}"; - hash = "sha256-o/TA/br7sJAcvfIR4uA7a6XRf/enJ/x7N4ys6Of0j3g="; + hash = "sha256-2EaFKvRdFPGnDlO8owjP1vCIY1hTQ3tep5oXV/JeU9M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index e388a9b7990f2..78b55e46c0eb1 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2024.4.1"; + version = "2024.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "adlfs"; rev = "refs/tags/${version}"; - hash = "sha256-u7iQCAfJDnN8MgFZDf/rPUM94HXAr+yzsajuKtmdX4s="; + hash = "sha256-V0Uzfj9xuPfLgfILwVbtId+B81w/25cO+G1Y/KOEOyI="; }; build-system = [ diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 46942738c93a9..e5c6a38539147 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-cUvm8WJs2eW/KHIaLhQq/DYj7VIuTqxjhcwHprYIxAo="; + hash = "sha256-KsmH7QJGVf+bZ5XoT+NeScwvvyrXSTZcAwdc12nJLHI="; }; build-system = [ diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3b25cf8bdf541..7639b8ac9fdc2 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; homepage = "https://github.com/ethanfurman/aenum"; license = licenses.bsd3; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 548ad6b5e40f6..38e7f713f91cb 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; + hash = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; }; meta = with lib; { description = "Adds read support for dbf files to agate"; homepage = "https://github.com/wireservice/agate-dbf"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index aad186601b7bc..5e346cbb95077 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/wireservice/agate-excel"; changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 7d357f49ff105..5d63ef863e3d5 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Adds SQL read/write support to agate"; homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 7af42df65a528..00bbf90ffbe68 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -10,26 +10,25 @@ lxml, parsedatetime, pyicu, - pynose, + pytestCheckHook, python-slugify, pythonOlder, pytimeparse, - pytz, setuptools, }: buildPythonPackage rec { pname = "agate"; - version = "1.9.1"; + version = "1.11.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wireservice"; repo = "agate"; rev = "refs/tags/${version}"; - hash = "sha256-I7jvZA/m06kUuUcfglySaroDbJ5wbgiF2lb84EFPmpw="; + hash = "sha256-JVBf21as4DNmGT84dSG+54RIU6PbRBoLPSsWj2FGXxc="; }; build-system = [ setuptools ]; @@ -47,15 +46,10 @@ buildPythonPackage rec { cssselect glibcLocales lxml - pynose pyicu - pytz + pytestCheckHook ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests tests - ''; - pythonImportsCheck = [ "agate" ]; meta = with lib; { @@ -63,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/wireservice/agate"; changelog = "https://github.com/wireservice/agate/blob/${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aigpy/default.nix b/pkgs/development/python-modules/aigpy/default.nix index d8cadb97e1cc9..fb331e1633f4f 100644 --- a/pkgs/development/python-modules/aigpy/default.nix +++ b/pkgs/development/python-modules/aigpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w="; + hash = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 309d04eef8a67..3b65236eab6cc 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.109"; + version = "9.2.114"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-1/17bSpvhripv0wYEQnhW2Z52fFThPjl8mNPTu2DP5s="; + hash = "sha256-l/cAGUmvIscZjFzTYNb+tMUPgyDEHt6emYbGjwpuJyU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 10c311c220c9d..0cbc50b667357 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.4.1"; + version = "9.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; + hash = "sha256-Juzbn6A8IIdbtlN3cyT7UBb9fMpEgEgg0VE8GJCnGW4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 21957343c838d..27567cab2e234 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.5.3"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-HI6ZSplKS8V+lfkyx1H8wcSPbNxJNF7h5qn7s75qCtI="; + hash = "sha256-8IMEolbeXzqUHo139B9hu4FwelLZ4ENEDLHcaUjU/KE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 8184e3e31172c..4beaeb6ce2c33 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "AMQP implementation using asyncio"; homepage = "https://github.com/polyconseil/aioamqp"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix index 5de50342b3ca7..6bb210a1efa0f 100644 --- a/pkgs/development/python-modules/aioapns/default.nix +++ b/pkgs/development/python-modules/aioapns/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "3.3"; + version = "3.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lLlfrv9yHBHKqmSrs4y9NKMgGSGQQe+zVFWMht+MvGk="; + hash = "sha256-bfQpcp/oEBpFu9ywog8CFGGHR8Z5kL6l2O2nzZXaN90="; }; nativeBuildInputs = [ setuptools ]; @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Fatal1ty/aioapns"; changelog = "https://github.com/Fatal1ty/aioapns/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aioaquacell/default.nix b/pkgs/development/python-modules/aioaquacell/default.nix new file mode 100644 index 0000000000000..542dbee66733f --- /dev/null +++ b/pkgs/development/python-modules/aioaquacell/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + aiobotocore, + aiohttp, + attr, + aws-request-signer, + botocore, + requests-aws4auth, + pycognito, +}: + +buildPythonPackage rec { + pname = "aioaquacell"; + version = "0.2.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-n2kPD1t5d/nf43rB0q1hNNYdHeaBiadsFWTmu1bYN1A="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + aiobotocore + attr + aws-request-signer + botocore + requests-aws4auth + pycognito + ]; + + pythonImportsCheck = [ "aioaquacell" ]; + + doCheck = false; + + meta = { + changelog = "https://github.com/Jordi1990/aioaquacell/releases/tag/v${version}"; + description = "Asynchronous library to retrieve details of your Aquacell water softener device."; + homepage = "https://github.com/Jordi1990/aioaquacell"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index c8f6a896c9fe8..54ab5e62bcf32 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioaseko"; - version = "0.1.1"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bjPl0yrRaTIEEuPV8NbWu2hx/es5bcu2tDBZV+95fUc="; + hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 48687293d434c..1c2c67e1acb7a 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { version = "2.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "timmo001"; @@ -53,15 +53,11 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "aioazuredevops.client" - "aioazuredevops.core" - ]; + pythonImportsCheck = [ "aioazuredevops" ]; meta = with lib; { changelog = "https://github.com/timmo001/aioazuredevops/releases/tag/${version}"; description = "Get data from the Azure DevOps API"; - mainProgram = "aioazuredevops"; homepage = "https://github.com/timmo001/aioazuredevops"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index b07dda7f5171b..e75f12130994a 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, poetry-core, pyjwt, - pytest-aiohttp, pytestCheckHook, python-dateutil, pythonOlder, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = "aiobiketrax"; rev = "refs/tags/v${version}"; - hash = "sha256-6hSSPanagYKZxoyU8mp/1bWRcpJJkhNw3Rh82ogKGr4="; + hash = "sha256-N0v5SCTf3NkW/TCSTQL9VkrDj7/GXEejJGFCvJY4pIc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 5aff82034bcc3..51a73cc4ecbf0 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.8"; + version = "0.4.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "chrysn"; repo = "aiocoap"; rev = "refs/tags/${version}"; - hash = "sha256-jBRxorHr5/CgAR6WVXBUycZpJ6n1DYVFQk6kqVv8D1Q="; + hash = "sha256-sKDkbv8OyPewfQpunFxezP0wjy3EAQxsQ0UfUm0REPM="; }; build-system = [ setuptools ]; @@ -63,6 +63,8 @@ buildPythonPackage rec { [ # Communication is not properly mocked "test_uri_parser" + # Doctest + "test_001" ] ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/chrysn/aiocoap/issues/339 diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index f8a116c011e03..c79904c5d05f7 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-Fjf7mXXUnBTtPfNHHJdFx5ho4eg0N3iHCGsACa4IMjY="; + hash = "sha256-3r9DyvzqtQ88VwKCghAC9nn5kXbBzbR8drTFTnWC/bM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiofile/default.nix b/pkgs/development/python-modules/aiofile/default.nix index ecbcf73396ece..0ed8b3fa7a34c 100644 --- a/pkgs/development/python-modules/aiofile/default.nix +++ b/pkgs/development/python-modules/aiofile/default.nix @@ -7,23 +7,26 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiofile"; version = "3.8.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mosquito"; - repo = pname; + repo = "aiofile"; rev = "refs/tags/${version}"; hash = "sha256-KBly/aeHHZh7mL8MJ9gmxbqS7PmR4sedtBY/2HCXt54="; }; - propagatedBuildInputs = [ caio ]; + build-system = [ setuptools ]; + + dependencies = [ caio ]; nativeCheckInputs = [ aiomisc @@ -44,8 +47,12 @@ buildPythonPackage rec { "test_async_open_unicode" "test_async_open" "test_binary_io_wrapper" + "test_line_reader_one_line" "test_modes" + "test_open_non_existent_file_with_append" "test_text_io_wrapper" + "test_truncate" + "test_unicode_reader" "test_unicode_writer" "test_write_read_nothing" ]; diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 89906cb458143..bd448f41c8499 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Python FTP client/server for asyncio"; homepage = "https://aioftp.readthedocs.io/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 696f05f403ce2..7ff1bd6b67220 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "23.11.0"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = "aiogithubapi"; rev = "refs/tags/${version}"; - hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI="; + hash = "sha256-z7l7Qx9Kg1FZ9nM0V2NzTyi3gbE2hakbc/GZ1CzDmKw="; }; __darwinAllowLocalNetworking = true; @@ -33,24 +33,25 @@ buildPythonPackage rec { # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus substituteInPlace pyproject.toml \ - --replace 'version = "0"' 'version = "${version}"' \ - --replace 'backoff = "^1.10.0"' 'backoff = "*"' \ - --replace 'sigstore = "<2"' 'sigstore = "*"' + --replace-fail 'version = "0"' 'version = "${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout backoff - sigstore ]; + # Optional dependencies for deprecated-verify are not added + # Only sigstore < 2 is supported + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook + sigstore ]; pytestFlagsArray = [ "--asyncio-mode=auto" ]; @@ -70,7 +71,7 @@ buildPythonPackage rec { description = "Python client for the GitHub API"; homepage = "https://github.com/ludeeus/aiogithubapi"; changelog = "https://github.com/ludeeus/aiogithubapi/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 31c5b19a1ab36..a217ac383a47d 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.8.0"; + version = "3.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-lqZnebFmNNSAOv3XcWHl+gtoWO7z27Zk0O6AJ7w+HDk="; + hash = "sha256-7GTZvYyD6ypaH6PuOoh6TVboyS6nf8BFGgKvD59K6gc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index efd083022fdaa..550d1d69133e7 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiohappyeyeballs"; - version = "2.3.2"; + version = "2.3.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohappyeyeballs"; rev = "refs/tags/v${version}"; - hash = "sha256-3Lj1eUDPoVCElrxowBhhrS0GCjD5qeUCiSB/gHoqC3Q="; + hash = "sha256-yzhxO/f9s6cKt5V3/qzqg+f0+iFx7MxuqUqryAY5Xac="; }; outputs = [ diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix index 9284686d3cab1..95d1ee3d3010d 100644 --- a/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Build and document REST APIs with aiohttp and apispec"; homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/"; license = licenses.mit; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 540a96a824dde..72ae35816ecb2 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; + hash = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix index e770098d63b3a..e320648df3c71 100644 --- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/aiohttp-fast-zlib"; changelog = "https://github.com/bdraco/aiohttp-fast-zlib/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 490dea94e0379..580db1e840dd7 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix index 8f11cfb849962..f91f30c396107 100644 --- a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix +++ b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/jelmer/aiohttp-openmetrics/"; changelog = "https://github.com/jelmer/aiohttp-openmetrics/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index ac73417b348ca..568c3888af767 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { "--asyncio-mode=auto" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Set of useful tools for aiohttp.web server"; homepage = "https://github.com/wikibusiness/aiohttp-remotes"; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 39468b2116a52..6ba83412a62b6 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -14,26 +14,27 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.7.1"; + version = "4.7.2"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "aiohue"; rev = "refs/tags/${version}"; - hash = "sha256-/9kATmBNhKXt2PWB1pRdMJr+QzP23ajQK+jA8BuJ7J4="; + hash = "sha256-ZMrB09DXyjPlQ0hOSi+3aI2eSGDAFfhBDPfBsvNpaE4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail "--cov" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ awesomeversion aiohttp asyncio-throttle diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index d5e45c6525b03..a5f6c852d13f6 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix new file mode 100644 index 0000000000000..886346f92bbe1 --- /dev/null +++ b/pkgs/development/python-modules/aiojellyfin/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + aiohttp, + mashumaro, + + # tests + pytestCheckHook, + pytest-aiohttp, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "aiojellyfin"; + version = "0.10.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Jc2k"; + repo = "aiojellyfin"; + rev = "v${version}"; + hash = "sha256-D4/DlhCeeI4CggW7KGauZ57fHY92JM/kZSUODyNVcNg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + mashumaro + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-aiohttp + pytest-cov-stub + ]; + + pythonImportsCheck = [ "aiojellyfin" ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Jc2k/aiojellyfin"; + changelog = "https://github.com/Jc2k/aiojellyfin/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index a2d012e2a6505..437e5a3ce0ce7 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, fetchpatch, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -32,11 +33,6 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov=aiojobs/ --cov=tests/ --cov-report term" "" - ''; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; @@ -48,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-aiohttp + pytest-cov-stub ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index 347a4a5f78a3d..d1d208b5f6d57 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "https://aiokafka.readthedocs.org"; changelog = "https://github.com/aio-libs/aiokafka/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 8f30f735364b5..cfad7ea83e964 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -8,12 +8,11 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - typer, }: buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.18"; + version = "0.4.27"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-6oV6pyVwSS6sYrTokcJ/1KBkuv7EHNr+2bJ5ujengTY="; + hash = "sha256-5wUyp1g1O0Ar+2sE+/XSi7l9CmvGLgT1b0IWI4bnTbg="; }; prePatch = '' diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index c9c518a57d3b3..c4421a071f5af 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.4"; + version = "1.0.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8EjmzidcxIOoH+88pEUuSJmbpU34B8dgz9csvlQf8Ks="; + hash = "sha256-DA949hZogSY3KkLSeILvB5Ay6rXZoLe8ndbOtagTtvM="; }; build-system = [ setuptools ]; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module for local communication with LIFX devices over a LAN"; - homepage = "https://github.com/frawau/aiolifx"; - changelog = "https://github.com/frawau/aiolifx/releases/tag/${version}"; + homepage = "https://github.com/aiolifx/aiolifx"; + changelog = "https://github.com/aiolifx/aiolifx/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ netixx ]; mainProgram = "aiolifx"; diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix index a432f5ec35340..4f7e703b3d599 100644 --- a/pkgs/development/python-modules/aiolivisi/default.nix +++ b/pkgs/development/python-modules/aiolivisi/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, pydantic, - pytestCheckHook, pythonOlder, websockets, }: diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index 0f4488317ba87..b2f4f98365598 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.5.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-pchGl3bkbW2bOQenYoSb0NmDvJqsYYuHHd4oUA9aTFo="; + hash = "sha256-/Hg0kcwUNaEsm8znOOkWd0oOu0ikK5LAYGKbP2pvHhQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 0a7e40e46ed9a..2b641a1af2e61 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.5.24"; + version = "17.5.25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9/7QI9z5dYADNRIWBelrUoNe/LaHqpb/Ch4e1Z9I1s4="; + hash = "sha256-qxvisqvsDdhdFut9kvbmcjXAcTw7QpYruGk8zyQcg9M="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index 6e074397fac85..69963a4650608 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/sbtinstruments/aiomqtt"; changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix deleted file mode 100644 index f23adad066628..0000000000000 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - aiofiles, - asyncio-mqtt, - awesomeversion, - buildPythonPackage, - click, - fetchFromGitHub, - marshmallow, - poetry-core, - pyserial-asyncio, - pytest-asyncio, - pytestCheckHook, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "aiomysensors"; - version = "0.3.16"; - pyproject = true; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "MartinHjelmare"; - repo = "aiomysensors"; - rev = "refs/tags/v${version}"; - hash = "sha256-1BpmjCgKiCZmBpBENlg79+I3UhkIxrgLAUD8ixpGUM8="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" - ''; - - build-system = [ poetry-core ]; - - dependencies = [ - aiofiles - asyncio-mqtt - awesomeversion - click - marshmallow - pyserial-asyncio - ]; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; - - pythonImportsCheck = [ "aiomysensors" ]; - - meta = with lib; { - description = "Library to connect to MySensors gateways"; - homepage = "https://github.com/MartinHjelmare/aiomysensors"; - changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - mainProgram = "aiomysensors"; - }; -} diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 093b6f0b96d3e..62abc53330da5 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "MySQL driver for asyncio"; homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 645bbc39c14c8..50336dddb6878 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -13,7 +13,7 @@ pytest-aiohttp, pytest-asyncio, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pythonOlder, yarl, }: @@ -50,7 +50,7 @@ buildPythonPackage rec { aresponses pytest-aiohttp pytest-asyncio - pytest-cov + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 7d3f698129ef5..2f32df9c72b91 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -2,34 +2,30 @@ lib, aiohttp, aioresponses, - pydantic, buildPythonPackage, fetchFromGitHub, + mashumaro, poetry-core, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.13"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-xVEyBE33gncw1h0/T7UJap8jd2KELBHSIlNE13YfIZA="; + hash = "sha256-XvpSHxPCsfxgHdPVf8NGKPpCYbeZhVLwRtj6koAt/Rk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" - ''; - pythonRelaxDeps = [ "pydantic" ]; build-system = [ poetry-core ]; @@ -37,12 +33,13 @@ buildPythonPackage rec { dependencies = [ aiohttp - pydantic + mashumaro ]; nativeCheckInputs = [ aioresponses pytest-aiohttp + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index b936ef7387161..0ec8f1697ca35 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, setuptools, wheel, diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix index e4649a8d8eadd..1d48f37e930cf 100644 --- a/pkgs/development/python-modules/aioraven/default.nix +++ b/pkgs/development/python-modules/aioraven/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioraven"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cottsay"; repo = "aioraven"; rev = "refs/tags/${version}"; - hash = "sha256-RU2DRDjxl0EVmnNLADawEB/x6Zc3/IWH015xig5AIJY="; + hash = "sha256-ux2jeXkh8YsJ6mItXOx40pp0Tc+aJXMV7ZqyZg+iy2c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index a770b6e5f3abe..7df3f61027a8a 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; + hash = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 4498c27080c38..1dcc44c1d408d 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.14"; + version = "0.8.17"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-x/QTmFNPnazyAmJQ9zLzAFB9V3NUwDeTJdrJqQ54jGE="; + hash = "sha256-iZYzERIJslbvmW+4yeHQvXt1EEyZcSR6+qYdpo9EmAg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 318411ae9a5dd..26d02803c4d77 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/cjrh/aiorun"; changelog = "https://github.com/cjrh/aiorun/blob/v${version}/CHANGES"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index 1a1de43c08866..f5033ae3431e5 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -3,7 +3,6 @@ fetchPypi, lib, pytest-asyncio, - pytest-cov, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix index 48a5ca3d1025a..430c5ba68d63b 100644 --- a/pkgs/development/python-modules/aiosenz/default.nix +++ b/pkgs/development/python-modules/aiosenz/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, httpx, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 819eb840fa0d1..ffb496df6973c 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "11.0.0"; + version = "11.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; rev = "refs/tags/${version}"; - hash = "sha256-158b4lsxebtLXXsPhzbkXP9ioPlFIsJcS5G5eDqFY98="; + hash = "sha256-uCvwqGsQuiFRhpEj9mIBNE8JsG/3uvMptzOXOwUhY3o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index 1aeccdce9fe9c..aae881ce671dd 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioshutil"; - version = "1.4"; + version = "1.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kumaraditya303"; repo = "aioshutil"; rev = "refs/tags/v${version}"; - hash = "sha256-OGxD7GusRcHpz7FdUpa/dJ6/jIAVexbTvXfouVw0C+I="; + hash = "sha256-hSUNx43sIUPs4YfQ+H39FXTpj3oCMUqRzDdHX2OdRdE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index dfecf0b966af3..ff9cb38cd6bac 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -9,6 +9,10 @@ pythonOlder, setuptools, typing-extensions, + + # for passthru.tests + django, + aiosmtplib, }: buildPythonPackage rec { @@ -49,6 +53,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosmtpd" ]; + passthru.tests = { + inherit django aiosmtplib; + }; + meta = with lib; { description = "Asyncio based SMTP server"; mainProgram = "aiosmtpd"; diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index fa8822675a22a..59e0fc5bd5971 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, hypothesis, - poetry-core, + hatchling, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -13,8 +13,8 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "3.0.1"; - format = "pyproject"; + version = "3.0.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,10 +22,10 @@ buildPythonPackage rec { owner = "cole"; repo = "aiosmtplib"; rev = "refs/tags/v${version}"; - hash = "sha256-67Z+k+PBIGP2oGb/52dMtsapUsHufvFcX+wWiMj5Jsg="; + hash = "sha256-1GuxlgNvzVv6hEQY1Mkv7NxAoOik9gpIS90a6flfC+k="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; nativeCheckInputs = [ aiosmtpd diff --git a/pkgs/development/python-modules/aiosolaredge/default.nix b/pkgs/development/python-modules/aiosolaredge/default.nix new file mode 100644 index 0000000000000..b05f1b84cc6ea --- /dev/null +++ b/pkgs/development/python-modules/aiosolaredge/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + yarl, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "aiosolaredge"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiosolaredge"; + rev = "refs/tags/v${version}"; + hash = "sha256-1C74U5HWDTJum1XES21t1uIJwm0YW3l041mwvqY/dA4="; + }; + + postPatch = '' + sed -i "/^addopts/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + yarl + ]; + + pythonImportsCheck = [ "aiosolaredge" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/bdraco/aiosolaredge/blob/${src.rev}/CHANGELOG.md"; + description = "Asyncio SolarEdge API client"; + homepage = "https://github.com/bdraco/aiosolaredge"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 3bad4e1870703..4fdd1c6a67b73 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/jreese/aiosqlite"; changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 98b2d3902fa41..e6f7900a0b934 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aiostream"; rev = "refs/tags/v${version}"; - hash = "sha256-RJ+0o8w92GteMRPOIddCBQ4JApi5gXiwkJRNe9t2E7g="; + hash = "sha256-uMK3WFO4IvrI7QBGiu1MOInRfGgdWufe4zefmT1Bjv0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 41b58f12fbd33..b9c3534c36d62 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { homepage = "https://github.com/Kane610/aiounifi"; changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "aiounifi"; }; } diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index beae5db296abf..e715d99833f8d 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, setuptools, - pynose, - coverage, + pytestCheckHook, wrapt, }: @@ -25,14 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wrapt ]; - nativeCheckInputs = [ - pynose - coverage - ]; - - checkPhase = '' - nosetests -e test_specific_test - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "aiounittest" ]; diff --git a/pkgs/development/python-modules/aioweenect/default.nix b/pkgs/development/python-modules/aioweenect/default.nix index 43083f319ba17..f49533da9de27 100644 --- a/pkgs/development/python-modules/aioweenect/default.nix +++ b/pkgs/development/python-modules/aioweenect/default.nix @@ -4,7 +4,8 @@ aresponses, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, + httpx, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -12,26 +13,31 @@ buildPythonPackage rec { pname = "aioweenect"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "eifinger"; - repo = pname; + repo = "aioweenect"; rev = "refs/tags/v${version}"; - hash = "sha256-9CYdOUPCt4TkepVuVJHMZngFHyCLFwVvik1xDnfneEc="; + hash = "sha256-qVhF+gy5qcH/okuncDuzbAUPonkmQo1/QwOjC70IV4w="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov --cov-report term-missing --cov-report xml --cov=aioweenect tests" "" + --replace-fail "--cov --cov-report term-missing --cov=src/aioweenect --asyncio-mode=auto" "" ''; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "aiohttp" ]; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + httpx + ]; nativeCheckInputs = [ aresponses @@ -44,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the weenect API"; homepage = "https://github.com/eifinger/aioweenect"; + changelog = "https://github.com/eifinger/aioweenect/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix index ad4db4e062ab1..8567f23ee0977 100644 --- a/pkgs/development/python-modules/aioymaps/default.nix +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -4,21 +4,24 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aioymaps"; - version = "1.2.4"; - format = "setuptools"; + version = "1.2.5"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-btBeYP+/ntWpWm5O6ERkRJlhpV8tLe9lrFLYOEB55cY="; + hash = "sha256-tEl2tX/mB8uYTYj1YFDs/2sPXiv6897jCEmsFCWBXYg="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix new file mode 100644 index 0000000000000..02a642b98beef --- /dev/null +++ b/pkgs/development/python-modules/airgradient/default.nix @@ -0,0 +1,61 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + syrupy, + yarl, +}: + +buildPythonPackage rec { + pname = "airgradient"; + version = "0.7.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "airgradienthq"; + repo = "python-airgradient"; + rev = "refs/tags/v${version}"; + hash = "sha256-EFt2V+r7RLiFMihFCCBU9iEPcbSybK6gP+uxed+mIeo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ "airgradient" ]; + + meta = with lib; { + description = "Module for AirGradient"; + homepage = "https://github.com/airgradienthq/python-airgradient"; + changelog = "https://github.com/airgradienthq/python-airgradient/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 555f919c0493b..335c10e103b31 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "albucore"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "albumentations-team"; repo = "albucore"; rev = "refs/tags/${version}"; - hash = "sha256-TJTIIshMUcHTGSo0lRA3hVkqMqKsfj0EuiV+SSsP5Q4="; + hash = "sha256-TqEOey6PxVesk1Xs9YvnFto8LrSVsfTMq+MqP/mwYCA="; }; pythonRemoveDeps = [ "opencv-python" ]; diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index 570f6aedfcd0a..a7bc2d5251401 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -16,8 +16,6 @@ pyyaml, scikit-image, scikit-learn, - scipy, - typing-extensions, deepdiff, pytestCheckHook, diff --git a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch b/pkgs/development/python-modules/ale-py/cmake-pybind11.patch deleted file mode 100644 index 5bcf5b1d9b2f4..0000000000000 --- a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 911e280..d484943 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -1,12 +1,6 @@ - find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED) - --include(FetchContent) --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11 -- GIT_TAG v2.10.0) --FetchContent_MakeAvailable(pybind11) -- -+find_package(pybind11 REQUIRED) - add_library(ale-py MODULE ale_python_interface.cpp) - # Depend on the ALE and pybind11 module - target_link_libraries(ale-py PUBLIC ale ale-lib) diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 14c3e7b939a6e..cdf2363a52f13 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -3,25 +3,34 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system cmake, ninja, pybind11, setuptools, wheel, + + # buildInputs SDL2, zlib, + + # dependencies importlib-resources, numpy, typing-extensions, importlib-metadata, + + # checks gymnasium, pytestCheckHook, + stdenv, }: buildPythonPackage rec { pname = "ale-py"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,14 +39,9 @@ buildPythonPackage rec { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; - hash = "sha256-obZfNQ0+ppnq/BD4IFeMFAqJnCVV3X/2HeRwbdSKRFk="; + hash = "sha256-MpumAQ5OW/+fRIvrBlRWkgioxMVceb5LxEH2JjRk5zY="; }; - patches = [ - # don't download pybind11, use local pybind11 - ./cmake-pybind11.patch - ]; - build-system = [ cmake ninja @@ -57,10 +61,16 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; + postPatch = + # Relax the pybind11 version + '' + substituteInPlace src/python/CMakeLists.txt \ + --replace-fail 'find_package(pybind11 ''${PYBIND11_VER} QUIET)' 'find_package(pybind11 QUIET)' + '' + + '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 039f03baacfbb..4d41cc11a6369 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "Database migration tool for SQLAlchemy"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "alembic"; }; } diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index af10ae03468e8..7ff595cb8b33f 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "alexapy"; - version = "1.27.10"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "keatontaylor"; repo = "alexapy"; rev = "refs/tags/v${version}"; - hash = "sha256-eoL7q+p0m3YZd7Ub7U8nE3tQGNA2oQXelvN+H01b0BM="; + hash = "sha256-sRTK3qaIiYxz9Z+LT2pFjqKXBHyr3EkSD4dtc+KXFQw="; }; pythonRelaxDeps = [ "aiofiles" ]; diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index b68fc39bc137c..3e39efa7d3843 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "alpha-vantage"; - version = "2.3.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,10 +22,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "RomelTorres"; repo = "alpha_vantage"; - rev = "refs/tags/${version}"; - hash = "sha256-DWnaLjnbAHhpe8aGUN7JaXEYC0ivWlizOSAfdvg33DM="; + rev = "refs/tags/v${version}"; + hash = "sha256-Ae9WqEsAjJcD62NZOPh6a49g1wY4KMswzixDAZEtWkw="; }; + postPatch = '' + # Files are only linked + rm alpha_vantage/async_support/* + cp alpha_vantage/{cryptocurrencies.py,foreignexchange.py,techindicators.py,timeseries.py} alpha_vantage/async_support/ + ''; + build-system = [ setuptools ]; dependencies = [ @@ -33,14 +39,19 @@ buildPythonPackage rec { requests ]; + passthru.optional-dependencies = { + pandas = [ + pandas + ]; + }; + nativeCheckInputs = [ aioresponses requests-mock - pandas pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # https://github.com/RomelTorres/alpha_vantage/issues/344 + # Starting with 3.0.0 most tests require an API key doCheck = false; pythonImportsCheck = [ "alpha_vantage" ]; diff --git a/pkgs/development/python-modules/altgraph/default.nix b/pkgs/development/python-modules/altgraph/default.nix index e45be70d4a08f..932896f1beea1 100644 --- a/pkgs/development/python-modules/altgraph/default.nix +++ b/pkgs/development/python-modules/altgraph/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools }: buildPythonPackage rec { @@ -12,9 +13,15 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; + hash = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; }; + dependencies = [ + # setuptools in dependencies is intentional + # https://github.com/ronaldoussoren/altgraph/issues/21 + setuptools + ]; + pythonImportsCheck = [ "altgraph" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 0bf6d2515ef26..2490deb1dbba4 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.0"; + version = "0.5.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-+EV2NgYSuCbYTQKeBUN+/D0attfrJ3cso7U6RjLEIbg="; + hash = "sha256-76wuxWz6RikFFJH+5kte57GcVhusJKtcMo5M/2U+Cl8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ambee/default.nix b/pkgs/development/python-modules/ambee/default.nix index ddd0b4e747eef..45dbce4ff1d4f 100644 --- a/pkgs/development/python-modules/ambee/default.nix +++ b/pkgs/development/python-modules/ambee/default.nix @@ -8,6 +8,7 @@ yarl, aresponses, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, }: @@ -34,14 +35,14 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace "0.0.0" "${version}" ''; pythonImportsCheck = [ "ambee" ]; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 8adda06c48c9e..c983669f85ddf 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - case, fetchPypi, pytestCheckHook, pytest-rerunfailures, @@ -26,7 +25,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - case pytestCheckHook pytest-rerunfailures ]; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index cc1789963e617..c5a4300736ee8 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, future, networkx, pygments, @@ -12,11 +13,9 @@ click, pydot, ipython, - packaging, pyqt5, pyperclip, - nose, - nose-timer, + pytestCheckHook, mock, python-magic, codecov, @@ -25,15 +24,16 @@ # This is usually used as a library, and it'd be a shame to force the GUI # libraries to the closure if GUI is not desired. withGui ? false, - # Tests take a very long time, and currently fail, but next release' tests - # shouldn't fail - doCheck ? false, + # Deprecated in 24.11. + doCheck ? true, }: +assert lib.warnIf (!doCheck) "python3Packages.androguard: doCheck is deprecated" true; + buildPythonPackage rec { pname = "androguard"; version = "3.4.0a1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { repo = pname; @@ -42,9 +42,16 @@ buildPythonPackage rec { sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy"; }; - nativeBuildInputs = [ packaging ] ++ lib.optionals withGui [ qt5.wrapQtAppsHook ]; + patches = [ + ./drop-removed-networkx-formats.patch + ./fix-tests.patch + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = + nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ]; + + dependencies = [ asn1crypto click @@ -57,29 +64,25 @@ buildPythonPackage rec { pydot pygments ] + ++ networkx.optional-dependencies.default + ++ networkx.optional-dependencies.extra ++ lib.optionals withGui [ pyqt5 pyperclip ]; nativeCheckInputs = [ + pytestCheckHook codecov coverage mock - nose - nose-timer pyperclip pyqt5 python-magic ]; - inherit doCheck; # If it won't be verbose, you'll see nothing going on for a long time. - checkPhase = '' - runHook preCheck - nosetests --verbosity=3 - runHook postCheck - ''; + pytestFlagsArray = [ "--verbose" ]; preFixup = lib.optionalString withGui '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch b/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch new file mode 100644 index 0000000000000..214fbaa2dafd4 --- /dev/null +++ b/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch @@ -0,0 +1,14 @@ +diff --git a/androguard/cli/main.py b/androguard/cli/main.py +index 13bc1d0ab7..a79b4fe5fa 100644 +--- a/androguard/cli/main.py ++++ b/androguard/cli/main.py +@@ -110,9 +110,7 @@ + + write_methods = dict(gml=_write_gml, + gexf=nx.write_gexf, +- gpickle=nx.write_gpickle, + graphml=nx.write_graphml, +- yaml=nx.write_yaml, + net=nx.write_pajek, + ) + diff --git a/pkgs/development/python-modules/androguard/fix-tests.patch b/pkgs/development/python-modules/androguard/fix-tests.patch new file mode 100644 index 0000000000000..b971b46c62445 --- /dev/null +++ b/pkgs/development/python-modules/androguard/fix-tests.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_types.py b/tests/test_types.py +index 127dfc20eb..f1c89f0712 100644 +--- a/tests/test_types.py ++++ b/tests/test_types.py +@@ -182,7 +182,7 @@ + for i in filter(lambda x: 'const' in x.get_name(), method.get_instructions()): + i.show(0) + # ins should only have one literal +- self.assertEquals(len(i.get_literals()), 1) ++ self.assertEqual(len(i.get_literals()), 1) + + fmt, value = VALUES[method.full_name].pop(0) + converted = format_value(i.get_literals()[0], i, fmt) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 41bf3abe2ee09..f08136d84c037 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.109"; + version = "9.2.114"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-hvWE812Gu63vTfDlOY80GuUMAS2jZDSxLs4EP0eSbQE="; + hash = "sha256-Juv1/N/QdV99P1QupXU+OTl2ycT0SNrQF3PfDvQjb3Y="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 255896d30982a..f871df2fbcedf 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, h5py, numpy, - pynose, + pytestCheckHook, pythonOlder, setuptools, }: @@ -16,9 +16,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-nL/r7+Cl+EPropxr5MhNYB9PQa1N7QSG8biMOwdznBU="; + src = fetchFromGitHub { + owner = "spotify"; + repo = "annoy"; + rev = "refs/tags/v${version}"; + hash = "sha256-oJHW4lULRun2in35pBGOKg44s5kgLH2BKiMOzVu4rf4="; }; postPatch = '' @@ -32,7 +34,16 @@ buildPythonPackage rec { nativeCheckInputs = [ numpy - pynose + pytestCheckHook + ]; + + preCheck = '' + rm -rf annoy + ''; + + disabledTestPaths = [ + # network access + "test/accuracy_test.py" ]; pythonImportsCheck = [ "annoy" ]; diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index b4aa2652bf0a6..6982aa47b297f 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, }: @@ -20,12 +21,10 @@ buildPythonPackage rec { sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=anonip --cov-report=term-missing --no-cov-on-fail" "" - ''; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pytestFlagsArray = [ "tests.py" ]; diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index cc44869c135ef..500abc063035a 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.15.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-GtUONwlY7JVImE7KiBGCa7DsQLw1agGdemmTczpXBU8="; + hash = "sha256-F/bd5BtHpF3778eoK0QBaSmdTOpLlz+fixCYR74BRZw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 493204c867382..e37247afee9ed 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "24.6.1"; + version = "24.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ansible_compat"; inherit version; - hash = "sha256-+T1MNH2OGQPCkkSUQcCamH1wNm+crfmv5eMtyKAZPKw="; + hash = "sha256-e8egwgpQWh62/5h3Bx/iAzATBCkIfaKY4lCZoU9w0C8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-navigator/default.nix b/pkgs/development/python-modules/ansible-navigator/default.nix deleted file mode 100644 index 5d767a4fab437..0000000000000 --- a/pkgs/development/python-modules/ansible-navigator/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - pkgs, - python3Packages, - podman, - oniguruma, - fetchPypi, - buildPythonPackage, -}: -buildPythonPackage rec { - pname = "ansible-navigator"; - version = "24.3.2"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-IAcZFisB3BOmdxZuGZ3PZcDl2CXsg6ToI/1fdPpkIXw="; - }; - - buildInputs = with python3Packages; [ - setuptools - setuptools-scm - ]; - - propagatedBuildInputs = with python3Packages; [ - ansible-builder - ansible-runner - podman - pkgs.ansible-lint - jinja2 - jsonschema - tzdata - onigurumacffi - ]; - - patchPhase = '' - # scm_git_archive doesn't exist anymore. Fixed upstream but unreleased - # Rev: https://github.com/ansible/ansible-navigator/pull/1716 - sed -i '/setuptools_scm_git_archive/d' pyproject.toml - ''; - - meta = with lib; { - description = "Text-based user interface (TUI) for Ansible"; - homepage = "https://ansible.readthedocs.io/projects/navigator/"; - license = licenses.asl20; - maintainers = with maintainers; [ melkor333 ]; - }; -} diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 0c6ed904a4541..746877f57e2ef 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -98,6 +98,6 @@ buildPythonPackage rec { mainProgram = "ansible-runner"; homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 8caf7e1e6274c..9a83bfebd7544 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -95,6 +95,6 @@ buildPythonPackage rec { description = "Radically simple IT automation"; homepage = "https://www.ansible.com"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 2dd2567589f24..cf484c1f07b34 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -89,6 +89,6 @@ buildPythonPackage { homepage = "https://www.ansible.com"; changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 95f78fcec2391..83f3b3207e713 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Library to produce ansi color output and colored highlighting and diffing"; homepage = "https://github.com/numerodix/ansicolor/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ansimarkup/default.nix b/pkgs/development/python-modules/ansimarkup/default.nix index 2f0a1f8501035..8be72615a24a6 100644 --- a/pkgs/development/python-modules/ansimarkup/default.nix +++ b/pkgs/development/python-modules/ansimarkup/default.nix @@ -2,23 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, colorama, }: buildPythonPackage rec { pname = "ansimarkup"; - version = "1.5.0"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "gvalkov"; repo = "python-ansimarkup"; - rev = "v${version}"; - hash = "sha256-HGeVapv2Z5GtPwSp3+dvUwAH0bFqu+Bmk5E6SRr7NO4="; + rev = "refs/tags/v${version}"; + hash = "sha256-+kZt8tv09RHrMRZtvJPBBiFaeCksXyrlHqIabPrXYDY="; }; - propagatedBuildInputs = [ colorama ]; + build-system = [ setuptools ]; + + dependencies = [ colorama ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix new file mode 100644 index 0000000000000..3f0ecc839a9ba --- /dev/null +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + colored, + pytestCheckHook, + numpy, +}: + +buildPythonPackage rec { + pname = "ansitable"; + version = "0.10.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ehPPpZ9C/Nrly9WoJJfZtv2YfZ9MEcQsKtuxNpcJe7U="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ colored ]; + + pythonImportsCheck = [ "ansitable" ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; + + meta = with lib; { + description = "Quick and easy display of tabular data and matrices with optional ANSI color and borders"; + homepage = "https://pypi.org/project/ansitable/"; + license = licenses.mit; + maintainers = with maintainers; [ + djacu + a-camarillo + ]; + }; +} diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index c80d24d1c9b63..f45f8c0ccaf05 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/jonathaneunice/ansiwrap"; changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index ad79271688f61..1cdc8595e296f 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.28.1"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-n5Vmi2frUdSbrmulopwUlIO+blkf7cANoKTaTFZQdjw="; + hash = "sha256-en2vaHI+fE4Jrh91EtFyWRBr+k6KVPanwiOXkZBi3Ts="; }; build-system = [ @@ -71,6 +71,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Test require network access "tests/api_resources" + "tests/lib/test_bedrock.py" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index 3a6c506f6b11b..b9fe52c10b857 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, aocd-example-parser, beautifulsoup4, buildPythonPackage, diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index e3cf3a0c7757a..60a34a3e03958 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Namespace control and lazy-import mechanism"; homepage = "https://github.com/pytest-dev/apipkg"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index f64100ce676d9..2ca9be416c8f5 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,7 +11,6 @@ pytestCheckHook, pythonOlder, pyyaml, - setuptools, }: buildPythonPackage rec { @@ -51,6 +50,6 @@ buildPythonPackage rec { description = "Pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 95bffbe4854bd..3481b3e3c1c38 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.2.4"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "erev0s"; repo = "apkInspector"; rev = "refs/tags/v${version}"; - hash = "sha256-WVqaRWOLo8/Xav+AtaxE3EKR9lZe+Z+ep/K88FGbASg="; + hash = "sha256-frcggMsDpPfIqL0J7FNOht+aXeg79xnZryZZwI4wWGw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index f786f70b0c8a1..af4e8cfec72de 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { hash = "sha256-KCdmBwQWt7IfHsjq7pWlbSISEpfQZDyt+SQSTDaUCV4="; }; - # Fix build with Astropy 6 and Python 3.12. + # Fix build with Astropy 6.1, Python 3.12 and matplotlib 3.9 patches = [ # https://github.com/aplpy/aplpy/pull/496 (fetchpatch { @@ -45,6 +45,16 @@ buildPythonPackage rec { url = "https://github.com/aplpy/aplpy/commit/468be394970b39f1aaa6debef51eb674e2dd86d8.patch"; hash = "sha256-/ovLrFOKb3RQ8TZSviuOV6EYNgz0gtrhVWZLFJBrzFg="; }) + # https://github.com/aplpy/aplpy/pull/500 + (fetchpatch { + url = "https://github.com/aplpy/aplpy/commit/c9049261b3724821f4d309d85fe73cabcc04d890.patch"; + hash = "sha256-ivdXLh1Z+WG3EL5u1wO+lqz6X1AP6WpyoZix5YiqW0w="; + }) + # https://github.com/aplpy/aplpy/pull/503 + (fetchpatch { + url = "https://github.com/aplpy/aplpy/commit/edc2aa9770b72bd3ac42db95a6e027b276be9c31.patch"; + hash = "sha256-QUZenY3XQ/T2tl5apxZUqjf4ACjOzJWb+1AUp5limi4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index bf2130e224176..da4854d547b00 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.7"; + version = "0.2.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-ISMSt7c8CoxffMhg7XC/ebKkgXFTBihDr1fGkqMCBoc="; + hash = "sha256-vGSFo2ZckIDI3TjBSTKZagTEYdILt1/5Wyws3P7FNiQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index b199051111370..a4329ff4dc70b 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "This project extends the Application Insights API surface to support Python"; homepage = "https://github.com/Microsoft/ApplicationInsights-Python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index e079703d17a0c..657537bbc5689 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,5 +1,6 @@ { lib, + apprise, babel, buildPythonPackage, click, @@ -17,18 +18,19 @@ requests, requests-oauthlib, setuptools, + testers, }: buildPythonPackage rec { pname = "apprise"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6PWM6/6ho09WnLTGiAmjF1voDsBvCi7Ec1IrkgIyEsU="; + hash = "sha256-CKIP5yZyt+kPeWnVuHnWV8Li2zhaiowQ9Uy6VlvyN/I="; }; nativeBuildInputs = [ installShellFiles ]; @@ -60,13 +62,19 @@ buildPythonPackage rec { # Nondeterministic. Fails with `assert 0 == 1` "test_notify_emoji_general" "test_plugin_mqtt_general" + # Nondeterministic. Fails with `assert 3 == 2` + "test_plugin_matrix_transaction_ids_api_v3" # Nondeterministic. Fails with `AssertionError` "test_plugin_xbmc_kodi_urls" + # Nondeterministic. Fails with `AssertionError` + "test_plugin_zulip_urls" ]; disabledTestPaths = [ # AttributeError: module 'apprise.plugins' has no attribute 'NotifyBulkSMS' "test/test_plugin_bulksms.py" + # Nondeterministic. Multiple tests will fail with `AssertionError` + "test/test_plugin_workflows.py" ]; postInstall = '' @@ -75,12 +83,19 @@ buildPythonPackage rec { pythonImportsCheck = [ "apprise" ]; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { + package = apprise; + version = "v${version}"; + }; + }; + + meta = { description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; changelog = "https://github.com/caronc/apprise/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ getchoo ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "apprise"; }; } diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b1fa512928c39..2b3ed4f45c196 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "12.2.1"; + version = "14.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-Hd0cEAL5RGmAhob1oZwOVC+eXOxc9OTeUnrTTNCpL2E="; + hash = "sha256-BTTmmtmFjYBfzbVf/Fi8PwnpVJBcOOBTdFBmGowGez4="; }; build-system = [ setuptools ]; @@ -70,6 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/approvals/ApprovalTests.Python"; changelog = "https://github.com/approvals/ApprovalTests.Python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 60360301a09bb..8540a8f39c4bd 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -2,11 +2,13 @@ lib, buildPythonPackage, configobj, - fetchPypi, - importlib-resources, + fetchFromGitHub, + numpy, pandas, + pyface, pytestCheckHook, pythonOlder, + setuptools, tables, traits, traitsui, @@ -14,27 +16,37 @@ buildPythonPackage rec { pname = "apptools"; - version = "5.2.1"; - format = "setuptools"; + version = "5.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-xiaPXfzzCIvK92oAA+ULd3TQG1JY1xmbQQtIUv8iRuM="; + src = fetchFromGitHub { + owner = "enthought"; + repo = "apptools"; + rev = "refs/tags/${version}"; + hash = "sha256-qNtDHmvl5HbtdbjnugVM7CKVCW+ysAwRB9e2Ounh808="; }; - propagatedBuildInputs = [ - configobj - traits - traitsui - ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - - nativeCheckInputs = [ - tables - pandas - pytestCheckHook - ]; + build-system = [ setuptools ]; + + dependencies = [ traits ]; + + optional-dependencies = { + gui = [ + pyface + traitsui + ]; + h5 = [ + numpy + pandas + tables + ]; + persistence = [ numpy ]; + preferences = [ configobj ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME=$TMP diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix index f05e9b8e5e95f..254c14527c5ae 100644 --- a/pkgs/development/python-modules/apricot-select/default.nix +++ b/pkgs/development/python-modules/apricot-select/default.nix @@ -5,7 +5,7 @@ apricot-select, numba, numpy, - pynose, + nose, pytestCheckHook, pythonOlder, scikit-learn, @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pynose + nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index 6d038d28ec3e5..d409a535b4632 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { description = "Library that lets you schedule your Python code to be executed"; homepage = "https://github.com/agronholm/apscheduler"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix new file mode 100644 index 0000000000000..d5005a1d1ca33 --- /dev/null +++ b/pkgs/development/python-modules/apsystems-ez1/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + aiohttp, + poetry-core, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "apsystems-ez1"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SonnenladenGmbH"; + repo = "APsystems-EZ1-API"; + rev = "refs/tags/${version}"; + hash = "sha256-V6GcTSupjhjGEOsO+C9pImYJRnvdDbttW3Zh0PDYt5I="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "APsystemsEZ1" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = { + changelog = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API/releases/tag/${version}"; + description = "Streamlined interface for interacting with the local API of APsystems EZ1 Microinverters."; + homepage = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 222a2a4567dd4..e8f8dcae4990f 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.109"; + version = "9.2.114"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-hyUzJO8e2XMkz91wBt9PP0dx1uVDlX2KDBkT5v/M1YQ="; + hash = "sha256-Ov7jEV4avhdslf6K36lSQpz/bA+riYUKGVtnd3ChXPI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index f5d268fcf2bf2..5c8c98177b694 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -4,38 +4,34 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pytest, pytest-asyncio, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "aresponses"; - version = "2.1.6"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "CircleUp"; - repo = pname; + owner = "aresponses"; + repo = "aresponses"; rev = version; - hash = "sha256-Ui9ZpWaVBfCbDlZH3EgHX32FIZtyTHnc/UXqtoEyFcw="; + hash = "sha256-RklXlIsbdq46/7D6Hv4mdskunqw1a7SFF09OjhrvMRY="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; - buildInputs = [ - pytest - pytest-asyncio - ]; - - nativeCheckInputs = [ + dependencies = [ aiohttp pytest-asyncio - pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ # Disable tests which requires network access "test_foo" @@ -47,8 +43,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "aresponses" ]; meta = with lib; { + changelog = "https://github.com/aresponses/aresponses/blob/${src.rev}/README.md#changelog"; description = "Asyncio testing server"; - homepage = "https://github.com/circleup/aresponses"; + homepage = "https://github.com/aresponses/aresponses"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 9d4167a3ddf1d..a4ab8087a6123 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "argh"; - version = "0.31.2"; + version = "0.31.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2xw0iFgE99RkbDhdwvsZtFKYVhMi9MFerhsTOZP54yM="; + hash = "sha256-8wAj2L4Uyl7msbPuq4KRUde72kZK4H3E3VNHkZxYkvk="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index c3abfb0c287d2..0df49f5835884 100644 --- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Low-level CFFI bindings for Argon2"; homepage = "https://github.com/hynek/argon2-cffi-bindings"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index 308f8bb7c0a17..86d269ce76a28 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; + hash = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 5d4db901771d5..69e3bf1cc0f82 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; + hash = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index a363318453bae..a2bd69bf3a19a 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; + hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 19e69d4e087fb..2d43abfd70b22 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -1,40 +1,45 @@ { lib, buildPythonPackage, - dm-tree, + pythonOlder, fetchFromGitHub, - emcee, + + # build-system + packaging, + setuptools, + + # dependencies + dm-tree, h5netcdf, matplotlib, - netcdf4, - numba, numpy, pandas, - setuptools, - cloudpickle, - pytestCheckHook, scipy, - packaging, - pythonOlder, typing-extensions, xarray, xarray-einstats, - zarr, + + # checks + bokeh, + cloudpickle, + emcee, ffmpeg, h5py, - jaxlib, - torchvision, jax, - # , pymc3 (circular dependency) + jaxlib, + numba, + numpyro, + #, pymc3 (circular dependency) pyro-ppl, #, pystan (not packaged) - numpyro, - bokeh, + pytestCheckHook, + torchvision, + zarr, }: buildPythonPackage rec { pname = "arviz"; - version = "0.18.0"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -43,7 +48,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-SZRqSqChQBSA9/jBXN2ds9hh6TI3qZksHai1j2oVsq0="; + hash = "sha256-fwDCl1KWClIOBWIL/ETw3hJUyHdpVpLnRmZoZXL3QXI="; }; build-system = [ @@ -55,7 +60,6 @@ buildPythonPackage rec { dm-tree h5netcdf matplotlib - netcdf4 numpy pandas scipy @@ -65,6 +69,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + bokeh cloudpickle emcee ffmpeg @@ -79,7 +84,6 @@ buildPythonPackage rec { pytestCheckHook torchvision zarr - bokeh ]; preCheck = '' @@ -98,24 +102,15 @@ buildPythonPackage rec { "test_plot_kde" "test_plot_kde_2d" "test_plot_pair" - # Array mismatch - "test_plot_ts" - # The following two tests fail in a common venv-based setup. - # An issue has been opened upstream: https://github.com/arviz-devs/arviz/issues/2282 - "test_plot_ppc_discrete" - "test_plot_ppc_discrete_save_animation" - # Assertion error - "test_data_zarr" - "test_plot_forest" ]; pythonImportsCheck = [ "arviz" ]; - meta = with lib; { + meta = { description = "Library for exploratory analysis of Bayesian models"; homepage = "https://arviz-devs.github.io/arviz/"; changelog = "https://github.com/arviz-devs/arviz/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ omnipotententity ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ omnipotententity ]; }; } diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index f63bd17297e1c..60aa3520e738e 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/asana/python-asana"; changelog = "https://github.com/Asana/python-asana/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index 1ee09ad98332a..a883fc87af817 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -15,8 +15,6 @@ scipy, setuptools-scm, setuptools, - tomli, - wheel, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 09e00d7ae8f51..6e936c6635ed6 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index f99b201842e65..326d51f55a64c 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Atomic Simulation Environment"; homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 1d54f0895933f..f893d22975033 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.1.3"; + version = "7.1.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-4TiLncVxDxGB8YSgeEvXGb3kY2tjfYYmBAleJeaiPWU="; + hash = "sha256-l1FrhQ82+0g/ivm2K2yXJ5EZNDGM3Olcj1AxiQc8cZI="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 10cfbf571b305..fecc4b98f490f 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - version = "3.7.2"; + version = "3.8.1"; pname = "asgiref"; format = "setuptools"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "django"; repo = "asgiref"; rev = "refs/tags/${version}"; - hash = "sha256-VW1PBh6+nLMD7qxmL83ymuxCPYKVY3qGKsB7ZiMqMu8="; + hash = "sha256-xepMbxglBpHL7mnJYlnvNUgixrFwf/Tc6b1zL4Wy+to="; }; propagatedBuildInputs = [ typing-extensions ]; @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Reference ASGI adapters and channel layers"; homepage = "https://github.com/django/asgiref"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 4895e713cd60b..cd0b3a0895bbf 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix index 37c708bed5c07..3f66a9a2bf5dd 100644 --- a/pkgs/development/python-modules/aspell-python/default.nix +++ b/pkgs/development/python-modules/aspell-python/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Python wrapper for aspell (C extension and Python version)"; homepage = "https://github.com/WojciechMula/aspell-python"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 097a850988832..322bb50e711fe 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-2Oj/3tMDC5s4OouSarAJo3TCwBOCY3DYjAZk3TcV9CQ="; + hash = "sha256-TIMyfX8bpzey0hw0lBMcdZVnc07j9PFVjn4YbX4oW/8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index 9d7a88369aaf8..e1cdd1febe461 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers"; homepage = "https://github.com/astropy/astropy-iers-data"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/async-tkinter-loop/default.nix b/pkgs/development/python-modules/async-tkinter-loop/default.nix index a620c95843cc4..b432d359b2a6a 100644 --- a/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - python3Packages, poetry-core, tkinter, typing-extensions, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/asyncarve/default.nix b/pkgs/development/python-modules/asyncarve/default.nix new file mode 100644 index 0000000000000..dc760169c215a --- /dev/null +++ b/pkgs/development/python-modules/asyncarve/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + mashumaro, + orjson, + aiohttp, + yarl, + setuptools, +}: + +buildPythonPackage rec { + pname = "asyncarve"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5h56Sr0kPLrNPU70W90WsjmWax/N90dRMJ6lI5Mg86E="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + mashumaro + orjson + aiohttp + yarl + ]; + + # No tests in repo + doCheck = false; + + pythonImportsCheck = [ "asyncarve" ]; + + meta = with lib; { + description = "Simple Arve library"; + homepage = "https://github.com/arvetech/asyncarve"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/asyncio-mqtt/default.nix b/pkgs/development/python-modules/asyncio-mqtt/default.nix deleted file mode 100644 index 8209b94606592..0000000000000 --- a/pkgs/development/python-modules/asyncio-mqtt/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - anyio, - buildPythonPackage, - fetchFromGitHub, - paho-mqtt, - pytestCheckHook, - pythonOlder, - setuptools, - setuptools-scm, - typing-extensions, - wheel, -}: - -buildPythonPackage rec { - pname = "asyncio-mqtt"; - version = "0.16.1"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "sbtinstruments"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM="; - }; - - nativeBuildInputs = [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = [ paho-mqtt ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; - - nativeCheckInputs = [ - anyio - pytestCheckHook - ]; - - pythonImportsCheck = [ "asyncio_mqtt" ]; - - disabledTests = [ - # Tests require network access - "test_client_filtered_messages" - "test_client_logger" - "test_client_max_concurrent_outgoing_calls" - "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" - "test_client_pending_calls_threshold" - "test_client_tls_context" - "test_client_tls_params" - "test_client_unfiltered_messages" - "test_client_unsubscribe" - "test_client_username_password " - "test_client_websockets" - "test_client_will" - "test_multiple_messages_generators" - ]; - - # newer version are packaged as aiomqtt - passthru.skipBulkUpdate = true; - - meta = with lib; { - description = "Idomatic asyncio wrapper around paho-mqtt"; - homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; - license = licenses.bsd3; - changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/asyncio-rlock/default.nix b/pkgs/development/python-modules/asyncio-rlock/default.nix index 8ed725d13ccc0..89ee558136ead 100644 --- a/pkgs/development/python-modules/asyncio-rlock/default.nix +++ b/pkgs/development/python-modules/asyncio-rlock/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 3618d0eaa1849..427178dfa037b 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.14.2"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6Va/iYjQega6MwX2YE4mH0ygFMSiMvCHPxx2kvvjz8I="; + hash = "sha256-ChOkOBb0bPCEZX+wVZaCO5PVtI5173djyKdW7BIXg3o="; }; build-system = [ setuptools ]; @@ -89,6 +89,6 @@ buildPythonPackage rec { homepage = "https://asyncssh.readthedocs.io/"; changelog = "https://github.com/ronf/asyncssh/blob/v${version}/docs/changes.rst"; license = licenses.epl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 9b9c571dde307..d095b203d72f1 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.1.0"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,24 +29,20 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-tHlo5oNsb8E6r0vmSi0eVbk4RCMg0xe97LITzW9FQWA="; + hash = "sha256-XXjzYDOEBdA4uk0VCzscHrPCY2Lgin0JBAVDdxmSOio="; fetchSubmodules = true; }; postPatch = '' - # https://github.com/FreeOpcUa/opcua-asyncio/issues/1263 - substituteInPlace setup.py \ - --replace ", 'asynctest'" "" - # Workaround hardcoded paths in test # "test_cli_tools_which_require_sigint" substituteInPlace tests/test_tools.py \ - --replace "tools/" "$out/bin/" + --replace-fail "tools/" "$out/bin/" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiosqlite cryptography @@ -65,9 +61,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "asyncua" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ # Failed: DID NOT RAISE <class 'asyncio.exceptions.TimeoutError'> "test_publish" + ] ++ lib.optionals stdenv.isDarwin [ # OSError: [Errno 48] error while attempting to bind on address ('127.0.0.1',... "test_anonymous_rejection" "test_certificate_handling_success" diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 3e7bb3e990b61..f858eb07be9a1 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools-scm, - future, cppy, pytestCheckHook, pythonOlder, @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "atom"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = "atom"; rev = "refs/tags/${version}"; - hash = "sha256-HoUKU6z+6PPBUsvI4earZG9UXN0PrugAxu/F7WUfUe8="; + hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index 6728f39269ecf..997466118258d 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -1,6 +1,5 @@ { lib, - ase, buildPythonPackage, cython, datamodeldict, @@ -11,35 +10,31 @@ pandas, phonopy, potentials, - pymatgen, pytestCheckHook, pythonOlder, requests, scipy, setuptools, toolz, - wheel, xmltodict, }: -buildPythonPackage { +buildPythonPackage rec { pname = "atomman"; - version = "1.4.6-unstable-2023-07-28"; + version = "1.4.11"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "usnistgov"; repo = "atomman"; - rev = "b8af21a9285959d38ee26173081db1b4488401bc"; - hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA="; + rev = "refs/tags/v${version}"; + hash = "sha256-2yxHv9fSgLM5BeUkXV9NX+xyplXtyfWodwS9sVUVzqU="; }; - build-system = [ setuptools - wheel numpy cython ]; @@ -57,7 +52,7 @@ buildPythonPackage { xmltodict ]; - pythonRelaxDeps = [ "potentials" ]; + pythonRelaxDeps = [ "atomman" ]; preCheck = '' # By default, pytestCheckHook imports atomman from the current directory @@ -68,9 +63,7 @@ buildPythonPackage { ''; nativeCheckInputs = [ - ase phonopy - pymatgen pytestCheckHook ]; @@ -81,9 +74,10 @@ buildPythonPackage { pythonImportsCheck = [ "atomman" ]; meta = with lib; { + changelog = "https://github.com/usnistgov/atomman/blob/${src.rev}/UPDATES.rst"; description = "Atomistic Manipulation Toolkit"; homepage = "https://github.com/usnistgov/atomman/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/attr/default.nix b/pkgs/development/python-modules/attr/default.nix new file mode 100644 index 0000000000000..5a6400d3e5e3a --- /dev/null +++ b/pkgs/development/python-modules/attr/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + python, +}: + +buildPythonPackage rec { + pname = "attr"; + version = "0.3.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "denis-ryzhkov"; + repo = "attr"; + rev = version; + hash = "sha256-1gOAONDuZb7xEPFZJc00BRtFF06uX65S8b3RRRNGeSo="; + }; + + build-system = [ setuptools ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -c "import dry_attr; dry_attr.test()" + runHook postCheck + ''; + + meta = { + description = "Simple decorator to set attributes of target function or class in a DRY way."; + homepage = "https://github.com/denis-ryzhkov/attr"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 00c25a332e76f..b20f0065dfe57 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, setuptools, six, @@ -45,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/bcj/AttrDict"; changelog = "https://github.com/bcj/AttrDict/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 6a9884beca5cc..96d6b5d0c96a7 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-attrs/attrs"; changelog = "https://github.com/python-attrs/attrs/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index a5b03baad8d1c..88d2d9af34340 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Library for audio and music analysis"; homepage = "https://aubio.org"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index 4bd7594b5fdc3..a6b485d7b2c9c 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Utilities and Python modules for handling audio"; homepage = "https://audiotools.sourceforge.net/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/auditok/default.nix b/pkgs/development/python-modules/auditok/default.nix index cad60d86198f8..d6735c9c79099 100644 --- a/pkgs/development/python-modules/auditok/default.nix +++ b/pkgs/development/python-modules/auditok/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/amsehili/auditok/"; changelog = "https://github.com/amsehili/auditok/blob/v${version}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 9da8e4a22dccc..6154b82465b9c 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, unittestCheckHook, diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index ac4d6834f8ba3..3982a00674eab 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "augmax"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disbaled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "khdlr"; repo = "augmax"; rev = "refs/tags/v${version}"; - hash = "sha256-xz6yJiVZUkRcRa2rKZdytfpP+XCk/QI4xtKlNaS9FYo="; + hash = "sha256-FXgkhZEAR1Y2LvVvV+IWMSQDWrLulLDsSKKuw4ER5wg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index 72ad0c41fc767..0ecb14291c3a7 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "autarco"; - version = "0.3.0"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-autarco"; rev = "refs/tags/v${version}"; - hash = "sha256-IBf6Dw2Yf7m+5bQ72K0kPxGdtpl8JowQ9IO3gWS3Vso="; + hash = "sha256-e/wi4suDMSQTaSdyYsTiBxVUNvisYBVPqy9Rpk0lwJw="; }; pythonRelaxDeps = [ "orjson" ]; @@ -37,11 +37,9 @@ buildPythonPackage rec { --replace "--cov" "" ''; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp mashumaro orjson @@ -63,7 +61,7 @@ buildPythonPackage rec { description = "Module for the Autarco Inverter"; homepage = "https://github.com/klaasnicolaas/python-autarco"; changelog = "https://github.com/klaasnicolaas/python-autarco/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 69d4fdedfd2a7..b292153e7d627 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://github.com/auth0/auth0-python"; changelog = "https://github.com/auth0/auth0-python/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index 77df68b23c2ac..ed3a469d312b7 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { homepage = "https://github.com/ValiMail/authentication-headers"; changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "dmarc-policy-find"; }; } diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 1efc211fcc54f..08187be3a2e80 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -144,6 +144,6 @@ buildPythonPackage rec { description = "WebSocket and WAMP in Python for Twisted and asyncio"; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index fd4a0f22d439c..8df21385cf04b 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Autocommand turns a python function into a CLI program"; homepage = "https://github.com/Lucretiel/autocommand"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index af707983b5958..05d612256e43d 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -47,7 +47,7 @@ let description = "Self-service finite-state machines for the programmer on the go"; mainProgram = "automat-visualize"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/automx2/default.nix b/pkgs/development/python-modules/automx2/default.nix index 05ddb4c521a9a..298dd7fb9adc3 100644 --- a/pkgs/development/python-modules/automx2/default.nix +++ b/pkgs/development/python-modules/automx2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "automx2"; - version = "2024.1"; + version = "2024.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rseichter"; repo = "automx2"; - rev = version; - hash = "sha256-s/kd9A/d3SPMZC9+B4DdcXVi77WLH/SBwXIdaKHUj34="; + rev = "refs/tags/${version}"; + hash = "sha256-7SbSKSjDHTppdqfPPKvuWbdoksHa6BMIOXOq0jDggTE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/autotrash/default.nix b/pkgs/development/python-modules/autotrash/default.nix index 1d0e28405c93f..6c628b3925357 100644 --- a/pkgs/development/python-modules/autotrash/default.nix +++ b/pkgs/development/python-modules/autotrash/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "autotrash" ]; nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Tool to automatically purge old trashed files"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "https://bneijt.nl/pr/autotrash"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "autotrash"; }; } diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index c126a8ab1fc43..e50028415d8a8 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -4,8 +4,9 @@ buildPythonPackage, cython, fetchFromGitHub, - fetchpatch, - ffmpeg_5-headless, + fetchurl, + linkFarm, + ffmpeg_6-headless, numpy, pillow, pkg-config, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "av"; - version = "11.0.0"; + version = "12.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,30 +26,29 @@ buildPythonPackage rec { owner = "mikeboers"; repo = "PyAV"; rev = "refs/tags/v${version}"; - hash = "sha256-pCKP+4ZmZCJcG7/Qy9H6aS4svQdgaRA9S1QVNWFYhSQ="; + hash = "sha256-yPVAtL71pL/ok3bli+r/IruCrmmhNyv98pr7z3m8sbo="; }; - patches = [ - # merged upstream PR: https://github.com/PyAV-Org/PyAV/pull/1387 - (fetchpatch { - name = "use-pkg-config-env-var-fix-cross.patch"; - url = "https://github.com/PyAV-Org/PyAV/commit/ba7a2c9f716af506838d399e6ed27ed6d64d2435.patch"; - sha256 = "sha256-oH+g8sVoVCQe6DimRN38VT2GdziriwHYRAhldNxz9/E="; - }) - ]; - nativeBuildInputs = [ cython pkg-config setuptools ]; - buildInputs = [ ffmpeg_5-headless ]; + buildInputs = [ ffmpeg_6-headless ]; - preCheck = '' - # ensure we import the built version - rm -r av - ''; + preCheck = + let + # Update with `./update-test-samples.bash` if necessary. + testSamples = linkFarm "pyav-test-samples" ( + lib.mapAttrs (_: fetchurl) (lib.importTOML ./test-samples.toml) + ); + in + '' + # ensure we import the built version + rm -r av + ln -s ${testSamples} tests/assets + ''; nativeCheckInputs = [ numpy @@ -56,61 +56,13 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = - [ - # urlopen fails during DNS resolution - "test_writing_to_custom_io" - "test_decode_close_then_use" - # Tests that want to download FATE data, https://github.com/PyAV-Org/PyAV/issues/955 - "test_vobsub" - "test_transcode" - "test_stream_tuples" - "test_stream_seek" - "test_stream_probing" - "test_seek_start" - "test_seek_middle" - "test_seek_int64" - "test_seek_float" - "test_seek_end" - "test_roundtrip" - "test_reading_from_write_readonl" - "test_reading_from_pipe_readonly" - "test_reading_from_file" - "test_reading_from_buffer" - "test_reading_from_buffer_no_see" - "test_parse" - "test_movtext" - "test_encoding_xvid" - "test_encoding_tiff" - "test_encoding_png" - "test_encoding_pcm_s24le" - "test_encoding_mpeg4" - "test_encoding_mpeg1video" - "test_encoding_mp2" - "test_encoding_mjpeg" - "test_encoding_h264" - "test_encoding_dvvideo" - "test_encoding_dnxhd" - "test_encoding_aac" - "test_decoded_video_frame_count" - "test_decoded_time_base" - "test_decoded_motion_vectors" - "test_decode_half" - "test_decode_audio_sample_count" - "test_data" - "test_container_probing" - "test_codec_tag" - "test_selection" - ] - ++ lib.optionals (stdenv.isDarwin) [ - # Segmentation Faults - "test_encoding_with_pts" - "test_bayer_write" - ]; + disabledTests = [ + # av.error.InvalidDataError: [Errno 1094995529] Invalid data found when processing input: 'custom_io_output.mpd' + "test_writing_to_custom_io_dash" + ]; - disabledTestPaths = [ - # urlopen fails during DNS resolution - "tests/test_doctests.py" + # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why. + disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_timeout.py" ]; @@ -146,6 +98,6 @@ buildPythonPackage rec { homepage = "https://github.com/mikeboers/PyAV/"; changelog = "https://github.com/PyAV-Org/PyAV/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/av/test-samples.toml b/pkgs/development/python-modules/av/test-samples.toml new file mode 100644 index 0000000000000..cdc1d93362f18 --- /dev/null +++ b/pkgs/development/python-modules/av/test-samples.toml @@ -0,0 +1,17 @@ +"fate-suite/aac/latm_stereo_to_51.ts" = { url = "http://fate.ffmpeg.org/fate-suite/aac/latm_stereo_to_51.ts", hash = "sha256-lVz0iby2IEUVdwKYamv4HVm8EUGHJS/cWY+QFBMaCBY=" } +"fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv" = { url = "http://fate.ffmpeg.org/fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv", hash = "sha256-O9YMj0+0bM4YyZNGgkZJL8E2aG+Y3lq8/c+DVht0McI=" } +"fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav" = { url = "http://fate.ffmpeg.org/fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav", hash = "sha256-KodB5hQkBFtfkI+L7hnkSonPM+IuOCNrTV3Vsy1bvhs=" } +"fate-suite/h264/interlaced_crop.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/h264/interlaced_crop.mp4", hash = "sha256-SVWWaOcfOp718dvgkpgOWCYoV9Ylomv8MBYzbRqvbBE=" } +"fate-suite/hap/HAPQA_NoSnappy_127x1.mov" = { url = "http://fate.ffmpeg.org/fate-suite/hap/HAPQA_NoSnappy_127x1.mov", hash = "sha256-WMUqg9o84ki2AIIsGhY8P10KBc3qgCsmljqJXXRHbs8=" } +"fate-suite/mkv/codec_delay_opus.mkv" = { url = "http://fate.ffmpeg.org/fate-suite/mkv/codec_delay_opus.mkv", hash = "sha256-GanpfRyGKN36NLAa7pZehcM1F2VDCW3g6hhO26vFg1I=" } +"fate-suite/mov/displaymatrix.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/displaymatrix.mov", hash = "sha256-Aq0/zcKKHI2dgThIKfYMXCjNI6WoVwy7VtD5Bke6krQ=" } +"fate-suite/mov/mov-1elist-ends-last-bframe.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/mov-1elist-ends-last-bframe.mov", hash = "sha256-1g488WPvvzzeHXoQg7xZnrVCoGCz7sOUSpzZj6qWnhI=" } +"fate-suite/mov/white_zombie_scrunch-part.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/white_zombie_scrunch-part.mov", hash = "sha256-apoPuBxsjqkjCaSdtgTJhpYFXMp5LbtZQz+lo3o9jx8=" } +"fate-suite/mpeg2/mpeg2_field_encoding.ts" = { url = "http://fate.ffmpeg.org/fate-suite/mpeg2/mpeg2_field_encoding.ts", hash = "sha256-logzOhRbniwhObnKts1JZqzRl4j9YgtLMdtcKJFUfLg=" } +"fate-suite/mxf/track_01_v02.mxf" = { url = "http://fate.ffmpeg.org/fate-suite/mxf/track_01_v02.mxf", hash = "sha256-AQ+UxFVfBgQwbEtoMautd02BL5kC6pAbsXD3SVRd9xE=" } +"fate-suite/png1/55c99e750a5fd6_50314226.png" = { url = "http://fate.ffmpeg.org/fate-suite/png1/55c99e750a5fd6_50314226.png", hash = "sha256-yADmkBgeMB5wv140gwnaDMjvErRTXZhXdBz02HZSMBc=" } +"fate-suite/qtrle/aletrek-rle.mov" = { url = "http://fate.ffmpeg.org/fate-suite/qtrle/aletrek-rle.mov", hash = "sha256-uXUvVkwuPbfs/rzT896ty3RZfvGoSPj3su+sjLPU09g=" } +"fate-suite/sub/MovText_capability_tester.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/sub/MovText_capability_tester.mp4", hash = "sha256-Y2uhvfGrZaPebD6ZsJemzpOk+XHX6ukBceVauEit9h8=" } +"fate-suite/sub/vobsub.sub" = { url = "http://fate.ffmpeg.org/fate-suite/sub/vobsub.sub", hash = "sha256-X2rEMyTlo1xuUlqgx2uvqd2WWhfOCID9fraeGbaFPIs=" } +"pyav-curated/pexels/time-lapse-video-of-night-sky-857195.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-night-sky-857195.mp4", hash = "sha256-6307VwepfoVNKeGm8WEMZtfowJZ27Hv2fwgp6J/Q0oE=" } +"pyav-curated/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4", hash = "sha256-2RWphhz5KWPSnJh8ARrC7aPjBa77DJO1Fv0/I4kWxYg=" } diff --git a/pkgs/development/python-modules/av/update-test-samples.bash b/pkgs/development/python-modules/av/update-test-samples.bash new file mode 100755 index 0000000000000..5b0b1966d43b2 --- /dev/null +++ b/pkgs/development/python-modules/av/update-test-samples.bash @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset + +if test "$#" != 1; then + printf >&2 'usage: update-test-samples.bash /path/to/PyAV/source\n' + exit 2 +fi + +pyav_source=$1 + +exec > "$(dirname "$(readlink -f "$0")")/test-samples.toml" + +fetch() { + path=$1 + url=$2 + prefetch_json=$(nix store prefetch-file --json "${url}") + sri_hash=$(jq -r .hash <<< "${prefetch_json}") + printf '"%s" = { url = "%s", hash = "%s" }\n' "${path}" "${url}" "${sri_hash}" +} + +fetch_all() { + function=$1 + base_path=$2 + base_url=$3 + + samples=$( + rg \ + --only-matching \ + --no-filename \ + "\\b${function}\\([\"']([^\"']+)[\"']\\)" \ + --replace '$1' \ + "${pyav_source}" + ) + unique_samples=$(sort -u <<< "${samples}") + + while IFS= read -r sample; do + fetch "${base_path}/${sample}" "${base_url}/${sample}" + done <<< "${unique_samples}" +} + +fetch_all fate_suite fate-suite "http://fate.ffmpeg.org/fate-suite" +fetch_all curated pyav-curated "https://pyav.org/datasets" diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 611454296cdf3..eac1d662bb696 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -12,14 +12,15 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "35"; + version = "37"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-H4sRKll70kOHlOGnIaY6phhp+pWYoXrGvYEa1vZADQY="; + pname = "awkward_cpp"; + inherit version; + hash = "sha256-bf9fzkr8rbSSu/fLIJCFctmb3DKqK+qGgbrPtpsqqG0="; }; build-system = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 1bd2e69742148..4bcfc343458db 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,19 +1,22 @@ { lib, - fsspec, - stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system hatch-fancy-pypi-readme, hatchling, + + # dependencies awkward-cpp, - importlib-metadata, + fsspec, numpy, packaging, typing-extensions, - jax, - jaxlib, + importlib-metadata, + + # checks numba, setuptools, numexpr, @@ -21,11 +24,15 @@ pyarrow, pytest-xdist, pytestCheckHook, + jax, + jaxlib, + + stdenv, }: buildPythonPackage rec { pname = "awkward"; - version = "2.6.6"; + version = "2.6.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +41,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-5Jg+Ki1vJ4Rz22TbqTvVtb5YLvkvP8EOQ7cmTmI6gQU="; + hash = "sha256-6Q2eXriMYmfrgv69ytxvyrxK9HPMX8AIZ3ZStZUMGIk="; }; build-system = [ @@ -46,7 +53,6 @@ buildPythonPackage rec { [ awkward-cpp fsspec - importlib-metadata numpy packaging ] diff --git a/pkgs/development/python-modules/aws-request-signer/default.nix b/pkgs/development/python-modules/aws-request-signer/default.nix new file mode 100644 index 0000000000000..065e4a2c166fc --- /dev/null +++ b/pkgs/development/python-modules/aws-request-signer/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + requests, + requests-toolbelt, +}: + +buildPythonPackage rec { + pname = "aws-request-signer"; + version = "1.2.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "aws_request_signer"; + hash = "sha256-DVorDO0wz94Fhduax7VsQZ5B5SnBfsHQoLoW4m6Ce+U="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "poetry>=0.12" poetry-core \ + --replace-fail poetry.masonry.api poetry.core.masonry.api + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + requests + requests-toolbelt + ]; + + doCheck = false; + + meta = { + changelog = "https://github.com/iksteen/aws-request-signer/releases/tag/${version}"; + description = "Python library to sign AWS requests using AWS Signature V4."; + homepage = "https://github.com/iksteen/aws-request-signer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index e672317cc75f6..c36c24553eced 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -88,6 +88,6 @@ buildPythonPackage rec { homepage = "https://github.com/aws/serverless-application-model"; changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix index 6427a1417ec2f..daf6adf4f00ce 100644 --- a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix +++ b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "aws-secretsmanager-caching"; - version = "1.1.2"; - pyprject = true; + version = "1.1.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "aws_secretsmanager_caching"; inherit version; - hash = "sha256-hhdo+I1yA/pLA+YFDFi8Ekrv27xQLpxiqXh1+4XqteA="; + hash = "sha256-9tbsnUPg2+T21d6982tMtpHRWpZ7NYsldfXZGXSmwP8="; }; patches = [ diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 418a938dc75ed..6774d1fefcc12 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/aws/aws-xray-sdk-python"; changelog = "https://github.com/aws/aws-xray-sdk-python/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 209627d858bf0..f7320137d717b 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.12"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z271rdHsBh8/+nIrMm3wGhxEJJNIl2hYuBQdkHSlRok="; + hash = "sha256-N6zijQ16kfkIYt0plIcqFZYre08TduC3sBqCGVRhFQc="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 12f4549bbe43d..6ad84623a6812 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -1,5 +1,4 @@ { - backoff, sparqlwrapper, boto3, buildPythonPackage, @@ -26,7 +25,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +34,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-2eF8WDhWfYgR3Ce/ehzCBtUdGUFzNmrTNfnatDpCg7Q="; + hash = "sha256-XhTRnQ2wsCD2jiiRFHDagmMB26lZ8Oj+tscgVypN0+c="; }; pythonRelaxDeps = [ "packaging" ]; diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax-platform/default.nix index dddcc6e1ebeb5..f0d274ef85aee 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -2,17 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - ax, botorch, ipywidgets, jinja2, pandas, plotly, - python, setuptools, setuptools-scm, typeguard, - wheel, hypothesis, mercurial, pyfakefs, @@ -22,24 +19,23 @@ }: buildPythonPackage rec { - pname = "ax"; - version = "0.4.0"; - format = "pyproject"; + pname = "ax-platform"; + version = "0.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "facebook"; - repo = pname; + repo = "ax"; rev = "refs/tags/${version}"; - hash = "sha256-dj6Gig8N4oLtcZLwPl4QDHG/FwA2nFBtYxSARnWiJJU="; + hash = "sha256-ygMMMKY5XsoQGp9yUMFAQqkSUlXNBJCb8xgGE10db4U="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ botorch ipywidgets jinja2 @@ -49,7 +45,9 @@ buildPythonPackage rec { pyre-extensions ]; - checkInputs = [ + env.ALLOW_BOTORCH_LATEST = "1"; + + nativeCheckInputs = [ hypothesis mercurial pyfakefs @@ -81,12 +79,8 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "ax" ]; - # Many portions of the test suite fail under Python 3.12 - doCheck = lib.versions.majorMinor python.version != "3.12"; - - passthru.tests.check = ax.overridePythonAttrs { doCheck = true; }; - meta = with lib; { + changelog = "https://github.com/facebook/Ax/releases/tag/${version}"; description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments"; homepage = "https://ax.dev/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 453f1c27f8bd0..f4760c620076c 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -6,38 +6,42 @@ protobuf, pytestCheckHook, setuptools-scm, + pythonOlder, }: buildPythonPackage rec { pname = "axisregistry"; - version = "0.4.9"; - format = "setuptools"; + version = "0.4.11"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-obpjiX86fzokao7UWQUXgarKYRNdxplr6/r2D2d7DCI="; + hash = "sha256-p1/ocmWqrCJ4CylRgen/DR0LeqcwIxB1jAauJbw8ygY="; }; - propagatedBuildInputs = [ + # Relax the dependency on protobuf 3. Other packages in the Google Fonts + # ecosystem have begun upgrading from protobuf 3 to protobuf 4, + # so we need to use protobuf 4 here as well to avoid a conflict + # in the closure of fontbakery. It seems to be compatible enough. + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ setuptools-scm ]; + + dependencies = [ fonttools protobuf ]; - nativeBuildInputs = [ - setuptools-scm - ]; - doCheck = true; nativeCheckInputs = [ pytestCheckHook ]; - # Relax the dependency on protobuf 3. Other packages in the Google Fonts - # ecosystem have begun upgrading from protobuf 3 to protobuf 4, - # so we need to use protobuf 4 here as well to avoid a conflict - # in the closure of fontbakery. It seems to be compatible enough. - pythonRelaxDeps = [ "protobuf" ]; + pythonImportsCheck = [ "axisregistry" ]; meta = with lib; { description = "Google Fonts registry of OpenType variation axis tags"; homepage = "https://github.com/googlefonts/axisregistry"; + changelog = "https://github.com/googlefonts/axisregistry/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; }; diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 7fb7cda0d3aea..33f24c827fdbe 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/appconfiguration/azure-appconfiguration"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_${version}/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index d5bc90eaf57b1..67178fac58aaa 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -99,6 +99,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 71e97c27e8d58..aea811201587f 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cosmos/azure-cosmos"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-cosmos_${version}/sdk/cosmos/azure-cosmos/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 7e030a049f94a..7b2dd03ad09b3 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-data-tables_${version}/sdk/tables/azure-data-tables/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 2a5ad27ee8c1c..1552f1c4b75df 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; + hash = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/pkgs/development/python-modules/azure-functions-devops-build/default.nix index 1b1683d5bfe14..a07ca228b92ea 100644 --- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix +++ b/pkgs/development/python-modules/azure-functions-devops-build/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Integrate Azure Functions with Azure DevOps. Specifically made for the Azure CLI"; homepage = "https://github.com/Azure/azure-functions-devops-build"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 83ac87a09e905..f8bf2b1c83f61 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 61d295e1b1529..66e16fbee10c0 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 2cf1f5a0235c2..54200ab0e0ff0 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-keys"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-keys_${version}/sdk/keyvault/azure-keyvault-keys"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index b9766e0a93bae..916897d5bf00d 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 895ba9f289fee..8b6a3524a04c1 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Key Vault Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 81d30a68fd604..5262587ba1339 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; + hash = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; }; nativeBuildInputs = [ setuptools ]; @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/apimanagement/azure-mgmt-apimanagement"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-apimanagement_${version}/sdk/apimanagement/azure-mgmt-apimanagement/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 4415da9527565..9fc23174d60dc 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appconfiguration/azure-mgmt-appconfiguration"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-appconfiguration_${version}/sdk/appconfiguration/azure-mgmt-appconfiguration"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index f29c1c1ad2c6e..12379092c4a61 100644 --- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/botservice/azure-mgmt-botservice"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-botservice_${version}/sdk/botservice/azure-mgmt-botservice"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 3b0c9ecfe20a4..aa25c6ad0e9df 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -6,7 +6,6 @@ msrestazure, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, pythonOlder, }: diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 98f652cf1f806..aa05085d1968a 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index c03cf2582452d..68d45218f7888 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -2,7 +2,6 @@ lib, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, buildPythonPackage, fetchPypi, isodate, @@ -12,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "30.0.0"; + version = "31.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bGLmrFkONP7dc5/iSzGzdQcToBRhZpbqjUTHvMgcBrc="; + hash = "sha256-E0NY1/iMTSm0AJ+R12GYYeH61dvqXhR0At1hrZa1Yko="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 5dc2f51e7f10b..62b1b1cc2863c 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Microsoft Azure Management Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 01ef04a5d2315..2ae19e4d8e256 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.5.0"; + version = "9.5.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XSGhl94Is2OOCa2I4y2iEfe7WYt9fP7kjWHVfWmz7dk="; + hash = "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix index 2d486d0156ec5..0d3d97aa0b21d 100644 --- a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/databox/azure-mgmt-databox"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-databoxedge_${version}/sdk/databox/azure-mgmt-databox/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix index de759e933bf76..6370b33bd3721 100644 --- a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, pythonOlder, setuptools, }: @@ -44,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/deploymentmanager/azure-mgmt-deploymentmanager"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-deploymentmanager_${version}/sdk/deploymentmanager/azure-mgmt-deploymentmanager/setup.py"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 3c117d02f6b31..b166ab5ea0f77 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; + hash = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index ba9c4cacb49ec..b24b2e0d3c925 100644 --- a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/extendedlocation/azure-mgmt-extendedlocation"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-extendedlocation_${version}/sdk/extendedlocation/azure-mgmt-extendedlocation"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 4a80dc7e36de7..2007e304f3ab5 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-hdinsight_${version}/sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index d919e7c6163cc..f565ddcd766bf 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/compute/azure-mgmt-imagebuilder"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-imagebuilder_${version}/sdk/compute/azure-mgmt-imagebuilder/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index f0b12aed9cb05..4213abd863530 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -4,23 +4,26 @@ azure-mgmt-core, buildPythonPackage, fetchPypi, + setuptools, isodate, pythonOlder, }: buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "10.3.0"; - format = "setuptools"; + version = "10.3.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GDtBZM8YaLjqfv6qmO2tfSpOFKm9l3woGLErdRUM0qI="; + hash = "sha256-NLkpVq773VccrloD9weOA32Ah7LADPpnSINdxzq7WjA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core isodate @@ -28,6 +31,8 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.mgmt.keyvault" ]; + # Module has no tests doCheck = false; @@ -36,8 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ - maxwilson - ]; + maintainers = with maintainers; [ maxwilson ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 186258f84ae14..9892b1c34decb 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-kusto_${version}/sdk/kusto/azure-mgmt-kusto/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index aa2f41d6f7d30..61f8804afa0b1 100644 --- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/managedservices/azure-mgmt-managedservices"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-managedservices_${version}/sdk/managedservices/azure-mgmt-managedservices/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 8a10fd41f1085..8d12b418a1942 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.0.0"; + version = "13.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-R322hzij1kcnrwxMClOzta40cMnd4w6bGnp5+p2pMQ8="; + hash = "sha256-8JzJFZTplNGo74wBelP8Geo7+FQ7WYmAOAef4jv533M="; }; build-system = [ setuptools ]; @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix index 664d6e905fa9b..b3db9d16407b4 100644 --- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix @@ -1,37 +1,41 @@ { lib, + azure-common, + azure-mgmt-core, buildPythonPackage, fetchPypi, - msrest, - msrestazure, - azure-common, - azure-mgmt-nspkg, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-powerbiembedded"; - version = "2.0.0"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "2f05be73f2a086c579a78fc900e3b2ae14ccde5bcec54e29dfc73e626b377476"; + hash = "sha256-yz2D3WfQKEdkTm10ZKIhZMi4y6GF6yz+L1+nB/VFofo="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common - azure-mgmt-nspkg + azure-mgmt-core + isodate ]; - # has no tests + # Module has only tests in mono-repo doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Power BI Embedded Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/powerbiembedded/azure-mgmt-powerbiembedded"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-powerbiembedded_${version}/sdk/powerbiembedded/azure-mgmt-powerbiembedded/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 20bed8458017a..9e3f437ced846 100644 --- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Microsoft Azure DNS Private Zones Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 6c678d4cad629..33ac1de82d77e 100644 --- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-redhatopenshift"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BL2a2L2AwJWvs0V+VpSGaS8//AWMy5m6rdAPDJPbrEo="; + hash = "sha256-Uft0KcOciKzJ+ic9n4nxkwNSBmKZam19jhEiqY9fJSc="; }; propagatedBuildInputs = [ @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index b40de91c0ad6e..18cf2fd0c10bf 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "14.3.0"; + version = "14.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eoMbY4oNzYXkn3uFUhxecJQD+BxYkGTbWhAWSgAoLyA="; + hash = "sha256-CIRzJa/wexeuheb+Az0KBaz4z0HMmpzGBiOuLaxGZ+8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index ffb31fbfbbdbc..abbf8d3443488 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -6,22 +6,24 @@ azure-mgmt-common, msrest, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-resource"; - version = "23.0.1"; - format = "setuptools"; + version = "23.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-wrps/ZnflfVfNurcQkXj3HEyVzAqH9And1bZS9jLKOA="; + hash = "sha256-ILawBrVE/bGWB/P2o4EQViXgu2D78wNvOYhcRkbTND4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-mgmt-common azure-mgmt-core msrest diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index ea1eeecdef0bf..d28b485bfca54 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/security/azure-mgmt-security"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-security_${version}/sdk/security/azure-mgmt-security/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix index 8ed3ef2a37fc0..4dbfb8a67be74 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -1,40 +1,44 @@ { lib, - buildPythonPackage, - fetchPypi, - msrest, - msrestazure, azure-common, azure-mgmt-core, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-servicefabricmanagedclusters"; - version = "1.0.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg="; + hash = "sha256-Bw+pMc0H9Gk8t4vaaOgwSMZ/zqzUJHGZ7keH+ylZnVw="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ + isodate azure-common azure-mgmt-core ]; pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Module has tests in mono-repo doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/servicefabricmanagedclusters/azure-mgmt-servicefabricmanagedclusters"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-servicefabricmanagedclusters_${version}/sdk/servicefabricmanagedclusters/azure-mgmt-servicefabricmanagedclusters/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index e38d0f6cc1386..16b8fd1a9f39f 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Microsoft Azure Servicelinker Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix index 34a562f4e49a0..8a17230abf094 100644 --- a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/sql/azure-mgmt-sqlvirtualmachine"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-sqlvirtualmachine_${version}/sdk/sql/azure-mgmt-sqlvirtualmachine/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index dbf43887100ba..a5449599400bc 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-mgmt-synapse"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-synapse_${version}/sdk/synapse/azure-mgmt-synapse/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-monitor-query/default.nix b/pkgs/development/python-modules/azure-monitor-query/default.nix new file mode 100644 index 0000000000000..f4d0870e81804 --- /dev/null +++ b/pkgs/development/python-modules/azure-monitor-query/default.nix @@ -0,0 +1,42 @@ +{ + azure-cli, + azure-core, + buildPythonPackage, + fetchPypi, + isodate, + lib, + setuptools, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "azure-monitor-query"; + version = "1.4.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-aZxvPFlC8J2pjO8nP/u3QDkE7EP5PA1j8Qo2e0R54Ak="; + }; + + nativeBuildInputs = [ setuptools ]; + + dependencies = [ + azure-core + isodate + typing-extensions + ]; + + pythonImportsCheck = [ + "azure" + "azure.monitor.query" + ]; + + meta = { + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-query_${version}/sdk/monitor/azure-monitor-query/CHANGELOG.md"; + description = "Microsoft Azure Monitor Query Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-query"; + license = lib.licenses.mit; + maintainers = azure-cli.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 7308578dfdee2..994394d3aec4b 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Microsoft Azure Storage Client Library for Python with multi API version support"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-search-documents/default.nix b/pkgs/development/python-modules/azure-search-documents/default.nix new file mode 100644 index 0000000000000..b6c26610b205d --- /dev/null +++ b/pkgs/development/python-modules/azure-search-documents/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + azure-common, + azure-core, + isodate, +}: + +buildPythonPackage rec { + pname = "azure-search-documents"; + version = "11.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "azure-search-documents_${version}"; + hash = "sha256-0J9AXDH7TOkcKDwFbICiMatLAwiFq3Jtoji8fJSOg8k="; + }; + + sourceRoot = "${src.name}/sdk/search/azure-search-documents"; + + build-system = [ setuptools ]; + + dependencies = [ + azure-common + azure-core + isodate + ]; + + pythonImportsCheck = [ "azure.search.documents" ]; + + # require devtools_testutils which is a internal package for azure-sdk + doCheck = false; + + meta = { + description = "Microsoft Azure Cognitive Search Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.rev}/sdk/search/azure-search-documents/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 1f47df6c9e73d..9a3ed6f0a1e98 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -5,7 +5,6 @@ cryptography, fetchPypi, isodate, - msrest, pythonOlder, setuptools, typing-extensions, @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.16.0"; + version = "12.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QS+35sPCj29yKvmBlapZQHqqMjI6+hOkoB9i0Lh3TrM="; + hash = "sha256-97LGz8G3y4AJelOx7S76nlRbSaKRQw02nNtJ+vvIQdY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 50f5d701138b5..c6fcce00fddd3 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.10.0"; + version = "12.11.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dnuj1czNtPcJdOXOYdFkx6t0cyz7K0Qd2HN2aaIRbag="; + hash = "sha256-Cox3eDnbpcUIJMrEivo8xWvgRPqkXKYbcmnrMZ6/AXE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index a3b59c446c036..0e3b8ce8c4f3a 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-accesscontrol"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-accesscontrol_${version}/sdk/synapse/azure-synapse-accesscontrol/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 45150bfc8532c..a952c215ab231 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix index 829577e636da3..dfceb84958399 100644 --- a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix +++ b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-managedprivateendpoints"; changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-synapse-managedprivateendpoints_${version}/sdk/synapse/azure-synapse-managedprivateendpoints"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index fbb9233538098..8c6e244e37bd7 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/synapse/azure-synapse-spark"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-spark_${version}/sdk/synapse/azure-synapse-spark/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 5c67b77e78f98..3bcca268dab33 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -80,6 +80,6 @@ buildPythonPackage rec { homepage = "https://github.com/Backblaze/b2-sdk-python"; changelog = "https://github.com/Backblaze/b2-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 64cd4318226af..9c7a990cbc82c 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/Diaoul/babelfish"; description = "Module to work with countries and languages"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index afc75992a9a5b..cc64639537e1e 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -13,6 +13,7 @@ setuptools, setuptools-scm, ufolib2, + vfblib, }: buildPythonPackage rec { @@ -41,6 +42,7 @@ buildPythonPackage rec { openstep-plist orjson ufolib2 + vfblib ]; nativeCheckInputs = [ @@ -48,6 +50,15 @@ buildPythonPackage rec { pytestCheckHook ]; + # Want non exsiting test data + disabledTests = [ + "test_rename" + "test_rename_nested" + "test_rename_contextual" + ]; + + disabledTestPaths = [ "tests/test_glyphs3_roundtrip.py" ]; + meta = with lib; { description = "Python library to load, examine, and save fonts in a variety of formats"; mainProgram = "babelfont"; diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index e0b4d3c8ebc17..901f4e1e020d9 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/gnome-keysign/babel-glade"; description = "Babel Glade XML files translatable strings extractor"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index d79b11eeb63be..a9aa34ec01acd 100644 --- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Backport of Python 3.11's datetime.fromisoformat"; homepage = "https://github.com/movermeyer/backports.datetime_fromisoformat"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 9a0baed50a48a..7e5046f6b618a 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Compatibility shim providing selectable entry points for older implementations"; homepage = "https://github.com/jaraco/backports.entry_points_selectable"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index 71312dd1677ed..8c2df112478c7 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -4,24 +4,25 @@ fetchFromGitHub, poetry-core, pytestCheckHook, + pythonAtLeast, pythonOlder, }: buildPythonPackage rec { pname = "backports-strenum"; - version = "1.2.8"; + version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "clbarnes"; repo = "backports.strenum"; rev = "refs/tags/v${version}"; - hash = "sha256-jbMR9VAGsMAJTP2VQyRr+RPYwWwk8hGAYs4KoZEWa7U="; + hash = "sha256-j5tALFrLeZ8k+GwAaq0ocmcQWvdWkRUHbOVq5Du4mu0="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/backports-tarfile/default.nix b/pkgs/development/python-modules/backports-tarfile/default.nix index 1b1c7790a91af..49c5c7458c884 100644 --- a/pkgs/development/python-modules/backports-tarfile/default.nix +++ b/pkgs/development/python-modules/backports-tarfile/default.nix @@ -59,7 +59,7 @@ let self = buildPythonPackage rec { description = "Backport of CPython tarfile module"; homepage = "https://github.com/jaraco/backports.tarfile"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in self diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index 5c525685d6227..8dbefd22d281d 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { description = "Backport of the standard library module zoneinfo"; homepage = "https://github.com/pganssle/zoneinfo"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 532228c31e4f5..9685709040673 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook ]; meta = with lib; { - description = "Generator of ANSI C tracers which output CTF data streams "; + description = "Generator of ANSI C tracers which output CTF data streams"; mainProgram = "barectf"; homepage = "https://github.com/efficios/barectf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix index 3f8ecf0c58b1f..e092fecc1c1c2 100644 --- a/pkgs/development/python-modules/base2048/default.nix +++ b/pkgs/development/python-modules/base2048/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, frelatage, libiconv, - maturin, pytestCheckHook, pythonOlder, rustc, diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix index 17963e1da7634..f50feac37d485 100644 --- a/pkgs/development/python-modules/basemap-data/default.nix +++ b/pkgs/development/python-modules/basemap-data/default.nix @@ -1,16 +1,7 @@ { lib, buildPythonPackage, - pythonAtLeast, basemap, - cython, - geos, - numpy, - matplotlib, - pyproj, - pyshp, - python, - setuptools, }: buildPythonPackage rec { @@ -32,6 +23,6 @@ buildPythonPackage rec { mit lgpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 74759f2a0d980..7e435d08fa315 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, basemap-data, cython, geos, @@ -68,7 +67,7 @@ buildPythonPackage rec { coastlines, lakes, rivers and political boundaries. See http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. ''; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = with licenses; [ mit lgpl21 diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix index d1844aaa144da..b3320cc775f30 100644 --- a/pkgs/development/python-modules/batchspawner/default.nix +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -8,6 +8,7 @@ jupyterhub, pythonOlder, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, }: @@ -35,13 +36,9 @@ buildPythonPackage rec { jupyterhub ]; - preCheck = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=batchspawner" "" - ''; - nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; @@ -53,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/batchspawner"; changelog = "https://github.com/jupyterhub/batchspawner/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix index 3eb45a2808eee..34a7a81333e86 100644 --- a/pkgs/development/python-modules/baycomp/default.nix +++ b/pkgs/development/python-modules/baycomp/default.nix @@ -4,7 +4,6 @@ fetchPypi, numpy, scipy, - scikit-learn, matplotlib, unittestCheckHook, }: diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index f8cfa8af8b4ce..24b86e8f224b5 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -3,34 +3,49 @@ lib, buildPythonPackage, fetchFromGitHub, + poetry-core, scikit-learn, + numpy, scipy, colorama, + jupyter, + matplotlib, + nbconvert, + nbformat, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.4.3"; - format = "setuptools"; + version = "1.5.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bayesian-optimization"; repo = "BayesianOptimization"; rev = "refs/tags/v${version}"; - hash = "sha256-Bp/ZhVSW5lTGwnsd/doOXu++Gxw/51owCfMm96Qmgd4="; + hash = "sha256-pDgvdQhlJ5aMRGdi2qXRXVCdJRvrOP/Nr0SSZyHH1WM="; }; + build-system = [ poetry-core ]; + propagatedBuildInputs = [ scikit-learn + numpy scipy colorama ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + jupyter + matplotlib + nbconvert + nbformat + pytestCheckHook + ]; pythonImportsCheck = [ "bayes_opt" ]; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 3054ff681076b..526562f1286a7 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.12"; + version = "1.5.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-njTVA1H0QM0PHIHe/Vc4IJtbgTyWdytqPv0RRnTY6cw="; + hash = "sha256-D4TJnaxaCCJWgDPbGvbxkW6yg/Ph1jaIT9QBjxFcxAw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 519a39c53baca..506352b25d322 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, lark, - pynose, pythonOlder, setuptools, }: @@ -20,11 +19,7 @@ buildPythonPackage rec { hash = "sha256-rI/1n7m9Q36im4mn18UH/QoelXhFuumurGnyiSuNaB4="; }; - # Nose is required during build process, so can not use `nativeCheckInputs`. - buildInputs = [ - pynose - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ lark ]; diff --git a/pkgs/development/python-modules/bcg/default.nix b/pkgs/development/python-modules/bcg/default.nix index 1855e95eddbaa..f0bf00086818d 100644 --- a/pkgs/development/python-modules/bcg/default.nix +++ b/pkgs/development/python-modules/bcg/default.nix @@ -2,9 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, appdirs, click, click-log, + looseversion, paho-mqtt, pyaml, pyserial, @@ -23,6 +25,13 @@ buildPythonPackage rec { sha256 = "2Yh5MeIv+BIxjoO9GOPqq7xTAFhyBvnxPy7DeO2FrkI="; }; + patches = [ + (fetchpatch { # https://github.com/hardwario/bch-gateway/pull/19 + name = "bcg-fix-import-with-Python-3.12.patch"; + url = "https://github.com/hardwario/bch-gateway/pull/19/commits/1314c892992d8914802b6c42602c39f6a1418fca.patch"; + hash = "sha256-dNiBppXjPSMUe2yiiSc9gGbAc8l4mI41wWq+g7PkD/Y="; + }) + ]; postPatch = '' sed -ri 's/@@VERSION@@/${version}/g' \ bcg/__init__.py setup.py @@ -32,6 +41,7 @@ buildPythonPackage rec { appdirs click click-log + looseversion paho-mqtt pyaml pyserial diff --git a/pkgs/development/python-modules/bcrypt/3.nix b/pkgs/development/python-modules/bcrypt/3.nix index 86b9361ff4ffe..7d0f4235277c2 100644 --- a/pkgs/development/python-modules/bcrypt/3.nix +++ b/pkgs/development/python-modules/bcrypt/3.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, setuptools, - isPyPy, fetchPypi, pythonOlder, cffi, diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index a369c25e8970d..dedbba874d1f9 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, glibcLocales, - nose, pylibmc, python-memcached, redis, @@ -15,7 +13,8 @@ pycrypto, cryptography, isPy27, - isPy3k, + pytestCheckHook, + setuptools, funcsigs ? null, pycryptopp ? null, }: @@ -23,16 +22,19 @@ buildPythonPackage rec { pname = "beaker"; version = "1.13.0"; + pyproject = true; # The pypy release do not contains the tests src = fetchFromGitHub { owner = "bbangert"; repo = "beaker"; rev = "refs/tags/${version}"; - sha256 = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE="; + hash = "sha256-HzjhOPXElwKoJLrhGIbVn798tbX/kaS1EpQIX+vXCtE="; }; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ sqlalchemy pycrypto @@ -47,29 +49,19 @@ buildPythonPackage rec { glibcLocales python-memcached mock - nose pylibmc pymongo redis webtest + pytestCheckHook ]; - # Can not run memcached tests because it immediately tries to connect - postPatch = '' - rm tests/test_memcached.py - ''; - + # Can not run memcached tests because it immediately tries to connect. # Disable external tests because they need to connect to a live database. - # Also disable a test in test_cache.py called "test_upgrade" because - # it currently fails on darwin. - # Please see issue https://github.com/bbangert/beaker/issues/166 - checkPhase = '' - nosetests \ - -e ".*test_ext_.*" \ - -e "test_upgrade" \ - ${lib.optionalString (!stdenv.isLinux) ''-e "test_cookie_expires_different_locale"''} \ - -vv tests - ''; + pytestFlagsArray = [ + "--ignore=tests/test_memcached.py" + "--ignore-glob='tests/test_managers/test_ext_*'" + ]; meta = { description = "Session and Caching library with WSGI Middleware"; diff --git a/pkgs/development/python-modules/beancount-black/default.nix b/pkgs/development/python-modules/beancount-black/default.nix index 4196997a0c95b..c229ec89cea26 100644 --- a/pkgs/development/python-modules/beancount-black/default.nix +++ b/pkgs/development/python-modules/beancount-black/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "beancount-black"; - version = "1.0.2"; + version = "1.0.4"; disabled = pythonOlder "3.9"; format = "pyproject"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beancount-black"; - rev = version; - hash = "sha256-SoAic9UYKE9lhMpl44VosJmmjKJjDrKOyMeUO931Ztg="; + rev = "refs/tags/${version}"; + hash = "sha256-GrdQCxVsAzCusxxfQHF48doWG8OVrqBayCFof9RHTkE="; }; buildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beancount-docverif/default.nix b/pkgs/development/python-modules/beancount-docverif/default.nix index e78db14aa2424..b53fab7c060a5 100644 --- a/pkgs/development/python-modules/beancount-docverif/default.nix +++ b/pkgs/development/python-modules/beancount-docverif/default.nix @@ -1,32 +1,41 @@ { lib, + beancount, buildPythonPackage, fetchPypi, - setuptools-scm, - beancount, pytestCheckHook, + pythonOlder, + regex, + setuptools-scm, }: buildPythonPackage rec { - version = "1.0.1"; pname = "beancount-docverif"; + version = "1.0.1"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "beancount_docverif"; inherit version; hash = "sha256-CFBv1FZP5JO+1MPnD86ttrO42zZlvE157zqig7s4HOg="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; + + dependencies = [ beancount ]; - propagatedBuildInputs = [ beancount ]; + nativeCheckInputs = [ + pytestCheckHook + regex + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "beancount_docverif" ]; meta = with lib; { - homepage = "https://github.com/siriobalmelli/beancount_docverif"; description = "Document verification plugin for Beancount"; + homepage = "https://github.com/siriobalmelli/beancount_docverif"; longDescription = '' Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions: diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index b0e9c97c5d1a2..81cf300fe559f 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "2.3.6"; format = "setuptools"; pname = "beancount"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z2aGhpx+o+78CU7hPthmv196K7DGHk1PXfPjX4Rs/98="; + hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; }; # Tests require files not included in the PyPI archive. @@ -58,6 +58,6 @@ buildPythonPackage rec { generate a variety of reports from them, and provides a web interface. ''; license = licenses.gpl2Only; - maintainers = with maintainers; [ bhipple ]; + maintainers = with maintainers; [ sharzy polarmutex ]; }; } diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index 61d95d881245d..98b5c8faed110 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; rev = "refs/tags/${version}"; - hash = "sha256-ZN384KN6+pkDDsCk825sr+LsArQ5Vaf09ASLN8IemhM="; + hash = "sha256-oHlI3hloquD86fHr3AgwW5SqKxUw2gphP76wi6mCy44="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index 230238b12d5b3..bfb3480bac996 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "0.3.2"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-import"; rev = "refs/tags/${version}"; - hash = "sha256-jDZUsV5yj4h7zUA5NB/4exhPj3f3put/bKXZmPz94OQ="; + hash = "sha256-igaW8vFUYagBfVQXL1Ulo7uhGilbOxxuyZV9Eda/Gto="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bech32/default.nix b/pkgs/development/python-modules/bech32/default.nix index 53c7bc5ec91d1..faed8e5615ff4 100644 --- a/pkgs/development/python-modules/bech32/default.nix +++ b/pkgs/development/python-modules/bech32/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/before-after/default.nix b/pkgs/development/python-modules/before-after/default.nix index 6756580f5a779..c1dce2b1a4ed0 100644 --- a/pkgs/development/python-modules/before-after/default.nix +++ b/pkgs/development/python-modules/before-after/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "sugar over the Mock library to help test race conditions"; homepage = "https://github.com/c-oreills/before_after"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2Only; }; } diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 21b6d7b692607..e7a9de7f1bc0d 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -4,46 +4,49 @@ fetchFromGitHub, buildPythonPackage, python, + pythonOlder, pytestCheckHook, + assertpy, mock, path, pyhamcrest, pytest-html, - glibcLocales, colorama, cucumber-tag-expressions, parse, parse-type, + setuptools, six, }: buildPythonPackage rec { pname = "behave"; - version = "1.2.7.dev2"; - format = "setuptools"; + version = "1.2.7.dev5"; + pyproject = true; src = fetchFromGitHub { owner = "behave"; - repo = pname; + repo = "behave"; rev = "v${version}"; - hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs="; + hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook + assertpy mock path pyhamcrest pytest-html ]; - # upstream tests are failing, so instead we only check if we can import it - doCheck = false; + doCheck = pythonOlder "3.12"; pythonImportsCheck = [ "behave" ]; - buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ + dependencies = [ colorama cucumber-tag-expressions parse @@ -60,15 +63,13 @@ buildPythonPackage rec { disabledTests = lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; postCheck = '' - export LANG="en_US.UTF-8" - export LC_ALL="en_US.UTF-8" - ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ ''; meta = with lib; { + changelog = "https://github.com/behave/behave/blob/${src.rev}/CHANGES.rst"; homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; mainProgram = "behave"; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 9d95e4ecd957b..444a1ae8eb9e7 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.39.1"; + version = "0.40.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-e7DGAA2/6tc2+iH/14y/QT7k9a7pgrE5bplTPL3xm2Q="; + hash = "sha256-pcyvJsAFJCm6mpGvfWp6WUzdn2Z7Fr2G6B5uEXZDhIg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bencode-py/default.nix b/pkgs/development/python-modules/bencode-py/default.nix index 7221c1e42c0cd..3620f34fa701e 100644 --- a/pkgs/development/python-modules/bencode-py/default.nix +++ b/pkgs/development/python-modules/bencode-py/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python, pbr, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/bencoder/default.nix b/pkgs/development/python-modules/bencoder/default.nix index 971588282320a..f8be50a99e273 100644 --- a/pkgs/development/python-modules/bencoder/default.nix +++ b/pkgs/development/python-modules/bencoder/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - setuptools, }: buildPythonPackage rec { pname = "bencoder"; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index ab5d4025dbf99..828021217c413 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, hatchling, hatch-vcs, aiohttp, @@ -130,8 +129,6 @@ buildPythonPackage { hash = "sha256-giZteSikwS9YEcVMPCC9h2khbBgvUPRW1biAyixO13Y="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "cattrs" "nvidia-ml-py" diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 9c96a59cabc34..dab6fcd1d4f28 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; + hash = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index e132936a1c397..2af89a69c9fdd 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -6,11 +6,12 @@ matplotlib, pyclipper, unittestCheckHook, + gitUpdater, }: buildPythonPackage rec { pname = "beziers"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; # PyPI doesn't have a proper source tarball, fetch from Github instead @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "simoncozens"; repo = "beziers.py"; rev = "v${version}"; - hash = "sha256-4014u7s47Tfdpa2Q9hKAoHg7Ebcs1/DVW5TpEmoh2bc="; + hash = "sha256-NjmWsRz/NPPwXPbiSaOeKJMrYmSyNTt5ikONyAljgvM="; }; propagatedBuildInputs = [ pyclipper ]; @@ -35,6 +36,8 @@ buildPythonPackage rec { "-v" ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { description = "Python library for manipulating Bezier curves and paths in fonts"; homepage = "https://github.com/simoncozens/beziers.py"; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 8a3ebaf0b6655..f954d7c4ab67f 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/bids-validator"; changelog = "https://github.com/bids-standard/bids-validator/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 87e6b47366a28..d3358fe645639 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - case, psutil, pythonOlder, }: @@ -21,7 +20,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - case psutil pytestCheckHook ]; @@ -38,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/celery/billiard"; changelog = "https://github.com/celery/billiard/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/binance-connector/default.nix b/pkgs/development/python-modules/binance-connector/default.nix index 914ab4c6acd07..5e76268d7cf42 100644 --- a/pkgs/development/python-modules/binance-connector/default.nix +++ b/pkgs/development/python-modules/binance-connector/default.nix @@ -7,7 +7,7 @@ requests, websocket-client, # dependencies for tests - pytest-cov, + pytest-cov-stub, pytest, sure, responses, @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "binance-connector"; - version = "3.7.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "binance"; repo = "${pname}-python"; rev = "refs/tags/v${version}"; - hash = "sha256-hmn8WKr+krzOzHNJ/aynXAbf+rHxDfyKDgycdQQU3xk="; + hash = "sha256-VUv9n+GePixsJ2Bqy4YOJpHEVkOjEO1HkBK+jxmkZpA="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytest sure responses diff --git a/pkgs/development/python-modules/binary/default.nix b/pkgs/development/python-modules/binary/default.nix index 93cb6d24dae06..ef2135e83f98b 100644 --- a/pkgs/development/python-modules/binary/default.nix +++ b/pkgs/development/python-modules/binary/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { asl20 mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index d3ebcbe91e37e..25365c67fbde3 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, stdenv, zlib, xz, @@ -14,37 +13,29 @@ cramfsprogs, cramfsswap, sasquatch, + setuptools, squashfsTools, matplotlib, - nose, pycrypto, pyqtgraph, pyqt5, + pytestCheckHook, visualizationSupport ? false, }: buildPythonPackage rec { pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; - version = "2.3.4"; - format = "setuptools"; + version = "2.4.2"; + pyproject = true; src = fetchFromGitHub { - owner = "ReFirmLabs"; + owner = "OSPG"; repo = "binwalk"; - rev = "v${version}"; - hash = "sha256-hlPbzqGRSXcIqlI+SNKq37CnnHd1IoMBNSjhyeAM1TE="; + rev = "refs/tags/v${version}"; + hash = "sha256-IFq/XotW3bbf3obWXRK6Nw1KQDqyFHb4tcA09Twg8SQ="; }; - patches = [ - # test_firmware_zip fails with 2.3.3 upgrade - # https://github.com/ReFirmLabs/binwalk/issues/566 - (fetchpatch { - url = "https://github.com/ReFirmLabs/binwalk/commit/dd4f2efd275c9dd1001130e82e0f985110cd2754.patch"; - sha256 = "1707n4nf1d1ay1yn4i8qlrvj2c1120g88hjwyklpsc2s2dcnqj9r"; - includes = [ "testing/tests/test_firmware_zip.py" ]; - revert = true; - }) - ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ @@ -80,12 +71,12 @@ buildPythonPackage rec { HOME=$(mktemp -d) ''; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "binwalk" ]; meta = with lib; { - homepage = "https://github.com/ReFirmLabs/binwalk"; + homepage = "https://github.com/OSPG/binwalk"; description = "Tool for searching a given binary image for embedded files"; mainProgram = "binwalk"; maintainers = [ maintainers.koral ]; diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix index 29e609b9b43c3..998974d90ee1c 100644 --- a/pkgs/development/python-modules/biopandas/default.nix +++ b/pkgs/development/python-modules/biopandas/default.nix @@ -7,8 +7,8 @@ mmtf-python, numpy, pandas, - pynose, pytestCheckHook, + fetchpatch2, }: buildPythonPackage rec { @@ -23,6 +23,21 @@ buildPythonPackage rec { hash = "sha256-1c78baBBsDyvAWrNx5mZI/Q75wyXv0DAwAdWm3EwX/I="; }; + patches = [ + # Needed for below patch to apply properly + (fetchpatch2 { + name = "deprecate-mmtf-parsing.patch"; + url = "https://github.com/BioPandas/biopandas/commit/7a1517dbe76f2c70da8edb35f90c9fa69254e726.patch?full_index=1"; + hash = "sha256-RFtXFqUYl8GnZ319HsBwx5SUbfUDnR66Ppakdvtg/wI="; + }) + # Remove nose as a dependency. + (fetchpatch2 { + name = "remove-nose.patch"; + url = "https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f.patch?full_index=1"; + hash = "sha256-fVl57/vGuzlYX/MBZnma1ZFCVmIpjr1k8t3bUJnb/uI="; + excludes = [ "setup.py" ]; + }) + ]; pythonRelaxDeps = [ "looseversion" ]; @@ -35,10 +50,7 @@ buildPythonPackage rec { looseversion ]; - nativeCheckInputs = [ - pynose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # require network access diff --git a/pkgs/development/python-modules/birch/default.nix b/pkgs/development/python-modules/birch/default.nix index f91bfea02733c..772ab25109e4c 100644 --- a/pkgs/development/python-modules/birch/default.nix +++ b/pkgs/development/python-modules/birch/default.nix @@ -6,6 +6,7 @@ setuptools, strct, pytestCheckHook, + pytest-cov-stub, pyyaml, }: @@ -31,11 +32,6 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail \ - "--cov" \ - "#--cov" - # configure correct version, which fails due to missing .git substituteInPlace versioneer.py birch/_version.py \ --replace-fail '"0+unknown"' '"${version}"' @@ -54,6 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pyyaml ]; diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 0217979d31da2..69b2b258e1f22 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/digitalbitbox/bitbox02-firmware/"; changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bitvector-for-humans/default.nix b/pkgs/development/python-modules/bitvector-for-humans/default.nix new file mode 100644 index 0000000000000..5652d850a7ea8 --- /dev/null +++ b/pkgs/development/python-modules/bitvector-for-humans/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch2, + poetry-core, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "bitvector-for-humans"; + version = "0.14.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JnyJny"; + repo = "bitvector"; + rev = version; + hash = "sha256-GVTRD83tq/Hea53US4drOD5ruoYCLTVd24aZOSdDsSo="; + }; + + patches = [ + (fetchpatch2 { + # https://github.com/JnyJny/bitvector/pull/1 + name = "fix-poetry-core.patch"; + url = "https://github.com/JnyJny/bitvector/commit/e5777f2425895ed854e54bed2ed9d993f6feaf2f.patch"; + hash = "sha256-BG3IpDMys88RtkPOd58CWpRWKKzbNe5kV+64hWjtecE="; + }) + ]; + + build-system = [ poetry-core ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "bitvector" ]; + + meta = with lib; { + homepage = "https://github.com/JnyJny/bitvector"; + description = "This simple bit vector implementation aims to make addressing single bits a little less fiddly."; + license = licenses.asl20; + maintainers = teams.helsinki-systems.members; + }; +} diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 3e8c680f7c91c..fa4ef1b19f067 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.2.1"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-VoWBCjFMyE5LVJyf7du/pKlnvDHj22lguiP6ZUzH9ak="; + hash = "sha256-W89L/3bpvecZdCpLCQOppev+fPc+SXd/T+zZLBH2wJs="; }; build-system = [ setuptools-scm ]; @@ -65,11 +65,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "blackjax" ]; - meta = with lib; { + meta = { homepage = "https://blackjax-devs.github.io/blackjax"; description = "Sampling library designed for ease of use, speed and modularity"; changelog = "https://github.com/blackjax-devs/blackjax/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 72cb3205e1553..c32e23e56a921 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Fast Python in-process signal/event dispatching system"; homepage = "https://github.com/pallets-eco/blinker/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index b1a7dc98b57da..7acdf490acb40 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -5,9 +5,9 @@ ephem, fetchFromGitHub, fetchpatch, + fetchpatch2, funcparserlib, pillow, - pynose, pytestCheckHook, pythonOlder, reportlab, @@ -36,8 +36,21 @@ buildPythonPackage rec { url = "https://github.com/blockdiag/blockdiag/commit/20d780cad84e7b010066cb55f848477957870165.patch"; hash = "sha256-t1zWFzAsLL2EUa0nD4Eui4Y5AhAZLRmp/yC9QpzzeUA="; }) + # https://github.com/blockdiag/blockdiag/pull/175 + (fetchpatch2 { + name = "migrate-to-pytest.patch"; + url = "https://github.com/blockdiag/blockdiag/commit/4f4f726252084f17ecc6c524592222af09d37da4.patch"; + hash = "sha256-OkfKJwJtb2DJRXE/8thYnisTFwcfstUFTTJHdM/qBzg="; + }) ]; + postPatch = '' + # requires network access the url-based icon + # and path-based icon is set to debian logo (/usr/share/pixmaps/debian-logo.png) + rm src/blockdiag/tests/diagrams/node_icon.diag + # note: this is a postPatch as `seqdiag` uses them directly + ''; + build-system = [ setuptools ]; dependencies = [ @@ -50,7 +63,6 @@ buildPythonPackage rec { nativeCheckInputs = [ ephem - pynose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix index 3c28d13e6c21d..394589c86f42c 100644 --- a/pkgs/development/python-modules/bloodyad/default.nix +++ b/pkgs/development/python-modules/bloodyad/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bloodyad"; - version = "2.0.4"; + version = "2.0.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CravateRouge"; repo = "bloodyAD"; rev = "refs/tags/v${version}"; - hash = "sha256-VqjWv7z2mU0mLM6rM4KBLS4JZaM3DGRxjXXBJQQcu9I="; + hash = "sha256-o035D6GYG1Uf59tFAAMsMF9kiY3yE15EDOCkg4V4tr4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index faffe2d1749e6..bdd5665f59223 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.4.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2CSWHkJlNnsHUM5YsH5WStC4PKZLM1UhzTQh6bnxDYk="; + hash = "sha256-Zeia3b6QDDevJaIFKuF0ttO6HvCMkf1att/XEuGEw5k="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index 16e9c8f76d474..a9a437af05ff8 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { mainProgram = "btp2"; homepage = "http://www.boltztrap.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix index 530f624987a18..0f2c5f180f05b 100644 --- a/pkgs/development/python-modules/bonsai/default.nix +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bonsai"; - version = "1.5.2"; + version = "1.5.3"; disabled = pythonOlder "3.8"; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "noirello"; repo = "bonsai"; rev = "v${version}"; - hash = "sha256-h/PbwQ69fDcmUCazMtxXP1iE0fE1on+WoK+wYgQ9jLs="; + hash = "sha256-SAP/YeWqow5dqXlXDzjnTWIfJhMwVeZSSUfWr1Mgmng="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ cyrus_sasl diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix index 8fd6b60311205..fde29936132f0 100644 --- a/pkgs/development/python-modules/boolean-py/default.nix +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Implements boolean algebra in one module"; homepage = "https://github.com/bastikr/boolean.py"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bootstrap/build/default.nix b/pkgs/development/python-modules/bootstrap/build/default.nix index 2101ee06c6bb4..0d693e2dde58b 100644 --- a/pkgs/development/python-modules/bootstrap/build/default.nix +++ b/pkgs/development/python-modules/bootstrap/build/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, build, diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index d348b1f877c80..bdd4a0f535ff8 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/bootstrap/installer/default.nix b/pkgs/development/python-modules/bootstrap/installer/default.nix index 454ec2a239a1a..9f396bb6275ab 100644 --- a/pkgs/development/python-modules/bootstrap/installer/default.nix +++ b/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -1,5 +1,4 @@ { - lib, stdenv, python, flit-core, diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix index 594c64fe66ef3..589eedcab9bfa 100644 --- a/pkgs/development/python-modules/borb/default.nix +++ b/pkgs/development/python-modules/borb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "borb"; - version = "2.1.24"; + version = "2.1.25"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jorisschellekens"; repo = "borb"; rev = "refs/tags/v${version}"; - hash = "sha256-3PZ3fHsq9pgJ4oK42Y4b/3ghuYELgRPe09fciOKknuE="; + hash = "sha256-eVxpcYL3ZgwidkSt6tUav3Bkne4lo1QCshdUFqkA0wI="; }; build-system = [ setuptools ]; @@ -63,11 +63,11 @@ buildPythonPackage rec { "tests/license/" ]; - meta = with lib; { + meta = { description = "Library for reading, creating and manipulating PDF files in Python"; homepage = "https://borbpdf.com/"; changelog = "https://github.com/jorisschellekens/borb/releases/tag/v${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index c0404e566de6c..44a8564558e9a 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -4,19 +4,20 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, build, coloredlogs, + importlib-metadata, packaging, pip, - readme-renderer, toml, - twine, + urllib3, }: buildPythonPackage rec { pname = "bork"; - version = "8.0.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "duckinator"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BDwVhKmZ/F8CvpT6dEI5moQZx8wHy1TwdOl889XogEo="; + hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk="; }; build-system = [ @@ -32,11 +33,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "build" "packaging" - "readme-renderer" - "twine" - "wheel" ]; dependencies = [ @@ -44,9 +41,10 @@ buildPythonPackage rec { coloredlogs packaging pip - readme-renderer - twine - ] ++ lib.optionals (pythonOlder "3.11") [ toml ]; + urllib3 + ] ++ lib.optionals (pythonOlder "3.11") [ toml ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ; pythonImportsCheck = [ "bork" @@ -67,7 +65,7 @@ buildPythonPackage rec { description = "Python build and release management tool"; mainProgram = "bork"; homepage = "https://github.com/duckinator/bork"; + license = licenses.mit; maintainers = with maintainers; [ nicoo ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 9d676c3612f66..0d352c9e2c52a 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, python, nose, mock, diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index c91e287076fff..3667e27f206ba 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.139"; + version = "1.34.158"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-MRteoVf/AXjzqVg+rniCIXBGevuHS6eGIWNNtOdOezY="; + hash = "sha256-APECk1mT4NCQQnrHkqTsU5Dk1nD6w5xbXNQ9mb0Ejc4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index e22bfe6166c52..266b2afca1313 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.139"; + version = "1.34.158"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-7lWxJvHtOkR09YBg4DtlFMDDs+zOiki0FxEZ52V6FC0="; + hash = "sha256-XeDJ5uZ4cLEyBmTcUL9T2/beUiksuW2PCBNYkU8KAQ4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 129facf57de18..7a860437c1b89 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, gpytorch, @@ -8,7 +9,6 @@ pyro-ppl, setuptools, setuptools-scm, - wheel, torch, scipy, pytestCheckHook, @@ -16,23 +16,22 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.11.1"; - format = "pyproject"; + version = "0.11.3"; + pyproject = true; src = fetchFromGitHub { owner = "pytorch"; - repo = pname; + repo = "botorch"; rev = "refs/tags/v${version}"; - hash = "sha256-YX/G46U09y/VZuWZhKY8zU0Y+bf0NKumzSGYUWvrq/0="; + hash = "sha256-AtRU5KC8KlkxMCU0OUAHDFK7BsPO3TbRmmzDGV7+yVk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ gpytorch linear-operator multipledispatch @@ -41,12 +40,33 @@ buildPythonPackage rec { torch ]; - pythonRelaxDeps = [ "linear-operator" ]; + pythonRelaxDeps = [ + "gpytorch" + "linear-operator" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + # tests tend to get stuck on busy hosts, increase verbosity to find out + # which specific tests get stuck + "-vvv" + ]; + + disabledTests = + [ "test_all_cases_covered" ] + ++ lib.optionals (stdenv.buildPlatform.system == "x86_64-linux") [ + # stuck tests on hydra + "test_moo_predictive_entropy_search" + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "botorch" ]; + # needs lots of undisturbed CPU time or prone to getting stuck + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { + changelog = "https://github.com/pytorch/botorch/blob/${src.rev}/CHANGELOG.md"; description = "Bayesian Optimization in PyTorch"; homepage = "https://botorch.org"; license = licenses.mit; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 8b84fc8c125f2..18aa852cd73b3 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Fast NumPy array functions"; homepage = "https://github.com/pydata/bottleneck"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index a04cb8c79de43..97fd086b1f5cf 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -4,16 +4,13 @@ beautifulsoup4, blender, boxx, - bpycv, buildPythonPackage, fetchFromGitHub, fetchPypi, minexr, opencv4, - python3Packages, requests, runCommand, - writeText, zcs, }: diff --git a/pkgs/development/python-modules/bpylist2/default.nix b/pkgs/development/python-modules/bpylist2/default.nix new file mode 100644 index 0000000000000..7becd01e194bf --- /dev/null +++ b/pkgs/development/python-modules/bpylist2/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage { + pname = "bpylist2"; + version = "4.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "parabolala"; + repo = "bpylist2"; + rev = "ddb89e0b0301c6b298de6469221d99b5fe127b58"; + hash = "sha256-OBwDQZL5++LZgpQM96tmplAh1Pjme3KGSNFTKqKUn00="; + }; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ "bpylist2" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--pycodestyle" "" \ + --replace-fail "--pylint --pylint-rcfile=pylint.rc" "" \ + --replace-fail "--mypy" "" + ''; + + meta = { + description = "Parse and Generate binary plists and NSKeyedArchiver archives"; + license = lib.licenses.mit; + homepage = "https://github.com/parabolala/bpylist2"; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index e6dd4a3f082b6..15f562185e1ba 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -12,7 +12,6 @@ pyperclip, pyxdg, requests, - substituteAll, typing-extensions, urwid, watchdog, diff --git a/pkgs/development/python-modules/bracex/default.nix b/pkgs/development/python-modules/bracex/default.nix index 7e341d4c1ce08..8149d1ad60f3d 100644 --- a/pkgs/development/python-modules/bracex/default.nix +++ b/pkgs/development/python-modules/bracex/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "bracex"; - version = "2.4"; + version = "2.5"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-on6vHfQs9WH+1Yt6jz/fEp0eoWqB4frdHReYm8Y4S+s="; + hash = "sha256-ByXaUEXo036pWSqzYU2LVh4iw8X945ZGmb5nLgcqthE="; }; nativeBuildInputs = [ hatchling ]; @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Bash style brace expansion for Python"; homepage = "https://github.com/facelessuser/bracex"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/brainflow/default.nix b/pkgs/development/python-modules/brainflow/default.nix new file mode 100644 index 0000000000000..a486055460087 --- /dev/null +++ b/pkgs/development/python-modules/brainflow/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + brainflow, + nptyping, + numpy, + python, + setuptools, +}: + +buildPythonPackage { + inherit (brainflow) + pname + version + src + patches + meta + ; + + pyproject = true; + build-system = [ setuptools ]; + + dependencies = [ + numpy + nptyping + ]; + + buildInputs = [ brainflow ]; + + postPatch = '' + cd python_package + ''; + + postInstall = '' + mkdir -p "$out/${python.sitePackages}/brainflow/lib/" + cp -Tr "${brainflow}/lib" "$out/${python.sitePackages}/brainflow/lib/" + ''; + + pythonImportsCheck = [ "brainflow" ]; +} diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 7791004c1b6af..854f1451c0b15 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -2,44 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, pytestCheckHook, - pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "braintree"; - version = "4.14.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "4.29.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; + owner = "braintree"; repo = "braintree_python"; rev = version; - hash = "sha256-qeqQX+qyy78sLe+46CA4D6VAxNHUVahS4LMYdGDzc2k="; + hash = "sha256-5MF8W2zUVvNiOnmszgJkMDmeYLZ6ppFHqmH6dmlCzQY="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + dependencies = [ requests ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braintree" ]; - disabledTestPaths = [ - # Don't test integrations - "tests/integration" + pytestFlagsArray = [ + "tests/" + "tests/fixtures" + "tests/unit" + "tests/integration/test_credentials_parser.py" ]; - meta = with lib; { + meta = { description = "Python library for integration with Braintree"; homepage = "https://github.com/braintree/braintree_python"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 4c16cd2a88937..aca3fcd645d0b 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-visualization/branca"; changelog = "https://github.com/python-visualization/branca/blob/v${version}/CHANGES.txt"; license = with licenses; [ mit ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index d9033c4fd3bad..4564364bfe5e3 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,54 +2,57 @@ lib, buildPythonPackage, defusedxml, - docutils, fetchFromGitHub, fetchpatch, pytestCheckHook, pythonOlder, + setuptools, sphinx, }: buildPythonPackage rec { pname = "breathe"; version = "4.35.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "michaeljones"; - repo = pname; + owner = "breathe-doc"; + repo = "breathe"; rev = "refs/tags/v${version}"; hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; patches = [ + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/964 (fetchpatch { - # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/956 - name = "breathe-sphinx7.2-support.patch"; - url = "https://github.com/breathe-doc/breathe/commit/46abd77157a2a57e81586e4f8765ae8f1a09d167.patch"; - hash = "sha256-zGFO/Ndk/9Yv2dbo8fpEoB/vchZP5vRceoC1E3sUny8="; + url = "https://github.com/breathe-doc/breathe/commit/caa8dc45222b35d360c24bf36835a7d8e6d86df2.patch"; + hash = "sha256-wWe4x4WwZTrDhNZAF7mhfHHNEjd+Kp4YXghL+DPa10w="; + }) + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/976 + (fetchpatch { + url = "https://github.com/breathe-doc/breathe/commit/09c856bf72de41e82582f31855e916295ba6d382.patch"; + hash = "sha256-vU3DUrj4Jj4AUolFFtWmaLMf9RG7TmKqJe5sCwwRjPI="; }) ]; - propagatedBuildInputs = [ - docutils - sphinx - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = [ sphinx ]; - checkInputs = [ defusedxml ]; + nativeCheckInputs = [ + defusedxml + pytestCheckHook + ]; pythonImportsCheck = [ "breathe" ]; - meta = with lib; { + meta = { description = "Sphinx Doxygen renderer"; mainProgram = "breathe-apidoc"; - homepage = "https://github.com/michaeljones/breathe"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - inherit (sphinx.meta) platforms; + homepage = "https://github.com/breathe-doc/breathe"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/brelpy/default.nix b/pkgs/development/python-modules/brelpy/default.nix index 96e0d47265458..b5edbe1e1aefd 100644 --- a/pkgs/development/python-modules/brelpy/default.nix +++ b/pkgs/development/python-modules/brelpy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pycryptodome, - pygithub, pythonOlder, }: diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix index 7d08a68e0e62a..596b173151145 100644 --- a/pkgs/development/python-modules/bring-api/default.nix +++ b/pkgs/development/python-modules/bring-api/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "bring-api"; - version = "0.7.2"; + version = "0.8.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "miaucl"; repo = "bring-api"; rev = "refs/tags/${version}"; - hash = "sha256-941IAVlLwfHCyqUu0AhdIfBjuT3pZpk98ZUssBVjEUA="; + hash = "sha256-w7DV+Idcg7OobFx+ECimngQKk0SCzd5F+DTg+WcnJwA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 1aef851742c57..10d0a020d3633 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -1,5 +1,4 @@ { - stdenv, fetchPypi, fetchpatch, buildPythonPackage, @@ -7,8 +6,6 @@ packbits, pillow, pyusb, - pytest, - mock, click, attrs, lib, diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index afe4e9e3fd702..f429478eca985 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc="; + hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM="; # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data forceFetchGit = true; }; @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix index 71a8f3ce37aae..8de7c2194ab2b 100644 --- a/pkgs/development/python-modules/brottsplatskartan/default.nix +++ b/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, requests, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bthomehub5-devicelist/default.nix b/pkgs/development/python-modules/bthomehub5-devicelist/default.nix new file mode 100644 index 0000000000000..2c4b9562c16b5 --- /dev/null +++ b/pkgs/development/python-modules/bthomehub5-devicelist/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + html-table-parser-python3, + requests, +}: + +buildPythonPackage rec { + pname = "bthomehub5-devicelist"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bWMwLbFGdMRcZLIVbOptWMOOFzVBm2KxQ9jwqvAU6zA="; + }; + + pythonRelaxDeps = [ "html-table-parser-python3" ]; + + build-system = [ setuptools ]; + + dependencies = [ + html-table-parser-python3 + requests + ]; + + # No tests in the package + doCheck = false; + + pythonImportsCheck = [ "bthomehub5_devicelist" ]; + + meta = { + description = "Returns a list of devices currently connected to a BT Home Hub 5"; + homepage = "https://github.com/ahobsonsayers/bthomehub5-devicelist"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 52aafcf554b67..e6d92d31f3e57 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Scalable persistent components"; homepage = "http://packages.python.org/BTrees"; license = licenses.zpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 18466cb31cb39..bfb6f582dd3a9 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/bugsnag/bugsnag-python"; changelog = "https://github.com/bugsnag/bugsnag-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 23e14d3eada99..0070effd7a0a1 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PhoxjnkeLGL8vgEp7UubXKlS8p44TUkJ3c4SqRjKFJA="; + hash = "sha256-MpUpj3/hsjkrsv+Ix6Cuadd6dpivWAqBVwBSygW6Uw8="; }; # Module has no tests diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index 54659c6110954..ff64e723cdbc6 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Python dictionary that provides attribute-style access"; homepage = "https://github.com/dsc/bunch"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-keepass/default.nix b/pkgs/development/python-modules/bundlewrap-keepass/default.nix index a738b0aa9e75f..d69580a00de0f 100644 --- a/pkgs/development/python-modules/bundlewrap-keepass/default.nix +++ b/pkgs/development/python-modules/bundlewrap-keepass/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bundlewrap-keepass"; description = "Use secrets from keepass in your BundleWrap repo"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-pass/default.nix b/pkgs/development/python-modules/bundlewrap-pass/default.nix index c4b58575700da..40014fbe6587e 100644 --- a/pkgs/development/python-modules/bundlewrap-pass/default.nix +++ b/pkgs/development/python-modules/bundlewrap-pass/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bundlewrap-pass"; description = "Use secrets from pass in your BundleWrap repo"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix index a8dd57f15b788..cf13c27302033 100644 --- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix +++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/trehn/bundlewrap-teamvault"; description = "Pull secrets from TeamVault into your BundleWrap repo"; license = [ licenses.gpl3 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index dcafcf1408483..35790227d5e53 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -7,7 +7,6 @@ jinja2, mako, passlib, - pytest, pyyaml, requests, rtoml, diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix new file mode 100644 index 0000000000000..6882416b57c81 --- /dev/null +++ b/pkgs/development/python-modules/busylight-for-humans/default.nix @@ -0,0 +1,67 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch2, + poetry-core, + pytestCheckHook, + pytest-mock, + bitvector-for-humans, + hidapi, + loguru, + pyserial, + typer, + webcolors, +}: +buildPythonPackage rec { + pname = "busylight-for-humans"; + version = "0.32.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JnyJny"; + repo = "busylight"; + rev = version; + hash = "sha256-rdgkTk9x3bO5H01Bo2yOGIIxkoLv1k7kkJidJu/1HDQ="; + }; + + patches = [ + (fetchpatch2 { + # https://github.com/JnyJny/busylight/pull/369 + name = "fix-poetry-core.patch"; + url = "https://github.com/helsinki-systems/busylight/commit/74ca283e2250564f422d904ece1b9ab0dd9a8f6c.patch"; + hash = "sha256-eif9ycSYL8ZpXsvNCOHDJlpj12oauyzlMKUScZMzllc="; + }) + ]; + + build-system = [ poetry-core ]; + dependencies = [ + bitvector-for-humans + hidapi + loguru + pyserial + typer + webcolors + ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + disabledTestPaths = [ "tests/test_pydantic_models.py" ]; + + pythonImportsCheck = [ "busylight" ]; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + $out/bin/busylight udev-rules -o $out/lib/udev/rules.d/99-busylight.rules + ''; + + meta = with lib; { + homepage = "https://github.com/JnyJny/busylight"; + description = "Control USB connected presence lights from multiple vendors via the command-line or web API."; + mainProgram = "busylight"; + license = licenses.asl20; + maintainers = teams.helsinki-systems.members; + }; +} diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix index c6cf1a32185f6..f1825c5ae7899 100644 --- a/pkgs/development/python-modules/bx-py-utils/default.nix +++ b/pkgs/development/python-modules/bx-py-utils/default.nix @@ -4,18 +4,19 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + setuptools-scm, beautifulsoup4, boto3, lxml, pdoc, pytestCheckHook, requests-mock, + typeguard, }: buildPythonPackage rec { pname = "bx-py-utils"; - version = "91"; + version = "93"; disabled = pythonOlder "3.9"; @@ -25,14 +26,14 @@ buildPythonPackage rec { owner = "boxine"; repo = "bx_py_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-W8NP5h9fHyTJj6TIpBunoPcNOu8eWV1rA8ZaoGUnmBQ="; + hash = "sha256-4xZOj6A2RKz7zOhFkLcSM7D870PfOljI8jn2+gKeYk4="; }; postPatch = '' rm bx_py_utils_tests/publish.py ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ setuptools-scm ]; pythonImportsCheck = [ "bx_py_utils.anonymize" @@ -62,6 +63,7 @@ buildPythonPackage rec { pdoc pytestCheckHook requests-mock + typeguard ]; disabledTests = [ diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 2ea260df66f81..869440098f1de 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -2,38 +2,50 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, numpy, cython, zlib, python-lzo, - nose, + pytestCheckHook, + setuptools, + oldest-supported-numpy, }: buildPythonPackage rec { pname = "bx-python"; - version = "0.11.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "0.12.0"; + pyproject = true; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-evhxh/cCZFSK6EgMu7fC9/ZrPd2S1fZz89ItGYrHQck="; + hash = "sha256-ZpZjh7OXdUY7rd692h7VYHzC3qCrDKFme6r+wuG7GP4="; }; - nativeBuildInputs = [ cython ]; + postPatch = '' + # pytest-cython, which provides this option, isn't packaged + substituteInPlace pytest.ini \ + --replace-fail "--doctest-cython" "" + ''; + + build-system = [ + setuptools + cython + oldest-supported-numpy + ]; buildInputs = [ zlib ]; - propagatedBuildInputs = [ - numpy + dependencies = [ numpy ]; + + nativeCheckInputs = [ python-lzo + pytestCheckHook ]; - nativeCheckInputs = [ nose ]; + # https://github.com/bxlab/bx-python/issues/101 + doCheck = false; postInstall = '' cp -r scripts/* $out/bin @@ -45,12 +57,12 @@ buildPythonPackage rec { ln -s $out/bin scripts ''; - meta = with lib; { + meta = { description = "Tools for manipulating biological data, particularly multiple sequence alignments"; homepage = "https://github.com/bxlab/bx-python"; changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ jbedo ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix index a16488b81d0db..985a2ada9b5e3 100644 --- a/pkgs/development/python-modules/cached-ipaddress/default.nix +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/bdraco/cached-ipaddress"; changelog = "https://github.com/bdraco/cached-ipaddress/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index dac7bb71f2362..93a0def9973ce 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -7,6 +7,7 @@ watchdog, portalocker, pytestCheckHook, + pytest-cov-stub, pymongo, dnspython, pymongo-inmemory, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "python-cachier"; repo = "cachier"; rev = "refs/tags/v${version}"; - hash = "sha256-3rKsgcJQ9RQwosVruD7H99msB8iGtAai320okrCZCTI="; + hash = "sha256-VApP1DRs+mjx+SELpdDOm2Sa7zBYHDqD/htFF/eNLu0="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -39,15 +40,9 @@ buildPythonPackage rec { portalocker ]; - preCheck = '' - substituteInPlace pyproject.toml \ - --replace-fail \ - '"--cov' \ - '#"--cov' - ''; - nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pymongo dnspython pymongo-inmemory diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 11a65554116c8..b871515bc42a1 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -6,8 +6,6 @@ fetchPypi, lib, substituteAll, - makeFontsConf, - freefont_ttf, pikepdf, pytestCheckHook, cairo, @@ -63,7 +61,7 @@ buildPythonPackage rec { changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; description = "cffi-based cairo bindings for Python"; }; } diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index de527486065dc..a2f64cb79c991 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { license = licenses.lgpl3Plus; description = "SVG converter based on Cairo"; mainProgram = "cairosvg"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix index 4d98b29c58004..906b372572c8a 100644 --- a/pkgs/development/python-modules/calmjs-types/default.nix +++ b/pkgs/development/python-modules/calmjs-types/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "calmjs.types"; inherit version; - sha256 = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; + hash = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix index 442528807daca..ee3affa9c1bdb 100644 --- a/pkgs/development/python-modules/calmjs/default.nix +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; + hash = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 71097501c21b9..f4dbf575be2df 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "can"; - version = "4.4.0"; + version = "4.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "hardbyte"; repo = "python-can"; rev = "refs/tags/v${version}"; - hash = "sha256-A3J/81QFSr9dP1FfpYZC+qAQlnYbzE4y5nBcfSzA3oI="; + hash = "sha256-p3B1LWSygDX0UhIx4XhXv15H7Hwn9UB20jFIPDZnuNs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index fa1130778b555..2dffe4fbec029 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - frozendict, pytestCheckHook, pythonOlder, setuptools, diff --git a/pkgs/development/python-modules/capstone/4.nix b/pkgs/development/python-modules/capstone/4.nix index 2ecf1ce9347a1..66b57a01bcb21 100644 --- a/pkgs/development/python-modules/capstone/4.nix +++ b/pkgs/development/python-modules/capstone/4.nix @@ -4,14 +4,23 @@ capstone_4, stdenv, setuptools, - pythonAtLeast, + fetchpatch, }: buildPythonPackage { pname = "capstone"; inherit (capstone_4) version src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${capstone_4.src.name}/bindings/python"; + patches = [ + # Drop distutils in python binding (PR 2271) + (fetchpatch { + name = "drop-distutils-in-python-binding.patch"; + url = "https://github.com/capstone-engine/capstone/commit/d63211e3acb64fceb8b1c4a0d804b4b027f4ef71.patch"; + hash = "sha256-zUGeFmm3xH5dzfPJE8nnHwqwFBrsZ7w8LBJAy20/3RI="; + stripLen = 2; + }) + ]; postPatch = '' ln -s ${capstone_4}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ @@ -42,6 +51,5 @@ buildPythonPackage { bennofs ris ]; - broken = pythonAtLeast "3.12"; # uses distutils }; } diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index ce7063adcd51e..74035c9bef303 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -4,19 +4,24 @@ capstone, stdenv, setuptools, - pythonAtLeast, + fetchpatch, }: buildPythonPackage rec { pname = "capstone"; version = lib.getVersion capstone; - format = "setuptools"; - - # distutils usage - disabled = pythonAtLeast "3.12"; src = capstone.src; sourceRoot = "${src.name}/bindings/python"; + patches = [ + # Drop distutils in python binding (PR 2271) + (fetchpatch { + name = "drop-distutils-in-python-binding.patch"; + url = "https://github.com/capstone-engine/capstone/commit/d63211e3acb64fceb8b1c4a0d804b4b027f4ef71.patch"; + hash = "sha256-zUGeFmm3xH5dzfPJE8nnHwqwFBrsZ7w8LBJAy20/3RI="; + stripLen = 2; + }) + ]; # libcapstone.a is not built with BUILD_SHARED_LIBS. For some reason setup.py # checks if it exists but it is not really needed. Most likely a bug in setup.py. diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 440ac99954f4b..49c9b305626b6 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/casbin/pycasbin"; changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix deleted file mode 100644 index 8cf5ad07a64b2..0000000000000 --- a/pkgs/development/python-modules/case/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pynose, - pythonOlder, - setuptools, - six, -}: - -buildPythonPackage rec { - pname = "case"; - version = "1.5.3"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "48432b01d91913451c3512c5b90e31b0f348f1074b166a3431085eb70d784fb1"; - }; - - build-system = [ - setuptools - ]; - - pythonRemoveDeps = [ - # replaced with pynopse for python 3.12 compat - "nose" - ]; - - dependencies = [ - pynose - six - ]; - - # No real unittests, only coverage - doCheck = false; - - pythonImportsCheck = [ "case" ]; - - meta = with lib; { - homepage = "https://github.com/celery/case"; - description = "Utilities for unittests handling"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix index 3d75bc80c4758..83ff91c16f115 100644 --- a/pkgs/development/python-modules/cashews/default.nix +++ b/pkgs/development/python-modules/cashews/default.nix @@ -9,7 +9,7 @@ lib, pytest, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytest-rerunfailures, pytestCheckHook, redis, @@ -46,7 +46,7 @@ buildPythonPackage rec { hypothesis pytest pytest-asyncio - pytest-cov + pytest-cov-stub pytest-rerunfailures pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index c850c6a89dd0d..9548bd1214d83 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -3,33 +3,31 @@ stdenv, buildPythonPackage, cryptography, - cython_0, + cython, eventlet, fetchFromGitHub, + fetchpatch2, geomet, gevent, gremlinpython, iana-etc, libev, libredirect, - mock, - nose, pytestCheckHook, - pythonOlder, pytz, pyyaml, scales, six, sure, twisted, + setuptools, + distutils, }: buildPythonPackage rec { pname = "cassandra-driver"; version = "3.29.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "datastax"; @@ -38,29 +36,53 @@ buildPythonPackage rec { hash = "sha256-pnNm5Pd5k4bt+s3GrUUDWRpSdqNSM89GiX8DZKYzW1E="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'geomet>=0.1,<0.3' 'geomet' - ''; + patches = [ + # https://github.com/datastax/python-driver/pull/1201 + # Also needed for below patch to apply + (fetchpatch2 { + name = "remove-mock-dependency.patch"; + url = "https://github.com/datastax/python-driver/commit/9aca00be33d96559f0eabc1c8a26bb439dcebbd7.patch"; + hash = "sha256-ZN95V8ebbjahzqBat2oKBJLfu0fqbWMvAu0DzfVGw8I="; + }) + # https://github.com/datastax/python-driver/pull/1215 + (fetchpatch2 { + name = "convert-to-pytest.patch"; + url = "https://github.com/datastax/python-driver/commit/9952e2ab22c7e034b96cc89330791d73c221546b.patch"; + hash = "sha256-xa2aV6drBcgkQT05kt44vwupg3oMHLbcbZSQ7EHKnko="; + }) + # https://github.com/datastax/python-driver/pull/1195 + (fetchpatch2 { + name = "remove-assertRaisesRegexp.patch"; + url = "https://github.com/datastax/python-driver/commit/622523b83971e8a181eb4853b7d877420c0351ef.patch"; + hash = "sha256-Q8pRhHBLKyenMfrITf8kDv3BbsSCDAmVisTr4jSAIvA="; + }) + ]; - nativeBuildInputs = [ cython_0 ]; + pythonRelaxDeps = [ "geomet" ]; + + build-system = [ + distutils + setuptools + cython + ]; buildInputs = [ libev ]; - propagatedBuildInputs = [ + dependencies = [ six geomet ]; nativeCheckInputs = [ pytestCheckHook - mock - nose pytz pyyaml sure ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + # This is used to determine the version of cython that can be used + CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; + # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests preCheck = @@ -92,6 +114,8 @@ buildPythonPackage rec { disabledTestPaths = [ # requires puresasl "tests/unit/advanced/test_auth.py" + # Uses asyncore, which is deprecated in python 3.12+ + "tests/unit/io/test_asyncorereactor.py" ]; disabledTests = [ @@ -112,11 +136,11 @@ buildPythonPackage rec { twisted = [ twisted ]; }; - meta = with lib; { + meta = { description = "Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; - maintainers = with maintainers; [ ris ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ris ]; }; } diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 8b864b6c2b49b..0ad13f1f28c2d 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonAtLeast, pythonOlder, setuptools, typing-extensions, diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix index cc1b3a938c0d9..a09cc9fd444eb 100644 --- a/pkgs/development/python-modules/catkin-pkg/default.nix +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "catkin-pkg"; - version = "0.5.2"; + version = "1.0.0"; pyproject = true; @@ -19,15 +19,16 @@ buildPythonPackage rec { owner = "ros-infrastructure"; repo = "catkin_pkg"; rev = version; - hash = "sha256-DjaPpLDsLpYOZukf5tYe6ZetSNTe/DJ2lS9BUsehZ8k="; + hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ docutils pyparsing python-dateutil + setuptools ]; pythonImportsCheck = [ "catkin_pkg" ]; @@ -37,6 +38,7 @@ buildPythonPackage rec { disabledTestPaths = [ "test/test_flake8.py" ]; meta = { + changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${version}/CHANGELOG.rst"; description = "Library for retrieving information about catkin packages"; homepage = "http://wiki.ros.org/catkin_pkg"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 319d7feb44fae..aee2824d2926d 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -49,6 +48,6 @@ buildPythonPackage rec { mainProgram = "cbor2"; homepage = "https://github.com/agronholm/cbor2"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 9e52b75e59afe..abdc5fb184e48 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,39 +1,31 @@ { - stdenv, lib, - buildPythonPackage, - fetchPypi, - pythonOlder, - - # build-system - setuptools, - - # dependencies + stdenv, billiard, - kombu, - vine, - click, + buildPythonPackage, click-didyoumean, - click-repl, click-plugins, - tzdata, - python-dateutil, - - # optional-dependencies + click-repl, + click, + fetchPypi, google-cloud-storage, + kombu, moto, msgpack, + nixosTests, pymongo, - pyyaml, - - # tests pytest-celery, pytest-click, pytest-subtests, pytest-timeout, pytest-xdist, pytestCheckHook, - nixosTests, + python-dateutil, + pythonOlder, + pyyaml, + setuptools, + tzdata, + vine, }: buildPythonPackage rec { @@ -62,28 +54,22 @@ buildPythonPackage rec { vine ]; - optional-dependencies = { + passthru.optional-dependencies = { gcs = [ google-cloud-storage ]; mongodb = [ pymongo ]; msgpack = [ msgpack ]; yaml = [ pyyaml ]; }; - nativeCheckInputs = - [ - moto - pytest-celery - pytest-click - pytest-subtests - pytest-timeout - pytest-xdist - pytestCheckHook - ] - # based on https://github.com/celery/celery/blob/main/requirements/test.txt - ++ optional-dependencies.yaml - ++ optional-dependencies.msgpack - ++ optional-dependencies.mongodb - ++ optional-dependencies.gcs; + nativeCheckInputs = [ + moto + pytest-celery + pytest-click + pytest-subtests + pytest-timeout + pytest-xdist + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ # test_eventlet touches network @@ -91,7 +77,7 @@ buildPythonPackage rec { # test_multi tries to create directories under /var "t/unit/bin/test_multi.py" "t/unit/apps/test_multi.py" - # requires moto<5 + # Test requires moto<5 "t/unit/backends/test_s3.py" ]; @@ -102,13 +88,15 @@ buildPythonPackage rec { # seems to only fail on higher core counts # AssertionError: assert 3 == 0 "test_setup_security_disabled_serializers" - # fails with pytest-xdist + # Test is flaky, especially on hydra + "test_ready" + # Tests fail with pytest-xdist "test_itercapture_limit" "test_stamping_headers_in_options" "test_stamping_with_replace" ] ++ lib.optionals stdenv.isDarwin [ - # too many open files on hydra + # Too many open files on hydra "test_cleanup" "test_with_autoscaler_file_descriptor_safety" "test_with_file_descriptor_safety" @@ -122,10 +110,10 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed task queue"; - mainProgram = "celery"; homepage = "https://github.com/celery/celery/"; changelog = "https://github.com/celery/celery/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "celery"; }; } diff --git a/pkgs/development/python-modules/cemm/default.nix b/pkgs/development/python-modules/cemm/default.nix index 2b93befacbbd7..83ff151d7c8b5 100644 --- a/pkgs/development/python-modules/cemm/default.nix +++ b/pkgs/development/python-modules/cemm/default.nix @@ -7,6 +7,7 @@ fetchpatch, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, yarl, @@ -37,8 +38,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" + --replace '"0.0.0"' '"${version}"' ''; nativeBuildInputs = [ poetry-core ]; @@ -53,6 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 460ac35b5351e..d6ed789655f54 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.12"; + version = "2.2.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Gw3JbAdg/ObWdD6vl8Wuct6VCcP4GAZbiesXSSnW1Mg="; + hash = "sha256-ejAgPSHeE2842WvGjH+2HbaA7HoNDuIGNvmqXgCjuLE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index a922e5a69d29b..ea1873e2c589d 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -12,12 +12,7 @@ josepy, parsedatetime, pyrfc3339, - pyopenssl, pytz, - requests, - six, - zope-component, - zope-interface, setuptools, dialog, gnureadline, diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index 2ed4c9407ac0b..49bf0b39adf55 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -1,26 +1,31 @@ { lib, buildPythonPackage, - dask, + pythonOlder, fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + xarray, + + # optional-dependencies matplotlib, pint, pooch, - pytestCheckHook, - pythonOlder, regex, rich, - scipy, - setuptools, - setuptools-scm, shapely, - wheel, - xarray, + + # checks + dask, + pytestCheckHook, + scipy, }: buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,13 +34,12 @@ buildPythonPackage rec { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-7eL8z2r1+X80QqiL/5XzfA+Jlx+WuKvuxIWG4YLCwfg="; + hash = "sha256-zio00ki86DZqWtGnVseDR28He4DW1jjKdwfsxRwFDfg="; }; build-system = [ setuptools setuptools-scm - wheel xarray ]; diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix index fcf6f222984c9..befd378ac31d3 100644 --- a/pkgs/development/python-modules/cffconvert/default.nix +++ b/pkgs/development/python-modules/cffconvert/default.nix @@ -9,7 +9,7 @@ pykwalify, jsonschema, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -34,11 +34,9 @@ buildPythonPackage rec { jsonschema ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ - # addopts uses --no-cov - pytest-cov + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index 988af2d302454..c9642235e37ea 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -1,40 +1,48 @@ { stdenv, lib, + afdko, buildPythonPackage, - fetchpatch, + cmake, + distutils, fetchPypi, fonttools, + ninja, pytestCheckHook, + scikit-build, + setuptools, setuptools-scm, - wheel, }: buildPythonPackage rec { pname = "cffsubr"; - version = "0.2.9.post1"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-azFBLc9JyPqEZkvahn4u3cVbb+b6aW/yU8TxOp/y/Fw="; + hash = "sha256-d0UVC9uBZ5+s3RHB87hwlsT029SVfo/Ou4jEVoeVLvs="; }; - patches = [ - # https://github.com/adobe-type-tools/cffsubr/pull/23 - (fetchpatch { - name = "remove-setuptools-git-ls-files.patch"; - url = "https://github.com/adobe-type-tools/cffsubr/commit/887a6a03b1e944b82fcb99b797fbc2f3a64298f0.patch"; - hash = "sha256-LuyqBtDrKWwCeckr+YafZ5nfVw1XnELwFI6X8bGomhs="; - }) - ]; - - nativeBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'afdko_output_dir = os.path.join(afdko_root_dir, "build", "bin")' \ + 'afdko_output_dir = "${lib.getBin afdko}/bin"' \ + --replace-fail 'build_cmd=build_release_cmd' 'build_cmd="true"' + ''; + + build-system = [ + cmake + distutils + ninja + scikit-build + setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ fonttools ]; + dontUseCmakeConfigure = true; + + dependencies = [ fonttools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -42,10 +50,11 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; + changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}"; description = "Standalone CFF subroutinizer based on AFDKO tx"; mainProgram = "cffsubr"; homepage = "https://github.com/adobe-type-tools/cffsubr"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 0e182eafcd744..d0325a5c21ea2 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -15,7 +15,6 @@ pyyaml, regex, sarif-om, - setuptools, sympy, }: @@ -79,6 +78,6 @@ buildPythonPackage rec { homepage = "https://github.com/aws-cloudformation/cfn-lint"; changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix index 4a1e79f898945..f4d6bc7a38a95 100644 --- a/pkgs/development/python-modules/cfscrape/default.nix +++ b/pkgs/development/python-modules/cfscrape/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Python module to bypass Cloudflare's anti-bot page"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 739d828ef2e56..443a7e8c1da60 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Time-handling functionality from netcdf4-python"; homepage = "https://github.com/Unidata/cftime"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index b0e85335e0b80..186422a49c34c 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -27,10 +27,10 @@ buildPythonPackage rec { pytest ''; - meta = with lib; { + meta = { description = "C/C++ source generation from an AST"; homepage = "https://github.com/inducer/cgen"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 89b05b5f34080..17047a3213893 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -2,25 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - pep8, - nose, + setuptools, }: buildPythonPackage rec { - version = "0.8"; - format = "setuptools"; pname = "cgroup-utils"; - - buildInputs = [ - pep8 - nose - ]; - # Pep8 tests fail... - doCheck = false; - - postPatch = '' - sed -i -e "/argparse/d" setup.py - ''; + version = "0.8"; + pyproject = true; src = fetchFromGitHub { owner = "peo3"; @@ -29,11 +17,25 @@ buildPythonPackage rec { sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; - meta = with lib; { + postPatch = '' + sed -i -e "/argparse/d" setup.py + ''; + + build-system = [ setuptools ]; + + # Upon running `from cgutils import cgroup`, it attempts to read a file in `/sys`. + # Due to the Nix build sandbox, this is disallowed, and so all possible tests fail, + # so we don't run them. Plain `import cgutils` works, so we run pythonImportsCheck below. + doCheck = false; + + pythonImportsCheck = [ "cgutils" ]; + + meta = { description = "Utility tools for control groups of Linux"; + homepage = "https://github.com/peo3/cgroup-utils"; mainProgram = "cgutil"; - maintainers = with maintainers; [ layus ]; - platforms = platforms.linux; - license = licenses.gpl2; + maintainers = with lib.maintainers; [ layus ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 2916b8e7d7793..6f306f46211be 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -18,7 +18,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.12.1"; + version = "0.12.2"; in buildPythonPackage { @@ -30,8 +30,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - hash = "sha256-jgbtDpl2hXmfzmsiIIG6+B3QoekuAjBJGMxQJPX4ynA="; + rev = "refs/tags/v${version}"; + hash = "sha256-RESSkMWkmlmYarLOI8pX5mwgcr8xAigbp1mrAQP/QNU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index dec0cbca53cdf..b91eb29a08188 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -105,6 +105,6 @@ buildPythonPackage rec { homepage = "https://github.com/aws/chalice"; changelog = "https://github.com/aws/chalice/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/changefinder/default.nix b/pkgs/development/python-modules/changefinder/default.nix index fc34238f00ecc..4405fa8a8525b 100644 --- a/pkgs/development/python-modules/changefinder/default.nix +++ b/pkgs/development/python-modules/changefinder/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, nose +, pytestCheckHook , numpy , scipy , statsmodels @@ -20,17 +20,21 @@ buildPythonPackage { hash = "sha256-1If0gIsMU8673fKSSHVMvDgR1UnYgM/4HiyvZJ9T6VM="; }; - nativeBuildInputs = [ - setuptools - ]; + patches = [ ./fix_test_invocation.patch ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ - nose # not actually required during runtime, but specified as required in `setup.py` + pythonRemoveDeps = [ "nose" ]; + + dependencies = [ numpy scipy statsmodels ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "test/test.py" ]; + pythonImportsCheck = [ "changefinder" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/changefinder/fix_test_invocation.patch b/pkgs/development/python-modules/changefinder/fix_test_invocation.patch new file mode 100644 index 0000000000000..f02e2e36d4b54 --- /dev/null +++ b/pkgs/development/python-modules/changefinder/fix_test_invocation.patch @@ -0,0 +1,13 @@ +diff --git a/test/test.py b/test/test.py +index 85a9f4e..a5f44fd 100644 +--- a/test/test.py ++++ b/test/test.py +@@ -4,7 +4,7 @@ import numpy as np + + + class TestChangeFinder(): +- def setup(self): ++ def setup_method(self): + self._term = 30 + self._smooth = 7 + self._order = 1 diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 09ecb4f986b5f..b850ed89301e0 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -3,53 +3,56 @@ buildPythonPackage, fetchFromGitHub, mock, - nose, plotly, - pytest, requests, retrying, setuptools, - six, + pytestCheckHook, }: buildPythonPackage rec { pname = "chart-studio"; - version = "5.22.0"; + version = "1.1.0-unstable-2024-07-23"; pyproject = true; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; - rev = "refs/tags/v${version}"; - hash = "sha256-cEm0vLQ4PAVxvplqK+yayxLpNCvyfZtjZva0Bl2Sdfs="; + # We use plotly's upstream version as it's the same repo, but chart studio has its own version number. + rev = "v5.23.0"; + hash = "sha256-K1hEs00AGBCe2fgytyPNWqE5M0jU5ESTzynP55kc05Y="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ plotly requests retrying - six ]; nativeCheckInputs = [ mock - nose - pytest + pytestCheckHook ]; - # most tests talk to a service - checkPhase = '' - HOME=$TMPDIR pytest chart_studio/tests/test_core chart_studio/tests/test_plot_ly/test_api + + preCheck = '' + export HOME=$(mktemp -d) ''; - meta = with lib; { + # most tests talk to a network service, so only run ones that don't do that. + pytestFlagsArray = [ + "chart_studio/tests/test_core" + "chart_studio/tests/test_plot_ly/test_api" + ]; + + meta = { description = "Utilities for interfacing with Plotly's Chart Studio service"; homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + license = with lib.licenses; [ mit ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/chat-downloader/default.nix b/pkgs/development/python-modules/chat-downloader/default.nix index 95e09e8db6e00..e19dd60a92693 100644 --- a/pkgs/development/python-modules/chat-downloader/default.nix +++ b/pkgs/development/python-modules/chat-downloader/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/xenova/chat-downloader"; changelog = "https://github.com/xenova/chat-downloader/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 533c05177689e..a14a4ecd8ba1f 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -7,6 +7,7 @@ git, pep517, pytestCheckHook, + setuptools, tomli, pythonOlder, }: @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ build pep517 + setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index bed41e7d9f471..4a17afb2f1b30 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -8,7 +8,6 @@ hatchling, publicsuffixlist, pyleri, - iana-etc, pytestCheckHook, pythonOlder, requests, diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index b4d7daab17aac..01773d1c20cfd 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -100,6 +100,6 @@ buildPythonPackage rec { mainProgram = "cheroot"; homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index f0f6ea8edcdeb..71d9a9aedfb56 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -126,6 +126,6 @@ buildPythonPackage rec { homepage = "https://cherrypy.dev/"; changelog = "https://github.com/cherrypy/cherrypy/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix index 845f2064f1cd3..52fe376961323 100644 --- a/pkgs/development/python-modules/chroma-hnswlib/default.nix +++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "chroma-hnswlib"; - version = "0.7.3"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "hnswlib"; rev = "refs/tags/${version}"; - hash = "sha256-c4FvymqZy8AZKbh6Y8xZRjKAqYcUyZABRGc1u7vwlsk="; + hash = "sha256-KU/t37MZMFeNWPme+rgCHchZH7B8timIV2EH40laXkA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 50cae5fb0108a..b0893ae7ca02e 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pname = "chromadb"; - version = "0.5.3"; + version = "0.5.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -59,16 +59,19 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "chroma"; rev = "refs/tags/${version}"; - hash = "sha256-czDL2b+Jj7mrYZCTfnaZArkOHBaWyTV0BTE2wvykHps="; + hash = "sha256-wzfzuWuNqLAjfAZC38p1iTtJHez/pJ9Ncgeo23o1dMo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eTVT1yowuDsajjceWojdUdX466FKneUt1i5QipBFdp4="; + hash = "sha256-0OE2i29oE6RpJRswQWI8+5dbA6lOWd3nhqe1RGlnjhk="; }; - pythonRelaxDeps = [ "orjson" ]; + pythonRelaxDeps = [ + "chroma-hnswlib" + "orjson" + ]; nativeBuildInputs = [ cargo diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index 3aeb0be954242..d87df6283746d 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/cinemagoer/cinemagoer/"; homepage = "https://cinemagoer.github.io/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 9f36998e98678..b87e4c42568b8 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -88,6 +88,6 @@ buildPythonPackage rec { homepage = "https://github.com/circus-tent/circus"; changelog = "https://github.com/circus-tent/circus/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index 3cdb2e6bafe23..6b0fed8e0fb8c 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -2,39 +2,41 @@ lib, buildPythonPackage, fetchPypi, - nose, git, lxml, rnc2rng, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "citeproc-py"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e"; + hash = "sha256-2eOiJPk2/i5QM7XZ/9rKt2nO22HZbE4M8vC0iPHSS04="; }; + build-system = [ setuptools ]; + buildInputs = [ rnc2rng ]; - propagatedBuildInputs = [ lxml ]; + dependencies = [ lxml ]; nativeCheckInputs = [ - nose git + pytestCheckHook ]; - checkPhase = "nosetests tests"; - doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; - meta = with lib; { - homepage = "https://github.com/brechtm/citeproc-py"; + meta = { + homepage = "https://github.com/citeproc-py/citeproc-py"; description = "Citation Style Language (CSL) parser for Python"; mainProgram = "csl_unsorted"; - license = licenses.bsd2; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index aa1575e2f247d..b2b2dec74e276 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.5.4"; + version = "10.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-iwL77pt313rroaJw7Pn6n41aSzLyKLiUR32yai91jWE="; + hash = "sha256-OWx+YtpZRWTsap4go89yia+DqqAewZq+0cTaoXdDRSk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 7d9e7a65b726e..f3fb349f412d3 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -4,13 +4,9 @@ clarifai-grpc, fetchFromGitHub, inquirerpy, - llama-index-core, numpy, - opencv4, - pandas, pillow, pycocotools, - pypdf, pytestCheckHook, pythonOlder, pyyaml, @@ -24,7 +20,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.5.2"; + version = "10.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +29,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-zAjGVICrYgai6GFpcJyigKxn7kNEZKclggR5ktzrCQ0="; + hash = "sha256-a/twKAwlvn017fqUsDBOcDxoZ63W0p6whQf53wlXFRU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index e905189e9c05c..6fbb68cb9713d 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.109"; + version = "9.2.114"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-loDB5y5j8hVmQL2zZf/az6jsRJKRRNWlcRp2WjS90Hc="; + hash = "sha256-VvYJQK2++wfH9aNR31Cbz8nQalWwbOwiE8YMOhAVG3c="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index f02d1f1fb62ec..f982d7b673278 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -8,7 +8,6 @@ minidump, pefile, pyelftools, - pynose, pytestCheckHook, pythonOlder, pyvex, @@ -19,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.109"; + version = "9.2.114"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-zuEDi4+qd5Inrd0t8StgnvrDnrYGvEPk/I5yxfEErYk="; + hash = "sha256-M8agIZ4Gk67wKUfKI/13sYAYUta0sWk7cVkM5ayb0V0="; }; in buildPythonPackage rec { @@ -40,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-+4VJ1fqnYPvgiCmU/+aKM+7YZkvDbCMxbWO3YqnELA8="; + hash = "sha256-PGAuLW0yTuKrAo+xxlLQnnxugiZAhXQmC89Ve2OY8aY="; }; build-system = [ setuptools ]; @@ -60,7 +59,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pynose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 106e4dac7c7c9..1d1e2c741b6ce 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -8,8 +8,6 @@ pytestCheckHook, pygments, tabulate, - terminaltables, - wcwidth, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/cliche/default.nix b/pkgs/development/python-modules/cliche/default.nix index 596ea43962b1a..4b0e63ed21c1c 100644 --- a/pkgs/development/python-modules/cliche/default.nix +++ b/pkgs/development/python-modules/cliche/default.nix @@ -34,6 +34,6 @@ buildPythonPackage { mainProgram = "cliche"; homepage = "https://github.com/kootenpv/cliche"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix index 2d19a760e5fa6..47d43ca1fa2b4 100644 --- a/pkgs/development/python-modules/click-configfile/default.nix +++ b/pkgs/development/python-modules/click-configfile/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Add support for commands that use configuration files to Click"; homepage = "https://github.com/click-contrib/click-configfile"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 348620d9106c6..fbf67e9b2a5f9 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-log/"; description = "Logging integration for Click"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix index dd9ee1c021f26..c022a33608a48 100644 --- a/pkgs/development/python-modules/click-spinner/default.nix +++ b/pkgs/development/python-modules/click-spinner/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/click-contrib/click-spinner"; changelog = "https://github.com/click-contrib/click-spinner/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index cca72fa51ef0d..416a34be304d8 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -5,21 +5,21 @@ autopage, cmd2, importlib-metadata, - installShellFiles, openstackdocstheme, pbr, prettytable, pyparsing, pyyaml, + setuptools, stevedore, - sphinx, + sphinxHook, callPackage, }: buildPythonPackage rec { pname = "cliff"; version = "4.7.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -32,13 +32,15 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ - installShellFiles + build-system = [ openstackdocstheme - sphinx + setuptools + sphinxHook ]; - propagatedBuildInputs = [ + sphinxBuilders = [ "man" ]; + + dependencies = [ autopage cmd2 importlib-metadata @@ -49,11 +51,6 @@ buildPythonPackage rec { stevedore ]; - postInstall = '' - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man - installManPage doc/build/man/cliff.1 - ''; - # check in passthru.tests.pytest to escape infinite recursion with stestr doCheck = false; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 7c19348d32f0f..3b6e68710b4b0 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { homepage = "https://clifford.readthedocs.io"; changelog = "https://github.com/pygae/clifford/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; # Broken with numba >= 0.54 # see https://github.com/pygae/clifford/issues/430 broken = versionAtLeast numba.version "0.58"; diff --git a/pkgs/development/python-modules/clintermission/default.nix b/pkgs/development/python-modules/clintermission/default.nix index 5fed44529a855..721b7cadb681a 100644 --- a/pkgs/development/python-modules/clintermission/default.nix +++ b/pkgs/development/python-modules/clintermission/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/sebageek/clintermission"; changelog = "https://github.com/sebageek/clintermission/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/clip-anytorch/default.nix b/pkgs/development/python-modules/clip-anytorch/default.nix index 97070159ef64a..10e368985f798 100644 --- a/pkgs/development/python-modules/clip-anytorch/default.nix +++ b/pkgs/development/python-modules/clip-anytorch/default.nix @@ -2,22 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, - - # dependencies + fetchpatch, ftfy, + packaging, + pythonOlder, regex, - tqdm, + setuptools, torch, torchvision, - - # tests - pytestCheckHook, + tqdm, }: buildPythonPackage rec { pname = "clip-anytorch"; version = "2.6.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "rom1504"; @@ -26,9 +27,21 @@ buildPythonPackage rec { hash = "sha256-4A8R9aEiOWC05uhMQslhVSkQ4hyjs6VsqkFi76miodY="; }; - propagatedBuildInputs = [ + patches = [ + # Import packaging to be compatible with setuptools==70.0.0, https://github.com/rom1504/CLIP/pull/10 + (fetchpatch { + name = "setuptools-comp.patch"; + url = "https://github.com/rom1504/CLIP/pull/10/commits/8137d899035d889623f6b0a0a0faae88c549dc50.patch"; + hash = "sha256-CIcuDk4QH+0g8YEa6TbKGjIcKJQqFviymVH68sKmsyk="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ ftfy regex + packaging tqdm torch torchvision @@ -36,15 +49,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "clip" ]; - # all tests require network access + # All tests require network access doCheck = false; - nativeCheckInputs = [ pytestCheckHook ]; - - preCheck = '' - export HOME=$TMPDIR - ''; - meta = with lib; { description = "Contrastive Language-Image Pretraining"; homepage = "https://github.com/rom1504/CLIP"; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index f87471c62c44e..fdd26fa0fd5e8 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 8765dc9e39f0b..1935151a7898d 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/cloudflare/python-cloudflare/blob/${version}/CHANGELOG.md"; license = licenses.mit; mainProgram = "cli4"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index b957df2991d18..d8ebf82cf2768 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Extended pickling support for Python objects"; homepage = "https://github.com/cloudpipe/cloudpickle"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index bb2499c258bad..8fd6f490f0422 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Cloudsmith API Client"; homepage = "https://github.com/cloudsmith-io/cloudsmith-api"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index a2a472836f2f5..fa8b93558fb4e 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -14,23 +14,31 @@ pythonOlder, pyyaml, schema, + setuptools, }: buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.6.2"; - format = "setuptools"; + version = "0.6.3"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; - repo = pname; + repo = "cloudsplaining"; rev = "refs/tags/${version}"; - hash = "sha256-7aOPerqayuJTHItlpnVVSzOlSGNnqHvtIi5BdovNh3A="; + hash = "sha256-mRWfb14zKS141cYzShXY+OoHWfs9PB1oJu3spsvv6mI="; }; - propagatedBuildInputs = [ + postPatch = '' + # Ignore pinned versions + sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" requirements.txt + ''; + + build-system = [ setuptools ]; + + dependencies = [ boto3 botocore cached-property @@ -45,11 +53,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # Ignore pinned versions - sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" requirements.txt - ''; - disabledTests = [ "test_policy_expansion" "test_statement_details_for_allow_not_action" @@ -59,9 +62,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for AWS IAM security assessment"; - mainProgram = "cloudsplaining"; homepage = "https://github.com/salesforce/cloudsplaining"; + changelog = "https://github.com/salesforce/cloudsplaining/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "cloudsplaining"; }; } diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 3d21118aca376..e5564a7800b2c 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff. ''; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 270c68e0fa2fb..6b3d2c3faa391 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -36,6 +36,11 @@ buildPythonPackage { format = "pyproject"; + buildInputs = [ + dotnetCorePackages.sdk_6_0.packages + dotnet-build.nugetDeps + ]; + nativeBuildInputs = [ setuptools setuptools-scm @@ -59,13 +64,11 @@ buildPythonPackage { preConfigure = '' dotnet restore "netfx_loader/ClrLoader.csproj" \ -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --source "${dotnet-build.nuget-source}" + -p:Deterministic=true dotnet restore "example/example.csproj" \ -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --source "${dotnet-build.nuget-source}" + -p:Deterministic=true ''; passthru.fetch-deps = dotnet-build.fetch-deps; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index f5bec35c1c5b4..1d2dd4a8faefc 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -5,12 +5,13 @@ numpy, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "cma"; - version = "3.3.0"; - format = "setuptools"; + version = "3.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +19,12 @@ buildPythonPackage rec { owner = "CMA-ES"; repo = "pycma"; rev = "refs/tags/r${version}"; - hash = "sha256-+UJI3hDVbDMfRF4bkwHED3eJCHzxS2hO4YPUzJqcoQI="; + hash = "sha256-wbAH0A5vpnnXqt7TTvLDPnCp6M3QjeCwD6l6LoTVu1w="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; checkPhase = '' # At least one doctest fails, thus only limited amount of files is tested @@ -33,7 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization"; homepage = "https://github.com/CMA-ES/pycma"; + changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index f0de12dcc8b30..cb31be20a1702 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, substituteAll, cmdstan, setuptools, @@ -32,11 +31,6 @@ buildPythonPackage rec { src = ./use-nix-cmdstan-path.patch; cmdstan = "${cmdstan}/opt/cmdstan"; }) - # Fix seed-dependent tests - (fetchpatch { - url = "https://github.com/stan-dev/cmdstanpy/commit/c72acd0b8123c02b47d5d583bdd7d8408b04562c.patch"; - hash = "sha256-cliyDDko4spYa62DMwWBavy5pePkofJo4Kf8I0RzueM="; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/cmsdials/default.nix b/pkgs/development/python-modules/cmsdials/default.nix new file mode 100644 index 0000000000000..eaf436af2eeda --- /dev/null +++ b/pkgs/development/python-modules/cmsdials/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pydantic, + requests, + typing-extensions, + pandas, + tqdm, +}: + +buildPythonPackage rec { + pname = "cmsdials"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cms-DQM"; + repo = "dials-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-tV802rz8V9zkjxOoGDXuYGD9FNWjdPb3Grp2khwxC9I="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + pydantic + requests + typing-extensions + ]; + + optional-dependencies = { + pandas = [ pandas ]; + tqdm = [ tqdm ]; + }; + + pythonRelaxDeps = [ + # pydantic = "<2, >=1"pydantic = "<2, >=1" + "pydantic" + # typing-extensions = "<4.6.0, >=3.6.6" + "typing-extensions" + ]; + + pythonImportsCheck = [ "cmsdials" ]; + + meta = with lib; { + description = "Python API client interface to CMS DIALS service"; + homepage = "https://github.com/cms-DQM/dials-py"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/development/python-modules/cmsis-svd/default.nix b/pkgs/development/python-modules/cmsis-svd/default.nix index 030b6d2822764..b3197b6f89ef5 100644 --- a/pkgs/development/python-modules/cmsis-svd/default.nix +++ b/pkgs/development/python-modules/cmsis-svd/default.nix @@ -2,33 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, six, + lxml, }: -buildPythonPackage rec { +buildPythonPackage { pname = "cmsis-svd"; - version = "0.4"; - format = "setuptools"; + version = "0.4-unstable-2024-01-25"; + pyproject = true; src = fetchFromGitHub { - owner = "posborne"; - repo = pname; - rev = "python-${version}"; - sha256 = "01f2z01gqgx0risqnbrlaqj49fmly30zbwsf7rr465ggnl2c04r0"; + owner = "cmsis-svd"; + repo = "cmsis-svd"; + rev = "38d21d30abd0d4c2f34fd79d83b34392ed4bb7a3"; + hash = "sha256-lFA0sNHVj4a4+EwOTmFUbM/nhmzJ4mx4GvT6Ykutakk="; }; - preConfigure = '' + preBuild = '' cd python ''; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "cmsis_svd" ]; + dependencies = [ + six + lxml + ]; - meta = with lib; { + pythonImportsCheck = [ + "cmsis_svd" + "cmsis_svd.parser" + ]; + + meta = { description = "CMSIS SVD parser"; - homepage = "https://github.com/posborne/cmsis-svd"; - maintainers = with maintainers; [ dump_stack ]; - license = licenses.asl20; + homepage = "https://github.com/cmsis-svd/cmsis-svd"; + maintainers = [ lib.maintainers.dump_stack ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/co2signal/default.nix b/pkgs/development/python-modules/co2signal/default.nix index 726e5736a0eac..6db0885e582f0 100644 --- a/pkgs/development/python-modules/co2signal/default.nix +++ b/pkgs/development/python-modules/co2signal/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "CO2Signal" ]; meta = with lib; { - description = "Package to access the CO2 Signal API "; + description = "Package to access the CO2 Signal API"; homepage = "https://github.com/danielsjf/CO2Signal"; license = licenses.gpl3Only; maintainers = with maintainers; [ plabadens ]; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index f65b11c81ce2b..b477d447c5621 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -9,7 +8,7 @@ find-libpython, pytestCheckHook, swig, - verilog, + iverilog, ghdl, }: @@ -45,11 +44,6 @@ buildPythonPackage rec { # remove circular dependency cocotb-bus from setup.py substituteInPlace setup.py --replace "'cocotb-bus<1.0'" "" - '' - + lib.optionalString stdenv.isDarwin '' - # disable lto on darwin - # https://github.com/NixOS/nixpkgs/issues/19098 - substituteInPlace cocotb_build_libs.py --replace "-flto" "" ''; patches = [ @@ -65,7 +59,7 @@ buildPythonPackage rec { cocotb-bus pytestCheckHook swig - verilog + iverilog ghdl ]; preCheck = '' diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 3b4d3f3f1befb..aabe21b1b748e 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -32,6 +32,7 @@ toml, tqdm, uproot, + vector, # checks distributed, @@ -41,7 +42,7 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.6.1"; + version = "2024.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -50,7 +51,7 @@ buildPythonPackage rec { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-Z6c8R8B8IrDkXVDx89XVtg3eRgORuHPfUyAPRGwAlrg="; + hash = "sha256-ghqJHTvCKAbbHPPwMVGxGqOV3fc25Gocs5VKebcb074="; }; build-system = [ @@ -82,6 +83,7 @@ buildPythonPackage rec { toml tqdm uproot + vector ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 84139b83f2530..c6f669c8ad569 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; + hash = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 46aed51be2992..e6d43cbc5b9ca 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -1,13 +1,20 @@ { lib, buildPythonPackage, - fetchPypi, - poetry-core, pythonOlder, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + boto3, fastavro, httpx, httpx-sse, + parameterized, pydantic, + pydantic-core, requests, tokenizers, types-requests, @@ -16,23 +23,28 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.5.8"; + version = "5.8.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hM52Zv+PvfT0H7X2ykUqsmOaUUvIiWeihUqbG4INbqA="; + src = fetchFromGitHub { + owner = "cohere-ai"; + repo = "cohere-python"; + rev = "refs/tags/${version}"; + hash = "sha256-ejqsiT0hDBusqOjDGaK6Wda3xr3iyZuQPFj0EDugcew="; }; build-system = [ poetry-core ]; dependencies = [ + boto3 fastavro httpx httpx-sse + parameterized pydantic + pydantic-core requests tokenizers types-requests @@ -44,11 +56,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "cohere" ]; - meta = with lib; { + meta = { description = "Simplify interfacing with the Cohere API"; homepage = "https://docs.cohere.com/docs"; changelog = "https://github.com/cohere-ai/cohere-python/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 6516cfce16878..d7f9b8a36fc82 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -81,6 +81,6 @@ buildPythonPackage rec { asl20 mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index fe5bf7716e40c..c1a62bc2d7537 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2024.2.6.16"; + version = "2024.7.11.18"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-rCj8nG7iQFJKs3Mic2wRZKBqx9T0lCPH5Po8k0nLppg="; + hash = "sha256-o8SVup50hD2BzQQ3Z5wANHWEhZDOl0FH7iTmYTJnkYw="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index d907499cafeeb..901750de1fe8f 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/tartley/colorama"; changelog = "https://github.com/tartley/colorama/raw/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index dbffade58911a..b335897207fcf 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { mainProgram = "colorcet"; homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/colored-traceback/default.nix b/pkgs/development/python-modules/colored-traceback/default.nix index b0447c66bc12d..8fc51701bf248 100644 --- a/pkgs/development/python-modules/colored-traceback/default.nix +++ b/pkgs/development/python-modules/colored-traceback/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pygments, }: buildPythonPackage rec { pname = "colored-traceback"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bafOKx2oafa7VMkntBW5VyfEu22ahMRhXqd9mHKRGwU="; + hash = "sha256-7LyOQfBxLqgZMdfNQ2uL658+/xWV0kmPGD4O9ptW/oQ="; }; - buildInputs = [ pygments ]; + build-system = [ setuptools ]; + + dependencies = [ pygments ]; # No setuptools tests for the package. doCheck = false; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index c9db3719d3f0b..18306a65bb98b 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { description = "Simple library for color and formatting to terminal"; homepage = "https://gitlab.com/dslackw/colored"; changelog = "https://gitlab.com/dslackw/colored/-/raw/${version}/CHANGES.md"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 0befe12cd88db..f5efbbf13486e 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/jackparmer/colorlover"; description = "Color scales in Python for humans"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/pkgs/development/python-modules/colorspacious/default.nix index 6e0762a814e0d..53ca726357d4d 100644 --- a/pkgs/development/python-modules/colorspacious/default.nix +++ b/pkgs/development/python-modules/colorspacious/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/njsmith/colorspacious"; - description = "Powerful, accurate, and easy-to-use Python library for doing colorspace conversions "; + description = "Powerful, accurate, and easy-to-use Python library for doing colorspace conversions"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix index d42304712ef3d..da91b39477310 100644 --- a/pkgs/development/python-modules/comicon/default.nix +++ b/pkgs/development/python-modules/comicon/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "comicon"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "potatoeggy"; repo = "comicon"; - rev = "v${version}"; - hash = "sha256-VP4n2pWXHge2gJ67O2nErJ30gI0vaAMn0VOpX8sLkfs="; + rev = "refs/tags/v${version}"; + hash = "sha256-oiEzZRgyG/RQCo2zSTqwlOhkwz76lSImR0ZtSlIUp4Y="; }; nativeBuildInputs = [ @@ -38,6 +38,8 @@ buildPythonPackage rec { python-slugify ]; + doCheck = false; # test artifacts are not public + pythonImportsCheck = [ "comicon" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix index 130b6e908413a..f18517eca1e79 100644 --- a/pkgs/development/python-modules/comm/default.nix +++ b/pkgs/development/python-modules/comm/default.nix @@ -32,6 +32,6 @@ buildPythonPackage { description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc"; homepage = "https://github.com/ipython/comm"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index f50e32abd5f3e..945400c194810 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, psutil, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix index a7f28dab15636..88002d022c717 100644 --- a/pkgs/development/python-modules/commandparse/default.nix +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; + hash = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix index defdc1aa3b059..f410d16628f4c 100644 --- a/pkgs/development/python-modules/commentjson/default.nix +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Add JavaScript or Python style comments in JSON"; homepage = "https://github.com/vaidik/commentjson/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix new file mode 100644 index 0000000000000..7f2870ae493c8 --- /dev/null +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -0,0 +1,135 @@ +{ lib +, commitizen +, fetchFromGitHub +, buildPythonPackage +, git +, pythonOlder +, stdenv +, installShellFiles +, poetry-core +, nix-update-script +, testers +, argcomplete +, charset-normalizer +, colorama +, decli +, importlib-metadata +, jinja2 +, packaging +, pyyaml +, questionary +, termcolor +, tomlkit +, py +, pytest-freezer +, pytest-mock +, pytest-regressions +, pytest7CheckHook +, deprecated +}: + +buildPythonPackage rec { + pname = "commitizen"; + version = "3.28.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "commitizen-tools"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Z/L8TvMoee3qB+P6HUJEQxqw3nDEbBQabQOUyx0iugw="; + }; + + pythonRelaxDeps = [ + "argcomplete" + "decli" + ]; + + nativeBuildInputs = [ + poetry-core + installShellFiles + ]; + + propagatedBuildInputs = [ + argcomplete + charset-normalizer + colorama + decli + importlib-metadata + jinja2 + packaging + pyyaml + questionary + termcolor + tomlkit + ]; + + nativeCheckInputs = [ + argcomplete + deprecated + git + py + pytest-freezer + pytest-mock + pytest-regressions + pytest7CheckHook + ]; + + doCheck = true; + + pythonImportsCheck = [ "commitizen" ]; + + # The tests require a functional git installation + # which requires a valid HOME directory. + preCheck = '' + export HOME="$(mktemp -d)" + + git config --global user.name "Nix Builder" + git config --global user.email "nix-builder@nixos.org" + git init . + ''; + + # NB: These tests require complex GnuPG setup + disabledTests = [ + "test_bump_minor_increment_signed" + "test_bump_minor_increment_signed_config_file" + "test_bump_on_git_with_hooks_no_verify_enabled" + "test_bump_on_git_with_hooks_no_verify_disabled" + "test_bump_pre_commit_changelog" + "test_bump_pre_commit_changelog_fails_always" + "test_get_commits_with_signature" + # fatal: not a git repository (or any of the parent directories): .git + "test_commitizen_debug_excepthook" + ]; + + postInstall = + let + register-python-argcomplete = lib.getExe' argcomplete "register-python-argcomplete"; + in + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) + '' + installShellCompletion --cmd cz \ + --bash <(${register-python-argcomplete} --shell bash $out/bin/cz) \ + --zsh <(${register-python-argcomplete} --shell zsh $out/bin/cz) \ + --fish <(${register-python-argcomplete} --shell fish $out/bin/cz) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = commitizen; + command = "cz version"; + }; + }; + + meta = with lib; { + description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; + homepage = "https://github.com/commitizen-tools/commitizen"; + changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + mainProgram = "cz"; + maintainers = with maintainers; [ lovesegfault anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 049cc4e09aa1b..7cc96f4d856f8 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -6,9 +6,9 @@ buildPythonPackage, click, fetchFromGitHub, + fetchpatch2, pytest-xdist, pytestCheckHook, - pythonAtLeast, pythonOlder, requests, saneyaml, @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "commoncode"; version = "31.2.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,11 +30,19 @@ buildPythonPackage rec { hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE="; }; + patches = [ + # https://github.com/nexB/commoncode/pull/66 + (fetchpatch2 { + url = "https://github.com/nexB/commoncode/commit/4f87b3c9272dcf209b9c4b997e98b58e0edaf570.patch"; + hash = "sha256-loUtAww+SK7kMt5uqZmLQ8Wg/OqB7LWVA4BiztnwHsA="; + }) + ]; + dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs beautifulsoup4 click @@ -48,11 +56,6 @@ buildPythonPackage rec { pytest-xdist ]; - preCheck = '' - # prevent readout of /etc/os-release during tests - sed -i "s/is_on_ubuntu_22()/lambda _: False/" src/commoncode/system.py - ''; - disabledTests = [ # chinese character translates different into latin @@ -69,11 +72,6 @@ buildPythonPackage rec { "test_searchable_paths" ]; - disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/nexB/commoncode/issues/36 - "src/commoncode/fetch.py" - ]; - pythonImportsCheck = [ "commoncode" ]; meta = with lib; { @@ -81,6 +79,6 @@ buildPythonPackage rec { homepage = "https://github.com/nexB/commoncode"; changelog = "https://github.com/nexB/commoncode/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index d318e031fb6d9..76cd8caa1a9ad 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { mainProgram = "compreffor"; homepage = "https://github.com/googlefonts/compreffor"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index 4c99fc866c5da..c2038f77e1bb4 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,15 +9,15 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "24.1.0"; + version = "24.7.0"; pyproject = true; src = fetchFromGitHub { inherit pname version; owner = "conda"; repo = "conda-libmamba-solver"; - rev = version; - hash = "sha256-vsUYrDVNMKHd3mlaAFYCP4uPQ9HxeKsose5O8InaMcE="; + rev = "refs/tags/${version}"; + hash = "sha256-HBbApS6hyIbRyxOpOwbC1+IalIYk17rYRo6HLcwKKW4="; }; diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index f9971372197a4..a02e75987d76f 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -11,6 +11,7 @@ conda-libmamba-solver, conda-package-handling, distro, + frozendict, jsonpatch, packaging, platformdirs, @@ -26,7 +27,7 @@ }: buildPythonPackage rec { pname = "conda"; - version = "24.5.0"; + version = "24.7.1"; pyproject = true; src = fetchFromGitHub { @@ -34,7 +35,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; rev = "refs/tags/${version}"; - hash = "sha256-DbgdTaCMWf0d3MLEMGoWxN3x37tAtoW8T7mm5279yqk="; + hash = "sha256-e+C+tSUdSGyotuZzkOuV0e0hOj+MZRuq1fHzsu3LERQ="; }; @@ -48,6 +49,7 @@ buildPythonPackage rec { conda-libmamba-solver conda-package-handling distro + frozendict jsonpatch packaging platformdirs diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index ad3ce46736112..02228f5f2fc03 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/DiffSK/configobj"; changelog = "https://github.com/DiffSK/configobj/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index efe6362da4803..d078fceee371b 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Updated configparser from Python 3.7 for Python 2.6+"; homepage = "https://github.com/jaraco/configparser"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index cc3c7002a4ec5..c2eabec513c23 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/connio/default.nix b/pkgs/development/python-modules/connio/default.nix index 93fe3c0fa5ddf..9e8fb88dbac0c 100644 --- a/pkgs/development/python-modules/connio/default.nix +++ b/pkgs/development/python-modules/connio/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, serialio, sockio, diff --git a/pkgs/development/python-modules/consonance/default.nix b/pkgs/development/python-modules/consonance/default.nix index 6b835fd44c567..dca06fcf55d64 100644 --- a/pkgs/development/python-modules/consonance/default.nix +++ b/pkgs/development/python-modules/consonance/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "WhatsApp's handshake implementation using Noise Protocol"; homepage = "https://github.com/tgalal/consonance"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 0e0b19ecdd500..89c328325499b 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -51,7 +51,7 @@ let description = "Module for symbolic constant support"; homepage = "https://github.com/twisted/constantly"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix index 14026a1957f1e..a89f8f030a0e1 100644 --- a/pkgs/development/python-modules/construct-classes/default.nix +++ b/pkgs/development/python-modules/construct-classes/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, poetry-core, diff --git a/pkgs/development/python-modules/construct-typing/default.nix b/pkgs/development/python-modules/construct-typing/default.nix new file mode 100644 index 0000000000000..73123bed0f39f --- /dev/null +++ b/pkgs/development/python-modules/construct-typing/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + construct, + typing-extensions, + arrow, + cloudpickle, + numpy, + pytestCheckHook, + ruamel-yaml, +}: + +buildPythonPackage rec { + pname = "construct-typing"; + version = "0.6.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "timrid"; + repo = "construct-typing"; + rev = "refs/tags/v${version}"; + hash = "sha256-zXpxu+VUcepEoAPLQnSlMCZkt8fDsMCLS0HBKhaYD20="; + }; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "construct" ]; + + dependencies = [ + construct + typing-extensions + ]; + + pythonImportsCheck = [ + "construct-stubs" + "construct_typed" + ]; + + nativeCheckInputs = [ + arrow + cloudpickle + numpy + pytestCheckHook + ruamel-yaml + ]; + + disabledTests = [ + # tests fail with construct>=2.10.70 + "test_bitsinteger" + "test_bytesinteger" + ]; + + meta = { + changelog = "https://github.com/timrid/construct-typing/releases/tag/v${version}"; + description = "Extension for the python package 'construct' that adds typing features"; + homepage = "https://github.com/timrid/construct-typing"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 430855c6f03e3..6d05455ae439c 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -13,27 +13,21 @@ buildPythonPackage rec { pname = "container-inspector"; - version = "33.0.0"; - format = "setuptools"; + version = "33.0.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "container-inspector"; rev = "refs/tags/v${version}"; - hash = "sha256-vtC42yq59vTE+4tF5CSm9zszj8goOP5i6+NMF2n4T1Q="; + hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs="; }; dontConfigure = true; - postPatch = '' - # PEP440 support was removed in newer setuptools, https://github.com/nexB/container-inspector/pull/51 - substituteInPlace setup.cfg \ - --replace ">=3.7.*" ">=3.7" - ''; - - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 18b18e917d617..b72e9a2ec99ee 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python, pythonAtLeast, pythonOlder, unittestCheckHook, @@ -30,6 +29,6 @@ buildPythonPackage rec { description = "Backports and enhancements for the contextlib module"; homepage = "https://contextlib2.readthedocs.org/"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 652fbbef7207b..4d668412f6745 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -77,7 +77,7 @@ let description = "Python library for calculating contours in 2D quadrilateral grids"; homepage = "https://github.com/contourpy/contourpy"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/convertertools/default.nix b/pkgs/development/python-modules/convertertools/default.nix index bf58e95a9e587..17739bd6619bb 100644 --- a/pkgs/development/python-modules/convertertools/default.nix +++ b/pkgs/development/python-modules/convertertools/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/bluetooth-devices/convertertools"; changelog = "https://github.com/bluetooth-devices/convertertools/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix index 454a2b7083cb1..f055b52ee2b41 100644 --- a/pkgs/development/python-modules/coordinates/default.nix +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/clbarnes/coordinates"; changelog = "https://github.com/clbarnes/coordinates/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index ad172b2961167..d620f6fb4e22a 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Python client library for Core API"; homepage = "https://github.com/core-api/python-client"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 8d597e530383e..1aede8b9f5873 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Python client library for Core Schema"; homepage = "https://github.com/ivegotasthma/python-coreschema"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix new file mode 100644 index 0000000000000..68446453e200b --- /dev/null +++ b/pkgs/development/python-modules/corner/default.nix @@ -0,0 +1,106 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + matplotlib, + + # optional-dependencies + arviz, + ipython, + myst-nb, + pandoc, + sphinx, + sphinx-book-theme, + pytest, + scipy, + + # checks + pytestCheckHook, + corner, +}: + +buildPythonPackage rec { + pname = "corner"; + version = "2.2.2"; + pyproject = true; + + disable = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "dfm"; + repo = "corner.py"; + rev = "refs/tags/v${version}"; + hash = "sha256-MYos01YCSUwivymSE2hbjV7eKXfaMqG89koD2CWZjcQ="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ matplotlib ]; + + passthru.optional-dependencies = { + arviz = [ arviz ]; + docs = [ + arviz + ipython + myst-nb + pandoc + sphinx + sphinx-book-theme + ]; + test = [ + arviz + pytest + scipy + ]; + }; + + pythonImportsCheck = [ "corner" ]; + + nativeCheckInputs = [ pytestCheckHook ] ++ corner.passthru.optional-dependencies.test; + + # matplotlib.testing.exceptions.ImageComparisonFailure: images not close + disabledTests = [ + "test_arviz" + "test_basic" + "test_bins" + "test_bins_log" + "test_color" + "test_color_filled" + "test_extended_overplotting" + "test_hist_bin_factor" + "test_labels" + "test_lowNfilled" + "test_no_fill_contours" + "test_overplot_log" + "test_pandas" + "test_quantiles" + "test_range_fig_arg" + "test_reverse_overplotting" + "test_tight" + "test_title_quantiles" + "test_title_quantiles_default" + "test_title_quantiles_raises" + "test_titles1" + "test_titles2" + "test_top_ticks" + "test_truths" + ]; + + meta = { + description = "Make some beautiful corner plots"; + homepage = "https://github.com/dfm/corner.py"; + changelog = "https://github.com/dfm/corner.py/releases/tag/v${version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index a007283c43d65..ac144b26450b0 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,19 +1,19 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - pythonOlder, colorlog, - pyvmomi, - requests, - verboselogs, - pyopenssl, - setuptools, + fetchPypi, mock, + pyopenssl, pytest-mock, pytestCheckHook, + pythonAtLeast, + pyvmomi, qemu, + requests, + setuptools, + stdenv, + verboselogs, }: buildPythonPackage rec { @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "2.2.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; @@ -75,15 +73,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "COT" ]; - meta = with lib; { + meta = { + homepage = "https://github.com/glennmatthews/cot"; description = "Common OVF Tool"; mainProgram = "cot"; longDescription = '' - COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, - with a focus on virtualized network appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. + COT (the Common OVF Tool) is a tool for editing Open Virtualization Format + (.ovf, .ova) virtual appliances, with a focus on virtualized network + appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. ''; - homepage = "https://github.com/glennmatthews/cot"; - license = licenses.mit; - maintainers = with maintainers; [ evanjs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evanjs ]; + broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards }; } diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index 96df4e29269e7..3941911ac6205 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/pkgs/development/python-modules/courlan/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "courlan"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DLycrIOXDGUbk3p4I6XZLL67a2AUVOoPtstNDuXRhF0="; + hash = "sha256-OGjziBIvKwnRVIAgQ/6S39YsPqenAOquirwFGYz4vCU="; }; # Tests try to write to /tmp directly. use $TMPDIR instead. diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix new file mode 100644 index 0000000000000..97f617bbd6749 --- /dev/null +++ b/pkgs/development/python-modules/cpe/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "cpe"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "nilp0inter"; + repo = "cpe"; + rev = "refs/tags/v${version}"; + hash = "sha256-1hTOMbsL1089/yPZbAIs5OgjtEzCBlFv2hGi+u4hV/k="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cpe" ]; + + disabledTests = [ + # Tests are outdated + "testfile_cpelang2" + "test_incompatible_versions" + "test_equals" + ]; + + meta = { + description = "Common platform enumeration for python"; + homepage = "https://github.com/nilp0inter/cpe"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index e3b007d480e06..f313e3a97ec07 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -5,7 +5,6 @@ cmake, cppe, eigen, - python, pybind11, numpy, h5py, diff --git a/pkgs/development/python-modules/craft-application-1/default.nix b/pkgs/development/python-modules/craft-application-1/default.nix deleted file mode 100644 index e47e502e09f25..0000000000000 --- a/pkgs/development/python-modules/craft-application-1/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nix-update-script, - craft-cli, - craft-parts, - craft-providers, - pydantic-yaml-0, - pyyaml, - setuptools, - setuptools-scm, - pytestCheckHook, - pytest-check, - pytest-mock, - hypothesis, -}: - -buildPythonPackage rec { - pname = "craft-application-1"; - version = "1.2.1"; - - pyproject = true; - - src = fetchFromGitHub { - owner = "canonical"; - repo = "craft-application"; - rev = "refs/tags/${version}"; - hash = "sha256-CXZEWVoE66dlQJp4G8tinufjyaDJaH1Muxz/qd/81oA="; - }; - - postPatch = '' - substituteInPlace craft_application/__init__.py \ - --replace-fail "dev" "${version}" - - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.7.2" "setuptools" - ''; - - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - - propagatedBuildInputs = [ - craft-cli - craft-parts - craft-providers - pydantic-yaml-0 - pyyaml - ]; - - pythonImportsCheck = [ "craft_application" ]; - - nativeCheckInputs = [ - hypothesis - pytest-check - pytest-mock - pytestCheckHook - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - pytestFlagsArray = [ "tests/unit" ]; - - disabledTests = [ "test_to_yaml_file" ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Basis for Canonical craft applications"; - homepage = "https://github.com/canonical/craft-application"; - changelog = "https://github.com/canonical/craft-application/releases/tag/${version}"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 1d8f388f78815..7f986dd9fd1f2 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -11,7 +11,7 @@ git, hypothesis, nix-update-script, - pydantic-yaml-0, + pydantic-yaml, pyfakefs, pygit2, pytest-check, @@ -21,13 +21,12 @@ pyyaml, responses, setuptools-scm, - setuptools, snap-helpers, }: buildPythonPackage rec { pname = "craft-application"; - version = "2.8.0"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -36,21 +35,17 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; rev = "refs/tags/${version}"; - hash = "sha256-COcZgl2XzPWknSKMUZgZBEMzkDdwK2PouIEuWKOP8dc="; + hash = "sha256-2JfCe7FJtuObC/4miA+OC/ctGy1fhdgI7DsowNYjQk8="; }; postPatch = '' - substituteInPlace craft_application/__init__.py \ - --replace-fail "dev" "${version}" - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" + --replace-fail "setuptools==70.1.0" "setuptools" ''; - build-system = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; + + pythonRelaxDeps = [ "requests" ]; dependencies = [ craft-archives @@ -58,7 +53,7 @@ buildPythonPackage rec { craft-grammar craft-parts craft-providers - pydantic-yaml-0 + pydantic-yaml pygit2 pyyaml snap-helpers @@ -110,7 +105,7 @@ buildPythonPackage rec { meta = { description = "Basis for Canonical craft applications"; homepage = "https://github.com/canonical/craft-application"; - changelog = "https://github.com/canonical/craft-application/releases/tag/${version}"; + changelog = "https://github.com/canonical/craft-application/blob/${src.rev}/docs/reference/changelog.rst"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 19f0133c69963..6369acc78208b 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "1.1.3"; + version = "1.2.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-ZUqMjbOsHwzZyn0NsSTlZTljzagYEirWKEGatXVL43g="; + hash = "sha256-4BYRwuBDKFbVvK805e+L4ZR8wtS8GHHYteexH4YZmSE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index d6900511af7ac..193616f1583ed 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -4,9 +4,7 @@ fetchFromGitHub, nix-update-script, platformdirs, - pydantic_1, pyyaml, - setuptools, setuptools-scm, pytest-check, pytest-mock, @@ -15,7 +13,7 @@ buildPythonPackage rec { pname = "craft-cli"; - version = "2.5.1"; + version = "2.6.0"; pyproject = true; @@ -23,25 +21,18 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-cli"; rev = "refs/tags/${version}"; - hash = "sha256-yEKF04OPu4paRrghAP78r9hu6cqkUy6z/V7cHNys82I="; + hash = "sha256-8+dyFOEW0F4t2issRlOqdbzf0Avg0NsADgk96mZFpEQ="; }; postPatch = '' - substituteInPlace craft_cli/__init__.py \ - --replace-fail "dev" "${version}" - substituteInPlace pyproject.toml \ - --replace-fail "setuptools==67.7.2" "setuptools" + --replace-fail "setuptools==70.1.0" "setuptools" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ platformdirs - pydantic_1 pyyaml ]; diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index 82c0fef4b0675..6b920aaa7a4a2 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -5,8 +5,6 @@ nix-update-script, overrides, setuptools, - pytest-check, - pytest-mock, pytestCheckHook, pydantic_1, pyyaml, diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 3a137744d68f8..2ad66a7d4a757 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -5,12 +5,11 @@ nix-update-script, overrides, pydantic_1, - pydantic-yaml-0, + pydantic-yaml, pyxdg, pyyaml, requests, requests-unixsocket, - types-pyyaml, urllib3, pytestCheckHook, pytest-check, @@ -20,14 +19,13 @@ hypothesis, git, squashfsTools, - setuptools, setuptools-scm, stdenv, }: buildPythonPackage rec { pname = "craft-parts"; - version = "1.31.0"; + version = "1.33.0"; pyproject = true; @@ -35,31 +33,26 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-DohH81xhUfZI3NfmX6aDaOC/QLiddsxPzrc1vgFECTg="; + hash = "sha256-SP2mkaXsU0btnA3aanSA18GkdW6ReLgImOWdpnwZiyU="; }; patches = [ ./bash-path.patch ]; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "pydantic-yaml[pyyaml]>=0.11.0,<1.0.0" "pydantic-yaml[pyyaml]" \ - --replace-fail "urllib3<2" "urllib3" - ''; + build-system = [ setuptools-scm ]; - nativeBuildInputs = [ - setuptools - setuptools-scm + pythonRelaxDeps = [ + "requests" + "urllib3" ]; - propagatedBuildInputs = [ + dependencies = [ overrides pydantic_1 - pydantic-yaml-0 + pydantic-yaml pyxdg pyyaml requests requests-unixsocket - types-pyyaml urllib3 ]; @@ -112,6 +105,7 @@ buildPythonPackage rec { passthru.updateScript = nix-update-script { }; meta = { + broken = lib.versionAtLeast pydantic-yaml.version "1"; description = "Software artifact parts builder from Canonical"; homepage = "https://github.com/canonical/craft-parts"; changelog = "https://github.com/canonical/craft-parts/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix new file mode 100644 index 0000000000000..3cd303990859c --- /dev/null +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + annotated-types, + distro, + fetchFromGitHub, + nix-update-script, + pytest-check, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "craft-platforms"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "craft-platforms"; + rev = "refs/tags/${version}"; + hash = "sha256-KzskmSw7NsH1CAYjPf2281Ob71Jd6AhWxtp5tR3IqyU="; + }; + + postPatch = '' + substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + annotated-types + distro + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-check + ]; + + pythonImportsCheck = [ "craft_platforms" ]; + + pytestFlagsArray = [ "tests/unit" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage platforms and architectures for charm applications"; + homepage = "https://github.com/canonical/craft-platforms"; + changelog = "https://github.com/canonical/craft-platforms/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 52954f8f0ddfb..3269ff03a4de9 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "1.24.0"; + version = "1.24.1"; pyproject = true; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; rev = "refs/tags/${version}"; - hash = "sha256-CkaJ8taTsnBpCffe/Eu4/FGpMwKcg3yeLVAahCyEsII="; + hash = "sha256-l57Y+sdCD0/3sBK48N/3p3ns3o0LB4h9FQ35ha1AOV4="; }; patches = [ diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 853df850c02af..4011b01d60d06 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -10,7 +10,7 @@ pydantic_1, pyyaml, pytestCheckHook, - keyring, + keyring_24, macaroonbakery, overrides, pyxdg, @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - keyring + keyring_24 macaroonbakery overrides pydantic_1 @@ -51,6 +51,8 @@ buildPythonPackage rec { requests-toolbelt ]; + pythonRelaxDeps = [ "macaroonbakery" ]; + pythonImportsCheck = [ "craft_store" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index 5b0df404ee775..e6c1395785629 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/sdispater/crashtest"; description = "Manage Python errors with ease"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/crccheck/default.nix b/pkgs/development/python-modules/crccheck/default.nix index 2bf31ea69c81a..63f6e570d71a5 100644 --- a/pkgs/development/python-modules/crccheck/default.nix +++ b/pkgs/development/python-modules/crccheck/default.nix @@ -29,7 +29,7 @@ buildPythonPackage { description = "Python library for CRCs and checksums"; homepage = "https://github.com/MartinScharrer/crccheck"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 930cbedd56cfb..97987cda532de 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { homepage = "https://github.com/LuminalOSS/credstash"; changelog = "https://github.com/fugue/credstash/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "credstash"; }; } diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix index d98630e3a381d..acd22f975f46c 100644 --- a/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/pkgs/development/python-modules/cron-descriptor/default.nix @@ -1,21 +1,22 @@ { lib, - python, - buildPythonPackage, fetchFromGitHub, + buildPythonPackage, + unittestCheckHook, mock, - pytestCheckHook, + setuptools, }: buildPythonPackage rec { - pname = "cron_descriptor"; - version = "1.4"; + pname = "cron-descriptor"; + version = "1.4.3"; + pyproject = true; src = fetchFromGitHub { owner = "Salamek"; repo = "cron-descriptor"; rev = "refs/tags/${version}"; - hash = "sha256-r5TMatjNYaPhPxhJbBGGshQf6VxKyBV6Za1lQoblxYA="; + hash = "sha256-Bvg2diheQihhiCVJjHqdFxbatb/gXS/aRogpzhIproE="; }; # remove tests_require, as we don't do linting anyways @@ -23,11 +24,12 @@ buildPythonPackage rec { sed -i "/'pep8\|flake8\|pep8-naming',/d" setup.py ''; - checkInputs = [ mock ]; + build-system = [ setuptools ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + nativeCheckInputs = [ + mock + unittestCheckHook + ]; pythonImportsCheck = [ "cron_descriptor" ]; diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index b92c7cc2ecd39..2437785db5b28 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "croniter"; - version = "2.0.5"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8fjKCvZCEvvpmxvuEl7lobU6nBtDOWjYvKiBe3nSN/M="; + hash = "sha256-NBF+wXQfEKe9DsOtfY8OuPpFei/rm+MuaiJQ4ViVdmg="; }; nativeBuildInputs = [ setuptools ]; @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/kiorky/croniter"; changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/crossandra/default.nix b/pkgs/development/python-modules/crossandra/default.nix index 423ee0aa3fc8a..c7400b62f53ac 100644 --- a/pkgs/development/python-modules/crossandra/default.nix +++ b/pkgs/development/python-modules/crossandra/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { --replace-fail "result ~= 0.9.0" "result >= 0.9.0" ''; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/crossandra/blob/${src.rev}/CHANGELOG.md"; description = "Fast and simple enum/regex-based tokenizer with decent configurability"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://trag1c.github.io/crossandra"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index 2c2bad80e21bf..9fe0ad7acaeba 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/coroner/cryptodatahub"; changelog = "https://gitlab.com/coroner/cryptodatahub/-/blob/${version}/CHANGELOG.rst"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 0d7cdb92a683d..a440e7e480da4 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -26,21 +26,21 @@ buildPythonPackage rec { pname = "cryptography"; - version = "42.0.5"; # Also update the hash in vectors.nix + version = "42.0.8"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b+B+7JXf1HfrlTCu9b6tNP7IGbOq9sW9bSBWXaYHv+E="; + hash = "sha256-jQnQVDnOe6qOnpWwfsW2yIb1SN634Pae8l9ks7zoQvI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-Pw3ftpcDMfZr/w6US5fnnyPVsFSB9+BuIKazDocYjTU="; + hash = "sha256-PgxPcFocEhnQyrsNtCN8YHiMptBmk1PUhEDQFdUR1nU="; }; patches = [ diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 85476ca492816..8d1bb48d623a5 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-UFzV47DLMtoVJvBwQrf8OKS2w1ZxDLc9K192sDejjtE="; + hash = "sha256-31ZXNnvAqQw3QwnLJhAJosU8rpGkWHgTOaD3JPgZpGo="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index c0e28720423a7..846b2643ebc94 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -5,11 +5,9 @@ buildPythonPackage, cryptodatahub, fetchPypi, - pytestCheckHook, python-dateutil, pythonOlder, setuptools, - unittestCheckHook, urllib3, }: diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index a85aa4345c543..41dfed02e7164 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://cssselect.readthedocs.io/"; changelog = "https://github.com/scrapy/cssselect/v${version}//CHANGES"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 0eabd5ca83235..3f92e6567f136 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Kozea/cssselect2"; changelog = "https://github.com/Kozea/cssselect2/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index d37d7819ec37c..be429844d13d6 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "CSV on the Web"; homepage = "https://github.com/cldf/csvw"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index a18241658b01e..07cf1b616027f 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; + hash = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; }; # removing optional dependency needing pyobjc diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index 976944c337803..da76a4d63dbe9 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -13,7 +13,6 @@ # tests pytestCheckHook, - tensorflow-bin, torch, transformers, wurlitzer, @@ -48,7 +47,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - tensorflow-bin torch transformers wurlitzer @@ -64,6 +62,16 @@ buildPythonPackage rec { disabledTests = [ # AssertionError: assert 'int8' in {'float32'} "test_get_supported_compute_types" + # Tensorflow (tf) not available in Python 3.12 yet + # To remove when https://github.com/NixOS/nixpkgs/pull/325224 is fixed + "test_opennmt_tf_model_conversion" + "test_opennmt_tf_model_quantization" + "test_opennmt_tf_model_conversion_invalid_vocab" + "test_opennmt_tf_model_conversion_invalid_dir" + "test_opennmt_tf_shared_embeddings_conversion" + "test_opennmt_tf_postnorm_transformer_conversion" + "test_opennmt_tf_gpt_conversion" + "test_opennmt_tf_multi_features" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/cu2qu/default.nix b/pkgs/development/python-modules/cu2qu/default.nix index 8cc3b4a34bb53..27faeab92bd43 100644 --- a/pkgs/development/python-modules/cu2qu/default.nix +++ b/pkgs/development/python-modules/cu2qu/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { mainProgram = "cu2qu"; homepage = "https://github.com/googlefonts/cu2qu"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 9e2e8df44a003..6f550580a208a 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Productivity Tools for Plotly + Pandas"; homepage = "https://github.com/santosjorge/cufflinks"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 8c042a9a965e6..8435c1e988dda 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - cython, + fetchFromGitHub, + cython_0, fastrlock, numpy, wheel, @@ -10,16 +10,15 @@ mock, setuptools, cudaPackages, - addOpenGLRunpath, + addDriverRunpath, pythonOlder, symlinkJoin, + fetchpatch }: let inherit (cudaPackages) cudnn cutensor nccl; - cudatoolkit-joined = symlinkJoin { - name = "cudatoolkit-joined-${cudaPackages.cudaVersion}"; - paths = with cudaPackages; [ + outpaths = with cudaPackages; [ cuda_cccl # <nv/target> cuda_cudart cuda_nvcc # <crt/host_defines.h> @@ -35,7 +34,10 @@ let # Missing: # cusparselt - ]; + ]; + cudatoolkit-joined = symlinkJoin { + name = "cudatoolkit-joined-${cudaPackages.cudaVersion}"; + paths = outpaths ++ lib.concatMap (f: lib.map f outpaths) [lib.getLib lib.getDev (lib.getOutput "static") (lib.getOutput "stubs")]; }; in buildPythonPackage rec { @@ -45,11 +47,22 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-5NvSsu1BWaXMDA+YpxCgFJUOssFu60VelWEo87O9DVE="; + src = fetchFromGitHub { + owner = "cupy"; + repo = "cupy"; + rev = "v13.2.0"; + hash = "sha256-vZAtpIZztmsYeJeuq7yl7kgZse2azrIM3efHDmUswJI="; + fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = + "https://github.com/cfhammill/cupy/commit/67526c756e4a0a70f0420bf0e7f081b8a35a8ee5.patch"; + hash = "sha256-WZgexBdM9J0ep5s+9CGZriVq0ZidCRccox+g0iDDywQ="; + }) + ]; + # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in # a small amount of thrashing but it turns out there are a large number of @@ -63,8 +76,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools wheel - addOpenGLRunpath - cython + addDriverRunpath + cython_0 cudaPackages.cuda_nvcc ]; @@ -77,7 +90,6 @@ buildPythonPackage rec { NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages CUDA_PATH = "${cudatoolkit-joined}"; - LDFLAGS = "-L${cudaPackages.cuda_cudart}/lib/stubs"; propagatedBuildInputs = [ fastrlock @@ -95,7 +107,7 @@ buildPythonPackage rec { postFixup = '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" done ''; diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 82a521898a63d..28f8eb2da729f 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.7.0b4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "yifeikong"; repo = "curl_cffi"; rev = "refs/tags/v${version}"; - hash = "sha256-txrJNUzswAPeH4Iazn0iKJI0Rqk0HHRoDrtTfDHKMoo="; + hash = "sha256-fVmZ5DKgkjnO1CPYVSa9qei26B0mXqZMtVGhtNGfEpY="; }; patches = [ ./use-system-libs.patch ]; diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index 10bd11bc849ca..8ff358be69058 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Python wrapper for the portable curve25519-donna implementation"; homepage = "http://code.google.com/p/curve25519-donna/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index b51d4ea6f64f2..121a9d166c9c9 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cvelib"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvelib"; rev = "refs/tags/${version}"; - hash = "sha256-nj5bkep8jYJE1qh2zNxivjKOpHj93UZ8bU+qNs2On8s="; + hash = "sha256-me61A1SyktPTd9u0t51kF4237/t9wiHqz+IVoyojMXY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index a33d19ff31354..7b4b0c564ef64 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, - python, blas, lapack, suitesparse, diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index d6fce58eaa734..e75ad737db9c8 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -2,46 +2,66 @@ lib, stdenv, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + fetchpatch, + + # build-system + numpy, + pybind11, + setuptools, + + # dependencies clarabel, cvxopt, ecos, - fetchPypi, - numpy, osqp, - pytestCheckHook, - pythonOlder, scipy, scs, - setuptools, - wheel, - pybind11, + + # checks + pytestCheckHook, + useOpenmp ? (!stdenv.isDarwin), }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.4.3"; - format = "pyproject"; + version = "1.5.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sbB4yMBZI60Sjn2BSwvhwzesBSYqeLdXqOb5V2SK2VM="; + src = fetchFromGitHub { + owner = "cvxpy"; + repo = "cvxpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-g4JVgykGNFT4ZEi5f8hkVjd7eUVJ+LxvPvmiVa86r1Y="; }; + patches = [ + # Fix invalid uses of the scipy library + # https://github.com/cvxpy/cvxpy/pull/2508 + (fetchpatch { + name = "scipy-1-14-compat"; + url = "https://github.com/cvxpy/cvxpy/pull/2508/commits/c343f4381c69f7e6b51a86b3eee8b42fbdda9d6a.patch"; + hash = "sha256-SqIdPs9K+GuCLCEJMHUQ+QGWNH5B3tKuwr46tD9Ao2k="; + }) + ]; + # we need to patch out numpy version caps from upstream postPatch = '' - sed -i 's/\(numpy>=[0-9.]*\),<[0-9.]*;/\1;/g' pyproject.toml + substituteInPlace pyproject.toml \ + --replace-fail "numpy >= 2.0.0" "numpy" ''; - nativeBuildInputs = [ - setuptools - wheel + build-system = [ + numpy pybind11 + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ clarabel cvxopt ecos @@ -77,12 +97,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "cvxpy" ]; - meta = with lib; { + meta = { description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index b01a4f7242711..75b8b091c39b4 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/sebastinas/cwcwidth"; changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index bc6ebb6820c88..44dc7e32fd4bb 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -4,8 +4,9 @@ fetchPypi, pythonOlder, ncurses, - importlib-metadata, setuptools, + filelock, + typing-extensions, wheel, patchelf, }: @@ -23,22 +24,28 @@ buildPythonPackage rec { hash = "sha256-M1wwutDj5lNlXyMJkzCEWL7cmXuvW3qZXoZB3rousoc="; }; - nativeBuildInputs = [ + pythonRelaxDeps = [ + "setuptools" + "wheel" + ]; + + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ - importlib-metadata # upstream has this for 3.8 as well + buildInputs = [ ncurses + ]; + + dependencies = [ + filelock setuptools + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; postPatch = '' - # timestamp need to come after 1980 for zipfiles and nix store is set to epoch - substituteInPlace cx_Freeze/freezer.py \ - --replace "st.st_mtime" "time.time()" - sed -i /patchelf/d pyproject.toml ''; @@ -57,7 +64,7 @@ buildPythonPackage rec { homepage = "https://marcelotduarte.github.io/cx_Freeze/"; changelog = "https://github.com/marcelotduarte/cx_Freeze/releases/tag/${version}"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "cxfreeze"; }; } diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 2d09a5006d4c5..e82f5c6e880e8 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cxxfilt" ]; meta = with lib; { - description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle "; + description = "Demangling C++ symbols in Python / interface to abi::__cxa_demangle"; homepage = "https://github.com/afq984/python-cxxfilt"; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 1dec715710038..67420aabf7c9b 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.5.0"; + version = "7.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,11 +32,12 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-yBBtE9DfHzUNXHMCo3KoUAAsvkBshczmVtMCUTtQ9zg="; + hash = "sha256-zYiSJJ49lgRMuJX0fqL8dedcFQzsh6JiMuoqV0VhF2I="; }; - build-system = [ poetry-core ]; + pythonRelaxDeps = [ "py-serializable" ]; + build-system = [ poetry-core ]; dependencies = [ importlib-metadata @@ -51,18 +52,27 @@ buildPythonPackage rec { types-toml ]; + passthru.optional-dependencies = { + validation = [ + jsonschema + lxml + ]; + json-validation = [ + jsonschema + ]; + xml-validation = [ + lxml + ]; + }; + nativeCheckInputs = [ ddt - jsonschema - lxml pytestCheckHook xmldiff - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; - pythonRelaxDeps = [ "py-serializable" ]; - preCheck = '' export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index d76fd3049cfe2..665ac92608887 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.9.3"; + version = "2.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-8D9HBWotn15fkHlwpXcpsC0VmaD7JuD0XVRJGRj1Ijg="; + hash = "sha256-s+MHy5L6Lof2Hd5gsEbKP5bmwMdbZCgHjOzR81lCoHk="; }; build-system = [ diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 3910cdd34f25a..f987ee07a64e1 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; + hash = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; }; patches = [ diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix index 8228274ee1712..fe5874db533f7 100644 --- a/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, apscheduler, bitstring, buildPythonPackage, diff --git a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix index 66adf36686001..70a2746b1c60b 100644 --- a/pkgs/development/python-modules/cython-test-exception-raiser/default.nix +++ b/pkgs/development/python-modules/cython-test-exception-raiser/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { publicDomain mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/daemonocle/default.nix b/pkgs/development/python-modules/daemonocle/default.nix index 5e236996bc200..abe58995650fc 100644 --- a/pkgs/development/python-modules/daemonocle/default.nix +++ b/pkgs/development/python-modules/daemonocle/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/jnrbsn/daemonocle"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix index 2e4841e70c171..d12b3245879b7 100644 --- a/pkgs/development/python-modules/daff/default.nix +++ b/pkgs/development/python-modules/daff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; + hash = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; }; # there are no tests diff --git a/pkgs/development/python-modules/dahlia/default.nix b/pkgs/development/python-modules/dahlia/default.nix index 3cb8900d3acb0..6762d6e666abe 100644 --- a/pkgs/development/python-modules/dahlia/default.nix +++ b/pkgs/development/python-modules/dahlia/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonImportsCheck = [ "dahlia" ]; - meta = with lib; { + meta = { changelog = "https://github.com/dahlia-lib/dahlia/blob/${src.rev}/CHANGELOG.md"; description = "Simple text formatting package, inspired by the game Minecraft"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/dahlia-lib/dahlia"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "dahlia"; }; } diff --git a/pkgs/development/python-modules/daiquiri/default.nix b/pkgs/development/python-modules/daiquiri/default.nix index 735131d935f7b..172253d600887 100644 --- a/pkgs/development/python-modules/daiquiri/default.nix +++ b/pkgs/development/python-modules/daiquiri/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Library to configure Python logging easily"; homepage = "https://github.com/Mergifyio/daiquiri"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 0965dacd42326..aee5251191170 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { homepage = "https://github.com/django/daphne"; changelog = "https://github.com/django/daphne/blob/${version}/CHANGELOG.txt"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "daphne"; }; } diff --git a/pkgs/development/python-modules/darkdetect/default.nix b/pkgs/development/python-modules/darkdetect/default.nix index e8dfaf086b963..fe38977f2ac06 100644 --- a/pkgs/development/python-modules/darkdetect/default.nix +++ b/pkgs/development/python-modules/darkdetect/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Detect OS Dark Mode from Python"; homepage = "https://github.com/albertosottile/darkdetect"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index a1bcb45202546..f95508612a714 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -11,22 +11,31 @@ buildPythonPackage rec { pname = "dasbus"; version = "unstable-11-10-2022"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "rhinstaller"; - repo = pname; + repo = "dasbus"; rev = "64b6b4d9e37cd7e0cbf4a7bf75faa7cdbd01086d"; hash = "sha256-TmhhDrfpP+nUErAd7dUb+RtGBRtWwn3bYOoIqa0VRoc="; }; - nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ pygobject3 ]; + build-system = [ hatchling ]; + + dependencies = [ pygobject3 ]; + nativeCheckInputs = [ dbus pytestCheckHook ]; + disabledTestPaths = [ + # https://github.com/dasbus-project/dasbus/issues/128 + "tests/lib_dbus.py" + "tests/test_dbus.py" + "tests/test_unix.py" + ]; + meta = with lib; { homepage = "https://github.com/rhinstaller/dasbus"; description = "DBus library in Python3"; diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 09d4749c09786..959d83b96bcd8 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,26 +1,34 @@ { lib, - awkward, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + hatch-vcs, + hatchling, + + # dependencies + awkward, cachetools, dask, + typing-extensions, + + # optional-dependencies + pyarrow, + + # checks dask-histogram, distributed, - fetchFromGitHub, - hatch-vcs, - hatchling, hist, pandas, - pyarrow, pytestCheckHook, - pythonOlder, - typing-extensions, uproot, }: buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.6.0"; + version = "2024.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +37,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-m/KvPo4IGn19sA5RcA/+OhLMCDBU+9BbMQtK3gHOoEc="; + hash = "sha256-xy3rq/gXQUtquvyWSCcBjZ+gUYT3RzxMgXThyT6Fwec="; }; pythonRelaxDeps = [ "awkward" ]; @@ -46,7 +54,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { io = [ pyarrow ]; }; @@ -57,7 +65,7 @@ buildPythonPackage rec { pandas pytestCheckHook uproot - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "dask_awkward" ]; diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 78577b34d9396..35fc7eb3c8f05 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -3,19 +3,25 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, versioneer, - wheel, + + # dependencies dask, pandas, pyarrow, + + # checks distributed, pytestCheckHook, + xarray }: buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.6"; + version = "1.1.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +30,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-O0s7jrxjTkIAb6zW+NuG1PPHhRHndcLt11uYNyknO4A="; + hash = "sha256-JLOTmpaKDyv4dgEM/dQFeQrD0OZcwNxBi7/pq/STJYY="; }; postPatch = '' @@ -35,7 +41,6 @@ buildPythonPackage rec { build-system = [ setuptools versioneer - wheel ]; dependencies = [ @@ -49,6 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ distributed pytestCheckHook + xarray ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 9d90d292ea7a6..8935e536996af 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { description = "Multi-tenant server for securely deploying and managing multiple Dask clusters"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index 79a1d54f4dc70..b3f63835c3a4f 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Client library for interacting with a dask-gateway server"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index ec4c90b5de919..a4bead52b43ba 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { description = "Generalized Linear Models with Dask"; homepage = "https://github.com/dask/dask-glm/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index 9bf5bd2cab788..55a528499d449 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -1,34 +1,43 @@ { lib, buildPythonPackage, - cryptography, + pythonOlder, + pythonAtLeast, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies dask, distributed, - docrep, - fetchPypi, + + # checks + cryptography, pytest-asyncio, pytestCheckHook, - pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { pname = "dask-jobqueue"; version = "0.8.5"; - format = "setuptools"; + pyproject = true; # Python 3.12 support should be added in 0.8.6 disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9pI/nX/4lLlu+/cGEYss03/Td1HVZ+kcIt/T4uqpMgI="; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-jobqueue"; + rev = "refs/tags/${version}"; + hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dask distributed - docrep ]; nativeCheckInputs = [ @@ -38,17 +47,17 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests have additional requirements (e.g., sge, etc.) - "test_adapt_parameters" + # Require some unavailable pytest fixtures "test_adapt" + "test_adaptive" "test_adaptive_cores_mem" "test_adaptive_grouped" - "test_adaptive" + "test_adapt_parameters" "test_basic" "test_basic_scale_edge_cases" + "test_cluster" "test_cluster_error_scheduler_arguments_should_use_scheduler_options" "test_cluster_has_cores_and_memory" - "test_cluster" "test_command_template" "test_complex_cancel_command" "test_config" @@ -63,12 +72,15 @@ buildPythonPackage rec { "test_forward_ip" "test_import_scheduler_options_from_config" "test_job" + "test_jobqueue_job_call" "test_log_directory" "test_scale_cores_memory" "test_scale_grouped" - "test_scheduler_options_interface" "test_scheduler_options" + "test_scheduler_options_interface" "test_security" + "test_security_temporary" + "test_security_temporary_defaults" "test_shebang_settings" "test_use_stdin" "test_worker_name_uses_cluster_name" @@ -77,10 +89,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_jobqueue" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; homepage = "https://github.com/dask/dask-jobqueue"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 2f6ffeff4ecd7..6b96c3d2199a1 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -66,12 +66,23 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # AttributeError: 'csr_matrix' object has no attribute 'A' + # Fixed in https://github.com/dask/dask-ml/pull/996 + "tests/test_svd.py" + ]; + + disabledTests = [ + # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match) + "test_whitening" + ]; + __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Scalable Machine Learn with Dask"; homepage = "https://github.com/dask/dask-ml"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 2bd7d06003c94..f51dccdc0377d 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "dask-mpi"; homepage = "https://github.com/dask/dask-mpi"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index c4988b4c8c5b0..69d4f119b6eba 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -6,7 +6,6 @@ # build-system setuptools, - wheel, # dependencies click, @@ -41,7 +40,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.6.2"; + version = "2024.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,13 +49,10 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-5jG9hx1tZkqLwjWF73Fm2oJBuejbq4a7GP9fMd8hRJg="; + hash = "sha256-u8rkay2c4gr3IVShGD6z0FfHkIiUvQwDpl8U6B0JsEM="; }; - build-system = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; dependencies = [ click diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 44e356bdf13fe..33fd15cded4b1 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "https://github.com/encode/databases"; changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 00a67be185756..9bce12ae9e2b9 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -12,27 +12,40 @@ pyarrow, pytestCheckHook, pythonOlder, + pythonAtLeast, sqlalchemy, thrift, + requests, + urllib3, + fetchpatch, }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + # Depends on thrift that at the moment do not work in Python 3.12 + # see PR 328415 fix this. + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Sk/tYgFnWWHAsMSHhEUIwUagc6femAzQpQGyzJGXW1E="; + hash = "sha256-a3OeKJ3c2UCClsPMah7iJY2YvIVLfHmmBuHAx8vdXZs="; }; + patches = [ + (fetchpatch { + name = "fix-pandas.patch"; + url = "https://patch-diff.githubusercontent.com/raw/databricks/databricks-sql-python/pull/416.patch"; + sha256 = "sha256-sNCp8xSSmKP2yNzDK4wyWC5Hoe574AeHnKTeNcIxaek="; + }) + ]; + pythonRelaxDeps = [ - "numpy" - "thrift" + "pyarrow" ]; nativeBuildInputs = [ @@ -49,6 +62,8 @@ buildPythonPackage rec { pyarrow sqlalchemy thrift + requests + urllib3 ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -63,8 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ harvidsen ]; - # No SQLAlchemy 2.0 support - # https://github.com/databricks/databricks-sql-python/issues/91 - broken = true; }; } diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index b020a279a0fc6..926f8a9f08a16 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Library to provide human-readable diffs of Python data structures"; homepage = "https://sourceforge.net/projects/datadiff/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 5103cc4df9477..6df2f77721f99 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -9,7 +9,6 @@ pytest-vcr, pytestCheckHook, python-dateutil, - pythonAtLeast, pythonOlder, requests, vcrpy, @@ -62,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/DataDog/datadogpy"; changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/datalad-gooey/default.nix b/pkgs/development/python-modules/datalad-gooey/default.nix new file mode 100644 index 0000000000000..a84e6c7a2be7e --- /dev/null +++ b/pkgs/development/python-modules/datalad-gooey/default.nix @@ -0,0 +1,64 @@ +{ + buildPythonPackage, + lib, + git, + fetchFromGitHub, + darwin, + setuptools, + stdenv, + git-annex, + pyside6, + pyqtdarktheme, + datalad-next, + outdated, + datalad, + pytestCheckHook, + pytest-qt, +}: + +buildPythonPackage { + pname = "datalad-gooey"; + # many bug fixes on `master` but no new release + version = "unstable-2024-02-20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "datalad"; + repo = "datalad-gooey"; + rev = "5bd6b9257ff1569439d2a77663271f5d665e61b6"; + hash = "sha256-8779SLcV4wwJ3124lteGzvimDxgijyxa818ZrumPMs4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyside6 + pyqtdarktheme + datalad-next + outdated + datalad + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppleScriptKit ]; + + pythonRemoveDeps = [ "applescript" ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-qt + git + git-annex + ]; + + pythonImportsCheck = [ "datalad_gooey" ]; + + meta = { + description = "Graphical user interface (GUI) for DataLad"; + homepage = "https://github.com/datalad/datalad-gooey"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; + mainProgram = "datalad-gooey"; + }; +} diff --git a/pkgs/development/python-modules/datalad-next/default.nix b/pkgs/development/python-modules/datalad-next/default.nix new file mode 100644 index 0000000000000..19b651db3ac61 --- /dev/null +++ b/pkgs/development/python-modules/datalad-next/default.nix @@ -0,0 +1,115 @@ +{ + annexremote, + buildPythonPackage, + datalad, + datasalad, + fetchFromGitHub, + git, + git-annex, + humanize, + lib, + more-itertools, + psutil, + pytestCheckHook, + setuptools, + openssh, + unzip, + versioneer, + webdavclient3, +}: + +buildPythonPackage rec { + pname = "datalad-next"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "datalad"; + repo = "datalad-next"; + rev = "refs/tags/${version}"; + hash = "sha256-fqP6nG2ncDRg48kvlsmPjNBOzfQp9+7wTcGvsYVrRzA="; + }; + + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + nativeBuildInputs = [ git ]; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + annexremote + datasalad + datalad + humanize + more-itertools + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + nativeCheckInputs = [ + pytestCheckHook + webdavclient3 + psutil + git-annex + datalad + openssh + unzip + ]; + + disabledTests = [ + # remotes available after datalad-next install (through `console_scripts`), but not yet in $PATH during test + "test_uncurl_addurl_unredirected" + "test_uncurl" + "test_uncurl_ria_access" + "test_uncurl_store" + "test_uncurl_remove" + "test_uncurl_testremote" + "test_replace_add_archive_content" + "test_annex_remote" + "test_export_remote" + "test_annex_remote_autorepush" + "test_export_remote_autorepush" + "test_typeweb_annex" + "test_typeweb_annex_uncompressed" + "test_typeweb_export" + "test_submodule_url" + "test_uncurl_progress_reporting_to_annex" + "test_archivist_retrieval" + "test_archivist_retrieval_legacy" + + # hardcoded /bin path + "test_auto_if_wanted_data_transfer_path_restriction" + + # requires internet access + "test_push_wanted" + "test_auto_data_transfer" + "test_http_url_operations" + "test_transparent_decompression" + "test_compressed_file_stay_compressed" + "test_ls_file_collection_tarfile" + "test_iter_tar" + ]; + + disabledTestPaths = [ + # requires internet access + "datalad_next/commands/tests/test_download.py" + "datalad_next/archive_operations/tests/test_tarfile.py" + ]; + pythonImportsCheck = [ "datalad_next" ]; + + meta = { + description = "DataLad extension with a staging area for additional functionality, or for improved performance and user experience"; + changelog = "https://github.com/datalad/datalad-next/blob/main/CHANGELOG.md"; + homepage = "https://github.com/datalad/datalad-next"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix new file mode 100644 index 0000000000000..a5f963b24e78c --- /dev/null +++ b/pkgs/development/python-modules/datalad/default.nix @@ -0,0 +1,242 @@ +{ + buildPythonPackage, + lib, + setuptools, + stdenv, + fetchFromGitHub, + installShellFiles, + git, + coreutils, + versioneer, + # core + platformdirs, + chardet, + iso8601, + humanize, + fasteners, + packaging, + patool, + tqdm, + annexremote, + looseversion, + git-annex, + # downloaders + boto3, + keyrings-alt, + keyring, + msgpack, + requests, + # publish + python-gitlab, + # misc + argcomplete, + pyperclip, + python-dateutil, + # duecredit + duecredit, + # python>=3.8 + distro, + # win + colorama, + # python-version-dependent + pythonOlder, + importlib-resources, + importlib-metadata, + typing-extensions, + # tests + pytestCheckHook, + p7zip, + curl, + httpretty, +}: + +buildPythonPackage rec { + pname = "datalad"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "datalad"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-HBHz1z34GFurDROm2goDxm3G2ml3SYOOTU2cQE36VYg="; + }; + + postPatch = '' + substituteInPlace datalad/distribution/create_sibling.py \ + --replace-fail "/bin/ls" "${coreutils}/bin/ls" + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + nativeBuildInputs = [ + installShellFiles + git + ]; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = + [ + # core + platformdirs + chardet + iso8601 + humanize + fasteners + packaging + patool + tqdm + annexremote + looseversion + setuptools + git-annex + + # downloaders-extra + # requests-ftp # not in nixpkgs yet + + # downloaders + boto3 + keyrings-alt + keyring + msgpack + requests + + # publish + python-gitlab + + # misc + argcomplete + pyperclip + python-dateutil + + # duecredit + duecredit + + # python>=3.8 + distro + ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] + ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + + postInstall = '' + installShellCompletion --cmd datalad \ + --bash <($out/bin/datalad shell-completion) \ + --zsh <($out/bin/datalad shell-completion) + wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + preCheck = '' + export HOME=$TMPDIR + ''; + + # tests depend on apps in $PATH which only will get installed after the test + disabledTests = [ + # No such file or directory: 'datalad' + "test_script_shims" + "test_cfg_override" + "test_completion" + "test_nested_pushclone_cycle_allplatforms" + "test_create_sub_gh3463" + "test_create_sub_dataset_dot_no_path" + "test_cfg_passthrough" + "test_addurls_stdin_input_command_line" + "test_run_datalad_help" + "test_status_custom_summary_no_repeats" + "test_quoting" + + # No such file or directory: 'git-annex-remote-[...]" + "test_create" + "test_ensure_datalad_remote_maybe_enable" + + # "git-annex: unable to use external special remote git-annex-remote-datalad" + "test_ria_postclonecfg" + "test_ria_postclone_noannex" + "test_ria_push" + "test_basic_scenario" + "test_annex_get_from_subdir" + "test_ensure_datalad_remote_init_and_enable_needed" + "test_ensure_datalad_remote_maybe_enable[False]" + "test_ensure_datalad_remote_maybe_enable[True]" + "test_create_simple" + "test_create_alias" + "test_storage_only" + "test_initremote" + "test_read_access" + "test_ephemeral" + "test_initremote_basic_fileurl" + "test_initremote_basic_httpurl" + "test_remote_layout" + "test_version_check" + "test_gitannex_local" + "test_push_url" + "test_url_keys" + "test_obtain_permission_root" + "test_source_candidate_subdataset" + "test_update_fetch_all" + "test_add_archive_dirs" + "test_add_archive_content" + "test_add_archive_content_strip_leading" + "test_add_archive_content_zip" + "test_add_archive_content_absolute_path" + "test_add_archive_use_archive_dir" + "test_add_archive_single_file" + "test_add_delete" + "test_add_archive_leading_dir" + "test_add_delete_after_and_drop" + "test_add_delete_after_and_drop_subdir" + "test_override_existing_under_git" + "test_copy_file_datalad_specialremote" + "test_download_url_archive" + "test_download_url_archive_from_subdir" + "test_download_url_archive_trailing_separator" + "test_download_url_need_datalad_remote" + "test_datalad_credential_helper - assert False" + + # need internet access + "test_clone_crcns" + "test_clone_datasets_root" + "test_reckless" + "test_autoenabled_remote_msg" + "test_ria_http_storedataladorg" + "test_gin_cloning" + "test_nonuniform_adjusted_subdataset" + "test_install_datasets_root" + "test_install_simple_local" + "test_install_dataset_from_just_source" + "test_install_dataset_from_just_source_via_path" + "test_datasets_datalad_org" + "test_get_cached_dataset" + "test_cached_dataset" + "test_cached_url" + "test_anonymous_s3" + "test_protocols" + "test_get_versioned_url_anon" + "test_install_recursive_github" + "test_failed_install_multiple" + + # pbcopy not found + "test_wtf" + ]; + + nativeCheckInputs = [ + p7zip + pytestCheckHook + git-annex + curl + httpretty + ]; + + pythonImportsCheck = [ "datalad" ]; + + meta = { + description = "Keep code, data, containers under control with git and git-annex"; + homepage = "https://www.datalad.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ renesat ]; + }; +} diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index 8ab7fd4c0bcc0..e7c8f0b3af2cb 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/datasalad/default.nix b/pkgs/development/python-modules/datasalad/default.nix new file mode 100644 index 0000000000000..66303c1ff0cdb --- /dev/null +++ b/pkgs/development/python-modules/datasalad/default.nix @@ -0,0 +1,46 @@ +{ + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + lib, + more-itertools, + psutil, + pytestCheckHook, + unzip, +}: + +buildPythonPackage rec { + pname = "datasalad"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "datalad"; + repo = "datasalad"; + rev = "refs/tags/v${version}"; + hash = "sha256-qgHWTokNBzJcBbEPCA/YfklzqyX1lM2yro7ElqBfrig="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + nativeCheckInputs = [ + pytestCheckHook + more-itertools + psutil + unzip + ]; + + pythonImportsCheck = [ "datasalad" ]; + + meta = { + description = "Pure-Python library with a collection of utilities for working with Git and git-annex"; + changelog = "https://github.com/datalad/datasalad/blob/main/CHANGELOG.md"; + homepage = "https://github.com/datalad/datasalad"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 3718c4db7eab4..14779ee62cabc 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/datasette-template-sql/default.nix b/pkgs/development/python-modules/datasette-template-sql/default.nix index ca77a27ca6ce7..5bdb48aa28cb6 100644 --- a/pkgs/development/python-modules/datasette-template-sql/default.nix +++ b/pkgs/development/python-modules/datasette-template-sql/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, datasette, fetchFromGitHub, - pytest-asyncio, pythonOlder, }: diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index d5976e2a92915..fd31d3bbf1897 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -102,6 +102,6 @@ buildPythonPackage rec { homepage = "https://datasette.io/"; changelog = "https://github.com/simonw/datasette/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 1fc9b1e80de05..c7e3237a1f65e 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -96,6 +96,6 @@ buildPythonPackage rec { mainProgram = "datashader"; homepage = "https://datashader.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/datashaper/default.nix b/pkgs/development/python-modules/datashaper/default.nix new file mode 100644 index 0000000000000..1da7346f26693 --- /dev/null +++ b/pkgs/development/python-modules/datashaper/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pythonRelaxDepsHook, + poetry-core, + dacite, + diskcache, + jsonschema, + pandas, + pyarrow, +}: + +buildPythonPackage rec { + pname = "datashaper"; + version = "0.0.49"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Bb+6WWRHSmK91SWew/oBc9AeNlIItqSv9OoOYwlqdTM="; + }; + + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pyarrow" ]; + + dependencies = [ + dacite + diskcache + jsonschema + pandas + pyarrow + ]; + + pythonImportsCheck = [ "datashaper" ]; + + # pypi tarball has no tests + doCheck = false; + + meta = { + description = "Collection of utilities for doing lightweight data wrangling"; + homepage = "https://github.com/microsoft/datashaper/tree/main/python/datashaper"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 1ecc3d89e102e..6a7c80ada33e7 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pipInstallHook, - writeText, blessed, docutils, libcxx, diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index 58fec05849684..4bf82cf464ca4 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "datauri"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fcurella"; repo = "python-datauri"; rev = "refs/tags/v${version}"; - hash = "sha256-+R1J4IjJ+Vf/+V2kiZyIyAqTAgGLTMJjGePyVRuO5rs="; + hash = "sha256-9BCYC8PW44pB348kkH7aB1YqXXN1VNcBHphlN503M6g="; }; build-system = [ setuptools ]; @@ -34,11 +34,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "datauri" ]; - disabledTests = [ - # Test is incompatible with pydantic >=2 - "test_pydantic" - ]; - meta = with lib; { description = "Module for Data URI manipulation"; homepage = "https://github.com/fcurella/python-datauri"; diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix index 9dbe3654a4019..f52c467fd3dd2 100644 --- a/pkgs/development/python-modules/dateutils/default.nix +++ b/pkgs/development/python-modules/dateutils/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Utilities for working with datetime objects"; homepage = "https://github.com/jmcantrell/python-dateutils"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix index 639b8baa21578..997600122d01f 100644 --- a/pkgs/development/python-modules/dawg-python/default.nix +++ b/pkgs/development/python-modules/dawg-python/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Pure Python reader for DAWGs created by dawgdic C++ library or DAWG Python extension"; homepage = "https://github.com/pytries/DAWG-Python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index 7613795fabe9a..e73892f1f998f 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; + hash = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; }; patches = [ diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 0b6eb890fb601..4f7eff5b9a732 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-db-dtypes-pandas"; changelog = "https://github.com/googleapis/python-db-dtypes-pandas/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index ebe64fa28a509..0be997c9fc2ad 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Module for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; homepage = "https://github.com/ethanfurman/dbf"; license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 029ca35d7785f..26d8046ea8f25 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Read DBF Files with Python"; homepage = "https://dbfread.readthedocs.org/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index ad26164903192..776725659d691 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-Erx/j1x+I4ypPqBFzJRZk3ILr3ZG97Hvk4vXe2p6cDc="; + hash = "sha256-M7n+WcHGBMNZ5k9GZRR05g8KzPDWjmB83iZSD16G774="; }; build-system = [ hatchling ]; @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-adapters"; changelog = "https://github.com/dbt-labs/dbt-adapters/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index d04bf2788b60a..e9eb98b93ca39 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -10,12 +10,11 @@ pytestCheckHook, pythonOlder, setuptools, - urllib3, }: buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-5sqKvYXKBze6t0yNaeYvwyS919CHMXCv3RRzNnBxfec="; + hash = "sha256-SYQAFvu7nw54X4jxicEA9+lnvMgj/Yp460xz3BFGYCM="; }; pythonRelaxDeps = [ "agate" ]; diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index be12462648451..bf9a93abafab6 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { build-system = [ hatchling ]; + pythonRelaxDeps = [ "agate" ]; + dependencies = [ agate colorama @@ -60,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-common"; changelog = "https://github.com/dbt-labs/dbt-common/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 0d2437e47f0be..638c5ef8a9ff2 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -17,7 +17,7 @@ packaging, pathspec, protobuf, - python3, + python, pythonOlder, pytz, pyyaml, @@ -85,7 +85,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - withAdapters = python3.pkgs.callPackage ./with-adapters.nix { }; + withAdapters = python.pkgs.callPackage ./with-adapters.nix { }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/dbt-core/with-adapters.nix b/pkgs/development/python-modules/dbt-core/with-adapters.nix index 92bd22dd2f9ff..b5fe0a527f0ea 100644 --- a/pkgs/development/python-modules/dbt-core/with-adapters.nix +++ b/pkgs/development/python-modules/dbt-core/with-adapters.nix @@ -1,5 +1,5 @@ { - python3, + python, dbt-bigquery, dbt-core, dbt-postgres, @@ -17,7 +17,7 @@ let }; in adapterFun: -(python3.buildEnv.override { +(python.buildEnv.override { extraLibs = [ dbt-core ] ++ (adapterFun adapters); ignoreCollisions = true; }).overrideAttrs diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index b818182d13b00..deffc3b313d13 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-XTAWCJ+aTFrAuggS3dbR9X08/x9ypXgE8tlWTaOmyRc="; + hash = "sha256-SmFN1GXX14L+3jtAo5Vqm53HLRaear2U/KI2Afx0ztU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 5f6a9d41fc4d3..9eb306074a573 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, click, dateutils, - dbt-postgres, fetchFromGitHub, hatchling, hypothesis, @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-77WKfegchgHIxgzL3Yhtx/4S5pYi6HeVCQH/19YscWA="; + hash = "sha256-V6yMT9Fkug+T3smBEu0Szg5GPMRxEOZc4gtJybWXbrs="; }; pythonRelaxDeps = [ "importlib-metadata" ]; diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index f49197cc90fcd..3f455b68a9612 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://tecnocode.co.uk/dbus-deviation/"; description = "Project for parsing D-Bus introspection XML and processing it in various ways"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dbus-python/default.nix b/pkgs/development/python-modules/dbus-python/default.nix index 937ec9511ef5e..b6664daa25768 100644 --- a/pkgs/development/python-modules/dbus-python/default.nix +++ b/pkgs/development/python-modules/dbus-python/default.nix @@ -100,7 +100,7 @@ lib.fix ( homepage = "https://gitlab.freedesktop.org/dbus/dbus-python"; license = licenses.mit; platforms = dbus.meta.platforms; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } ) diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index cbe1451875073..541ac2a3cdda0 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { changelog = "https://github.com/datadriventests/ddt/releases/tag/${version}"; description = "Data-Driven/Decorated Tests, a library to multiply test cases"; homepage = "https://github.com/txels/ddt"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 571040b89fa0f..b5785b93132fe 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -13,9 +13,9 @@ buildPythonPackage rec { pname = "debian-inspector"; version = "31.1.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "debian_inspector"; @@ -25,15 +25,17 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ chardet attrs - commoncode ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + commoncode + pytestCheckHook + ]; pythonImportsCheck = [ "debian_inspector" ]; diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index 5174c46c444a8..d9b2011b17f2f 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -2,8 +2,11 @@ lib, buildPythonPackage, fetchPypi, + openstackdocstheme, pbr, six, + setuptools, + sphinxHook, wrapt, callPackage, }: @@ -11,16 +14,23 @@ buildPythonPackage rec { pname = "debtcollector"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-KokX0lsOHx0NNl08HG7Px6UiselxbooaSpFRJvfM6m8="; }; - nativeBuildInputs = [ pbr ]; + build-system = [ + openstackdocstheme + pbr + setuptools + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; - propagatedBuildInputs = [ + dependencies = [ six wrapt ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 92f42bd90d64d..ddbf84a511e48 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, pythonOlder, + pythonAtLeast, fetchFromGitHub, substituteAll, gdb, @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-2TkieSQYxnlUroSD9wNKNaHUTLRksFWL/6XmSNGTCA4="; + hash = "sha256-J63izrJX7/el36kMHv+IyqDQ1C13CKb40HLOVgOzHEw="; }; patches = @@ -92,6 +93,9 @@ buildPythonPackage rec { } )''; + # Disable tests for unmaintained versions of python + doCheck = pythonAtLeast "3.11"; + nativeCheckInputs = [ ## Used to run the tests: pytestCheckHook diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 0836e284a9081..5a0bc26763a46 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://github.com/micheles/decorator"; description = "Better living through Python with decorators"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 4b002da52acfc..ed70dd98468c4 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-q52dMygpBzL92yW8DFIKpjxykGqW86CNM1xqxGf/JJ0="; + hash = "sha256-foIRWZcv+i/UZMMr1LjNiUpvJVD9UOWHPKHpcGHXfxQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index 6e2c89df3a19b..40ee84f52aa21 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Deezer downloader built from the ashes of Deezloader Remix"; mainProgram = "deemix"; - homepage = "https://git.freezerapp.xyz/RemixDev/deemix-py"; + homepage = "https://gitlab.com/RemixDev/deemix-py"; license = licenses.gpl3Plus; maintainers = with maintainers; [ natto1784 ]; }; diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 0bd136e6fcebb..e0b4b3907c37a 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -3,27 +3,27 @@ buildPythonPackage, environs, fetchFromGitHub, + httpx, poetry-core, pytest-mock, pytest-vcr, pytestCheckHook, pythonOlder, - requests, tornado, }: buildPythonPackage rec { pname = "deezer-python"; - version = "6.2.0"; + version = "7.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "browniebroke"; repo = "deezer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Y1y8FBxpGpNIWCZbel9fdGLGC9VM9h1BvHtUxCZxp/A="; + hash = "sha256-V4M6qRTa7XKbl962Z3y70+v3YCeW65VjeSIv/1Oxnws="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - requests + httpx tornado ]; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index c30add3f1edcc..082c0a8ff4475 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -8,7 +8,7 @@ peppercorn, translationstring, zope-deprecation, - nose, + setuptools, coverage, beautifulsoup4, flaky, @@ -19,14 +19,16 @@ buildPythonPackage rec { pname = "deform"; version = "2.0.15"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1e912937650c1dbb830079dd9c039950762a230223a567740fbf1b23f1090367"; + hash = "sha256-HpEpN2UMHbuDAHndnAOZUHYqIwIjpWd0D78bI/EJA2c="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ chameleon colander iso8601 @@ -36,7 +38,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose coverage beautifulsoup4 flaky @@ -44,10 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with lib; { + meta = { description = "Form library with advanced features like nested forms"; homepage = "https://docs.pylonsproject.org/projects/deform/en/latest/"; - license = licenses.free; # http://www.repoze.org/LICENSE.txt - maintainers = with maintainers; [ domenkozar ]; + # https://github.com/Pylons/deform/blob/fdc43d59de7d11b0e3ba1b92835b780cfe181719/LICENSE.txt + license = [ lib.licenses.bsd3 lib.licenses.cc-by-30 ]; + maintainers = with lib.maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/dek/default.nix b/pkgs/development/python-modules/dek/default.nix index 811c406480a15..4f528b8551339 100644 --- a/pkgs/development/python-modules/dek/default.nix +++ b/pkgs/development/python-modules/dek/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/rec/dek"; changelog = "https://github.com/rec/dek/blob/${src.rev}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/delegator-py/default.nix b/pkgs/development/python-modules/delegator-py/default.nix index b51ff537518cd..0e4fc71161a79 100644 --- a/pkgs/development/python-modules/delegator-py/default.nix +++ b/pkgs/development/python-modules/delegator-py/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Subprocesses for Humans 2.0"; homepage = "https://github.com/amitt001/delegator.py"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 2ea42160a8920..964921eda9f47 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, pkg-config, diff --git a/pkgs/development/python-modules/deltachat2/default.nix b/pkgs/development/python-modules/deltachat2/default.nix index 78d10679a3079..cbd9fd791e6fb 100644 --- a/pkgs/development/python-modules/deltachat2/default.nix +++ b/pkgs/development/python-modules/deltachat2/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , buildPythonPackage , deltachat-rpc-server -, libdeltachat , setuptools-scm , substituteAll }: @@ -37,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/adbenitez/deltachat2"; license = lib.licenses.mpl20; mainProgram = "deltachat2"; - inherit (libdeltachat.meta) maintainers; + inherit (deltachat-rpc-server.meta) maintainers; }; } diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index ef0dae99acb65..7ded47926fdce 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -13,21 +13,22 @@ , pytest-benchmark , pytest-cov , pandas +, azure-storage-blob }: buildPythonPackage rec { pname = "deltalake"; - version = "0.18.1"; + version = "0.18.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-qkmCKk1VnROK7luuPlKbIx3S3C8fzGJy8yhTyZWXyGc="; + hash = "sha256-xvmtaHNkE6bXwVJtYJBc30qutZuMlcx4JmElCRdxmu8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-Dj2vm0l4b/E6tbXgs5iPvbDAsxNW0iPUSRPzT5KaA3Y="; + hash = "sha256-/2K8/hsMIeidfviCKK+ffWPB51svWZa+9eZoK9erBaY="; }; env.OPENSSL_NO_VENDOR = 1; @@ -59,6 +60,7 @@ buildPythonPackage rec { pandas pytest-benchmark pytest-cov + azure-storage-blob ]; preCheck = '' diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 19c85bddc8584..d68c1c457bc48 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.2.0"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pdm-project"; repo = "dep-logic"; rev = "refs/tags/${version}"; - hash = "sha256-NB0TR7fCtjSm4cAl+Fy+6c+z1ZBDiRw7nXux/s6ON/c="; + hash = "sha256-7w5yN+3/u7mcGwBZAgTc/HHpZGyVZzSTWktmmcVSqpA="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix index 62c05168c2cb3..1635a99d71378 100644 --- a/pkgs/development/python-modules/deprecat/default.nix +++ b/pkgs/development/python-modules/deprecat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "deprecat"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mjhajharia"; repo = "deprecat"; rev = "refs/tags/v${version}"; - hash = "sha256-uAabZAtZDhcX6TfiM0LnrAzxxS64ys+vdodmxO//0x8="; + hash = "sha256-CvW4SQ78FG8GqBs6/a0yHWfTAn64sH54GVSETooMa6A="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index c7e67c6eaaf5f..a3fbc61e2c042 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/globocom/derpconf"; changelog = "https://github.com/globocom/derpconf/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 6afee98488724..fd502d99eef90 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "5.0.0"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qv63aX96iUzxZPKr3FZq7fuWh2fYmKV3JMmy7txT05w="; + hash = "sha256-A+25T0xgUcE1NaOKNZgeP80VlEmqa137YGn3g/pwpxM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index a678a2bb69dec..820e204e118a4 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "Enterprise friendly way of detecting and preventing secrets in code"; homepage = "https://github.com/Yelp/detect-secrets"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index a9d34cd2f0bbd..95ec86ff5eb36 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -3,6 +3,7 @@ stdenv, anytree, buildPythonPackage, + setuptools, cached-property, cgen, click, @@ -25,8 +26,8 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.8"; - format = "setuptools"; + version = "4.8.11"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -34,18 +35,20 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-j+If/yYj85c8GpSo/fq5MfxVHQlo/4+Qh+Bn1N/9nd4="; + hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0="; }; - pythonRemoveDeps = [ - "codecov" - "flake8" - "pytest-runner" - "pytest-cov" - ]; + # packaging.metadata.InvalidMetadata: 'python_version_3.8_' is invalid for 'provides-extra' + postPatch = '' + substituteInPlace requirements-testing.txt \ + --replace-fail 'pooch; python_version >= "3.8"' "pooch" + ''; + + pythonRemoveDeps = [ "pip" ]; pythonRelaxDeps = true; + build-system = [ setuptools ]; dependencies = [ anytree diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 6330d06537950..814f5f40de036 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.1.0"; + version = "9.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-xsn38erNkBnRGMr7dZCERcqkGnn2Xzb59QbJYm28vHA="; + hash = "sha256-te0glVs+ve6UR25CnP2fEyThwZoExKrjKok7EcNnPx4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 93ce2b7de1386..7c7936ec88166 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; description = "Diff, Match and Patch libraries for Plain Text"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 3eb3f6137ab7d..4ef707184fe3c 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.29.0"; + version = "0.29.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-sC/vstc7347ofNWESiUnvRsfAu/sKzlNV3lTPTuqUkY="; + hash = "sha256-RJQo+2lZ863nP9ZCQbntfuxDI+elB0RJ5E8zGs65E2A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index f34b0fc6be27d..023b14113622b 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "2.3.2"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bZoYdDpk34x+Vw1pAZ3EcTFp2JJ/Ow0Jfof/XjqeRmY="; + hash = "sha256-GIwXx7bRCH2+G3zlilJ/Tb8el50SDbxGGX2/1bqL3+U="; }; propagatedBuildInputs = @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://discordpy.rtfd.org/"; changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/discum/default.nix b/pkgs/development/python-modules/discum/default.nix new file mode 100644 index 0000000000000..acc3a6e49a031 --- /dev/null +++ b/pkgs/development/python-modules/discum/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pythonRelaxDepsHook, + brotli, + colorama, + filetype, + requests, + requests-toolbelt, + ua-parser, + websocket-client, + pycryptodome, + pypng, + pyqrcode, +}: + +buildPythonPackage rec { + pname = "discum"; + version = "1.4.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-/8TaAmfSPv/7kuymockSvC2uxXgHfuP+FXN8vuA9WHY="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ + brotli + colorama + filetype + requests + requests-toolbelt + ua-parser + websocket-client + ]; + + passthru.optional-dependencies = { + ra = [ + pycryptodome + pypng + pyqrcode + ]; + }; + + pythonImportsCheck = [ "discum" ]; + + pythonRelaxDeps = [ "websocket-client" ]; + + meta = { + description = "Discord API Wrapper for Userbots/Selfbots written in Python"; + homepage = "https://pypi.org/project/discum/"; + changelog = "https://github.com/Merubokkusu/Discord-S.C.U.M/blob/v${version}/changelog.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jokatzke ]; + }; +} diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 4fe4bad03abc6..c2a18535a7634 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Disk and file backed persistent cache"; homepage = "http://www.grantjenks.com/docs/diskcache/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dissect-archive/default.nix b/pkgs/development/python-modules/dissect-archive/default.nix index 864e6eb1ff180..95382864a6a81 100644 --- a/pkgs/development/python-modules/dissect-archive/default.nix +++ b/pkgs/development/python-modules/dissect-archive/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-archive"; - version = "1.1"; + version = "1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.archive"; rev = "refs/tags/${version}"; - hash = "sha256-DUAJUbG3k6sbO7mqvNzQQns+4l8XHDUh0xZ/RA5LWEY="; + hash = "sha256-j+p42DTRM/StP9S/5Kotfz8xrmdKaNLIyCkEZr9f5Nw="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index 02271c9bf43b7..ef7f8fdd9f4ac 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-btrfs"; - version = "1.3"; + version = "1.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.btrfs"; rev = "refs/tags/${version}"; - hash = "sha256-Xn7y9om/IuCaPR77lSuC0peF5umIxu2BS9esMPXsv+Y="; + hash = "sha256-cQC9lY80JOgLJZpNCwpvDldWjfbbI14uc9q/miAOBGM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index 9073873f148db..9c841cbf3e157 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-UZ4mlshaKqZKoysvnGfcaoMOrMwfsN/qOJ8hrpMcQL0="; + hash = "sha256-7Mv8yiWEs/mj/JKDrD1BxT75tQr13VgGj0yHdRltcYM="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 287896b2448dd..3f3be066d2c49 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.8"; + version = "1.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-C1a85OLMkj0vjnRpenfC/xyxJ1TjYSlHPOq0jIrA/Ng="; + hash = "sha256-VK17Q28Bqdu/NckBZNMJciWbnGkhfEbPmBeVo0etnW0="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 04a64d8a9e7bb..e4d8f0037e5d9 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.14"; + version = "4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-Et6Pb7iRVlxcrR4gZf+5h7mVikf7CyDd7N+q4TH18vg="; + hash = "sha256-iQbHt8qhplwR/CHaDOWr/pDCZ+lPbrWDJKr3989DLDA="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index f2cf84f2c8346..5286413d55f6f 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-GdHMKLO44hR+H3fQ9h3t6sL8ACMwIVeg4nrg9brYmsU="; + hash = "sha256-IDLarSiI7GHjOOLibk2s/KqKwmozgIHdSfClPQXOsXI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 10ceff3e6eeff..598886447c5f3 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + defusedxml, dissect-cstruct, dissect-util, fetchFromGitHub, @@ -12,16 +13,16 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-gLxBVHhtQS4Ep64H4jvndGyjUW1cQ68f346utVI9eC4="; + hash = "sha256-c8qbh0LSTAV23J//Kx76eeIjptW1cVcxBSqO22okRkU="; }; build-system = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; dependencies = [ + defusedxml dissect-cstruct dissect-util ]; diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 1752640a65047..bdc1bb48112e0 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-MvCHeeuwwE/EOK5rh5vtwTtMrSO/BtfFenQZn5VTgb0="; + hash = "sha256-MXjWHbw/iEzKo4cgiYAHLzt6/Y7s9o9cPNV5TD0gqW8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 6f617db679a38..ba44d902b5dd8 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-0WLX5mD+opJoRdnk4w8mMySn41473PcRod4YxEk3S2s="; + hash = "sha256-VUdJkMtJkWGn79iopeZCTjAoD7mZkRxQaJ9Lem7Wkt8="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index c8d9c456fa990..8d7cf33acb59f 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-executable"; - version = "1.6"; + version = "1.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-b8xPOIUMn6JdYlvuoV5UeBdyISh6CC2Gh6E6U5ZZ7qY="; + hash = "sha256-qr8t+k0m9VoF2hLNilCLJ9BfATLRlZupF2C9l+6OMDo="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index a0697189f1a31..a9a2c7064c3df 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.10"; + version = "3.11"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-EIM2kS5V2+e7/bvuB8ezBZQl3XopdlzZ7Cmwr+Ns/Us="; + hash = "sha256-i77pxr0+GbrGK5skevkb+g5JKB/aEmetJc+sbqO1o4I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 6e14afb3f1e00..8cfd011f2c560 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-U7SSLvEK6IYZjjUIGT9n1w7oLdB8Q2/msQ/EBJfatJY="; + hash = "sha256-jwTHvh1fqmVisW5rYDa5mOD1MMdBb10EHo945WHBnp8="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index fac9898633bc1..29d5e3a68380d 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.8"; + version = "3.9"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-L2LL+Er5nSYpRBW5CO9EBkYY85vnDkuvaOP0kbkH2T4="; + hash = "sha256-PRf3w9s0N3Zfcaoo3RtBEYcv7Ocs4h6V+3XshRI2XXI="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index b24f1e69f8671..6ea8e4bc82783 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.13"; + version = "3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-6sjRkhZOmAckzu/lUA4Sw48cmKfMOGLGgB5dB6M06qQ="; + hash = "sha256-27GfO1HEy9EWdWuPkznOjju6Xy3W2kjKDP0gF3NqYs0="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix index ecaab632fafab..a8c9fed87a46a 100644 --- a/pkgs/development/python-modules/dissect-jffs/default.nix +++ b/pkgs/development/python-modules/dissect-jffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-jffs"; - version = "1.2"; + version = "1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.jffs"; rev = "refs/tags/${version}"; - hash = "sha256-aElQR9QDC2110QZdk+PKkBky6FUXz9pSTJV7weTBvAE="; + hash = "sha256-hpCgo3Qj8nWvqVdKESrR6Tafgvxuc7xzhq8oiHApbwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 046eec0aa74e2..6e79803b03bfd 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.10"; + version = "3.11"; format = "pyproject"; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-7D+5Btvm9fWwtVjVpKNc0VU7seyZXFxR7tEh7CAh7io="; + hash = "sha256-rwn7nKfEmv92JdSMhKztMWptvggzlWhGA0gg5C0EbFM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index cb84b16aa8fe8..e3a11e4e8a461 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.8"; + version = "3.9"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-VWbgQhKV1vJBRQROrJXbJ7qDIVOfZwvjsRwUbm7q7OQ="; + hash = "sha256-MW76O7JH9hkDlIncPqoydZ8bzpmXqmvvm0i1IOF6Pnk="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 4705900e19ca6..8165c7ca2e3b5 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.10"; + version = "3.11"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-uMC5av4NAzDF5JRUz4L8/jTLrBv9blNMYtM6dOuHe5s="; + hash = "sha256-PzGA5OZ74bS25lC77pi6tG1x7BZcr9GtKbyKf9i/MwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 4546141996142..8718b156a42b2 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.8"; + version = "3.9"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-zoq42Au2dNJTryj3GNXJrEGvE0az8psPuMXoJNc74QM="; + hash = "sha256-bkh8eiq07cspRQfs1amiyDuFmoXSBwG/fS/6nn9KV/Y="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 6c61796409ec0..e2b3341dfdaae 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-aq/p6oa+6C2BS2TV8YYXwGP580tIHYZqO455bYm0yeo="; + hash = "sha256-mhZvvPmREBY29U31POH8OfktVdNqNpQVIICPBin5WyI="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 6303663d2b073..b932c18daad2a 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.5"; + version = "1.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-eylLBPim3dmo8h95lRmlh8O9m458K07TH2uK+hn3nKs="; + hash = "sha256-XTVGhTnDtuYTAjEeliwYDjuKfP7ljHIxaQAsQI1x5lk="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 593e821394655..d2c632a1f564e 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.17"; + version = "3.18"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-UIgHjSTHaxo8jCqe+R6rRxQXX8RUFKAI5+zscInAtgg="; + hash = "sha256-jR+f4t0QXmm007lrGdMyF9vFa3NW35gZxs7pe9sdjfg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index 60091bb178230..4fed8a55122c2 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.8"; + version = "1.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-LcuuRVSnZVFtht03MD8qVNNPljVUzGa8vXu9GQPOgjs="; + hash = "sha256-ab7Ci64eeeUcmY2opa16weuVvsWn5UgvSauE55gVH/w="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index b7ae3a54ae1cd..a303691f3dd8b 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.16"; + version = "3.17"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-OHlWOWB476KERerEo2ZYLMIIO+eIpKlNLOHMCiE5jdE="; + hash = "sha256-uCmHvpZ5/TjUb9A8+GhaTAAEfCM9LxQdUDPWAvd7P7w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index ba7d93b747789..57511b5af47d0 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-AcVWKUgykgTgP0haBOtWR+wNWzc/PN9qIwVJMqNg8hg="; + hash = "sha256-855Rqz4WuTwopJo1yT8zsSvods3p+7EoB1sAXu3U5QU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 811793f6a6954..3a094cbd78801 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.10"; + version = "3.11"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-tQNmSnQBchj3SUq2XPsK/LWrKiCw4MFKmopHbxnzMxg="; + hash = "sha256-eHIInoquuyukKuPVvVB6qtovx1NloHHVGKfFBHxVd+o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index cc137632f7d7c..a8891ef7f2cbe 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.9"; + version = "3.10"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-jUNstyHVPJazf4idXNe9xICpi0MKkz8q0rWUEHjk2ZA="; + hash = "sha256-VZu6XmEKYcmqGM2eJMpABRTOBxDTwsYd7Pn662kO13o="; }; build-system = [ diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 7102f03e869ab..b14ad477132ec 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -5,7 +5,6 @@ dissect-btrfs, dissect-cim, dissect-clfs, - dissect-cobaltstrike, dissect-cstruct, dissect-esedb, dissect-etl, @@ -36,7 +35,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.14"; + version = "3.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -45,7 +44,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-wHLpysvOkJ1t0KKJXwfeRp/7mSom5WvrJ0lyRGoDwJM="; + hash = "sha256-9LRF5WBaxCaj2MEa2q90294seAU+89p5t5JBVa3vb5w="; }; pythonRelaxDeps = true; @@ -55,13 +54,11 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ dissect-archive dissect-btrfs dissect-cim dissect-clfs - dissect-cobaltstrike dissect-cstruct dissect-esedb dissect-etl diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index d069c9470ced1..583e4cc857428 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, + distutils, fetchFromGitHub, - pythonAtLeast, pythonOlder, pytestCheckHook, setuptools, @@ -14,8 +14,7 @@ buildPythonPackage rec { version = "3.5.2"; pyproject = true; - # Still uses distutils, https://github.com/gdabah/distorm/issues/191 - disabled = pythonOlder "3.5" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gdabah"; @@ -24,17 +23,18 @@ buildPythonPackage rec { hash = "sha256-Fhvxag2UN5wXEySP1n1pCahMQR/SfssywikeLmiASwQ="; }; - build-system = [ setuptools ]; + build-system = [ + distutils + setuptools + ]; nativeCheckInputs = [ pytestCheckHook yasm ]; - disabledTests = [ - # TypeError: __init__() missing 3 required positional... - "test_dummy" - ]; + # TypeError: __init__() missing 3 required positional... + doCheck = false; pythonImportsCheck = [ "distorm3" ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 0778fcc9543b4..18270c22331f2 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.6.2"; + version = "2024.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-GgW9BtTqjac+olAGg+LOO+lTopuUukVUmQ0ZWsMJOc8="; + hash = "sha256-7Z/KKm9C/n4yFKv9KHmGhIUeddwCIZL1A/SBGJKDlbI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 9c4a7a9e70ab3..0de0aee0c165f 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Linux Distribution - a Linux OS platform information API"; mainProgram = "distro"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix new file mode 100644 index 0000000000000..4e0a2d10d26e9 --- /dev/null +++ b/pkgs/development/python-modules/distutils/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + setuptools, + python, + jaraco-envs, + jaraco-path, + jaraco-text, + more-itertools, + path, + pyfakefs, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "distutils"; + inherit (setuptools) version; + pyproject = true; + + src = fetchFromGitHub { + owner = "pypa"; + repo = "distutils"; + rev = "813ab9868b353991ec7324eb09619ee5beb9183f"; + hash = "sha256-/YtITDuZlTJRisqsQ6SrgRRUrqLZpj+k3drrouURZlc="; + }; + + build-system = [ setuptools-scm ]; + + postInstall = '' + rm -r $out/${python.sitePackages}/distutils + ln -s ${setuptools}/${python.sitePackages}/setuptools/_distutils $out/${python.sitePackages}/distutils + ''; + + pythonImportsCheck = [ "distutils" ]; + + nativeCheckInputs = [ + jaraco-envs + jaraco-path + jaraco-text + more-itertools + path + pyfakefs + pytestCheckHook + ]; + + meta = { + description = "Distutils as found in cpython"; + homepage = "https://github.com/pypa/distutils"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index aec84b9102911..aee96dfd6cc7c 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/dj-database-url"; changelog = "https://github.com/jazzband/dj-database-url/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index e557c9992717b..1214234bf8dd1 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Use an URL to configure email backend settings in your Django Application"; homepage = "https://github.com/migonzalvar/dj-email-url"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 49e0c49e75bb1..1f0ac3747c878 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/iMerica/dj-rest-auth"; changelog = "https://github.com/iMerica/dj-rest-auth/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index 22ef40ac2f694..29d9e7b82689c 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -1,36 +1,40 @@ { lib, buildPythonPackage, - django_4, - fetchPypi, pythonOlder, + fetchFromGitHub, + setuptools, + django, }: buildPythonPackage rec { pname = "django-admin-sortable2"; - version = "2.2.1"; - format = "setuptools"; + version = "2.2.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - pname = "django_admin_sortable2"; - inherit version; - hash = "sha256-MKlSf5P8YbeixZVNtX2EKJMeN/Riw7RssQEFPcX1F1E="; + src = fetchFromGitHub { + owner = "jrief"; + repo = "django-admin-sortable2"; + rev = "refs/tags/${version}"; + hash = "sha256-BgydzSrbEMC6fE3W9TqjedBYtxMhK/bsYexNTXnJfUo="; }; - propagatedBuildInputs = [ django_4 ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; pythonImportsCheck = [ "adminsortable2" ]; # Tests are very slow (end-to-end with playwright) doCheck = false; - meta = with lib; { + meta = { description = "Generic drag-and-drop ordering for objects in the Django admin interface"; homepage = "https://github.com/jrief/django-admin-sortable2"; changelog = "https://github.com/jrief/django-admin-sortable2/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ sephi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sephi ]; }; } diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index d30360e375f76..beb39bf6fc9b6 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "11.0"; + version = "11.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "anymail"; repo = "django-anymail"; rev = "refs/tags/v${version}"; - hash = "sha256-8XRDoJ9WPKBjgTgQgNmf0omDILfZtnGg3I5HT9rgNic="; + hash = "sha256-tCGohY/vwdKKOqhFGLJqX+kyl0n3XUJToJMErICGjEw="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index c7dae9135674a..2715638ed9594 100644 --- a/pkgs/development/python-modules/django-appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pythonOlder, django, - six, python, }: diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 85b44d4523a94..ab29fb9d843ca 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index f46ce7c36b9d2..a66912ee09fcc 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - case, celery, cron-descriptor, django-timezone-field, @@ -42,7 +41,6 @@ buildPythonPackage rec { ephem pytest-timeout pytest-django - case pytestCheckHook ]; diff --git a/pkgs/development/python-modules/django-celery-results/default.nix b/pkgs/development/python-modules/django-celery-results/default.nix index 92d2bf2355603..e2a0a47a7f90f 100644 --- a/pkgs/development/python-modules/django-celery-results/default.nix +++ b/pkgs/development/python-modules/django-celery-results/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/celery/django-celery-results"; changelog = "https://github.com/celery/django-celery-results/blob/v{version}/Changelog"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-classy-tags/default.nix b/pkgs/development/python-modules/django-classy-tags/default.nix index 3f4fd07ae08b4..a115015facee7 100644 --- a/pkgs/development/python-modules/django-classy-tags/default.nix +++ b/pkgs/development/python-modules/django-classy-tags/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/divio/django-classy-tags"; changelog = "https://github.com/django-cms/django-classy-tags/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 668c36f5deda1..0344868d2c302 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { pname = "django-compressor"; - version = "4.5"; + version = "4.5.1"; pyproject = true; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-nZjJBbdBvmywmtgowdIqn/kkTdCII+KSavjd0YccPGU="; + hash = "sha256-wdikii7k2LfyPEEeucl+LYjbGKGLocnoF41fW4NmqCI="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 5200ef0afc07e..a7c944f981678 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { mainProgram = "django-cadmin"; homepage = "https://django-configurations.readthedocs.io/"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index a198b7dfff035..6271f6ade6f41 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, django, pytest-django, pytestCheckHook, @@ -9,27 +10,31 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.13.0"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; - repo = "django-cors-headers"; + repo = pname; rev = version; - hash = "sha256-pIyf4poW8/slxj4PVvmXpuYp//v5w00yU0Vz6Jiy2yM="; + hash = "sha256-/uTQ09zIjRV1Ilb/mXyr4zn5tJI/mNFHpfql2ptuER4="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; nativeCheckInputs = [ pytest-django pytestCheckHook ]; + pythonImportsCheck = [ "corsheaders" ]; + meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; homepage = "https://github.com/OttoYiu/django-cors-headers"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix index 823bf6efd9940..2406715f4f245 100644 --- a/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2.2"; + version = "2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; rev = "refs/tags/${version}"; - hash = "sha256-6S/Pscwi6AEQnmJf6JTT5Q5vxoZ3PC65ZjT2XszwVZM="; + hash = "sha256-R2s2dUsVw5p7xn4yWeFcE7au8yHWXjFgS5jjCBveg04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-currentuser/default.nix b/pkgs/development/python-modules/django-currentuser/default.nix index 7325793966c4b..4bbbe4fdb9556 100644 --- a/pkgs/development/python-modules/django-currentuser/default.nix +++ b/pkgs/development/python-modules/django-currentuser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - python3, + python, pythonOlder, django, hatchling, @@ -38,7 +38,7 @@ buildPythonPackage { checkPhase = '' runHook preCheck - ${python3.interpreter} manage.py test testapp + ${python.interpreter} manage.py test testapp runHook postCheck ''; diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 99bb0afb9178b..f4c3d8e27ed3d 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "4.4.2"; + version = "4.4.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZfGDXyrHwlFpeGK1QTD4nlGWdbEK7+hurOVkAAp/LyA="; + hash = "sha256-eLC3GnhYuEunKkKXNMtaFCqjyf8rn5cTkjL7Ep4Qp3c="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix index 63140be2e28bc..cbd1e348c74d4 100644 --- a/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, # build-system poetry-core, @@ -13,7 +14,6 @@ graphene-django, # tests - python, pytest-django, pytestCheckHook }: @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-graphiql-debug-toolbar"; version = "0.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -31,9 +31,18 @@ buildPythonPackage rec { sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw"; }; - nativeBuildInputs = [ poetry-core ]; + patches = [ + # Add compatibility for py-django-debug-toolbar >= 4.4.6 + # https://github.com/flavors/django-graphiql-debug-toolbar/pull/27 + (fetchpatch { + url = "https://github.com/flavors/django-graphiql-debug-toolbar/commit/2b42fdb1bc40109d9bb0ae1fb4d2163d13904724.patch"; + hash = "sha256-ywTLqXlAxA2DCacrJOqmB7jSzfpeuGTX2ETu0fKmhq4="; + }) + ]; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ django django-debug-toolbar graphene-django diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix index c9111e8be76cd..a6727b8f055b8 100644 --- a/pkgs/development/python-modules/django-guardian/default.nix +++ b/pkgs/development/python-modules/django-guardian/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { mit bsd2 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 8b49b0014b928..f74215dd1e8d5 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -10,6 +10,7 @@ # dependencies django, + packaging, # tests elasticsearch, @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; buildInputs = [ django ]; + propagatedBuildInputs = [ packaging ]; optional-dependencies = { elasticsearch = [ elasticsearch ]; @@ -63,6 +65,6 @@ buildPythonPackage rec { description = "Pluggable search for Django"; homepage = "http://haystacksearch.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index 420475a54e8a3..fa4e5bcb12ca6 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-health-check"; - version = "3.18.2"; + version = "3.18.3"; format = "setuptools"; src = fetchFromGitHub { owner = "KristianOellegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-c0JOfbuVIiTqZo/alJWPN7AB8a3nNdG7euS3scwGHaY="; + hash = "sha256-+6+YxB/x4JdKUCwxxe+YIc+r1YAzngFUHiS6atupWM8="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 6d29cacb8c540..5900e4a42ff5e 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.5.4"; + version = "3.6.0"; pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-d8rKn4Hab7y/e/VLhVfr3A3TUhoDtjP7RhCj+o6IbyE="; + hash = "sha256-uece+tR3Nd32nfKn1gtcWqckN4z5iUP+C0dJxyDPXBA="; }; postPatch = '' @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; preCheck = '' - export DJANGO_SETTINGS_MODULE=hijack.tests.test_app.settings + export DJANGO_SETTINGS_MODULE=tests.test_app.settings ''; # needed for npmDeps update diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 6cde0dae20cb7..52f1ff4d5b4c3 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.9"; + version = "4.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-T7XnPxvqnLI3rd0xSZb2iOsgcOqiA/JrRh3rjCm5gG4="; + hash = "sha256-kD/9cpFqjipP3onMHCfimu0ffzGQAoEspjc4IfyuZak="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index c786de25abceb..b778e0a93d7d0 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, django, + python-ipware, pythonOlder, }: @@ -18,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-2exD0r983yFv7Y1JSghN61dhpUhgpTsudDRqTzhM/0c="; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django python-ipware ]; # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; @@ -31,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/un33k/django-ipware"; changelog = "https://github.com/un33k/django-ipware/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index 99e7e47ca8b68..628cae9403d29 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/makinacorpus/django-leaflet"; changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 14b53943eb90f..1dbbeff2cb933 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Django model mixins and utilities"; changelog = "https://github.com/jazzband/django-model-utils/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index e32886c600f5b..288ee150f9b5b 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -12,7 +12,7 @@ let # 0.18.12 was yanked from PyPI, it refers to this issue: # https://github.com/deschler/django-modeltranslation/issues/701 - version = "0.19.3"; + version = "0.19.6"; in buildPythonPackage { pname = "django-modeltranslation"; @@ -22,7 +22,7 @@ buildPythonPackage { owner = "deschler"; repo = "django-modeltranslation"; rev = "refs/tags/v${version}"; - hash = "sha256-tCj3+9iQ5DBf0fxAHgHkgcARFDfZTV/o6wvQ7ASUJWQ="; + hash = "sha256-zFY8YsM1Qp6rdcb+Upfk0/6mTv0o1zwxGqKzTupZ1zI="; }; # Remove all references to pytest-cov diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index cc6d7ce153888..04f582bd9f61b 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.1.0"; + version = "1.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vitalik"; repo = "django-ninja"; rev = "refs/tags/v${version}"; - hash = "sha256-pvpYDuUZi0Gr5RbBWc91LzgmRLhihrhsKaD/AWN5+Bo="; + hash = "sha256-wD2ZizvMEY9oDQZTr4KzbNY5sStf7lCyPPJBoaa4trU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 139a0d022c159..ae4a56d8790bc 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -12,7 +12,6 @@ # tests djangorestframework, pytest-django, - pytest-xdist, pytest-mock, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index 67395fa588e88..fa38355d1ebcf 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/django-otp/django-otp/blob/${src.rev}/CHANGES.rst"; description = "Pluggable framework for adding two-factor authentication to Django using one-time passwords"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-parler/default.nix b/pkgs/development/python-modules/django-parler/default.nix index 8f444bd88fb36..b963f709a4d3b 100644 --- a/pkgs/development/python-modules/django-parler/default.nix +++ b/pkgs/development/python-modules/django-parler/default.nix @@ -3,8 +3,6 @@ buildPythonPackage, django, fetchFromGitHub, - pytest, - pytest-django, pythonOlder, python, }: diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index fc9f0964259fa..25b9e1c34c8d4 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, django, - pytest, - pytest-django, python, }: buildPythonPackage rec { pname = "django-picklefield"; - version = "3.0.1"; + version = "3.2.0"; format = "setuptools"; # The PyPi source doesn't contain tests @@ -18,15 +16,11 @@ buildPythonPackage rec { owner = "gintas"; repo = pname; rev = "v${version}"; - sha256 = "0ni7bc86k0ra4pc8zv451pzlpkhs1nyil1sq9jdb4m2mib87b5fk"; + sha256 = "sha256-UMMbJoSHWcdumZOFPhKNUjThGzU/8nhP2J8YsDjgbHo="; }; propagatedBuildInputs = [ django ]; - # Tests are failing with Django 3.2 - # https://github.com/gintas/django-picklefield/issues/58 - doCheck = false; - checkPhase = '' runHook preCheck ${python.interpreter} -m django test --settings=tests.settings @@ -37,6 +31,6 @@ buildPythonPackage rec { description = "Pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 9030630a784a1..b313276bbf6b6 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index e1282e8802d01..d3fb086fc4174 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/jimfunk/django-postgresql-netfields"; changelog = "https://github.com/jimfunk/django-postgresql-netfields/blob/v${version}/CHANGELOG"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index 3757f96c672b9..316b07a274e0a 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Django app that makes registration and authentication easy"; homepage = "https://github.com/Tivix/django-rest-auth"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 8430161948225..73196ccfbcf00 100644 --- a/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Polymorphic serializers for Django REST Framework"; homepage = "https://github.com/apirobot/django-rest-polymorphic"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 4513056064aa4..9d795c9346474 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/etianen/django-reversion"; changelog = "https://github.com/etianen/django-reversion/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-scheduler/default.nix b/pkgs/development/python-modules/django-scheduler/default.nix index 0635f69631a22..f03dd71d0e3a1 100644 --- a/pkgs/development/python-modules/django-scheduler/default.nix +++ b/pkgs/development/python-modules/django-scheduler/default.nix @@ -4,8 +4,6 @@ django, fetchFromGitHub, icalendar, - pytest, - pytest-django, python, python-dateutil, pythonOlder, diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 0cfe0fae0222c..5727b5ac9990d 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; + hash = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; }; propagatedBuildInputs = [ django-classy-tags ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index f7524810f4a13..84378ee311a86 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.14.2"; + version = "1.14.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "jschneier"; repo = "django-storages"; rev = "refs/tags/${version}"; - hash = "sha256-V0uFZvnBi0B31b/j/u3Co6dd9XcdVefiSkl3XmCTJG4="; + hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index 1176f2ba09c79..557e6410daeaf 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.0.2"; + version = "5.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs_ext"; inherit version; - hash = "sha256-QJxiWF1/mWzvXHYObifqP/KflhyUN0fmdRnIN0IsrTI="; + hash = "sha256-hdoGUiQgR3Qgi+KcfQK0SC1aaSGKcoRlwvvkFyX9yBk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index c111c4aff6d4a..e53b0da04c4a0 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -6,50 +6,45 @@ poetry-core, django, djangorestframework, - pytz, - pytest, + pytestCheckHook, + pytest-django, pytest-lazy-fixture, - python, }: buildPythonPackage rec { pname = "django-timezone-field"; - version = "5.1"; - disabled = pythonOlder "3.5"; - format = "pyproject"; + version = "7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mfogel"; repo = pname; rev = version; - hash = "sha256-FAYO8OEE/h4rsbC4Oc57ylWV7TqQ6DOd6/2M+mb/AsM="; + hash = "sha256-q06TuYkBA4z6tJdT3an6Z8o1i/o85XbYa1JYZBHC8lI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - django - djangorestframework - pytz - ]; + dependencies = [ django ]; - pythonImportsCheck = [ "timezone_field" ]; - - # Uses pytest.lazy_fixture directly which is broken in pytest-lazy-fixture - # https://github.com/TvoroG/pytest-lazy-fixture/issues/22 - doCheck = false; + pythonImportsCheck = [ + # Requested setting USE_DEPRECATED_PYTZ, but settings are not configured. + #"timezone_field" + ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; nativeCheckInputs = [ - pytest + djangorestframework + pytestCheckHook + pytest-django pytest-lazy-fixture ]; - checkPhase = '' - ${python.interpreter} -m django test - ''; - meta = with lib; { description = "Django app providing database, form and serializer fields for pytz timezone objects"; homepage = "https://github.com/mfogel/django-timezone-field"; diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix index 523e155a68c5c..bbcf238a10f21 100644 --- a/pkgs/development/python-modules/django-types/default.nix +++ b/pkgs/development/python-modules/django-types/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Type stubs for Django"; homepage = "https://github.com/sbdchd/django-types"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 2bc86f7579cce..34f2075a442af 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.12"; + version = "4.2.14"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-n6esWUpZpCP4J4bNckNKJ9E61qFjTPS7XF+WgxNS2JE="; + hash = "sha256-Nt+dVIikfe7gJY6/qJzkolkXeSFNBCbCEMSaKYmvCz4="; }; patches = diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 6bb8432f149d6..2c5cd89b5cb4f 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.0.5"; + version = "5.0.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-0/AbPmTl38E9BpHVKs0r79fISjEa1d4XO/se1pA7zxg="; + hash = "sha256-g2Y8kcfYUjykZ7Y6JEsNW/jw6chMLLYpQlgdTFt7HmM="; }; patches = diff --git a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index 3e036dfe98a92..1c1a0c14740da 100644 --- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Camel case JSON support for Django REST framework"; homepage = "https://github.com/vbabiy/djangorestframework-camel-case"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index 51c169ab929cb..3fa7cbb024906 100644 --- a/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = " Dataclasses serializer for Django REST framework"; homepage = "https://github.com/oxan/djangorestframework-dataclasses"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/pkgs/development/python-modules/djangorestframework-guardian/default.nix index d04cd24f54f9b..4d4a1d45fc9c1 100644 --- a/pkgs/development/python-modules/djangorestframework-guardian/default.nix +++ b/pkgs/development/python-modules/djangorestframework-guardian/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { description = "Django-guardian support for Django REST Framework"; homepage = "https://github.com/rpkilby/django-rest-framework-guardian"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; # unmaintained, last compatible version is 3.x, use djangorestframework-guardian2 instead broken = lib.versionAtLeast django.version "4"; }; diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix index 909a1d167d296..cdb68b5164f3a 100644 --- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -29,9 +29,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "rest_framework_recursive" ]; meta = with lib; { - description = " Recursive Serialization for Django REST framework "; + description = " Recursive Serialization for Django REST framework"; homepage = "https://github.com/heywbj/django-rest-framework-recursive"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index af8c7bdbee7f8..567b79ab9bd79 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -3,11 +3,14 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system absl-py, mujoco, pyparsing, setuptools, - wheel, + + # dependencies dm-env, dm-tree, fsspec, @@ -15,8 +18,6 @@ h5py, lxml, mock, - nose, - nose-xunitmp, numpy, pillow, protobuf, @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.20"; + version = "1.0.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-huXvfQz7E+OCqRrhLC5dUaG/A2PQXrPBzseIFx7ZIeE="; + hash = "sha256-Tw4VZmunSeb0H7ltPnLCEidSZ2cvcoWLei1DB32vWpw="; }; build-system = [ @@ -46,7 +47,6 @@ buildPythonPackage rec { mujoco pyparsing setuptools - wheel ]; pythonRemoveDeps = [ @@ -64,8 +64,6 @@ buildPythonPackage rec { lxml mock mujoco - nose - nose-xunitmp numpy pillow protobuf diff --git a/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch b/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch new file mode 100644 index 0000000000000..ac51e3bd50d15 --- /dev/null +++ b/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch @@ -0,0 +1,21 @@ +diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt +index 4fd1b1a..2d1d9d3 100644 +--- a/tree/CMakeLists.txt ++++ b/tree/CMakeLists.txt +@@ -40,16 +40,6 @@ if (NOT (WIN32 OR MSVC)) + endif() + endif() + +-if(APPLE) +- # On MacOS: +- # -undefined dynamic_lookup is necessary for pybind11 linking +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything -w -undefined dynamic_lookup") +- +- # On MacOS, we need this so that CMake will use the right Python if the user +- # has a virtual environment active +- set (CMAKE_FIND_FRAMEWORK LAST) +-endif() +- + # Fetch pybind to be able to use pybind11_add_module symbol. + set(PYBIND_VER v2.10.1) + include(FetchContent) diff --git a/pkgs/development/python-modules/dm-tree/cmake.patch b/pkgs/development/python-modules/dm-tree/cmake.patch deleted file mode 100644 index 28f201a30f71b..0000000000000 --- a/pkgs/development/python-modules/dm-tree/cmake.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt -index 4fd1b1a..f0d072b 100644 ---- a/tree/CMakeLists.txt -+++ b/tree/CMakeLists.txt -@@ -50,70 +50,79 @@ if(APPLE) - set (CMAKE_FIND_FRAMEWORK LAST) - endif() - --# Fetch pybind to be able to use pybind11_add_module symbol. --set(PYBIND_VER v2.10.1) --include(FetchContent) --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11 -- GIT_TAG ${PYBIND_VER} --) --if(NOT pybind11_POPULATED) -- FetchContent_Populate(pybind11) -- add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) -- include_directories(${pybind11_INCLUDE_DIR}) --endif() -- --# Needed to disable Abseil tests. --set (BUILD_TESTING OFF) -- --# Include abseil-cpp. --set(ABSEIL_VER 20210324.2) --include(ExternalProject) --set(ABSEIL_CMAKE_ARGS -- "-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/abseil-cpp" -- "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" -- "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" -- "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}" -- "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" -- "-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}" -- "-DLIBRARY_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/abseil-cpp/lib") --if(DEFINED CMAKE_OSX_ARCHITECTURES) -- set(ABSEIL_CMAKE_ARGS -- ${ABSEIL_CMAKE_ARGS} -- "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}") -+find_package(pybind11 CONFIG) -+ -+if (NOT pybind11_FOUND) -+ # Fetch pybind to be able to use pybind11_add_module symbol. -+ set(PYBIND_VER v2.10.1) -+ include(FetchContent) -+ FetchContent_Declare( -+ pybind11 -+ GIT_REPOSITORY https://github.com/pybind/pybind11 -+ GIT_TAG ${PYBIND_VER} -+ ) -+ if(NOT pybind11_POPULATED) -+ FetchContent_Populate(pybind11) -+ add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) -+ include_directories(${pybind11_INCLUDE_DIR}) -+ endif() - endif() --ExternalProject_Add(abseil-cpp -- GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git -- GIT_TAG ${ABSEIL_VER} -- PREFIX ${CMAKE_SOURCE_DIR}/abseil-cpp -- CMAKE_ARGS ${ABSEIL_CMAKE_ARGS} --) --ExternalProject_Get_Property(abseil-cpp install_dir) --set(abseil_install_dir ${install_dir}) --include_directories (${abseil_install_dir}/include) -- - - # Define pybind11 tree module. - pybind11_add_module(_tree tree.h tree.cc) --add_dependencies(_tree abseil-cpp) -- -+find_package(absl) -+ -+if (NOT absl_FOUND) -+ # Needed to disable Abseil tests. -+ set (BUILD_TESTING OFF) -+ -+ # Include abseil-cpp. -+ set(ABSEIL_VER 20210324.2) -+ include(ExternalProject) -+ set(ABSEIL_CMAKE_ARGS -+ "-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/abseil-cpp" -+ "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" -+ "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" -+ "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}" -+ "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" -+ "-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}" -+ "-DLIBRARY_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/abseil-cpp/lib") -+ if(DEFINED CMAKE_OSX_ARCHITECTURES) -+ set(ABSEIL_CMAKE_ARGS -+ ${ABSEIL_CMAKE_ARGS} -+ "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}") -+ endif() -+ ExternalProject_Add(abseil-cpp -+ GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git -+ GIT_TAG ${ABSEIL_VER} -+ PREFIX ${CMAKE_SOURCE_DIR}/abseil-cpp -+ CMAKE_ARGS ${ABSEIL_CMAKE_ARGS} -+ ) -+ ExternalProject_Get_Property(abseil-cpp install_dir) -+ set(abseil_install_dir ${install_dir}) -+ include_directories (${abseil_install_dir}/include) -+ -+ add_dependencies(_tree abseil-cpp) -+ -+ if (WIN32 OR MSVC) -+ set(ABSEIL_LIB_PREF "absl") -+ set(LIB_SUFF "lib") -+ else() -+ set(ABSEIL_LIB_PREF "libabsl") -+ set(LIB_SUFF "a") -+ endif() -+ --if (WIN32 OR MSVC) -- set(ABSEIL_LIB_PREF "absl") -- set(LIB_SUFF "lib") -+ # Link abseil static libs. -+ # We don't use find_library here to force cmake to build abseil before linking. -+ set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate) -+ foreach(ABSEIL_LIB IN LISTS ABSEIL_LIBS) -+ target_link_libraries(_tree PRIVATE -+ "${abseil_install_dir}/lib/${ABSEIL_LIB_PREF}_${ABSEIL_LIB}.${LIB_SUFF}") -+ endforeach() - else() -- set(ABSEIL_LIB_PREF "libabsl") -- set(LIB_SUFF "a") -+ target_link_libraries(_tree PRIVATE absl::int128 absl::raw_hash_set absl::raw_logging_internal absl::strings absl::throw_delegate) - endif() - --# Link abseil static libs. --# We don't use find_library here to force cmake to build abseil before linking. --set(ABSEIL_LIBS int128 raw_hash_set raw_logging_internal strings throw_delegate) --foreach(ABSEIL_LIB IN LISTS ABSEIL_LIBS) -- target_link_libraries(_tree PRIVATE -- "${abseil_install_dir}/lib/${ABSEIL_LIB_PREF}_${ABSEIL_LIB}.${LIB_SUFF}") --endforeach() -- - # Make the module private to tree package. - set_target_properties(_tree PROPERTIES OUTPUT_NAME tree/_tree) - diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index 0cf64bc5da029..6062d202a3ce7 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -1,21 +1,42 @@ { + lib, + buildPythonPackage, + fetchpatch, + fetchFromGitHub, stdenv, + + # nativeBuildInputs + cmake, + pybind11, + + # buildInputs abseil-cpp, + + # build-system + setuptools, + + # checks absl-py, attrs, - buildPythonPackage, - cmake, - fetchFromGitHub, - lib, numpy, - pybind11, wrapt, }: - +let + patchCMakeAbseil = fetchpatch { + name = "0001-don-t-rebuild-abseil.patch"; + url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0001-don-t-rebuild-abseil.patch"; + hash = "sha256-bho7lXAV5xHkPmWy94THJtx+6i+px5w6xKKfThvBO/M="; + }; + patchCMakePybind = fetchpatch { + name = "0002-don-t-fetch-pybind11.patch"; + url = "https://raw.githubusercontent.com/conda-forge/dm-tree-feedstock/93a91aa2c13240cecf88133e2885ade9121b464a/recipe/patches/0002-don-t-fetch-pybind11.patch"; + hash = "sha256-41XIouQ4Fm1yewaxK9erfcnkGBS6vgdvMm/DyF0rsKg="; + }; +in buildPythonPackage rec { pname = "dm-tree"; version = "0.1.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "deepmind"; @@ -24,7 +45,10 @@ buildPythonPackage rec { hash = "sha256-VvSJTuEYjIz/4TTibSLkbg65YmcYqHImTHOomeorMJc="; }; - patches = [ ./cmake.patch ]; + patches = [ + patchCMakeAbseil + patchCMakePybind + ] ++ (lib.optional stdenv.isDarwin ./0003-don-t-configure-apple.patch); dontUseCmakeConfigure = true; @@ -38,6 +62,8 @@ buildPythonPackage rec { pybind11 ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ absl-py attrs @@ -47,12 +73,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "tree" ]; - meta = with lib; { - broken = stdenv.isDarwin; + meta = { description = "Tree is a library for working with nested data structures"; homepage = "https://github.com/deepmind/tree"; - license = licenses.asl20; - maintainers = with maintainers; [ + changelog = "https://github.com/google-deepmind/tree/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ samuela ndl ]; diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 7153ea8fd4a26..65d908605b9e0 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.24"; + version = "0.9.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7xZ4aKMNTOfJC5ISedfs+5hr6OvFMPPmBQouy2hwfHY="; + hash = "sha256-aH3yCG4oCGyzK5R9r6TApOYT8UKbqjvmHYuU5pQYtO8="; }; checkPhase = '' @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Simple library to encode/decode DNS wire-format packets"; homepage = "https://github.com/paulc/dnslib"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index c26f5f656d4d2..7a36c27e8e223 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "API client for docker written in Python"; homepage = "https://github.com/docker/docker-py"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix index 199f73afeefed..d90710fc3d84b 100644 --- a/pkgs/development/python-modules/dockerspawner/default.nix +++ b/pkgs/development/python-modules/dockerspawner/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/dockerspawner"; changelog = "https://github.com/jupyterhub/dockerspawner/blob/${version}/docs/source/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index 20b77a521e410..2aeb00ebe324b 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Python package for docstring repetition"; homepage = "https://github.com/Chilipp/docrep"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix index 2e08bfc613413..3e4569f3035a9 100644 --- a/pkgs/development/python-modules/dodgy/default.nix +++ b/pkgs/development/python-modules/dodgy/default.nix @@ -1,41 +1,40 @@ { buildPythonPackage, fetchFromGitHub, - isPy3k, lib, # pythonPackages mock, - nose, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "dodgy"; version = "0.2.1"; - format = "setuptools"; - disabled = !isPy3k; + pyproject = true; src = fetchFromGitHub { owner = "landscapeio"; - repo = pname; + repo = "dodgy"; rev = version; sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ mock - nose + pytestCheckHook ]; - checkPhase = '' - nosetests tests/test_checks.py - ''; + pytestFlagsArray = [ "tests/test_checks.py" ]; - meta = with lib; { + meta = { description = "Looks at Python code to search for things which look \"dodgy\" such as passwords or diffs"; mainProgram = "dodgy"; homepage = "https://github.com/landscapeio/dodgy"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index 8fa2509927bc3..c6b78aa0504b0 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Caching front-end based on the Dogpile lock"; homepage = "https://github.com/sqlalchemy/dogpile.cache"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dogtag-pki/default.nix b/pkgs/development/python-modules/dogtag-pki/default.nix index f2077050314fb..2731e184eed25 100644 --- a/pkgs/development/python-modules/dogtag-pki/default.nix +++ b/pkgs/development/python-modules/dogtag-pki/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchPypi, buildPythonPackage, @@ -16,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; + hash = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index ae4babf0c222d..04067083b56aa 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -76,6 +76,6 @@ buildPythonPackage { description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications"; homepage = "https://gitlab.com/dogtail/dogtail"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix new file mode 100644 index 0000000000000..839bfd2f38f34 --- /dev/null +++ b/pkgs/development/python-modules/dohq-artifactory/default.nix @@ -0,0 +1,57 @@ +{ + lib +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, setuptools +, requests +, python-dateutil +, pyjwt +, pytestCheckHook +, responses +, nix-update-script +}: + +buildPythonPackage rec { + pname = "dohq-artifactory"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "devopshq"; + repo = "artifactory"; + rev = version; + hash = "sha256-gccVwshGBgbhTSX4o0vANIRct1isqDj+gWeZZxExj9Q="; + }; + + # https://github.com/devopshq/artifactory/issues/430 + disabled = pythonAtLeast "3.12"; + + pyproject = true; + + build-system = [ setuptools ]; + + dependencies = [ + requests + python-dateutil + pyjwt + ]; + + pythonImportsCheck = [ "artifactory" ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + pytestFlagsArray = [ "tests/unit" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Python interface library for JFrog Artifactory"; + homepage = "https://devopshq.github.io/artifactory/"; + changelog = "https://github.com/devopshq/artifactory/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 5e1db9ff7559e..f2eae14e99a97 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/Knio/dominate/"; changelog = "https://github.com/Knio/dominate/releases/tag/${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index 4cb0a90c0f0f4..13ea26e68c2c5 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dploot"; - version = "2.7.2"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vbaghcomf9gRso4DN/cpJ4j7t6AU2vg2OhucKbfS1hc="; + hash = "sha256-G39dzP5A6ZySo7AhDIZWXjhtk2zm15wSnrdknLqHHcY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/drafthorse/default.nix b/pkgs/development/python-modules/drafthorse/default.nix new file mode 100644 index 0000000000000..4efde1b74bb8a --- /dev/null +++ b/pkgs/development/python-modules/drafthorse/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + lxml, + pypdf, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "drafthorse"; + version = "2.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pretix"; + repo = "python-drafthorse"; + rev = version; + hash = "sha256-3W5rQ0YhyhIoZ+KsaOjlEJOrcoejPoTIJaylK7DOwKc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + lxml + pypdf + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "drafthorse" ]; + + meta = with lib; { + description = "Pure-python ZUGFeRD implementation"; + homepage = "https://github.com/pretix/python-drafthorse"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index 8b74363689d07..072192a23b5d9 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -74,6 +74,6 @@ buildPythonPackage rec { description = "Speech recognition framework allowing powerful Python-based scripting"; homepage = "https://github.com/dictation-toolbox/dragonfly"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix index af9246717692b..426a9e440013c 100644 --- a/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix +++ b/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Serve self-contained distribution builds of Swagger UI and Redoc with Django"; homepage = "https://github.com/tfranzel/drf-spectacular-sidecar"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 9b957b53d4a0c..cb9adc54051d9 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -98,6 +98,6 @@ buildPythonPackage rec { homepage = "https://github.com/tfranzel/drf-spectacular"; changelog = "https://github.com/tfranzel/drf-spectacular/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index d6692b1f78b59..1463ae7880b9b 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generation of Swagger/OpenAPI schemas for Django REST Framework"; homepage = "https://github.com/axnsan12/drf-yasg"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 3ab19124eb8ae..e2f2c295a37ae 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 0df77d3e68058..59ff3cdd88d32 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -8,7 +8,6 @@ , sparse , pybind11 , scikit-learn -, pytestCheckHook }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 3c195638a8e01..1282fdfc9952d 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pythonAtLeast, pythonOlder, duckdb, hypothesis, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-XbO9LyweJ+pYQvEbdmiUJnVNr2BQAgwu9Imq7rAFEYg="; + hash = "sha256-6aVVs3ii8pJOSaLx0maoFmiMvbUh/LOdizmPSpqPiM4="; }; nativeBuildInputs = [ poetry-core ]; @@ -45,8 +46,11 @@ buildPythonPackage rec { hypothesis pandas pytest-remotedata - snapshottest typing-extensions + ] ++ lib.optionals (pythonOlder "3.12") [ + # requires wasmer which is broken for python 3.12 + # https://github.com/wasmerio/wasmer-python/issues/778 + snapshottest ]; pytestFlagsArray = [ @@ -54,6 +58,11 @@ buildPythonPackage rec { "'not remote_data'" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + # requires snapshottest + "duckdb_engine/tests/test_datatypes.py" + ]; + pythonImportsCheck = [ "duckdb_engine" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 9dbaee5c8975e..ca69dba4338fd 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "6.1.9"; + version = "6.1.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; - rev = "v${version}"; - hash = "sha256-hw6fe0SDywBQ8k6gpkTVxdJW5AQUk+GY2qoou0JzTlo="; + rev = "refs/tags/v${version}"; + hash = "sha256-HidBPd69Fihx6+fGifil0PSZ7lGfW+qStzma8Npfmes="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 95939d5ad8e5a..345161c8350ff 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { psfl asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix new file mode 100644 index 0000000000000..453d68e8534e9 --- /dev/null +++ b/pkgs/development/python-modules/dukpy/default.nix @@ -0,0 +1,53 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + mutf8, + webassets, + pytestCheckHook, + mock, +}: + +buildPythonPackage rec { + pname = "dukpy"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "amol-"; + repo = "dukpy"; + rev = "refs/tags/${version}"; + hash = "sha256-8RDMz9SfBoUe7LQ9/atsZlJ/2uwLUb0hZxeYdsUOGpU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ mutf8 ]; + + optional-dependencies = { + webassets = [ webassets ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + mock + ] ++ optional-dependencies.webassets; + + disabledTests = [ "test_installer" ]; + + preCheck = '' + rm -r dukpy + ''; + + pythonImportsCheck = [ "dukpy" ]; + + meta = { + description = "Simple JavaScript interpreter for Python"; + homepage = "https://github.com/amol-/dukpy"; + changelog = "https://github.com/amol-/dukpy/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ruby0b ]; + mainProgram = "dukpy"; + }; +} diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 1c71b925e99c6..fe5fd07044cae 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/duosecurity/duo_client_python"; changelog = "https://github.com/duosecurity/duo_client_python/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/durus/default.nix b/pkgs/development/python-modules/durus/default.nix index 3c7fd696fa998..2c651f7b22201 100644 --- a/pkgs/development/python-modules/durus/default.nix +++ b/pkgs/development/python-modules/durus/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -12,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Durus"; inherit version; - sha256 = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; + hash = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; }; # Checks disabled due to missing python unittest framework 'sancho' in nixpkgs diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 6cbd0b1b71d83..0b3c3b444e74c 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.15.1"; + version = "3.15.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-pr5RtVlGKKtpcmmCNGqcLiBFzJcajpqtPjBbzeCCHF8="; + hash = "sha256-8720nqWmi/1Be2ckuCvctfJbOSFCME27OOtA3qZMr7E="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index cbdc820633900..ea93ceeffda02 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -1,17 +1,17 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - setuptools-scm, - kombu, - shortuuid, celery, + fetchFromGitHub, funcy, + kombu, pytest-celery, pytest-mock, pytest-test-utils, pytestCheckHook, + pythonOlder, + setuptools-scm, + shortuuid, }: buildPythonPackage rec { @@ -31,10 +31,10 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ - kombu - shortuuid celery funcy + kombu + shortuuid ]; nativeCheckInputs = [ @@ -46,11 +46,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "dvc_task" ]; + disabledTests = [ + # Test is flaky + "test_start_already_exists" + ]; + meta = with lib; { description = "Celery task queue used in DVC"; homepage = "https://github.com/iterative/dvc-task"; changelog = "https://github.com/iterative/dvc-task/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 85c817f2f4fc1..26ae7ec03de67 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.51.2"; + version = "3.53.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-MjzunpPWzGfa62Jr+krEdm+i+N10QNmW7qRWaU/58OM="; + hash = "sha256-YX65jAkM0LFFtKf+MX0w1BfhyR2Dzr5Vpwxl2jJ/GGw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 45cdd3c924d20..7973a0e769676 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.46.1"; + version = "3.48.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvclive"; rev = "refs/tags/${version}"; - hash = "sha256-ifr8gsGSOIBPC07JcFcV97yV4Io5J2uiMf2ucmySiWc="; + hash = "sha256-WIVRpJD7B6OI7ZfdHT+DunRRiaxHhri5Ge/B1BQ1kJY="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index f16d9d4d55d74..bd40c29d8dd09 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://dyn.readthedocs.org"; changelog = "https://github.com/dyninc/dyn-python/blob/${version}/HISTORY.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 2701b845234e7..3c001d39392a8 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -2,16 +2,11 @@ autoPatchelfHook, buildPythonPackage, colorama, - coverage, distro, fetchFromGitHub, - httpretty, lib, - mock, packaging, psutil, - pytest, - pytest-socket, python-dateutil, pyyaml, requests, @@ -20,10 +15,7 @@ stdenv, setuptools, stevedore, - tomlkit, - tox, tqdm, - typeguard, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix index c0f3f2af57cdf..bf8ba8850a3d1 100644 --- a/pkgs/development/python-modules/e3-testsuite/default.nix +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, lib, setuptools, - stdenv, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 4fa457481c75f..9c801e132f8b0 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,6 @@ django, fetchPypi, pillow, - pytestCheckHook, pythonOlder, reportlab, svglib, @@ -39,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/SmileyChris/easy-thumbnails"; changelog = "https://github.com/SmileyChris/easy-thumbnails/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 18e720fbc20ec..d19d378fde5d3 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Very simple, very easy GUI programming in Python"; homepage = "https://github.com/robertlugg/easygui"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index b72a85ea9b03b..a07f10e8a4b11 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "echo"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "glue-viz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-IKd5n8+U6+0dgV4PbLcPaormXCX4srGcXmvYSrnCt60="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ecs-logging/default.nix b/pkgs/development/python-modules/ecs-logging/default.nix index 86caf047fa80b..f95fa5df1be25 100644 --- a/pkgs/development/python-modules/ecs-logging/default.nix +++ b/pkgs/development/python-modules/ecs-logging/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/editor/default.nix b/pkgs/development/python-modules/editor/default.nix index d2256da39545b..5cf8a6d2de331 100644 --- a/pkgs/development/python-modules/editor/default.nix +++ b/pkgs/development/python-modules/editor/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/rec/editor"; changelog = "https://github.com/rec/editor/blob/${src.rev}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index c53e939a66b6d..59059586c89be 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.8"; + version = "0.21.10"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-ffKteff4Xsg9kxJukVlSnwmKowRN35bMfDJo/9mV6s8="; + hash = "sha256-77Eu1yqCsYgRgEMxBFEmV51Tj/NGH1sFjx016fC3uMM="; }; build-system = [ diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 64f9f96db4078..5a16cd6e023f2 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, edlib, diff --git a/pkgs/development/python-modules/eduvpn-common/default.nix b/pkgs/development/python-modules/eduvpn-common/default.nix index 8c17edcf2df64..9d2bfda4ee8d7 100644 --- a/pkgs/development/python-modules/eduvpn-common/default.nix +++ b/pkgs/development/python-modules/eduvpn-common/default.nix @@ -1,7 +1,5 @@ { - lib, buildPythonPackage, - callPackage, libeduvpn-common, selenium, setuptools, diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 8de9fda503670..fbc88f69d874a 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://effect.readthedocs.io/"; changelog = "https://github.com/python-effect/effect/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 113898825f5dc..6fb1abd35fdb4 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.22.3"; + version = "6.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-nA+c2ycSVVJyfcNcj5W7Z2VSVcCzyCtoi3B/T4QZWnw="; + hash = "sha256-S1Ebo9AWN+Mf3OFwxNTiR/AZtje3gNiYkZnVqGb7D4c="; }; pythonRelaxDeps = [ "wrapt" ]; diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 45476eaf04186..bd9b460356cb5 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; + hash = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e33c98782bb46..562d66e9bc2a6 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; + hash = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; }; nativeBuildInputs = [ elastic-transport ]; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 8c36c4af08d6e..3d3594ae4b344 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -8,7 +8,6 @@ pythonOlder, requests, setuptools, - urllib3, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index b30a3706287a4..d8a89c437ade1 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/sissaschool/elementpath"; changelog = "https://github.com/sissaschool/elementpath/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 6c522d9413873..e5f447b233c61 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -1,45 +1,62 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, - aiocontextvars, + pythonAtLeast, + + setuptools, + boltons, - hypothesis, + orjson, pyrsistent, + zope-interface, + + daemontools, + dask, + distributed, + hypothesis, + pandas, pytestCheckHook, - setuptools, - six, testtools, - zope-interface, + twisted, }: buildPythonPackage rec { pname = "eliot"; - version = "1.14.0"; - format = "setuptools"; + version = "1.15.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wvCZo+jV7PwidFdm58xmSkjbZLa4nZht/ycEkdhoMUk="; + src = fetchFromGitHub { + owner = "itamarst"; + repo = "eliot"; + rev = "refs/tags/${version}"; + hash = "sha256-Ur7q7PZ5HH4ttD3b0HyBTe1B7eQ2nEWcTBR/Hjeg9yw="; }; - propagatedBuildInputs = [ - aiocontextvars + build-system = [ setuptools ]; + + dependencies = [ boltons + orjson pyrsistent - setuptools - six zope-interface ]; nativeCheckInputs = [ + dask + distributed hypothesis + pandas pytestCheckHook testtools - ]; + twisted + ] ++ lib.optionals stdenv.isLinux [ daemontools ]; + + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "eliot" ]; @@ -48,17 +65,12 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - disabledTests = [ - "test_parse_stream" - # AttributeError: module 'inspect' has no attribute 'getargspec' - "test_default" - ]; - - meta = with lib; { + meta = { homepage = "https://eliot.readthedocs.io"; description = "Logging library that tells you why it happened"; + changelog = "https://github.com/itamarst/eliot/blob/${version}/docs/source/news.rst"; mainProgram = "eliot-prettyprint"; - license = licenses.asl20; - maintainers = with maintainers; [ dpausp ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dpausp ]; }; } diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 44ea2d3aa87ef..b18d0f1e6d7b1 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - python, isPy3k, unittestCheckHook, }: diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index be4fd02424677..cefe2c87cd8a2 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://emcee.readthedocs.io/"; changelog = "https://github.com/dfm/emcee/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix index da51b198efd96..4cd481da50387 100644 --- a/pkgs/development/python-modules/empty-files/default.nix +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Null Object pattern for files"; homepage = "https://github.com/approvals/EmptyFiles.Python"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index ea80513816439..018e0240ca65d 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; + hash = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; }; pythonImportsCheck = [ "em" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix index 61c2ca0e1b206..eeef7703dd926 100644 --- a/pkgs/development/python-modules/enocean/default.nix +++ b/pkgs/development/python-modules/enocean/default.nix @@ -2,39 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, + setuptools, beautifulsoup4, enum-compat, pyserial, - pynose, + pytestCheckHook, }: buildPythonPackage rec { pname = "enocean"; version = "0.60.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kipe"; repo = "enocean"; - rev = version; - sha256 = "0cbcvvy3qaqv8925z608qmkc1l914crzw79krwrz2vpm2fyribab"; + rev = "refs/tags/${version}"; + hash = "sha256-S62YvRP1bvEzzzMd/jMjIdHAZsUImF9EQhsrPPzebDE="; }; - propagatedBuildInputs = [ + patches = [ + (fetchpatch2 { + name = "replace-nose-with-pytest.patch"; + url = "https://github.com/kipe/enocean/commit/e5ca3b70f0920f129219c980ad549d7f3a4576de.patch"; + hash = "sha256-cDBvI0I4W5YkGTpg+rKy08TUAmKlhKa/5+Muou9iArs="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ beautifulsoup4 enum-compat pyserial ]; - nativeCheckInputs = [ pynose ]; - - checkPhase = '' - runHook preCheck - - nosetests - - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "enocean.communicators" @@ -43,6 +47,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/kipe/enocean/releases/tag/${version}"; description = "EnOcean serial protocol implementation"; mainProgram = "enocean_example.py"; homepage = "https://github.com/kipe/enocean"; diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix index 4210283b3e251..bccb74b2f8378 100644 --- a/pkgs/development/python-modules/enrich/default.nix +++ b/pkgs/development/python-modules/enrich/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Enrich adds few missing features to the wonderful rich library"; homepage = "https://github.com/pycontribs/enrich"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 20b44c5fbd88e..5277106f01d23 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -4,7 +4,6 @@ pythonOlder, fetchPypi, flit-core, - configparser, pytestCheckHook, }: @@ -28,6 +27,6 @@ buildPythonPackage rec { description = "Discover and load entry points from installed packages"; homepage = "https://github.com/takluyver/entrypoints"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 80c7f22cb33a4..d2424a76c004d 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-GWNGLhnXr8NOrR5stOjHbk9X+BObs1sbG6lWn2apPQI="; + hash = "sha256-3SVpzWii9/ViJ7mbrqzKmN5FkOOYTeYdhJll6q/IseU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 94964c9a581a8..9c6e90c8d0484 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -3,48 +3,41 @@ apptools, buildPythonPackage, fetchPypi, - ipython, + pyface, pytestCheckHook, - pythonAtLeast, pythonOlder, setuptools, traits, + traitsui, }: buildPythonPackage rec { pname = "envisage"; version = "7.0.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-97GviL86j/8qmsbja7SN6pkp4/YSIEz+lK7WKwMWyeM="; }; - # for the optional dependency ipykernel, only versions < 6 are - # supported, so it's not included in the tests, and not propagated - propagatedBuildInputs = [ - traits + build-system = [ setuptools ]; + + dependencies = [ apptools + pyface setuptools - ]; + traits + traitsui + ] ++ apptools.optional-dependencies.preferences; preCheck = '' export HOME=$PWD/HOME ''; - nativeCheckInputs = [ - ipython - pytestCheckHook - ]; - - disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/enthought/envisage/issues/455 - "envisage/tests/test_egg_basket_plugin_manager.py" - "envisage/tests/test_egg_plugin_manager.py" - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "envisage" ]; diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 3d113a4f2dfde..10fc95fbb13b4 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -4,10 +4,8 @@ click, fetchPypi, jinja2, - mock, - pynose, + pytestCheckHook, poetry-core, - pythonOlder, terminaltables, }: @@ -16,41 +14,32 @@ buildPythonPackage rec { version = "1.4"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ click jinja2 terminaltables ]; - nativeCheckInputs = [ - mock - pynose - ]; - - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ pytestCheckHook ]; - nosetests --with-isolation + pytestFlagsArray = [ "envs/tests.py" ]; - runHook postCheck - ''; + disabledTests = [ "test_list_envs" ]; pythonImportsCheck = [ "envs" ]; - meta = with lib; { + meta = { description = "Easy access to environment variables from Python"; mainProgram = "envs"; homepage = "https://github.com/capless/envs"; - license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index 47c2abb01ed27..5d969858c00fb 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -2,24 +2,27 @@ lib, fetchPypi, buildPythonPackage, + setuptools, }: buildPythonPackage rec { pname = "enzyme"; - version = "0.4.1"; - format = "setuptools"; + version = "0.5.2"; + pyproject = true; # Tests rely on files obtained over the network doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "1fv2kh2v4lwj0hhrhj9pib1pdjh01yr4xgyljhx11l94gjlpy5pj"; + hash = "sha256-fPd5FI2eZusoOGA+rOFAxTw878i4/l1NWgOl+11Xs8E="; }; + nativeBuildInputs = [ setuptools ]; + meta = with lib; { homepage = "https://github.com/Diaoul/enzyme"; - license = licenses.asl20; + license = licenses.mit; description = "Python video metadata parser"; }; } diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix new file mode 100644 index 0000000000000..5fc267fe2e219 --- /dev/null +++ b/pkgs/development/python-modules/eq3btsmart/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + bleak, + construct, + construct-typing, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "eq3btsmart"; + version = "1.1.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "EuleMitKeule"; + repo = "eq3btsmart"; + rev = "refs/tags/${version}"; + hash = "sha256-7kJqPygX2Oc7fz31qZWrS1ZA+kANZr8vxOwarUzgp/M="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + bleak + construct + construct-typing + ]; + + pythonImportsCheck = [ "eq3btsmart" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/EuleMitKeule/eq3btsmart/releases/tag/${version}"; + description = "Python library that allows interaction with eQ-3 Bluetooth smart thermostats"; + homepage = "https://github.com/EuleMitKeule/eq3btsmart"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 0e9cabdcf6563..47a1be3005684 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -72,6 +72,10 @@ buildPythonPackage rec { # AssertionError: assert 'foo:\n pri...pe=float32)\n' == 'foo:\n pri...pe=float32)\n' # Also reported in patrick-kidger/equinox#716 "test_backward_nan" + + # Flaky test + # See https://github.com/patrick-kidger/equinox/issues/781 + "test_traceback_runtime_eqx" ]; meta = { diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index f63b1dfa7a2d8..7438c2ef6e981 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -11,7 +11,6 @@ markupsafe, pydantic, pytestCheckHook, - pythonImportsCheckHook, pyyaml, rich, setuptools, diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix index 7dd8adcccd71d..e94a3ccf98b83 100644 --- a/pkgs/development/python-modules/essentials/default.nix +++ b/pkgs/development/python-modules/essentials/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, setuptools, pytestCheckHook, - pythonImportsCheckHook, lib, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/et-xmlfile/default.nix b/pkgs/development/python-modules/et-xmlfile/default.nix index 8d647852dfc3c..67d26aa36a070 100644 --- a/pkgs/development/python-modules/et-xmlfile/default.nix +++ b/pkgs/development/python-modules/et-xmlfile/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { ''; homepage = "https://foss.heptapod.net/openpyxl/et_xmlfile"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 355d6cd4fbaec..d9dc4fcd07532 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Python etcd client that just works"; homepage = "https://github.com/dsoprea/PythonEtcdClient"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix index 31ff0eb6dcc84..e105afb48ae48 100644 --- a/pkgs/development/python-modules/etcd3/default.nix +++ b/pkgs/development/python-modules/etcd3/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "Python client for the etcd API v3"; homepage = "https://github.com/kragniz/python-etcd3"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 54864226c75ea..ee5881128336b 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, numpy, six, withTreeVisualization ? false, @@ -18,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; + hash = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; }; doCheck = false; # Tests are (i) not 3.x compatible, (ii) broken under 2.7 diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index bb23e85534b8a..ffdad63476285 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -12,23 +12,39 @@ openssl, Security, msgpack, + fetchpatch, }: buildPythonPackage rec { pname = "etebase"; - version = "0.31.6"; + version = "0.31.7"; src = fetchFromGitHub { owner = "etesync"; repo = "etebase-py"; rev = "v${version}"; - hash = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q="; + hash = "sha256-ZNUUp/0fGJxL/Rt8sAZ864rg8uCcNybIYSk4POt0vqg="; }; + # https://github.com/etesync/etebase-py/pull/54 + patches = [ + # fix python 3.12 build + (fetchpatch { + url = "https://github.com/etesync/etebase-py/commit/898eb3aca1d4eb30d4aeae15e35d0bc45dd7b3c8.patch"; + hash = "sha256-0BDUTztiC4MiwwNEDFtfc5ruc69Qk+svepQZRixNJgA="; + }) + # replace flapigen git dependency in Cargo.lock + (fetchpatch { + url = "https://github.com/etesync/etebase-py/commit/7e9e4244a144dd46383d8be950d3df79e28eb069.patch"; + hash = "sha256-8EH8Sc3UnmuCrSwDf3+as218HiG2Ed3r+FCMrUi5YrI="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-wrMNtcaLAsWBVeJbYbYo+Xmobl01lnUbR9NUqqUzUgU="; + hash = "sha256-We19laZd6b2fLSPNLegyNp0eQSeCvUJeTIXqvG7o08c="; + inherit patches; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix index c61159a4e1e7c..8227fb9536cc7 100644 --- a/pkgs/development/python-modules/etelemetry/default.nix +++ b/pkgs/development/python-modules/etelemetry/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/sensein/etelemetry-client"; changelog = "https://github.com/sensein/etelemetry-client/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 61ba458104597..2b5d280562084 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Ethereum ABI utilities"; homepage = "https://github.com/ethereum/eth-abi"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 059fd610cb9a7..7be6722f233b6 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Account abstraction library for web3.py"; homepage = "https://github.com/ethereum/eth-account"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 7d75ccf1655e4..c53e052b76fcb 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index 8ed0657104717..8175b2cfe7613 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Tools for handling the encrypted keyfile format used to store private keys"; homepage = "https://github.com/ethereum/eth-keyfile"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index e599a21546f0a..964f4f08326dc 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Common API for Ethereum key operations"; homepage = "https://github.com/ethereum/eth-keys"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix index d70ede6773ca8..3bc8d7c35b836 100644 --- a/pkgs/development/python-modules/eth-rlp/default.nix +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "RLP definitions for common Ethereum objects"; homepage = "https://github.com/ethereum/eth-rlp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 6e437a5418985..cbf0c4df19b9e 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/eth-typing"; changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index c45aec172690f..2167c3e1abdde 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ethtool/default.nix b/pkgs/development/python-modules/ethtool/default.nix new file mode 100644 index 0000000000000..497e6cc888513 --- /dev/null +++ b/pkgs/development/python-modules/ethtool/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch2, + setuptools, + pkg-config, + libnl, + nettools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "ethtool"; + version = "0.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fedora-python"; + repo = "python-ethtool"; + rev = "refs/tags/v${version}"; + hash = "sha256-0XzGaqpkEv3mpUsbfOtRl8E62iNdS7kRoo4oYrBjMys="; + }; + + patches = [ + # https://github.com/fedora-python/python-ethtool/pull/60 + (fetchpatch2 { + url = "https://github.com/fedora-python/python-ethtool/commit/f82dd763bd50affda993b9afe3b141069a1a7466.patch"; + hash = "sha256-mtI7XsoyM43s2DFQdsBNpB8jJff7ZyO2J6SHodBrdrI="; + }) + ]; + + postPatch = '' + substituteInPlace tests/parse_ifconfig.py \ + --replace-fail "Popen('ifconfig'," "Popen('${lib.getExe' nettools "ifconfig"}'," + ''; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libnl ]; + + pythonImportsCheck = [ "ethtool" ]; + + nativeCheckInputs = [ + nettools + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/fedora-python/python-ethtool/blob/${src.rev}/CHANGES.rst"; + description = "Python bindings for the ethtool kernel interface"; + homepage = "https://github.com/fedora-python/python-ethtool"; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index bf3eee9692f15..5cb92f9c66159 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { homepage = "https://python-evdev.readthedocs.io/"; changelog = "https://github.com/gvalkov/python-evdev/blob/v${version}/docs/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index c73cb2a049516..5fa638ddddd54 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, # build-system hatch-vcs, diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix index 8b2be689737a2..ecf7fa96bc25f 100644 --- a/pkgs/development/python-modules/events/default.nix +++ b/pkgs/development/python-modules/events/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://events.readthedocs.org"; changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/evosax/default.nix b/pkgs/development/python-modules/evosax/default.nix new file mode 100644 index 0000000000000..08771810c948c --- /dev/null +++ b/pkgs/development/python-modules/evosax/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + chex, + dotmap, + flax, + jax, + jaxlib, + matplotlib, + numpy, + pyyaml, + + # checks + # brax, (unpackaged) + # gymnax, (unpackaged) + pytestCheckHook, + torch, + torchvision, +}: + +buildPythonPackage rec { + pname = "evosax"; + version = "0.1.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RobertTLange"; + repo = "evosax"; + rev = "refs/tags/v.${version}"; + hash = "sha256-v8wRiWZlJPF9pIXocQ6/caHl1W4QBNjkmuImJ6MAueo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + chex + dotmap + flax + jax + jaxlib + matplotlib + numpy + pyyaml + ]; + + pythonImportsCheck = [ "evosax" ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + # brax + # gymnax + pytestCheckHook + torch + torchvision + ]; + + disabledTests = [ + # Requires unpackaged gymnax + "test_env_ffw_rollout" + + # Tries to download a data set from the internet + "test_vision_fitness" + ]; + + meta = { + description = "Evolution Strategies in JAX"; + homepage = "https://github.com/RobertTLange/evosax"; + changelog = "https://github.com/RobertTLange/evosax/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 1ee6dcfb3215e..805c348756e1f 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -29,18 +29,20 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.4.1"; + version = "5.4.2"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ecederstrand"; repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-FPn2l+PkTXFqzjqF4kQ8KE49BXZUzDDIcFI3UqoxqQM="; + hash = "sha256-UAc8Aju2+AM7m8XbWliVNzfWlL5fdPDa2q6Fsw04nHQ="; }; + pythonRelaxDeps = [ "defusedxml" ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 4d303a64c256b..9221ae0a16936 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Extract code blocks from markdown"; homepage = "https://github.com/nschloe/exdown"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/exifread/default.nix b/pkgs/development/python-modules/exifread/default.nix index 16497817b44e5..942b5b761abd3 100644 --- a/pkgs/development/python-modules/exifread/default.nix +++ b/pkgs/development/python-modules/exifread/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { mainProgram = "EXIF.py"; homepage = "https://github.com/ianare/exif-py"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix index 59608910e50fa..ba846ebbab32e 100644 --- a/pkgs/development/python-modules/expiring-dict/default.nix +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Python dict with TTL support for auto-expiring caches"; homepage = "https://github.com/dparker2/py-expiring-dict"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 772b3d6363357..4b5591d055257 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -2,44 +2,53 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, dill, - coverage, - coveralls, mock, - nose, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "expiringdict"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball src = fetchFromGitHub { owner = "mailgun"; - repo = pname; + repo = "expiringdict"; rev = "refs/tags/v${version}"; hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; + patches = [ + # apply mailgun/expiringdict#49 to address NixOS/nixpkgs#326513 + (fetchpatch2 { + url = "https://github.com/mailgun/expiringdict/commit/1c0f82232d20f8b3b31c9269a4d0e9510c1721a6.patch"; + hash = "sha256-IeeJVb2tOwRhEPNGqM30fNZyz3jFcnZNWC3I6K1+hSY="; + }) + + # apply mailgun/expiringdict#56 for compatibility with Python 3.12 + (fetchpatch2 { + url = "https://github.com/mailgun/expiringdict/commit/976faf3664d54049e443aca054f5819db834577b.patch"; + hash = "sha256-FNdnU6iUMyED5j8oAjhmJTR7zQeEc/Z5s64pdeT4F8w="; + }) + ]; + + build-system = [ setuptools ]; + nativeCheckInputs = [ dill - coverage - coveralls mock - nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - nosetests -v --with-coverage --cover-package=expiringdict - runHook postCheck - ''; - pythonImportsCheck = [ "expiringdict" ]; meta = with lib; { + changelog = "https://github.com/mailgun/expiringdict/blob/${src.rev}/CHANGELOG.rst"; description = "Dictionary with auto-expiring values for caching purposes"; homepage = "https://github.com/mailgun/expiringdict"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index 56f6a8f4d0a8d..d8429d0869eee 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - cython, fetchFromGitHub, pip, pytestCheckHook, @@ -9,7 +8,6 @@ setuptools-scm, setuptools, tomli, - wheel, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix index 27faad2695cae..37f4ea55af7af 100644 --- a/pkgs/development/python-modules/extract-msg/default.nix +++ b/pkgs/development/python-modules/extract-msg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "extract-msg"; - version = "0.48.5"; + version = "0.48.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "TeamMsgExtractor"; repo = "msg-extractor"; rev = "refs/tags/v${version}"; - hash = "sha256-GBX6VRXXja18azyiJZJ3niKPhAKZxDR8kcFbiC2XgeU="; + hash = "sha256-ZZ07YCGRBcWKauNfIRi+CLE75BcOMIWuP+OZFDA5SSs="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix index f7ede71841122..bc4c50ef292b8 100644 --- a/pkgs/development/python-modules/extruct/default.nix +++ b/pkgs/development/python-modules/extruct/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "extruct"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "scrapinghub"; repo = "extruct"; rev = "refs/tags/v${version}"; - hash = "sha256-6lAb17EoR0FKyIOb9hk1jcpmPtZ7vClfuCrDZ83XBeg="; + hash = "sha256-CfhIqbhrZkJ232grhHxrmj4H1/Bq33ZXe8kovSOWSK0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 3b9c528b85b19..7efaaa64937f0 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python, isPyPy, six, filetype, diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index 51addca7efbf6..3ed46178f1e87 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/f5-sdk/default.nix b/pkgs/development/python-modules/f5-sdk/default.nix index 09aded01c5ae1..304f1daabbfbd 100644 --- a/pkgs/development/python-modules/f5-sdk/default.nix +++ b/pkgs/development/python-modules/f5-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; + hash = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/f90nml/default.nix b/pkgs/development/python-modules/f90nml/default.nix index 2657ae73d4202..0a0f735e901ac 100644 --- a/pkgs/development/python-modules/f90nml/default.nix +++ b/pkgs/development/python-modules/f90nml/default.nix @@ -2,14 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - python, setuptools-scm, + unittestCheckHook, }: buildPythonPackage rec { pname = "f90nml"; version = "1.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "marshallward"; @@ -18,19 +18,17 @@ buildPythonPackage rec { hash = "sha256-nSpVBAS2VvXIQwYK/qVVzEc13bicAQ+ScXpO4Rn2O+8="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "f90nml" ]; - meta = with lib; { + meta = { description = "Python module for working with Fortran Namelists"; mainProgram = "f90nml"; homepage = "https://f90nml.readthedocs.io"; - license = licenses.asl20; - maintainers = with maintainers; [ loicreynier ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ loicreynier ]; }; } diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index 075f01ee64061..d94227989c490 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pillow, + setuptools, python, }: buildPythonPackage rec { pname = "fabulous"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jart"; @@ -18,9 +20,18 @@ buildPythonPackage rec { hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; - patches = [ ./relative_import.patch ]; + patches = [ + ./relative_import.patch + # https://github.com/jart/fabulous/pull/22 + (fetchpatch2 { + url = "https://github.com/jart/fabulous/commit/5779f2dfbc88fd81b5b5865247913d4775e67959.patch?full_index=1"; + hash = "sha256-miWFt4vDpwWhSUgnWDjWUXoibijcDa1c1dDOSkfWoUg="; + }) + ]; - propagatedBuildInputs = [ pillow ]; + build-system = [ setuptools ]; + + dependencies = [ pillow ]; checkPhase = '' for i in tests/*.py; do @@ -28,10 +39,10 @@ buildPythonPackage rec { done ''; - meta = with lib; { + meta = { description = "Make the output of terminal applications look fabulous"; homepage = "https://jart.github.io/fabulous"; - license = licenses.asl20; - maintainers = [ maintainers.symphorien ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.symphorien ]; }; } diff --git a/pkgs/development/python-modules/face-recognition/default.nix b/pkgs/development/python-modules/face-recognition/default.nix index ff50cce91dad0..6385b51b936c7 100644 --- a/pkgs/development/python-modules/face-recognition/default.nix +++ b/pkgs/development/python-modules/face-recognition/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { license = licenses.mit; homepage = "https://github.com/ageitgey/face_recognition"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; description = "World's simplest facial recognition api for Python and the command line"; }; } diff --git a/pkgs/development/python-modules/face-recognition/models.nix b/pkgs/development/python-modules/face-recognition/models.nix index ba704dbbeb043..cc7dbe6481ada 100644 --- a/pkgs/development/python-modules/face-recognition/models.nix +++ b/pkgs/development/python-modules/face-recognition/models.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/ageitgey/face_recognition_models"; license = licenses.cc0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; description = "Trained models for the face_recognition python library"; }; } diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix new file mode 100644 index 0000000000000..f6eee8cc5e329 --- /dev/null +++ b/pkgs/development/python-modules/faiss/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + callPackage, + faiss-build, + numpy, + packaging, + setuptools, + pip, + wheel, +}: + +buildPythonPackage { + inherit (faiss-build) pname version; + pyproject = true; + + src = "${lib.getOutput "dist" faiss-build}"; + + postPatch = '' + mkdir dist + mv *.whl dist/ + ''; + + build-system = [ + setuptools + pip + wheel + ]; + + dependencies = [ + numpy + packaging + ]; + + # E.g. cuda libraries; needed because reference scanning + # can't see inside the wheels + inherit (faiss-build) buildInputs; + + dontBuild = true; + + pythonImportsCheck = [ "faiss" ]; + + passthru = { + inherit (faiss-build) cudaSupport cudaPackages pythonSupport; + + tests = { + pytest = callPackage ./pytest.nix { inherit faiss-build; }; + }; + }; + + meta = lib.pipe (faiss-build.meta or { }) [ + (lib.flip builtins.removeAttrs [ "mainProgram" ]) + (m: m // { description = "Bindings for faiss, the similarity search library"; }) + ]; +} diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/python-modules/faiss/pytest.nix index 858a980bfeaf3..b90ee9c244c67 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/python-modules/faiss/pytest.nix @@ -1,8 +1,10 @@ -{ lib -, buildPythonPackage -, faiss -, scipy -, pytestCheckHook +{ + lib, + buildPythonPackage, + faiss, + faiss-build, + scipy, + pytestCheckHook, }: assert faiss.pythonSupport; @@ -13,15 +15,13 @@ buildPythonPackage { format = "other"; - src = "${faiss.src}/tests"; + src = "${faiss-build.src}/tests"; dontBuild = true; dontInstall = true; # Tests that need GPUs and would fail in the sandbox - disabledTestPaths = lib.optionals faiss.cudaSupport [ - "test_contrib.py" - ]; + disabledTestPaths = lib.optionals faiss.cudaSupport [ "test_contrib.py" ]; disabledTests = [ # https://github.com/facebookresearch/faiss/issues/2836 @@ -32,6 +32,9 @@ buildPythonPackage { faiss pytestCheckHook scipy - ] ++ - faiss.extra-requires.all; + ]; + + meta = faiss.meta // { + description = "Faiss test suite"; + }; } diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 515597eca0368..3c49234385ef6 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -6,7 +6,6 @@ jsonpath-ng, lupa, poetry-core, - pybloom-live, pyprobables, pytest-asyncio, pytest-mock, @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.23.2"; + version = "2.23.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-/nuBj9h5MMz1YvJozhl4Fq/OkLckesnQHHTUWfz06sA="; + hash = "sha256-SZyYtXwd5ofE2rlRw9Nl24VYMlPIuzrnoyE2ayapZww="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index ac88fb2249be4..4cd2944f6b99e 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-yw4u1xhfY9WYLSf9CNAsiDpY7y2Llf8j4gDoNZjACw0="; + hash = "sha256-xFrTOsoh/qCCnzJq97pHW2TogiWfnw4zL4Lul4jRaA0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 7668dd48da547..507ee3a0135a3 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.18.0"; + version = "1.18.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-oYE7Iik0+CbOfxF9IeeZotpGqV8TTz15MxJEC4VBrhk="; + hash = "sha256-QSJrzZyqwaHu8as03YIzB7PjUMzCnyADZgcBVnhm6c0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/farama-notifications/default.nix b/pkgs/development/python-modules/farama-notifications/default.nix index 1fc964a560178..c04c3a50a584d 100644 --- a/pkgs/development/python-modules/farama-notifications/default.nix +++ b/pkgs/development/python-modules/farama-notifications/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - numpy, setuptools, }: diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index 884c51f65efc2..620b992fb2025 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -5,7 +5,6 @@ fastprogress, fastcore, fastdownload, - torch, torchvision, matplotlib, pillow, diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix index f717ccee0428e..b802b058df49c 100644 --- a/pkgs/development/python-modules/fastapi-cli/default.nix +++ b/pkgs/development/python-modules/fastapi-cli/default.nix @@ -51,8 +51,10 @@ let self = buildPythonPackage rec { meta = with lib; { description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; homepage = "https://github.com/tiangolo/fastapi-cli"; + changelog = "https://github.com/tiangolo/fastapi-cli/releases/tag/${version}"; + mainProgram = "fastapi"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in self diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 7b84824404947..06b86d13aaf13 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.9.4"; + version = "1.9.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UWvNEi6vzQknUws+b7UCFUajMUJkfnQkfBeCR0XfqQY="; + hash = "sha256-rw0kTSROCFthjo8SrLevBiACNaKpKWcZfIYoc89Q3eM="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 92eb19e0a0eec..195491ec8ab66 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/breezy-team/fastbencode"; changelog = "https://github.com/breezy-team/fastbencode/releases/tag/v${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index da813f7611c60..b3082c4d28a21 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -3,14 +3,13 @@ buildPythonPackage, fetchFromGitHub, packaging, - pytestCheckHook, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "fastcore"; - version = "1.5.48"; + version = "1.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-wBw6b6/tjvoiQnOyyTkdNlGxHkB7XnIrzFxwenbn06k="; + hash = "sha256-WCPO/JLc39EoUyaRNUgaJZvPlyt8WogRct73aOzhyH8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index 9ddf94d5020aa..1096add5b6278 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { description = "Fast native implementation of diff algorithm with a pure Python fallback"; homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; # resulting compiled object panics at import broken = stdenv.is32bit; }; diff --git a/pkgs/development/python-modules/fastdownload/default.nix b/pkgs/development/python-modules/fastdownload/default.nix index 82e9281dbf437..363230edcf816 100644 --- a/pkgs/development/python-modules/fastdownload/default.nix +++ b/pkgs/development/python-modules/fastdownload/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo="; + hash = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 2767700af20b6..ab7153ad3a89f 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.3.1"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "fastembed"; rev = "refs/tags/v${version}"; - hash = "sha256-bFIikLogTxrwLNR+NOnnRjKGneZ63N7CBuu81z85xZo="; + hash = "sha256-fsouRmBW56NJMsVsOaBUp920NVj/o0wd6DNsEd5qil8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 494a384849b9d..4460c71f3c314 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/harlowja/fasteners"; changelog = "https://github.com/harlowja/fasteners/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 0b54f1022f05d..11d5ef13a2488 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Python module for text classification and representation learning"; homepage = "https://fasttext.cc/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix index b845389006940..ff3cd46700c94 100644 --- a/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, cython, diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 5dba169171d6b..e6b7866b0cd0d 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; + hash = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 5b76a3ca74445..725150b18fb63 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50="; + hash = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50="; }; postPatch = '' @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Standalone version of Django's feedgenerator module"; homepage = "https://github.com/getpelican/feedgenerator"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index c7e5507cd8ee1..5db6107c918bc 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Python bindings for FFmpeg - with complex filtering support"; homepage = "https://github.com/kkroening/ffmpeg-python"; license = licenses.asl20; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index a14d17776dd40..00a8a73aadad5 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - setuptools, + poetry-core, pytestCheckHook, go, ffmpeg-headless, @@ -12,22 +12,24 @@ buildPythonPackage rec { pname = "ffmpy"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8.1"; src = fetchFromGitHub { owner = "Ch00k"; repo = "ffmpy"; rev = "refs/tags/${version}"; - hash = "sha256-q41JjAWcIiD2nJck5Zzb/lhfIZ3xJGU1I2crsMN0T8Q="; + hash = "sha256-XWI0Hq4vf9Q0/dRzmu1B7EQHdQRkWaNJaBaqusWW7YM="; }; postPatch = '' # default to store ffmpeg substituteInPlace ffmpy.py \ - --replace-fail 'executable="ffmpeg",' 'executable="${ffmpeg-headless}/bin/ffmpeg",' + --replace-fail \ + 'executable: str = "ffmpeg",' \ + 'executable: str = "${ffmpeg-headless}/bin/ffmpeg",' # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail. for fname in tests/*.py; do @@ -37,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ffmpy" ]; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook @@ -52,8 +54,8 @@ buildPythonPackage rec { # the vendored ffmpeg mock binary assumes FHS preCheck = '' rm -v tests/ffmpeg/ffmpeg - HOME=$(mktemp -d) go build -o ffmpeg tests/ffmpeg/ffmpeg.go - export PATH=".:$PATH" + echo Building tests/ffmpeg/ffmpeg... + HOME=$(mktemp -d) go build -o tests/ffmpeg/ffmpeg tests/ffmpeg/ffmpeg.go ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fiblary3-fork/default.nix b/pkgs/development/python-modules/fiblary3-fork/default.nix index ac7d3215593b4..ab971979d692b 100644 --- a/pkgs/development/python-modules/fiblary3-fork/default.nix +++ b/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy3k, fetchPypi, fixtures, jsonpatch, @@ -12,7 +11,6 @@ requests, requests-mock, six, - sphinx, testtools, }: diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix index 17dde1d6701f2..2452a6cbf07de 100644 --- a/pkgs/development/python-modules/finalfusion/default.nix +++ b/pkgs/development/python-modules/finalfusion/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for using finalfusion, word2vec, and fastText word embeddings"; homepage = "https://github.com/finalfusion/finalfusion-python/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; license = licenses.blueOak100; }; diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix new file mode 100644 index 0000000000000..d4a2752c8ea30 --- /dev/null +++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix @@ -0,0 +1,55 @@ +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, + pytestCheckHook, + torch, + pytorch-lightning, +}: + +buildPythonPackage rec { + pname = "finetuning-scheduler"; + version = "2.3.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "speediedan"; + repo = "finetuning-scheduler"; + rev = "refs/tags/v${version}"; + hash = "sha256-Nci+NcfcaZV3NH3MTCyr8PwPdDykJTdq8+CmtngWdiM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pytorch-lightning + torch + ]; + + # needed while lightning is installed as package `pytorch-lightning` rather than`lightning`: + env.PACKAGE_NAME = "pytorch"; + + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests" ]; + disabledTests = lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + # slightly exceeds numerical tolerance on aarch64-linux: + "test_fts_frozen_bn_track_running_stats" + ]; + + pythonImportsCheck = [ "finetuning_scheduler" ]; + + meta = { + description = "PyTorch Lightning extension for foundation model experimentation with flexible fine-tuning schedules"; + homepage = "https://finetuning-scheduler.readthedocs.io"; + changelog = "https://github.com/speediedan/finetuning-scheduler/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + # "No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package" at import time: + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix index cf12acd2ade1d..6b3bf80810f67 100644 --- a/pkgs/development/python-modules/fingerprints/default.nix +++ b/pkgs/development/python-modules/fingerprints/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Library to generate entity fingerprints"; homepage = "https://github.com/alephdata/fingerprints"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 098cbce956fec..f63a5a37324c3 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, pythonOlder, + setuptools, fetchFromGitHub, bleach, mt-940, @@ -12,26 +13,36 @@ }: buildPythonPackage rec { - version = "4.0.0"; + version = "4.1.0"; pname = "fints"; - disabled = pythonOlder "3.6"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "raphaelm"; repo = "python-fints"; rev = "v${version}"; - hash = "sha256-SREprcrIdeKVpL22IViexwiKmFfbT2UbKEmxtVm6iu0="; + hash = "sha256-1k6ZeYlv0vxNkqQse9vi/NT6ag3DJONKCWB594LvER0="; }; - propagatedBuildInputs = [ - requests + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "enum-tools~=0.9.0" "" + sed -i "/document_enum/d" fints/formals.py + ''; + + build-system = [ setuptools ]; + + dependencies = [ + bleach mt-940 + requests sepaxml - bleach ]; + pythonImportsCheck = [ "fints" ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 9d09ace0f5785..7e0ad12fd7986 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-cdQdpQWPnMJ69VxOrn8SvNWTRcGt3S/PwoClGO9uh5I="; + hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index dc9bee90b3cb6..0d6118e44c4e8 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { homepage = "https://github.com/sdb9696/firebase-messaging"; changelog = "https://github.com/sdb9696/firebase-messaging/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index 9185b5a696861..96c7e0674ba68 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fireflyalgorithm"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "FireflyAlgorithm"; rev = "refs/tags/${version}"; - hash = "sha256-xsTgSHBtN4gGw+9YvprcLubnCXSNRdn4abcz391cMEE="; + hash = "sha256-dJnjeJN9NI8G/haYeOiMtAl56cExqMk0iTWpaybl4nE="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/fissix/default.nix b/pkgs/development/python-modules/fissix/default.nix new file mode 100644 index 0000000000000..d600d8410795f --- /dev/null +++ b/pkgs/development/python-modules/fissix/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + appdirs, + pytestCheckHook, +}: + +let + version = "24.4.24"; +in + +buildPythonPackage { + pname = "fissix"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "amyreese"; + repo = "fissix"; + rev = "v${version}"; + hash = "sha256-geGctke+1PWFqJyiH1pQ0zWj9wVIjV/SQ5njOOk9gOw="; + }; + + build-system = [ flit-core ]; + + dependencies = [ appdirs ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "fissix" ]; + + meta = { + description = "Backport of latest lib2to3, with enhancements"; + homepage = "https://github.com/amyreese/fissix"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.emily ]; + }; +} diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index a479e66246fd1..f53eba81b2ea1 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Fitbit API Python Client Implementation"; homepage = "https://github.com/orcasgit/python-fitbit"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 476491873e4f9..ea860b563edb1 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { lgpl3 mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix index be5b422f1402b..7d52055c8956b 100644 --- a/pkgs/development/python-modules/flasgger/default.nix +++ b/pkgs/development/python-modules/flasgger/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { description = "Easy OpenAPI specs and Swagger UI for your Flask API"; homepage = "https://github.com/flasgger/flasgger/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index b35020f88ee28..64efa21f8ced2 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { homepage = "https://github.com/dpgaspar/flask-appbuilder/"; changelog = "https://github.com/dpgaspar/Flask-AppBuilder/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; # Support for flask-sqlalchemy >= 3.0 is missing, https://github.com/dpgaspar/Flask-AppBuilder/pull/1940 broken = true; }; diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 966d7db267db3..46e225783493f 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -5,8 +5,7 @@ setuptools, flask, webassets, - flask-script, - nose, + pytestCheckHook, }: buildPythonPackage rec { @@ -31,10 +30,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask webassets - flask-script - nose ]; + doCheck = false; # tests are broken with webassets 2.0 + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "flask_assets" ]; + meta = with lib; { homepage = "https://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix index a34a1c2673b36..4c4e24aa7225c 100644 --- a/pkgs/development/python-modules/flask-bootstrap/default.nix +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/mbr/flask-bootstrap"; description = "Ready-to-use Twitter-bootstrap for use in Flask"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index e679bf16e8ebf..0f733a1b9a38c 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { description = "Caching extension for Flask"; homepage = "https://github.com/pallets-eco/flask-caching"; changelog = "https://github.com/pallets-eco/flask-caching/blob/v${version}/CHANGES.rst"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 2456aa9ab52a1..b9d62fcbd8e04 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -6,6 +6,10 @@ packaging, pytestCheckHook, setuptools, + + # for passthru.tests + aiobotocore, + moto, }: buildPythonPackage rec { @@ -29,6 +33,10 @@ buildPythonPackage rec { packaging ]; + passthru.tests = { + inherit aiobotocore moto; + }; + meta = with lib; { description = "Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 3ccf3d41fcbb4..77f07f3910a51 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -91,6 +91,6 @@ buildPythonPackage rec { homepage = "https://flask-limiter.readthedocs.org/"; changelog = "https://github.com/alisaifee/flask-limiter/blob/${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix index 2403e436266ed..e76561dc8ca13 100644 --- a/pkgs/development/python-modules/flask-mailman/default.nix +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -1,5 +1,6 @@ { lib, + aiosmtpd, buildPythonPackage, fetchFromGitHub, poetry-core, @@ -11,30 +12,34 @@ buildPythonPackage rec { pname = "flask-mailman"; - version = "1.1.0"; - format = "pyproject"; + version = "1.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "waynerv"; - repo = pname; + repo = "flask-mailman"; rev = "refs/tags/v${version}"; - hash = "sha256-2ll5+D35dQN3r7gDpY1iSOuJBlqMorhjhFohPug8GK8="; + hash = "sha256-0kD3rxFDJ7FcmBLVju75z1nf6U/7XfjiLD/oM/VP4jQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ flask mkdocs-material-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + aiosmtpd + pytestCheckHook + ]; pythonImportsCheck = [ "flask_mailman" ]; meta = with lib; { + changelog = "https://github.com/waynerv/flask-mailman/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/waynerv/flask-mailman"; description = "Flask extension providing simple email sending capabilities"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 32f8642212728..65ba830e91035 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://github.com/mongoengine/flask-mongoengine"; changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index ee15641a9d5cb..5624141f671d9 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/lixxu/flask-paginate"; changelog = "https://github.com/lixxu/flask-paginate/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index e1f15d6fad0c1..ca27a3292c052 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -5,8 +5,8 @@ buildPythonPackage, fetchPypi, flask, + fetchpatch2, mock, - nose, pytestCheckHook, pythonOlder, pytz, @@ -30,7 +30,15 @@ buildPythonPackage rec { # conditional so that overrides are easier for web applications patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [ ./werkzeug-2.1.0-compat.patch ] - ++ lib.optionals (lib.versionAtLeast flask.version "3.0.0") [ ./flask-3.0-compat.patch ]; + ++ lib.optionals (lib.versionAtLeast flask.version "3.0.0") [ ./flask-3.0-compat.patch ] + ++ [ + # replace use nose by pytest: https://github.com/flask-restful/flask-restful/pull/970 + (fetchpatch2 { + url = "https://github.com/flask-restful/flask-restful/commit/6cc4b057e5450e0c84b3ee5f6f7a97e648a816d6.patch?full_index=1"; + hash = "sha256-kIjrkyL0OfX+gjoiYfchU0QYTPHz4JMCQcHLFH9oEF4="; + }) + ./fix-test-inputs.patch + ]; propagatedBuildInputs = [ aniso8601 @@ -42,7 +50,6 @@ buildPythonPackage rec { nativeCheckInputs = [ blinker mock - nose pytestCheckHook ]; @@ -64,6 +71,6 @@ buildPythonPackage rec { REST API. ''; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flask-restful/fix-test-inputs.patch b/pkgs/development/python-modules/flask-restful/fix-test-inputs.patch new file mode 100644 index 0000000000000..5f58c675f2aa6 --- /dev/null +++ b/pkgs/development/python-modules/flask-restful/fix-test-inputs.patch @@ -0,0 +1,173 @@ +diff --git a/tests/test_inputs.py b/tests/test_inputs.py +index 7c30d45..645b728 100644 +--- a/tests/test_inputs.py ++++ b/tests/test_inputs.py +@@ -5,6 +5,7 @@ import re + + #noinspection PyUnresolvedReferences + import six ++import pytest + + from flask_restful import inputs + +@@ -17,7 +18,7 @@ def test_reverse_rfc822_datetime(): + ] + + for date_string, expected in dates: +- yield assert_equal, inputs.datetime_from_rfc822(date_string), expected ++ assert inputs.datetime_from_rfc822(date_string) == expected + + + def test_reverse_iso8601_datetime(): +@@ -29,7 +30,7 @@ def test_reverse_iso8601_datetime(): + ] + + for date_string, expected in dates: +- yield assert_equal, inputs.datetime_from_iso8601(date_string), expected ++ assert inputs.datetime_from_iso8601(date_string) == expected + + + def test_urls(): +@@ -53,7 +54,7 @@ def test_urls(): + ] + + for value in urls: +- yield assert_equal, inputs.url(value), value ++ assert inputs.url(value) == value + + + def check_bad_url_raises(value): +@@ -118,7 +119,8 @@ def test_regex_bad_input(): + num_only = inputs.regex(r'^[0-9]+$') + + for value in cases: +- yield assert_raises, ValueError, lambda: num_only(value) ++ with pytest.raises(ValueError): ++ num_only(value) + + + def test_regex_good_input(): +@@ -131,12 +133,13 @@ def test_regex_good_input(): + num_only = inputs.regex(r'^[0-9]+$') + + for value in cases: +- yield assert_equal, num_only(value), value ++ assert num_only(value) == value + + + def test_regex_bad_pattern(): + """Regex error raised immediately when regex input parser is created.""" +- assert_raises(re.error, inputs.regex, '[') ++ with pytest.raises(re.error): ++ inputs.regex('[') + + + def test_regex_flags_good_input(): +@@ -149,7 +152,7 @@ def test_regex_flags_good_input(): + case_insensitive = inputs.regex(r'^[A-Z]+$', re.IGNORECASE) + + for value in cases: +- yield assert_equal, case_insensitive(value), value ++ assert case_insensitive(value) == value + + + def test_regex_flags_bad_input(): +@@ -161,7 +164,8 @@ def test_regex_flags_bad_input(): + case_sensitive = inputs.regex(r'^[A-Z]+$') + + for value in cases: +- yield assert_raises, ValueError, lambda: case_sensitive(value) ++ with pytest.raises(ValueError): ++ case_sensitive(value) + + + class TypesTestCase(unittest.TestCase): +@@ -191,35 +195,41 @@ class TypesTestCase(unittest.TestCase): + assert inputs.boolean(False) == False + + def test_bad_boolean(self): +- assert_raises(ValueError, lambda: inputs.boolean("blah")) ++ with pytest.raises(ValueError): ++ inputs.boolean("blah") + + def test_date_later_than_1900(self): + assert inputs.date("1900-01-01") == datetime(1900, 1, 1) + + def test_date_input_error(self): +- assert_raises(ValueError, lambda: inputs.date("2008-13-13")) ++ with pytest.raises(ValueError): ++ inputs.date("2008-13-13") + + def test_date_input(self): + assert inputs.date("2008-08-01") == datetime(2008, 8, 1) + + def test_natual_negative(self): +- assert_raises(ValueError, lambda: inputs.natural(-1)) ++ with pytest.raises(ValueError): ++ inputs.natural(-1) + + def test_natural(self): + assert 3 == inputs.natural(3) + + def test_natual_string(self): +- assert_raises(ValueError, lambda: inputs.natural('foo')) ++ with pytest.raises(ValueError): ++ inputs.natural('foo') + + def test_positive(self): + assert 1 == inputs.positive(1) + assert 10000 == inputs.positive(10000) + + def test_positive_zero(self): +- assert_raises(ValueError, lambda: inputs.positive(0)) ++ with pytest.raises(ValueError): ++ inputs.positive(0) + + def test_positive_negative_input(self): +- assert_raises(ValueError, lambda: inputs.positive(-1)) ++ with pytest.raises(ValueError): ++ inputs.positive(-1) + + def test_int_range_good(self): + int_range = inputs.int_range(1, 5) +@@ -231,11 +241,13 @@ class TypesTestCase(unittest.TestCase): + + def test_int_range_low(self): + int_range = inputs.int_range(0, 5) +- assert_raises(ValueError, lambda: int_range(-1)) ++ with pytest.raises(ValueError): ++ int_range(-1) + + def test_int_range_high(self): + int_range = inputs.int_range(0, 5) +- assert_raises(ValueError, lambda: int_range(6)) ++ with pytest.raises(ValueError): ++ int_range(6) + + + def test_isointerval(): +@@ -389,7 +401,7 @@ def test_isointerval(): + ] + + for value, expected in intervals: +- yield assert_equal, inputs.iso8601interval(value), expected ++ assert inputs.iso8601interval(value) == expected + + + def test_invalid_isointerval_error(): +@@ -413,12 +425,9 @@ def test_bad_isointervals(): + ] + + for bad_interval in bad_intervals: +- yield ( +- assert_raises, +- Exception, +- inputs.iso8601interval, +- bad_interval, +- ) ++ with pytest.raises(Exception): ++ inputs.iso8601interval(bad_interval) ++ + + if __name__ == '__main__': + unittest.main() diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e02bb99626df6..98eb553794936 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -48,20 +48,23 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.4.3"; + version = "5.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - pname = "Flask-Security-Too"; + pname = "flask_security_too"; inherit version; - hash = "sha256-YrGTl+jXGo1MuNwNRAnMehSXmCVJAwOWlgruUYdV5YM="; + hash = "sha256-nuYOqKgH3Wfk2IFEDUhWUB6aP1xZ+c4DK7n0zB01TSk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0 + pythonRelaxDeps = [ "flask-login" ]; + + dependencies = [ email-validator flask flask-login diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix index 9541e74148ca6..07bb5cbe40b15 100644 --- a/pkgs/development/python-modules/flask-versioned/default.nix +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Flask plugin to rewrite file paths to add version info"; homepage = "https://github.com/pilt/flask-versioned"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 154c9f97ecc41..5088c3bcd605c 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Testing library that makes it easy to create mocks,stubs and fakes"; homepage = "https://flexmock.readthedocs.org"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index b6af9c7564f8f..6999a333f284c 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WrcXuXlTB3DBavtItQ0qmNI8Pp/jmFHc9rxNAYRaAqA="; + hash = "sha256-WrcXuXlTB3DBavtItQ0qmNI8Pp/jmFHc9rxNAYRaAqA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flowmc/default.nix b/pkgs/development/python-modules/flowmc/default.nix new file mode 100644 index 0000000000000..27127b93b5784 --- /dev/null +++ b/pkgs/development/python-modules/flowmc/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + corner, + equinox, + evosax, + jax, + jaxlib, + optax, + tqdm, + + # checks + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flowmc"; + version = "0.3.4"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "kazewong"; + repo = "flowMC"; + rev = "refs/tags/flowMC-${version}"; + hash = "sha256-unvbNs0AOzW4OI+9y6KxoBC5yEjEz+q0PZblQLXCC/Y="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + corner + equinox + evosax + jax + jaxlib + optax + tqdm + ]; + + pythonImportsCheck = [ "flowMC" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Normalizing-flow enhanced sampling package for probabilistic inference in Jax"; + homepage = "https://github.com/kazewong/flowMC"; + changelog = "https://github.com/kazewong/flowMC/releases/tag/flowMC-${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index b514947d8e3bf..c527d036200b7 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Email bounce detectors"; homepage = "https://gitlab.com/warsaw/flufl.bounce"; changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index a592c4a4ddb0b..3a7295e0a0877 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/warsaw/flufl.i18n"; changelog = "https://gitlab.com/warsaw/flufl.i18n/-/raw/${version}/docs/NEWS.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 8926badb3e631..3c1b2ce83efde 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,34 +1,36 @@ { lib, + atpublic, buildPythonPackage, fetchPypi, - pytestCheckHook, - pythonOlder, - atpublic, + hatchling, psutil, pytest-cov, + pytestCheckHook, + pythonOlder, sybil, - pdm-pep517, }: buildPythonPackage rec { pname = "flufl-lock"; - version = "7.1.1"; + version = "8.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "flufl.lock"; + pname = "flufl_lock"; inherit version; - hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; + hash = "sha256-2IMCAFaSpj2YtgCAFY+vCJvl7K5pafcGQJ2oJ2/c58s="; }; - nativeBuildInputs = [ pdm-pep517 ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ atpublic psutil ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov @@ -45,10 +47,10 @@ buildPythonPackage rec { pythonNamespaces = [ "flufl" ]; meta = with lib; { - homepage = "https://flufllock.readthedocs.io/"; description = "NFS-safe file locking with timeouts for POSIX and Windows"; + homepage = "https://flufllock.readthedocs.io/"; changelog = "https://gitlab.com/warsaw/flufl.lock/-/blob/${version}/docs/NEWS.rst"; - maintainers = with maintainers; [ qyliss ]; license = licenses.asl20; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index ccc8a300095c9..8be25eafc613a 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -3,6 +3,7 @@ branca, buildPythonPackage, fetchFromGitHub, + geodatasets, geopandas, jinja2, nbconvert, @@ -48,6 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + geodatasets geopandas nbconvert pandas @@ -65,6 +67,8 @@ buildPythonPackage rec { "test_notebook" "test_valid_png_size" "test_valid_png" + # pooch tries to write somewhere it can, and geodatasets does not give us an env var to customize this. + "test_timedynamic_geo_json" ]; pythonImportsCheck = [ "folium" ]; @@ -74,5 +78,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-visualization/folium"; changelog = "https://github.com/python-visualization/folium/blob/v${version}/CHANGES.txt"; license = with lib.licenses; [ mit ]; + maintainers = lib.teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/fontawesomefree/default.nix b/pkgs/development/python-modules/fontawesomefree/default.nix index 0c3e0123befd9..ebdf6c247cfcf 100644 --- a/pkgs/development/python-modules/fontawesomefree/default.nix +++ b/pkgs/development/python-modules/fontawesomefree/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "fontawesomefree"; - version = "6.5.1"; + version = "6.6.0"; format = "wheel"; # they only provide a wheel @@ -14,7 +14,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-jexKLuN7+OUzeeu/DTjO/sTgbHySJ/Wa8527exYygXs="; + hash = "sha256-WZtXRDHJvZLtX8BU0QRaB8QjNdo2wXiE8rk0dV7vkIk="; }; pythonImportsCheck = [ "fontawesomefree" ]; diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 5d0f5d6dcaefc..c875392e62f32 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -1,59 +1,76 @@ { lib, - buildPythonPackage, - callPackage, - fetchPypi, axisregistry, babelfont, beautifulsoup4, beziers, + buildPythonPackage, + callPackage, cmarkgfm, collidoscope, defcon, dehinter, - fonttools, + fetchPypi, font-v, + fonttools, freetype-py, gflanguages, gfsubsets, git, glyphsets, - lxml, installShellFiles, jinja2, + lxml, munkres, opentypespec, ots-python, packaging, pip-api, protobuf, - pytestCheckHook, pytest-xdist, + pytestCheckHook, + pythonOlder, pyyaml, - requests, requests-mock, + requests, rich, - setuptools, setuptools-scm, + setuptools, shaperglot, stringbrewer, toml, - unicodedata2, ufo2ft, ufolint, + unicodedata2, vharfbuzz, }: buildPythonPackage rec { pname = "fontbakery"; - version = "0.12.7"; + version = "0.12.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7cZeazEyAyU+WDop2n7wneg2wzh+9U9atKSRcreJpGw="; + hash = "sha256-Cl0jRQqF83IIldkp1VuVSS4ZeVsQH1NNpyEkpMJqhA8="; }; - pyproject = true; + pythonRelaxDeps = [ + "collidoscope" + "protobuf" + "vharfbuzz" + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = [ + installShellFiles + ]; dependencies = [ axisregistry @@ -64,17 +81,17 @@ buildPythonPackage rec { collidoscope defcon dehinter - fonttools font-v + fonttools freetype-py gflanguages gfsubsets glyphsets - lxml jinja2 + lxml munkres - ots-python opentypespec + ots-python packaging pip-api protobuf @@ -84,26 +101,12 @@ buildPythonPackage rec { shaperglot stringbrewer toml + ufo2ft ufolint unicodedata2 vharfbuzz - ufo2ft - ]; - build-system = [ - setuptools - setuptools-scm - ]; - nativeBuildInputs = [ - installShellFiles - ]; - - pythonRelaxDeps = [ - "collidoscope" - "protobuf" - "vharfbuzz" ]; - doCheck = true; nativeCheckInputs = [ git pytestCheckHook @@ -111,6 +114,7 @@ buildPythonPackage rec { requests-mock ufolint ]; + preCheck = '' # Let the tests invoke 'fontbakery' command. export PATH="$out/bin:$PATH" @@ -121,6 +125,7 @@ buildPythonPackage rec { git config user.name Test git commit --allow-empty --message 'Dummy commit for tests' ''; + disabledTests = [ # These require network access: "test_check_description_broken_links" @@ -145,6 +150,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for checking the quality of font projects"; homepage = "https://github.com/googlefonts/fontbakery"; + changelog = "https://github.com/fonttools/fontbakery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; }; diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 2829e4f1242db..7a4bca9d1fb91 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -1,14 +1,17 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + pytestCheckHook, + fontmath, + fonttools, glyphslib, + setuptools, setuptools-scm, + skia-pathops, + ttfautohint-py, ufo2ft, - fonttools, - fontmath, - lxml, - setuptools, + ufolib2, }: buildPythonPackage rec { @@ -16,28 +19,45 @@ buildPythonPackage rec { version = "3.9.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-KrfT0fvE1fhaM2RH4LqRUda7yMHg2T59UdGi3SSZP7s="; - extension = "zip"; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "fontmake"; + rev = "v${version}"; + hash = "sha256-q6ul9MYbq85RpZE0ozHOCBNAR4r9InIjumadT1GyJ6k="; }; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ - glyphslib - ufo2ft - fonttools - fontmath - lxml + build-system = [ setuptools + setuptools-scm ]; + dependencies = + [ + fontmath + fonttools + glyphslib + ufo2ft + ufolib2 + ] + ++ fonttools.optional-dependencies.ufo + ++ fonttools.optional-dependencies.lxml + ++ fonttools.optional-dependencies.unicode; + + optional-dependencies = { + pathops = [ skia-pathops ]; + autohint = [ ttfautohint-py ]; + json = ufolib2.optional-dependencies.json; + repacker = fonttools.optional-dependencies.repacker; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.autohint; + pythonImportsCheck = [ "fontmake" ]; meta = { description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)"; homepage = "https://github.com/googlefonts/fontmake"; + changelog = "https://github.com/googlefonts/fontmake/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.BarinovMaxim ]; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 5db308aa20cd5..246c97aa9c015 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/warner/foolscap"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix deleted file mode 100644 index 178f97c0f3d61..0000000000000 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pynose, - setuptools, -}: - -buildPythonPackage rec { - version = "0.1.4"; - pname = "forbiddenfruit"; - pyproject = true; - - src = fetchFromGitHub { - owner = "clarete"; - repo = "forbiddenfruit"; - rev = "refs/tags/${version}"; - hash = "sha256-yHIZsVn2UVmWeBNIzWDE6AOwAXZilPqXo+bVtXqGkJk="; - }; - - build-system = [ setuptools ]; - - env.FFRUIT_EXTENSION = "true"; - - pythonImportsCheck = [ "forbiddenfruit" ]; - - nativeCheckInputs = [ pynose ]; - - # https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest - checkPhase = '' - runHook preCheck - - find ./build -name '*.so' -exec mv {} tests/unit \; - nosetests - - runHook postCheck - ''; - - meta = with lib; { - description = "Patch python built-in objects"; - homepage = "https://github.com/clarete/forbiddenfruit"; - changelog = "https://github.com/clarete/forbiddenfruit/releases/tag/${version}"; - license = with licenses; [ - mit - gpl3Plus - ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix index f3f1ce44febb9..a67216ebf30f2 100644 --- a/pkgs/development/python-modules/formbox/default.nix +++ b/pkgs/development/python-modules/formbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "formbox"; - version = "0.4.3"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchzip { url = "https://trong.loang.net/~cnx/formbox/snapshot/formbox-${version}.tar.gz"; - hash = "sha256-sRu0otyeYpxot/Fyiz3wyQJsJvl8nsgIVitzT8frxLE="; + hash = "sha256-YS0hkmEly7SXQvMIPLmqY89ux6E951twAy7iA3K+asA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index b6be8e6158f6d..216e48dd1ff2c 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "FormEncode"; inherit version; - sha256 = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; + hash = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; }; postPatch = '' @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "FormEncode validates and converts nested structures"; homepage = "http://formencode.org"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index 526be820c131b..57c26378761f7 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bambinos"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A0CI0bpoRYFAcPiNAf5haQu9BEqmBgxF7HfIl4qcML0="; + hash = "sha256-SSyQa7soIp+wSXX5wek9LG95q7J7K34mztzx01lPiWo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index ae9ccc02c36c9..ee149c96832c7 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -3,7 +3,6 @@ astor, buildPythonPackage, fetchFromGitHub, - git, hatch-vcs, hatchling, interface-meta, @@ -19,7 +18,7 @@ buildPythonPackage rec { pname = "formulaic"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +27,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; rev = "refs/tags/v${version}"; - hash = "sha256-qivWv1LtFkW55tVKD/Zjd8Q5gVbxhDpZ0inkV6NR7bA="; + hash = "sha256-1Ygu4o6RXXTnvve8XZi+QMhCjvUyMspYWTyUH3p6+dg="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/free-proxy/default.nix b/pkgs/development/python-modules/free-proxy/default.nix new file mode 100644 index 0000000000000..c6d78bedfab6d --- /dev/null +++ b/pkgs/development/python-modules/free-proxy/default.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pip-chill, + lxml, + requests, +}: + +buildPythonPackage rec { + pname = "free-proxy"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jundymek"; + repo = "free-proxy"; + rev = "refs/tags/${version}"; + hash = "sha256-82usyhUzZrdYir8puiAfaF650f0PxYJSXBE75zxYjK8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pip-chill + lxml + requests + ]; + + meta = { + description = "Free proxy scraper written in python"; + homepage = "https://github.com/jundymek/free-proxy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/development/python-modules/freenub/default.nix b/pkgs/development/python-modules/freenub/default.nix new file mode 100644 index 0000000000000..fec4d3180bc41 --- /dev/null +++ b/pkgs/development/python-modules/freenub/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + cbor2, + pycryptodomex, + busypie, + pytest-asyncio, + pytest-vcr, + pytestCheckHook, + requests, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "freenub"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "freenub"; + rev = "refs/tags/v${version}"; + hash = "sha256-UkW/7KUQ4uCu3cxDSL+kw0gjKjs4KnmxRIOLVP4hwyA="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + cbor2 + pycryptodomex + requests + ]; + + nativeCheckInputs = [ + busypie + pytest-asyncio + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ "pubnub" ]; + + meta = with lib; { + description = "Fork of pubnub"; + homepage = "https://github.com/bdraco/freenub"; + changelog = "https://github.com/bdraco/freenub/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/freertos-gdb/default.nix b/pkgs/development/python-modules/freertos-gdb/default.nix index 7535ba80d35c6..f932925762134 100644 --- a/pkgs/development/python-modules/freertos-gdb/default.nix +++ b/pkgs/development/python-modules/freertos-gdb/default.nix @@ -1,4 +1,4 @@ -{ lib, pkg-config, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "freertos-gdb"; @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; + hash = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; }; # Project has no tests diff --git a/pkgs/development/python-modules/freud/default.nix b/pkgs/development/python-modules/freud/default.nix index 49a25ed500e36..a681bd1f14b13 100644 --- a/pkgs/development/python-modules/freud/default.nix +++ b/pkgs/development/python-modules/freud/default.nix @@ -1,20 +1,23 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, cmake -, cython -, oldest-supported-numpy -, scikit-build -, setuptools -, tbb -, numpy -, rowan -, scipy -, pytest -, gsd -, matplotlib -, sympy +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + cmake, + cython, + oldest-supported-numpy, + scikit-build, + setuptools, + tbb, + numpy, + rowan, + scipy, + pytestCheckHook, + python, + gsd, + matplotlib, + sympy, }: buildPythonPackage rec { @@ -29,6 +32,15 @@ buildPythonPackage rec { hash = "sha256-jlscEHQ1q4oqxE06NhVWCOlPRcjDcJVrvy4h6iYrkz0="; fetchSubmodules = true; }; + + patches = [ + # https://github.com/glotzerlab/freud/issues/1269 + (fetchpatch { + url = "https://github.com/glotzerlab/freud/commit/8f636e3815737945e45da5b9996b5f69df07c9a5.patch"; + hash = "sha256-PLorRrYj16oBWHYzXDq62kECzVTtyr+1Z20DJqTkXxg="; + }) + ]; + # Because we prefer to not `leaveDotGit`, we need to fool upstream into # thinking we left the .git files in the submodules, so cmake won't think we # didn't initialize them. Upstream doesn't support using the system wide @@ -39,6 +51,13 @@ buildPythonPackage rec { touch extern/{voro++,fsph,Eigen}/.git ''; + # Scipy still depends on numpy 1, and so we'd get 'package duplicates in + # closure' error if we'd use numpy_2 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy>=2.0.0rc1' 'numpy' \ + ''; + nativeBuildInputs = [ cmake cython @@ -47,9 +66,7 @@ buildPythonPackage rec { setuptools ]; dontUseCmakeConfigure = true; - buildInputs = [ - tbb - ]; + buildInputs = [ tbb ]; propagatedBuildInputs = [ numpy @@ -58,33 +75,29 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - # Encountering circular ImportError issues with pytestCheckHook, see also: - # https://github.com/NixOS/nixpkgs/issues/255262 - pytest + pytestCheckHook gsd matplotlib sympy ]; - checkPhase = '' - runHook preCheck - - pytest - - runHook postCheck + disabledTests = lib.optionals stdenv.isAarch64 [ + # https://github.com/glotzerlab/freud/issues/961 + "test_docstring" + ]; + # On top of cd $out due to https://github.com/NixOS/nixpkgs/issues/255262 , + # we need to also copy the tests because otherwise pytest won't find them. + preCheck = '' + cp -R tests $out/${python.sitePackages}/freud/tests + cd $out ''; - # Some tests fail on aarch64. If we could have used pytestCheckHook, we would - # have disabled only the tests that fail with the disabledTests attribute. - # But that is not possible unfortunately. See upstream report for the - # failure: https://github.com/glotzerlab/freud/issues/961 - doCheck = !stdenv.isAarch64; pythonImportsCheck = [ "freud" ]; - meta = with lib; { + meta = { description = "Powerful, efficient particle trajectory analysis in scientific Python"; homepage = "https://github.com/glotzerlab/freud"; changelog = "https://github.com/glotzerlab/freud/blob/${src.rev}/ChangeLog.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index fa2441e82923c..6e1d469ba34f0 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, pytestCheckHook, - pythonAtLeast, pythonOlder, }: diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 5913bb656e8a1..5372eb0b6d0c7 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/fs-s3fs/"; license = licenses.mit; description = "Amazon S3 filesystem for PyFilesystem2"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 735d0b115cd64..e423f32d799e7 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -132,6 +132,6 @@ buildPythonPackage rec { homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index bc4e43e29c393..01ec0e9d616af 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, freezegun, @@ -39,6 +38,6 @@ buildPythonPackage rec { description = "High-level FTP client library (virtual file system and more)"; homepage = "https://ftputil.sschwarzer.net/"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix index 4c3c342f32d60..33446197f52d3 100644 --- a/pkgs/development/python-modules/func-timeout/default.nix +++ b/pkgs/development/python-modules/func-timeout/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads"; homepage = "https://github.com/kata198/func_timeout"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/funcparserlib/default.nix b/pkgs/development/python-modules/funcparserlib/default.nix index abe8fb25d68e0..4c67565fd5f3c 100644 --- a/pkgs/development/python-modules/funcparserlib/default.nix +++ b/pkgs/development/python-modules/funcparserlib/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - python, pytestCheckHook, pythonOlder, six, diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 63fcb2052237a..bafdd58d56ce5 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; homepage = "https://github.com/aliles/funcsigs"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/funcy/default.nix b/pkgs/development/python-modules/funcy/default.nix index a6bb66a173569..45359c9adc181 100644 --- a/pkgs/development/python-modules/funcy/default.nix +++ b/pkgs/development/python-modules/funcy/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://funcy.readthedocs.org/"; changelog = "https://github.com/Suor/funcy/blob/2.0/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/future-typing/default.nix b/pkgs/development/python-modules/future-typing/default.nix index ef2c18fda510f..291b26c8c4522 100644 --- a/pkgs/development/python-modules/future-typing/default.nix +++ b/pkgs/development/python-modules/future-typing/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, - typing-extensions, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 29809ebdfa5f5..7e99404d942a0 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - python, fetchFromGitHub, sdcc, libusb1, @@ -50,6 +49,6 @@ buildPythonPackage rec { mainProgram = "fx2tool"; homepage = "https://github.com/whitequark/libfx2"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index ace8f66e14eab..139e103d40a17 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.10"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-GHvLE6xTY37MCDlGOmvyqi42ORRk1W8UcQXqH3Ty/c4="; + hash = "sha256-ZNVBP/c1Q7635PbySk5Yxz7riYNLnBnJLG6AMxy/ZeA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix index 088e253def72e..4f39dd06556be 100644 --- a/pkgs/development/python-modules/gamble/default.nix +++ b/pkgs/development/python-modules/gamble/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "gamble"; - version = "0.13"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "jpetrucciani"; repo = "gamble"; rev = "refs/tags/${version}"; - hash = "sha256-eHosY/JfJr317S7WI8phy7DNHf3cZzs6c5MMfw7yzAE="; + hash = "sha256-vzaY5gJ0Ou2ArUJ0kuTWzTeLfiRDhUt/Hxpns9rFiDk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 6bba760ec1c4d..1d1585521b233 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.18"; + version = "0.2.19"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-ElgSL4NuEYv/VHPZIQlDWehS4B03/PCM6uk3OhvnNjA="; + hash = "sha256-v3Z6cUHqE52BJUgfyWMojwdbxWIEyNR8c/oNS9QEFeA="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix index 6437deacd4904..5a928d5c79914 100644 --- a/pkgs/development/python-modules/gatt/default.nix +++ b/pkgs/development/python-modules/gatt/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { mainProgram = "gattctl"; homepage = "https://github.com/getsenic/gatt-python/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index 4c192b43f666e..8c4252e490292 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools-scm, pygobject3, pytestCheckHook, gtk3, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "gbulb"; version = "0.6.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "beeware"; @@ -21,10 +22,16 @@ buildPythonPackage rec { hash = "sha256-03Ott+V3Y4+Y72Llsug5coqG3C+pjAdLkPYbaY/6Uow="; }; - propagatedBuildInputs = [ - pygobject3 - gtk3 - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "==" ">=" + ''; + + build-system = [ setuptools-scm ]; + + dependencies = [ pygobject3 ]; + + buildInputs = [ gtk3 ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 5bf66cdb24192..c6ec91b5946b9 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { "gcovr.configuration" ]; - meta = with lib; { + meta = { description = "Python script for summarizing gcov data"; mainProgram = "gcovr"; homepage = "https://www.gcovr.com/"; changelog = "https://github.com/gcovr/gcovr/blob/${version}/CHANGELOG.rst"; - license = licenses.bsd0; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix index 87f9e361feaae..0cb900cffb8d9 100644 --- a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix +++ b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix @@ -2,7 +2,6 @@ lib, boto, buildPythonPackage, - fasteners, fetchFromGitHub, freezegun, google-reauth, diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index 1fb6123f0133f..1a4461a1b472c 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gekko"; - version = "1.1.3"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JN7CWOR7CcWzmKDNlUXm/6ilrTJ3vLa8h2TNnmALhfk="; + hash = "sha256-a3Iy61B3JddLeEilaa5Z0smQepjkfyNr4mOCEx+1LlM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index b1b7d034ff591..057898dded4e0 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { gpl3Plus mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "parsegemfile"; }; } diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 30674f2090526..c9bd2b520c3b5 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "generic"; - version = "1.1.2"; + version = "1.1.3"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NfUvmkUIAdm+UZqmBWh0MZTViLJSkeRonPNSnVd+RbA="; + hash = "sha256-d4+CRv1uecIdS4t23cAI34s/PdIFYNQXfABuRWjzCUQ="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index c005662068ca9..61ce59689b64e 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -8,7 +8,6 @@ numpy, scipy, smart-open, - testfixtures, pyemd, pytestCheckHook, pythonOlder, diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 35969322e75e8..bd3cd71bfa471 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.15.1"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-EMsaB6VDDDvXg9LKa9ms0+AfzX1rG+yeR898EK59DDs="; + hash = "sha256-c5PvkQdfKajQha2nAtqYq7aHCgP/n41ekE04Rl2Pnr0="; }; build-system = [ diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix index 306c152dffa9f..e61305cd03712 100644 --- a/pkgs/development/python-modules/geodatasets/default.nix +++ b/pkgs/development/python-modules/geodatasets/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "geodatasets"; - version = "2023.12.0"; + version = "2024.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "geopandas"; repo = "geodatasets"; - rev = version; - hash = "sha256-yecAky3lCKcSgW4kkYTBNnyKyIWnGSBL600wVgGN8CE="; + rev = "refs/tags/${version}"; + hash = "sha256-DNM3DUtj+hfwiqjnCf3OSiSuuf1AbFnyCN9KPDBisyU="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 14433fe94f3f9..4d91f5fb8a2e9 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://geographiclib.sourceforge.io"; description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index 179ed9888c74b..b4a4583275878 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "https://github.com/maxmind/GeoIP2-python"; changelog = "https://github.com/maxmind/GeoIP2-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index 58eb57fe6856c..0172159ec6bd2 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { changelog = "https://github.com/geomet/geomet/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ - turion ris ]; }; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e4b958d424618..e8e78f80acc67 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -3,14 +3,13 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, setuptools, - fiona, packaging, pandas, + pyogrio, pyproj, rtree, shapely, @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.14.4"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,29 +26,15 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-FBhPcae8bnNnsfr14I1p22VhoOf9USF9DAcrAqx+zso="; + hash = "sha256-SZizjwkx8dsnaobDYpeQm9jeXZ4PlzYyjIScnQrH63Q="; }; - patches = [ - # GDAL 3.9 compat for boolean array in shp - (fetchpatch { - url = "https://github.com/geopandas/geopandas/commit/f1be60532bed31cb410ce4db2da6b733bc8713c9.patch"; - sha256 = "sha256-DZhC7sSOki0XTcojSRvVVSlsnYnxCw/Ee7vHBmDCsbA="; - }) - - # GDAL 3.9 compat for boolean array in shp for fiona - (fetchpatch { - url = "https://github.com/geopandas/geopandas/commit/1e08422d8aee4877752047a8a08f41e3a67188f2.patch"; - sha256 = "sha256-SpNqe7jL1rA79YhhSUfEzt30plt56Tux5v1h7IHp31I="; - }) - ]; - build-system = [ setuptools ]; propagatedBuildInputs = [ - fiona packaging pandas + pyogrio pyproj shapely ]; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index 9ec61acb00d5d..bd356f044af48 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; - version = "0.7"; + version = "0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,12 +19,12 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "refs/tags/v${version}"; - hash = "sha256-ajCw1m7Qm1kZE/hOsBzFXPWAxl/pFD8pOOQo6qvachE="; + hash = "sha256-/MyjYLu29PANe17KxJCkmHPjvjlPfswn7ZBAKFSwohc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ georss-client ]; + dependencies = [ georss-client ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix index 480a7dc239280..46a226f5637d6 100644 --- a/pkgs/development/python-modules/gerbonara/default.nix +++ b/pkgs/development/python-modules/gerbonara/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, setuptools, - pytest, click, numpy, scipy, @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "gerbonara"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jaseg"; repo = "gerbonara"; rev = "v${version}"; - hash = "sha256-VU4Of90YUPoLuiUpIDwSUfxQOoKChNbZE0klHkHEmaY="; + hash = "sha256-SwXoCA9ru5VgH4geKUDgdcPrgEYgNoVwNb5YUBAcXlo="; }; format = "setuptools"; @@ -43,6 +43,8 @@ buildPythonPackage rec { # Test environment is exceptionally tricky to get set up, so skip for now. doCheck = false; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + meta = with lib; { description = "Pythonic library for reading/modifying/writing Gerber/Excellon/IPC-356 files"; mainProgram = "gerbonara"; diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 62f6e49ec63d7..153f25ad2cb11 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "getjump"; - version = "2.4.2"; + version = "2.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WSLfhVCqP+N+2Rs2PUXOknnlNx3UtWdFYrK1lTW1fqQ="; + hash = "sha256-3VxsKum6aB35XYjz9ZKkUBdPuofOWzG+ttkX9pnzu7U="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 141a6c44d27d5..4c3339e7580af 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "getmac"; - version = "0.9.4"; + version = "0.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "GhostofGoes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B9agBmSrD3ZhqpGclZdMQNRSLSkepR6iduP1yrYz9tU="; + hash = "sha256-ZbTCbbASs7+ChmgcDePXSbiHOst6/eCkq9SiKgYhFyM="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 29f1714039f55..aa592a876e1b5 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -4,7 +4,6 @@ fetchPypi, gevent, gevent-websocket, - mock, versiontools, pythonOlder, }: @@ -36,6 +35,6 @@ buildPythonPackage rec { description = "SocketIO server based on the Gevent pywsgi server"; homepage = "https://github.com/abourget/gevent-socketio"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 9fad31860ef11..a93c3dc6b925f 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Websocket handler for the gevent pywsgi server"; homepage = "https://www.gitlab.com/noppo/gevent-websocket"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 478faeaeb3c33..230d8f300e294 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -6,11 +6,9 @@ dpkt, fetchFromGitHub, gevent, - llhttp, pytestCheckHook, pythonOlder, setuptools, - six, stdenv, urllib3, }: diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix index 5e163ec21c05a..154f3b86614d3 100644 --- a/pkgs/development/python-modules/ghapi/default.nix +++ b/pkgs/development/python-modules/ghapi/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, fastcore, packaging, pythonOlder, diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 7a0529cc89af3..aed16c67ce017 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "http://gehrcke.de/gipc"; changelog = "https://github.com/jgehrcke/gipc/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 07f546d41571a..7778ecd9ca883 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -8,7 +8,6 @@ gitMinimal, pygit2, pytestCheckHook, - python, pythonOlder, setuptools, substituteAll, diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix index ceb49c027fb4b..5591d87dd5a3d 100644 --- a/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, fetchPypi, - fetchpatch, installShellFiles, pythonOlder, setuptools-scm, @@ -12,34 +11,25 @@ buildPythonPackage rec { pname = "git-filter-repo"; - version = "2.38.0"; - docs_version = "01ead411966a83dfcfb35f9d2e8a9f7f215eaa65"; + version = "2.45.0"; + docs_version = "71d71d4be238628bf9cb9b27be79b8bb824ed1a9"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; - hash = "sha256-/hdT4Y8L1tPJtXhoyAEa59BWpuurcGcGOWoV71MScl4="; + pname = "git_filter_repo"; + inherit version; + hash = "sha256-L6gP+NpUOCpuGJvBUi3Jhu56UqvL6eKBkvc8D2yLXqk="; }; docs = fetchFromGitHub { owner = "newren"; repo = "git-filter-repo"; rev = docs_version; - hash = "sha256-Z/3w3Rguo8sfuc/OQ25eFbMfiOHjxQqPY6S32zuvoY4="; + hash = "sha256-m9NI7bLR5F+G7f3Dyi4sP6n4qz2i8cdBRuIn0OcpHAw="; }; - patches = [ - # https://github.com/newren/git-filter-repo/pull/498 - (fetchpatch { - name = "remove-duplicate-script.patch"; - url = "https://github.com/newren/git-filter-repo/commit/a59e67e7918e577147ca36a70916741be029c878.patch"; - hash = "sha256-b0QHy9wMWuBWQoptdvLRT+9SRx2u2+11PnzEEB5F0Yo="; - stripLen = 1; - }) - ]; - postInstall = '' installManPage ${docs}/man1/git-filter-repo.1 ''; @@ -56,8 +46,8 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly rewrite git repository history"; - mainProgram = "git-filter-repo"; homepage = "https://github.com/newren/git-filter-repo"; + changelog = "https://github.com/newren/git-filter-repo/releases/tag/v${version}"; license = with licenses; [ mit # or gpl2Plus @@ -66,6 +56,7 @@ buildPythonPackage rec { aiotter fab ]; + mainProgram = "git-filter-repo"; }; passthru.updateScript = writeScript "update-${pname}" '' diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 422b7b52c3c56..6de58d1edd01a 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/gitpython-developers/gitdb"; changelog = "https://github.com/gitpython-developers/gitdb/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 85e581200fdef..5d69969fa5dce 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -8,6 +8,7 @@ poetry-core, pydantic, pyjwt, + pytest-cov-stub, pytest-xdist, pytestCheckHook, pythonOlder, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.6"; + version = "0.11.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,14 +26,9 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-bcQUms4nZ4BUowcF3YxTQPc6Ts6VoRumEA0DuCPQpfg="; + hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov=githubkit --cov-append --cov-report=term-missing" "" - ''; - pythonRelaxDeps = [ "hishel" ]; build-system = [ poetry-core ]; @@ -61,6 +57,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pytest-xdist ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index a7f45bd7b3dbc..8b6e93e2fe802 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -6,7 +6,6 @@ gitdb, pkgs, pythonOlder, - substituteAll, typing-extensions, }: diff --git a/pkgs/development/python-modules/glad/default.nix b/pkgs/development/python-modules/glad/default.nix index 56eeb3f9047e7..8c9b40345a73d 100644 --- a/pkgs/development/python-modules/glad/default.nix +++ b/pkgs/development/python-modules/glad/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { mainProgram = "glad"; homepage = "https://github.com/Dav1dde/glad"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index 4ad9fa3060900..a62e403fc2603 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "OpenGL implementation for ModernGL"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index bf22e5bce9196..9fc995c3270a4 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -8,43 +8,39 @@ jinja2, jsonschema, pytestCheckHook, - pythonOlder, pyyaml, setuptools, setuptools-scm, - yamllint, }: buildPythonPackage rec { pname = "glean-parser"; - version = "14.1.2"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "14.5.0"; + pyproject = true; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-OL59Tg+rD4M0DjQnkU4IqGMcf6sIioxg6bVDyrbqgww="; + hash = "sha256-/j96nM3vW1HpfaxFMyumIj1IccjUcK6lySuTiKf5kLA="; }; postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" \ - --replace "MarkupSafe>=1.1.1,<=2.0.1" "MarkupSafe>=1.1.1" + --replace-fail "pytest-runner" "" ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ appdirs click diskcache jinja2 jsonschema pyyaml - setuptools - yamllint ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -63,12 +59,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "glean_parser" ]; - meta = with lib; { + meta = { description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK"; mainProgram = "glean_parser"; homepage = "https://github.com/mozilla/glean_parser"; changelog = "https://github.com/mozilla/glean_parser/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ ]; + license = lib.licenses.mpl20; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 6a577a000f60b..5dea3e4736652 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -2,55 +2,41 @@ stdenv, lib, buildPythonPackage, - cargo, - cffi, - fetchPypi, + fetchFromGitHub, glean-parser, - iso8601, - lmdb, - pkg-config, pytest-localserver, pytestCheckHook, - python, - pythonOlder, - rustc, rustPlatform, semver, - setuptools-rust, + setuptools, }: buildPythonPackage rec { pname = "glean-sdk"; - version = "52.7.0"; - format = "setuptools"; + version = "60.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-sLjdGHiS7Co/oA9gQyAFkD14tAYjmwjWcPr4CRrzw/0="; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "glean"; + rev = "v${version}"; + hash = "sha256-C3wQdxPNBPQN6eUK6Vq0bA6Wpqb28e9BTBf7c/hTQxU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-5TlgWcLmjklxhtDbB0aRF71iIRTJwetFj1Jii1DGdvU="; + hash = "sha256-XqOCHnvM64kZNifU5Wt/bFAvyRVy28ozWSwlvm/sMk8="; }; - nativeBuildInputs = [ - cargo - pkg-config - rustc + build-system = [ rustPlatform.cargoSetupHook - setuptools-rust + rustPlatform.maturinBuildHook + setuptools ]; - buildInputs = [ lmdb ]; - - propagatedBuildInputs = [ - cffi + dependencies = [ glean-parser - iso8601 semver ]; @@ -59,23 +45,23 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ "glean-core/python/tests" ]; + disabledTests = [ # RuntimeError: No ping received. "test_client_activity_api" "test_flipping_upload_enabled_respects_order_of_events" + # A warning causes this test to fail + "test_get_language_tag_reports_the_tag_for_the_default_locale" ]; - postInstallCheck = lib.optionalString stdenv.hostPlatform.isElf '' - readelf -a $out/${python.sitePackages}/glean/libglean_ffi.so | grep -F 'Shared library: [liblmdb.so' - ''; - pythonImportsCheck = [ "glean" ]; - meta = with lib; { + meta = { broken = stdenv.isDarwin; description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; - license = licenses.mpl20; - maintainers = with maintainers; [ melling ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ melling ]; }; } diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index 2dcae7a38566e..6ceaca44406b4 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/pkgs/development/python-modules/glob2/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { ${python.interpreter} test.py ''; - meta = with lib; { + meta = { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; homepage = "https://github.com/miracle2k/python-glob2/"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index 1db27a1d72823..4f13f73214e73 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -3,69 +3,66 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - dill, astropy, + dill, + echo, + fast-histogram, + h5py, + ipython, + matplotlib, + mpl-scatter-density, numpy, + openpyxl, pandas, - qt6, - pyqt6, pyqt-builder, - qtconsole, + pytestCheckHook, + qt6, + scipy, setuptools, setuptools-scm, - scipy, - ipython, - ipykernel, - h5py, - matplotlib, + shapely, xlrd, - mpl-scatter-density, - pvextractor, - openpyxl, - echo, - pytest, - pytest-flakes, - pytest-cov, }: buildPythonPackage rec { pname = "glueviz"; - version = "1.21.0"; - format = "setuptools"; + version = "1.21.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "glue-viz"; repo = "glue"; rev = "refs/tags/v${version}"; - sha256 = "sha256-C9UqDdhPcaznidiDlQO27Vgct2MT9gVlH740hoYg3Bc="; + hash = "sha256-/awIgfKbDFKM2WFlfpo5f/Px/N1aMXkV9eSTXts0aGo="; }; buildInputs = [ pyqt-builder ]; - nativeBuildInputs = [ + + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + + build-system = [ setuptools setuptools-scm - qt6.wrapQtAppsHook ]; - propagatedBuildInputs = [ + + dependencies = [ astropy dill - setuptools - scipy - numpy - matplotlib - pandas - pyqt6 - qtconsole - ipython - ipykernel + echo + fast-histogram h5py - xlrd + ipython + matplotlib mpl-scatter-density - pvextractor + numpy openpyxl - echo + pandas + scipy + setuptools + shapely + xlrd ]; dontConfigure = true; @@ -74,14 +71,12 @@ buildPythonPackage rec { # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. doCheck = false; - nativeCheckInputs = [ - pytest - pytest-flakes - pytest-cov - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "glue" ]; + dontWrapQtApps = true; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 611c87e1fe3a9..f54ccc14df0cc 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glymur"; - version = "0.13.2"; + version = "0.13.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "quintusdias"; repo = "glymur"; rev = "refs/tags/v${version}"; - hash = "sha256-GUqe9mdMm2O/cbZw8Reohh4X1kO+xOMWHb83PjNvdu8="; + hash = "sha256-RzRZuSNvlUrB+J93a1ob7dDMacZB082JwVHQ9Fce2JA="; }; patches = [ @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = { description = "Tools for accessing JPEG2000 files"; homepage = "https://github.com/quintusdias/glymur"; - changelog = "https://github.com/quintusdias/glymur/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/quintusdias/glymur/blob/${src.rev}/CHANGES.txt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tomasajt ]; }; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index d58f39b9c633a..043fce83f167e 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.7.1"; + version = "6.7.2"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-mUwbUGLhxwoYEwjbT558rTA8dtWxQXyqWYNEVy/WpIU="; + hash = "sha256-wiDLFRoP7MBzZuDA5drdXPS58Mhrw83xUKES3b1tBow="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index 8ae218aaa9227..c87af7633b86f 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -4,23 +4,25 @@ fetchFromGitHub, requests, six, + setuptools, pytestCheckHook, responses, - nose, }: buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.52.0"; - format = "setuptools"; + version = "1.53.0"; + pyproject = true; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Oi68s4x/rS8ahvJ9TsniYfDidCxtvcvsMwYhJirYlP0="; + hash = "sha256-Z58akjaYuvKVQWFfiP5TZlM/+4CB/vmLzd4eWmnWV90="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ requests six @@ -31,7 +33,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook responses - nose ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 10fb6837f5eea..662631c36fb2a 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FznwNcru7KXCj4h0Be7IaQ8zctr3n+zyZFSpek8XM6g="; + hash = "sha256-6eLvojtiwxGPhkFu75zEgBkjDScVxVWsYfnh6oBQMTI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index cbff06c5d889f..ccfeaa3debacb 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -85,6 +85,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-api-core"; changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index c31e4c81359f3..3cb93fc574194 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/google-api-python-client"; changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index cfa2a0ba47a6f..ef1ad2a2fa901 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; changelog = "https://github.com/googleapis/google-auth-library-python-httplib2/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index d086f02de5c00..5556429082f11 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -103,6 +103,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-auth-library-python"; changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 08770d71976d7..0aa83d81b55a2 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.4.3"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-+1BOYZn+jehbqp0xzs9ndod4Uf5Yhn3mAzF+x8xzmYc="; + pname = "google_cloud_appengine_logging"; + inherit version; + hash = "sha256-3n12bl1nsZ/Fgzl0tQWzLSpbvfsoP9lB4yDnz9rky4M="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 proto-plus diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 494e8bae5252f..9fd7a92d85ec6 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.3"; + version = "1.11.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wsSeFbtZHWXeoiyC2lUUjFE09xkZuu+OtNNb4dHLIM0="; + hash = "sha256-Rf1kC+XSFciXMeZ2LjdkqQ0AYQZ0cdN2TvccGvOXgkk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 88ec60d0c1d75..350faaddb76d4 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.26.1"; + version = "3.26.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5O3ge5/ot0zQoLKKPP6E7M2RVtDxnYfe2J0iYJISWX4="; + hash = "sha256-DCFDVdtuXwY7hphChHSzCTc8hw8MEohX67SRGOaRQ6A="; }; build-system = [ setuptools ]; @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v${version}/packages/google-cloud-asset/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 93907bcf7eafd..113e8a0c3dda9 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-audit-log"; changelog = "https://github.com/googleapis/python-audit-log/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index a8240580d12e8..43c6da42b468b 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.13.3"; + version = "2.13.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iRqQgurt6xe8W7ck/BULdwLGhNdCD58irj98X8YRxxo="; + hash = "sha256-NxAoob0wJKobtcEQNTgH+fylnTtJdL98h23IVNfLhew="; }; nativeBuildInputs = [ setuptools ]; @@ -74,6 +74,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-automl"; changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-automl-v${version}/packages/google-cloud-automl"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index fbec33fc371c6..7830d012c7c72 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.3"; + version = "3.15.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5MhO7TEgnEO0PwjdpzB+7AZmokMdjAh6z0poKtQfOrE="; + hash = "sha256-rjVTnrJIUMJsnh/vdpiiL9e4g0iZP9ftYksVQd6cG4M="; }; build-system = [ setuptools ]; @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-datatransfer"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v${version}/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index b89159c5838e0..7f671c9eff4e3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.4.3"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-7RqwaSthQcwGebhi5F/V//WxBIp5upVS0ToDDsjyURY="; + pname = "google_cloud_bigquery_logging"; + inherit version; + hash = "sha256-XrBXr0Y1vpxWceSR59ERQJKziMBI4+QBoHWK0Wt1cec="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 proto-plus diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 2326fb680467e..807c9c8acb91b 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery-storage"; changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 7062b2b2e3d84..d9ea0eba51ba7 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -132,6 +132,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigquery"; changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 30c5087f0d4a2..116e83effc962 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-bigtable"; changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index b7f89a66dd6da..1613121d34003 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oHs0CLP3d4bcsZZmn/N2e8UQgHGKfC0/13ne/I2Be00="; + hash = "sha256-a0pbhsLLvNpd2Q9OM4xRA/PoRgTs+wAtTss6DF1BUxs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 5ec6a9d49cd06..16794b8df65ba 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.47.0"; + version = "2.49.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tvzOKTu2n5b9JDo9EJw48BUrJuOwOR9JK6PQyi44HfI="; + hash = "sha256-HBZFJ5oUVS1PIS/WBm4Xt/D0S+OGuM7gV43mInN8Lv8="; }; build-system = [ setuptools ]; @@ -56,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v${version}/packages/google-cloud-container/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 3213156bb49ac..bd5fbf7ee044b 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-cloud-core"; changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index afdb8dcf4eb24..2aab9d33f9487 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.19.0"; + version = "3.19.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Oo0O94fw7dRwPn4nyRobX4W9vgTWFgkTLsdyaffVJpI="; + hash = "sha256-BqD8VvOHrJw42atKxRyaWxaA1afzTlo52LPkuEk7+8E="; }; build-system = [ setuptools ]; @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-datacatalog"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v${version}/packages/google-cloud-datacatalog/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 05040c6ae1c96..456411f13f9a6 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataproc"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dataproc-v${version}/packages/google-cloud-dataproc/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index fbce5713a507f..44f38f1e9ba4e 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-datastore"; changelog = "https://github.com/googleapis/python-datastore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 3772f823e92ae..6a7ddacb06494 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.18.0"; + version = "3.18.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R0CMx16DmMfc6Tw/YqPthYKyDxJcyODdMxAVrj62L34="; + hash = "sha256-KYqhwSa9Z+1s41Ve+GGbnR0BfSZE5UwAqgmqEWfxOC0="; }; nativeBuildInputs = [ setuptools ]; @@ -53,9 +53,9 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; - homepage = "https://github.com/googleapis/python-dlp"; - changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dlp"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dlp-v${version}/packages/google-cloud-dlp/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 0ab6d3f677e9f..12da5d31a7cf3 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-dns"; changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 5c60a79bd6133..56e898a15bfd1 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-error-reporting"; changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 43fa37d3aabff..ce88d28953628 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.16.1"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M4HrgpbtECjZtCGqQrkQDxmMWH+OM8AF0xplVnALda4="; + hash = "sha256-PoG3HZY7fjvMh/uBMjbzhkvHsKPyB6xNh7xlle/iuKM="; }; build-system = [ setuptools ]; @@ -74,6 +74,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-firestore"; changelog = "https://github.com/googleapis/python-firestore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 13e45e3f02d61..a5fd7575a29c9 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.3"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-99YYGGrI8zg+cwdVKqFVneL0jTzO7GJq91O/Kk0lGJM="; + pname = "google_cloud_iam_logging"; + inherit version; + hash = "sha256-B/OE8m6CpTddR+nAv9OP/y1V1c32/cUZPzfptAOuMrw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core grpc-google-iam-v1 proto-plus diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 7fe73ddf3c916..4cd4dc257fda9 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-iot"; changelog = "https://github.com/googleapis/python-iot/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 5a9c25bfc20ff..ff28fe3dfcb68 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v${version}/packages/google-cloud-kms/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 75c88a69744be..04f88778036e4 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.13.3"; + version = "2.13.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vp01Jgr5Bt4luOKna2Nk4FgJuEU6/Ynac41KT8uQhG8="; + hash = "sha256-j8ZgMxoTxkDbdqSLrBP56AIBJjGvm63TViaep/Z3xZI="; }; nativeBuildInputs = [ setuptools ]; @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v${version}/packages/google-cloud-language/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 95b237af99848..9fbd08a30863a 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -86,6 +86,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-logging"; changelog = "https://github.com/googleapis/python-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index fb5e089228f7f..5b6c969a9ce39 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.22.0"; + version = "2.22.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SUaW4XiMVe9bL61GSBP92fWRF/wogZt9nSehhz17f60="; + hash = "sha256-2xexWvjUfaDPj7DjZfqvvNEfmqYngc4EjCmYiAiz3H0="; }; build-system = [ setuptools ]; @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-monitoring"; changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-monitoring-v${version}/packages/google-cloud-monitoring"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 75cdea2190971..66b341273fd2c 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.10"; + version = "0.3.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Bau1Xqb+lmG6aCoWm93mtfOII7CbnnaeZ5vmLp6n0Zs="; + hash = "sha256-VFdqldB85ZP+U2CNk19nSbgRFa0UnUc0kq9oNW5nJqs="; }; build-system = [ setuptools ]; @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index ca1b446f92320..e4c45f2e3fb4a 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.17.3"; + version = "1.17.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oKOqWVmAP14dKpbVDlcX2KSRceTqVES/UGlLsYtnWHA="; + hash = "sha256-ocZ41cEZVjSfFMVoNiPOxwaymn9eylWmw6qlp/R/yMQ="; }; nativeBuildInputs = [ setuptools ]; @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-os-config"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-os-config-v${version}/packages/google-cloud-os-config/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 4f4877e3589a8..94b11b4513fc8 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,14 +18,15 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.21.5"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-T6lufyADWczEnPZlfjGsNfXm5V0A+7PO36ZykDz3WyQ="; + pname = "google_cloud_pubsub"; + inherit version; + hash = "sha256-zz1vKrEbXI38CqfUyuXuHWa0CNlmbxdiycF+JpzYtlg="; }; build-system = [ setuptools ]; @@ -64,10 +65,10 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Pub/Sub API client library"; - mainProgram = "fixup_pubsub_v1_keywords.py"; homepage = "https://github.com/googleapis/python-pubsub"; changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; + mainProgram = "fixup_pubsub_v1_keywords.py"; }; } diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 5dd7405a8d114..83a14eb68c4f8 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.15.3"; + version = "2.15.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5qIx5FEHA4z+SY360fba0sp73KOpMTI3ML4Dq3oACo8="; + hash = "sha256-vG8+mL1A5j9Cuwzmz+aYbjmYXWlGCzriDNtQoLbwmoU="; }; nativeBuildInputs = [ setuptools ]; @@ -44,9 +44,9 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Memorystore for Redis API client library"; - homepage = "https://github.com/googleapis/python-redis"; - changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-redis"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-redis-v${version}/packages/google-cloud-redis/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 5e7f3530cb5ee..6cb795d073f36 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.12.3"; + version = "1.12.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gJhRgkEZg05PIxCyxPOGIcHRayuxTVufEy5px501Xn8="; + hash = "sha256-PtqRSpJekkZe+A+qq34PepMS1IbdThI9LHbgS6xoj/A="; }; nativeBuildInputs = [ setuptools ]; @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 82cd2b45ecbbf..7f6cc83c1c974 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-runtimeconfig"; changelog = "https://github.com/googleapis/python-runtimeconfig/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 01a271e84ae6b..3b30ec1851c89 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.20.0"; + version = "2.20.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oIanQTqvT/+9HE/pIp7wzpvPSPWo31tEnEoy3rWiz94="; + hash = "sha256-kcpPVCTYDOT1543sqCmW7jh7jI4GDRaYFpDjHjpCE4s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 79071c30d32e8..1a45f67cb5df0 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.32.0"; + version = "1.33.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EQ3KkE+5mxaFrJ6+zfGFQKI013dY4TyrxxzvDE/KuME="; + hash = "sha256-/BsKTEMKyj+dTRIutNMu3JP/DHgHBNgvJvp+ehb58nk="; }; build-system = [ setuptools ]; @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-securitycenter"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v${version}/packages/google-cloud-securitycenter/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix index ae5b9b7483082..1e9bbb918ff18 100644 --- a/pkgs/development/python-modules/google-cloud-shell/default.nix +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-shell"; - version = "1.9.3"; + version = "1.9.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-33TZcRsOWP8PBAXFHy9DQn20bVECwD2wv7hcaYl0E8Y="; + pname = "google_cloud_shell"; + inherit version; + hash = "sha256-UpDomrWUTrsiI+OdrI5nJKC/J+eaZiNDmMt0QgcP5Fw=="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-auth proto-plus diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 671c5fc37e2ad..421f2ade417bd 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, deprecated, - fetchPypi, + fetchFromGitHub, google-api-core, google-cloud-core, google-cloud-testutils, @@ -21,14 +21,16 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.45.0"; + version = "3.48.0"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-MKtW6krGqnQ3hCmPgh4N5lRAGTe0DGDMegpUUoSpG0M="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-spanner"; + rev = "refs/tags/v${version}"; + hash = "sha256-QgLZQ0rgBEmYDAE16K84bSx4bFWJRviY1WqsVwKcO6w="; }; build-system = [ setuptools ]; @@ -60,6 +62,13 @@ buildPythonPackage rec { rm -r google ''; + disabledTests = [ + # Requires credentials + "test_list_backup" + "test_list_database" + "test_list_instance" + ]; + disabledTestPaths = [ # Requires credentials "tests/system/test_backup_api.py" @@ -72,6 +81,7 @@ buildPythonPackage rec { "tests/unit/spanner_dbapi/test_connect.py" "tests/unit/spanner_dbapi/test_connection.py" "tests/unit/spanner_dbapi/test_cursor.py" + "samples/samples/" ]; pythonImportsCheck = [ @@ -86,6 +96,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-spanner"; changelog = "https://github.com/googleapis/python-spanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index e1875f677afaa..fd1d084cd14f4 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.26.0"; + version = "2.26.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0xVqeElq6s/0A0KUCKGxPv6ZbabwVEolVnkErYAWcdU="; + hash = "sha256-EqzrAuNMFO1J7qMQKufndt/Yciur3RRm3k2w3owfkak="; }; nativeBuildInputs = [ setuptools ]; @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-speech"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-speech-v${version}/packages/google-cloud-speech/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 3d47efcfcfbb6..4a5081468f9c5 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -94,6 +94,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-storage"; changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 215fe74b66cff..144f568cd484c 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.16.3"; + version = "2.16.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2JH+cAbbTWEig4qm3krKbgB3urIk7crmhGZq4+MDxF8="; + hash = "sha256-YQM8Ht19xao7n75cjetkvgxQ4LrunZRl8/i3WyzaVbk="; }; nativeBuildInputs = [ setuptools ]; @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-tasks"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-tasks-v${version}/packages/google-cloud-tasks/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 15d8d226d50bd..e62d47e372496 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-test-utils"; changelog = "https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 7adb663194b91..80b22fb2ecd92 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.16.3"; + version = "2.16.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+rwxUDLRN9oHELtMJoc00zYhLY+oMWsjsnfdOoTOchw="; + hash = "sha256-B7fioSbikhnSAk3WnkDLMf8IBb2uSVfcukUsatSGJAU="; }; nativeBuildInputs = [ setuptools ]; @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-texttospeech"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-texttospeech-v${version}/packages/google-cloud-texttospeech/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 9bfed30a71b63..caf839ce54c2a 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.13.3"; + version = "1.13.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NqwuM94NsBf/0vY9jWTct1vpETzPpN5JYvRzfv1srIA="; + hash = "sha256-wCO8ySoD2iAsA0ydtQki65yw1qteAHn1EUFLFhV0qdQ="; }; nativeBuildInputs = [ setuptools ]; @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-trace"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-trace-v${version}/packages/google-cloud-trace/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 919a21471a8b6..f3cbe6abc8551 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.15.3"; + version = "3.15.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7Vh6HmDPhHw7Gt1rKCVuLRci+nOkKFM09excqTPmFvI="; + hash = "sha256-nZ3YzyJe+fsGdahvkuecrDKVoo0JpEeeEj7wy+VHSWs="; }; nativeBuildInputs = [ setuptools ]; @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-translate"; changelog = "https://github.com/googleapis/python-translate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 22182e2500a81..bf5358dce44cc 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.3"; + version = "2.13.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FGByHYEgZhxHfAGvDt09sDhFhX9SFGpKOfFrSs+zb20="; + hash = "sha256-bwKYqNnttZCXte51PeXdcfN6kmbJpMXq4/tNDSQLEMA="; }; nativeBuildInputs = [ setuptools ]; @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-videointelligence"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-videointelligence-v${version}/packages/google-cloud-videointelligence/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 3213316718597..75cc08070a317 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.7.2"; + version = "3.7.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BEMwrWGMgQMz/yKWzSf/0UXySWONGzWycN5rRgsA6NI="; + hash = "sha256-7kjEjoIMfgmTJmOYaXD+9FbcD0XHr3KdRvHz3ZfB37Y="; }; nativeBuildInputs = [ setuptools ]; @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-vision"; changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index c29a042394478..8bdcc432a84b7 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.10.3"; + version = "1.10.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-mkDYB4HFJEu1ZRKo58s5a9lZjQ0pUs6nOBMnm27ajeM="; + pname = "google_cloud_vpc_access"; + inherit version; + hash = "sha256-ee0O0MDo3VEUuansbm0Io35g/8aRA2ShoZh+IfwQAww="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-auth proto-plus diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index aaeab75a44c85..0a11573eb6828 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -15,19 +15,20 @@ buildPythonPackage rec { pname = "google-cloud-webrisk"; - version = "1.14.3"; + version = "1.14.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-VrfIVy3qGEMfFUiJ27zZPjBaWIPZX/qraga/+FfJol4="; + pname = "google_cloud_webrisk"; + inherit version; + hash = "sha256-zlJhVcoqagtodRCVUVlWZODH+C7/H1KIj7vBYkZUs2A="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-auth proto-plus diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 624ce66ed720f..5c55dd74169b5 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.14.3"; + version = "1.14.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wp88cJqlAaAkaemHzkgKuhU4v4dFpgn5Sf+uqGKTeWQ="; + hash = "sha256-JqI7ELEfq8MUEdk5PI94YZHUc0Hyf3V1qb1ORXPBUz4="; }; nativeBuildInputs = [ setuptools ]; @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-websecurityscanner"; changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-websecurityscanner-v${version}/packages/google-cloud-websecurityscanner"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 95bf8d056e257..9d77226951ea5 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -14,19 +14,20 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.14.3"; + version = "1.14.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-IUC5f3gDe5Z9QYVXaIZ3L+F7530q6ZltIHozTtWnf/4="; + pname = "google_cloud_workflows"; + inherit version; + hash = "sha256-HNur2TEVRf8+sg6r8qmE62ZsOP0lF2ma1Fpp85lmfoM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core proto-plus protobuf diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix index 88ccbf44d9aae..7fb70589b7181 100644 --- a/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -16,19 +16,20 @@ buildPythonPackage rec { pname = "google-cloud-workstations"; - version = "0.5.6"; + version = "0.5.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-K6Qq243bX3waymyGcirLAANqmP0UAUgFS3kidwCFYBE="; + pname = "google_cloud_workstations"; + inherit version; + hash = "sha256-Xu7oL5R/K3oHMea1xCwRLPoxgPNMFRSMYCQ73K9sMgQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ google-api-core google-auth grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 69882392bb98b..ae1bdc82ae7f5 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-4pfcZIRPxkZkKjzYtOn3r7mn0pJZeUzkYidZmePgDys="; + hash = "sha256-KVKoPCpMaaVMU6VqYXD7vHmhv1AS5slRobRVDDuaDHc="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 47355a45ffdf2..d13183bacf354 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/mirumee/google-i18n-address"; changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index bcfbd6744dd6f..dea16732f29a7 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.1.20240601"; + version = "1.1.20240702"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_re2"; inherit version; - hash = "sha256-MYf2iFUwd1TUnzmOWDhT1bCNeD0/5mL2kWuZkHX34JU="; + hash = "sha256-h4jbafbJPLIp32LHSy2aqOZL91TpSVcA+FgSr6Mu/Ss="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index f5975586735c6..504987669e7e3 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; changelog = "https://github.com/googleapis/google-resumable-media-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 9e62755a0e111..eb4d8e5944aeb 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Common protobufs used in Google APIs"; homepage = "https://github.com/googleapis/python-api-common-protos"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index e2f3658e135a1..e86eb4e6e0e48 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-38s7XLCh55uXxu/Go04Ku/m4xeqAAa2sRe4SiqIXolU="; + hash = "sha256-rF4msWYWgNUtOnMAB11vdAPNWZeAoeglnzMPWEM503I="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index c9a97a114c956..840c0d0ae65ff 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.31.3"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-Gb9k2MieRKSJeKpmltL9HYA7pYKTSTWLGDgo52mY6xA="; + hash = "sha256-w21paR1VTV/ZFnl9SKkJmFFDZMPgA3d7P6blceVvnVk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index da55f64055d59..cd6ce736d2a62 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/NoMore201/googleplay-api"; license = licenses.gpl3Only; description = "Google Play Unofficial Python API"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index a7535c813b6ff..7f1e5ce0e4764 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Python interface to libgphoto2"; homepage = "https://github.com/jim-easterbrook/python-gphoto2"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index cf427d0560c29..9303ef9d1450e 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -70,6 +70,6 @@ buildPythonPackage rec { homepage = "https://github.com/matlink/gplaycli"; changelog = "https://github.com/matlink/gplaycli/releases/tag/${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix index e2908da74f70a..6d12f2629793d 100644 --- a/pkgs/development/python-modules/gpt-2-simple/default.nix +++ b/pkgs/development/python-modules/gpt-2-simple/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Easily retrain OpenAI's GPT-2 text-generating model on new texts"; homepage = "https://github.com/minimaxir/gpt-2-simple"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index bd7e8276ef989..3613f16bd6068 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gptcache"; - version = "0.1.43"; + version = "0.1.44"; format = "setuptools"; disabled = pythonOlder "3.8.1"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zilliztech"; repo = "GPTCache"; rev = "refs/tags/${version}"; - hash = "sha256-EDsHzl55j4sehbKk0/be+WOl83f1/7zPLvPyzKnTBP4="; + hash = "sha256-FRqngDyGO0ReTRtm9617TFLHVXWY9/NQlZHlBP8ukg0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 27bc11f0ee0e1..cb449dc56d611 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gpytorch"; - version = "1.11"; + version = "1.12"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; - rev = "v${version}"; - hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; + rev = "refs/tags/v${version}"; + hash = "sha256-8W0QSiXl+C86m5yaI9KfGN92uA2VGjGwQt6DI/1NaQE="; }; patches = [ diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 1c7a51dd2aa81..ed2d52c30c391 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -14,7 +14,6 @@ httpx, huggingface-hub, packaging, - requests, typing-extensions, websockets, # checkInputs @@ -28,7 +27,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "1.0.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +39,7 @@ buildPythonPackage rec { # not to be confused with @gradio/client@${version} rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-nbOWg2ZPcXTft7e4tR5p5xecVU62en0hEdXqAgLDZF4="; + hash = "sha256-l5WHNerSYNXrFGOpAqxxh0JLiFpatxq6a62q83tEavo="; }; prePatch = '' cd client/python diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 5cc026cd3f2a4..a25d8baa10d35 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -15,7 +15,7 @@ # runtime setuptools, aiofiles, - altair, + anyio, diffusers, fastapi, ffmpy, @@ -47,6 +47,7 @@ # check pytestCheckHook, + altair, boto3, gradio-pdf, ffmpeg, @@ -62,7 +63,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.36.1"; + version = "4.40.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -70,7 +71,7 @@ buildPythonPackage rec { # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-crLSEVbTRnEjuubzD0Y/AC7wbicnZidDCPXtPKw3Vjs="; + hash = "sha256-ChV5E6RfFcOwW6uFqU4/phfHfn27yS8+MKjMVytnlgU="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -98,7 +99,7 @@ buildPythonPackage rec { dependencies = [ setuptools # needed for 'pkg_resources' aiofiles - altair + anyio diffusers fastapi ffmpy @@ -123,7 +124,7 @@ buildPythonPackage rec { uvicorn typer tomlkit - ] ++ typer.passthru.optional-dependencies.all; + ]; passthru.optional-dependencies.oauth = [ authlib @@ -132,6 +133,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + altair boto3 gradio-pdf ffmpeg @@ -183,6 +185,9 @@ buildPythonPackage rec { # fails without network "test_download_if_url_correct_parse" + # flaky: OSError: Cannot find empty port in range: 7860-7959 + "test_docs_url" + # tests if pip and other tools are installed "test_get_executable_path" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index 7cdb0a533b28d..b3792237f2d5c 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -34,12 +34,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.71"; + version = "2.72"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-MVeEEAxvc6fEmQatlTn9XGCOTNkcCv8ouNbYqL69A8U="; + hash = "sha256-fInEzyauJPTjOU4XAR0TkIDbpAjli+rpzH++iztunHQ="; }; # Remove error messages about tput during build process without adding ncurses, diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index bea97bea98f7b..db44239de0b57 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/graphql-python/graphene"; changelog = "https://github.com/graphql-python/graphene/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 8da175e4f5737..2a861bd8d339c 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, python, cairocffi, diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 75b0471211765..a358ab4fe9141 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Library to help construct a graphql-py server supporting react-relay"; homepage = "https://github.com/graphql-python/graphql-relay-py/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix new file mode 100644 index 0000000000000..d00cc1b4b26e8 --- /dev/null +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -0,0 +1,129 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + aiofiles, + aiolimiter, + azure-identity, + azure-search-documents, + azure-storage-blob, + datashaper, + devtools, + environs, + fastparquet, + graspologic, + json-repair, + lancedb, + networkx, + nltk, + numba, + numpy, + openai, + pyaml-env, + pydantic, + python-dotenv, + pyyaml, + rich, + scipy, + swifter, + tenacity, + textual, + tiktoken, + typing-extensions, + uvloop, + nbformat, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "graphrag"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "graphrag"; + rev = "refs/tags/v${version}"; + hash = "sha256-X4mhnKSaQQo0i10EsdaDtMgKwfBxFvOOrkDrkUM2cQI="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + pythonRelaxDeps = [ + "aiofiles" + "azure-identity" + "json-repair" + "lancedb" + "scipy" + "tenacity" + "textual" + "tiktoken" + ]; + + dependencies = [ + aiofiles + aiolimiter + azure-identity + azure-search-documents + azure-storage-blob + datashaper + devtools + environs + fastparquet + graspologic + json-repair + lancedb + networkx + nltk + numba + numpy + openai + pyaml-env + pydantic + python-dotenv + pyyaml + rich + scipy + swifter + tenacity + textual + tiktoken + typing-extensions + uvloop + ]; + + env.NUMBA_CACHE_DIR = "$TMPDIR"; + + pythonImportsCheck = [ "graphrag" ]; + + nativeCheckInputs = [ + nbformat + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit" ]; + + disabledTests = [ + # touch the network + "test_child" + "test_dotprefix" + "test_find" + "test_run_extract_entities_multiple_documents" + "test_run_extract_entities_single_document" + ]; + + meta = { + description = "Modular graph-based Retrieval-Augmented Generation (RAG) system"; + homepage = "https://github.com/microsoft/graphrag"; + changelog = "https://github.com/microsoft/graphrag/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock b/pkgs/development/python-modules/graspologic-native/Cargo.lock index 5e698d4ff735e..e2133ee8c5d53 100644 --- a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock +++ b/pkgs/development/python-modules/graspologic-native/Cargo.lock @@ -1,114 +1,122 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] -name = "ahash" -version = "0.4.7" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] -name = "assert_approx_eq" -version = "1.1.0" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] [[package]] -name = "autocfg" -version = "1.0.1" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] [[package]] -name = "bitflags" -version = "1.2.1" +name = "atty" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] [[package]] -name = "byteorder" -version = "1.4.2" +name = "autocfg" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] -name = "cfg-if" -version = "1.0.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "const_fn" -version = "0.4.5" +name = "bumpalo" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] -name = "crossbeam-channel" -version = "0.5.0" +name = "cc" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] -name = "crossbeam-deque" -version = "0.8.0" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "crossbeam-epoch" -version = "0.9.1" +name = "chrono" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "cfg-if", - "const_fn", - "crossbeam-utils", - "lazy_static", - "memoffset", - "scopeguard", + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets", ] [[package]] -name = "crossbeam-utils" -version = "0.8.1" +name = "clap" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "autocfg", - "cfg-if", - "lazy_static", + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", ] [[package]] -name = "ctor" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" +name = "cli" +version = "0.1.0" dependencies = [ - "quote", - "syn", + "clap", + "network_partitions", + "rand", + "rand_xorshift", ] [[package]] -name = "either" -version = "1.6.1" +name = "core-foundation-sys" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -116,38 +124,46 @@ dependencies = [ ] [[package]] -name = "ghost" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" +name = "graspologic_native" +version = "1.2.1" dependencies = [ - "proc-macro2", - "quote", - "syn", + "chrono", + "network_partitions", + "pyo3", + "rand", + "rand_xorshift", ] [[package]] -name = "glob" -version = "0.3.0" +name = "hermit-abi" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] -name = "hashbrown" -version = "0.9.1" +name = "iana-time-zone" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ - "ahash", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", ] [[package]] -name = "hermit-abi" -version = "0.1.18" +name = "iana-time-zone-haiku" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "libc", + "cc", ] [[package]] @@ -169,131 +185,79 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unindent", ] [[package]] name = "instant" -version = "0.1.9" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] [[package]] -name = "inventory" -version = "0.1.10" +name = "js-sys" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ - "ctor", - "ghost", - "inventory-impl", + "wasm-bindgen", ] [[package]] -name = "inventory-impl" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] name = "libc" -version = "0.2.86" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "lock_api" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "memoffset" -version = "0.6.1" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", + "scopeguard", ] [[package]] -name = "num-bigint" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.3.1" +name = "log" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +name = "network_partitions" +version = "0.1.0" dependencies = [ - "autocfg", - "num-traits", + "chrono", + "rand", + "rand_xorshift", ] [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.13.0" +name = "once_cell" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", @@ -302,9 +266,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -335,118 +299,98 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proptest" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" -dependencies = [ - "bitflags", - "byteorder", - "lazy_static", - "num-traits", - "quick-error", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", + "unicode-ident", ] [[package]] name = "pyo3" -version = "0.13.2" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" dependencies = [ - "assert_approx_eq", "cfg-if", - "ctor", - "hashbrown", "indoc", - "inventory", "libc", - "num-bigint", - "num-complex", "parking_lot", "paste", - "proptest", - "pyo3", + "pyo3-build-config", "pyo3-macros", - "rustversion", - "serde", - "serde_json", - "trybuild", "unindent", ] [[package]] +name = "pyo3-build-config" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +dependencies = [ + "once_cell", +] + +[[package]] name = "pyo3-macros" -version = "0.13.2" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" dependencies = [ "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.13.2" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" dependencies = [ "proc-macro2", + "pyo3-build-config", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] name = "quote" -version = "1.0.9" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "getrandom", "libc", "rand_chacha", "rand_core", - "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core", @@ -454,229 +398,255 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_xorshift" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ "rand_core", ] [[package]] -name = "rand_xorshift" -version = "0.2.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "rand_core", + "bitflags", ] [[package]] -name = "rayon" -version = "1.5.0" +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "strsim" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "rayon-core" -version = "1.9.0" +name = "syn" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "redox_syscall" -version = "0.2.5" +name = "textwrap" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "bitflags", + "unicode-width", ] [[package]] -name = "regex-syntax" -version = "0.6.22" +name = "unicode-ident" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "rustapi-module" -version = "0.1.0" -dependencies = [ - "pyo3", -] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] -name = "rustversion" -version = "1.0.4" +name = "unindent" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] -name = "ryu" -version = "1.0.5" +name = "vec_map" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] -name = "scopeguard" -version = "1.1.0" +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "serde" -version = "1.0.123" +name = "wasm-bindgen" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ - "serde_derive", + "cfg-if", + "wasm-bindgen-macro", ] [[package]] -name = "serde_derive" -version = "1.0.123" +name = "wasm-bindgen-backend" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ + "bumpalo", + "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.69", + "wasm-bindgen-shared", ] [[package]] -name = "serde_json" -version = "1.0.62" +name = "wasm-bindgen-macro" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "itoa", - "ryu", - "serde", + "quote", + "wasm-bindgen-macro-support", ] [[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - -[[package]] -name = "syn" -version = "1.0.60" +name = "wasm-bindgen-macro-support" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "syn 2.0.69", + "wasm-bindgen-backend", + "wasm-bindgen-shared", ] [[package]] -name = "termcolor" -version = "1.1.2" +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "winapi-util", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] -name = "toml" -version = "0.5.8" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "serde", + "windows-targets", ] [[package]] -name = "trybuild" -version = "1.0.41" +name = "windows-targets" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "glob", - "lazy_static", - "serde", - "serde_json", - "termcolor", - "toml", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "unicode-xid" -version = "0.2.1" +name = "windows_aarch64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] -name = "unindent" -version = "0.1.7" +name = "windows_aarch64_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +name = "windows_i686_gnu" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows_i686_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] -name = "winapi-util" -version = "0.1.5" +name = "windows_x86_64_gnu" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_x86_64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] -name = "word-count" -version = "0.1.0" -dependencies = [ - "pyo3", - "rayon", -] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/graspologic-native/default.nix b/pkgs/development/python-modules/graspologic-native/default.nix new file mode 100644 index 0000000000000..3f014562f40ab --- /dev/null +++ b/pkgs/development/python-modules/graspologic-native/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + libiconv, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "graspologic-native"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "graspologic-org"; + repo = "graspologic-native"; + rev = "refs/tags/${version}"; + hash = "sha256-fgiBUzYBerYX59uj+I0Yret94vA+FpQK+MckskCBqj4="; + }; + + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + buildAndTestSubdir = "packages/pyo3"; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; + + buildInputs = [ libiconv ]; + + build-system = [ rustPlatform.maturinBuildHook ]; + + pythonImportsCheck = [ "graspologic_native" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + cd packages/pyo3 + ''; + + meta = with lib; { + description = "Library of rust components to add additional capability to graspologic a python library for intelligently building networks and network embeddings, and for analyzing connected data"; + homepage = "https://github.com/graspologic-org/graspologic-native"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 74e7442f0e417..c6a72fc6ee345 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -1,18 +1,28 @@ { lib, + stdenv, buildPythonPackage, - isPy27, fetchFromGitHub, - setuptools, + poetry-core, + poetry-dynamic-versioning, pytestCheckHook, - pytest-cov, + testfixtures, + anytree, + beartype, + gensim, + graspologic-native, hyppo, + joblib, matplotlib, networkx, numpy, + pot, scikit-learn, scipy, seaborn, + statsmodels, + typing-extensions, + umap-learn, }: buildPythonPackage rec { @@ -20,30 +30,44 @@ buildPythonPackage rec { version = "3.4.1"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { - owner = "microsoft"; + owner = "graspologic-org"; repo = "graspologic"; rev = "refs/tags/v${version}"; hash = "sha256-taX/4/uCQXW7yFykVHY78hJIGThEIycHwrEOZ3h1LPY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + pythonRelaxDeps = [ "scipy" ]; - propagatedBuildInputs = [ + dependencies = [ + anytree + beartype + gensim + graspologic-native hyppo + joblib matplotlib networkx numpy + pot scikit-learn scipy seaborn + statsmodels + typing-extensions + umap-learn ]; + env.NUMBA_CACHE_DIR = "$TMPDIR"; + nativeCheckInputs = [ pytestCheckHook - pytest-cov + testfixtures ]; pytestFlagsArray = [ "tests" @@ -52,12 +76,16 @@ buildPythonPackage rec { ]; disabledTests = [ "gridplot_outputs" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # SIGABRT + "tests/test_plot.py" + "tests/test_plot_matrix.py" + ]; + meta = with lib; { - homepage = "https://graspologic.readthedocs.io"; + homepage = "https://graspologic-org.github.io/graspologic"; description = "Package for graph statistical algorithms"; - license = licenses.asl20; # changing to `licenses.mit` in next release + license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; - # graspologic-native is not available - broken = true; }; } diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 147cd19164e2a..9383ec903700c 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -1,46 +1,69 @@ { - lib, - fetchFromGitHub, buildPythonPackage, - isPy3k, + cmsis-svd, + fetchFromGitHub, future, - pyusb, ipython, + lib, + prompt-toolkit, + pyfwup, pygreat, + pythonOlder, + pyusb, + setuptools, + tabulate, + tqdm, }: buildPythonPackage rec { pname = "greatfet"; version = "2024.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - sha256 = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ="; + hash = "sha256-AKpaJZJTzMY3IQXLvVnLWh3IHeGp759z6tvaBl28BHQ="; }; - disabled = !isPy3k; + sourceRoot = "${src.name}/host"; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ setuptools ]; + + dependencies = [ + cmsis-svd future - pyusb ipython + prompt-toolkit + pyfwup pygreat + pyusb + tabulate + tqdm ]; + # Tests seem to require devices (or simulators) which are + # not available in the build sandbox. doCheck = false; - preBuild = '' - cd host - echo "$version" > ../VERSION - ''; - meta = { description = "Hardware hacking with the greatfet"; homepage = "https://greatscottgadgets.com/greatfet"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ mog ]; + mainProgram = "gf"; + maintainers = with lib.maintainers; [ + mog + msanft + ]; }; } diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index f1e5c52f0f925..3970ef993cb59 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-EHVUbvz0lz0gnmLd8XpIVo8OaZPr2k96l1Wu57pnIJE="; + hash = "sha256-SO7/uheAPVFZ1C2qrzP7jB88u6EH79f1+qMZIgHZaCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 4d632b21ca5c7..96792daa628d2 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - django, colorama, coverage, unidecode, @@ -50,6 +49,6 @@ buildPythonPackage rec { description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/grep-ast/default.nix b/pkgs/development/python-modules/grep-ast/default.nix new file mode 100644 index 0000000000000..01d164bacdc13 --- /dev/null +++ b/pkgs/development/python-modules/grep-ast/default.nix @@ -0,0 +1,41 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + + pathspec, + pytestCheckHook, + setuptools, + tree-sitter-languages, +}: + +buildPythonPackage rec { + pname = "grep-ast"; + version = "0.3.3"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "grep_ast"; + hash = "sha256-QriIfVcwHcVWNDaPjVSenEnJE9r7TRnJtUw922BPzPQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pathspec + tree-sitter-languages + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "grep_ast" ]; + + meta = { + homepage = "https://github.com/paul-gauthier/grep-ast"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ greg ]; + description = "Python implementation of the ast-grep tool"; + mainProgram = "grep-ast"; + }; +} diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 41632258f64f2..a442a6e5d727a 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; + hash = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; }; # No tests in archive diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 44eadbdb6d3ca..eb3e4f3c11782 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "greynoise"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; rev = "refs/tags/v${version}"; - hash = "sha256-jsLvq0GndprdYL5mxHDRtZmNkeKT/rIV+dAnRPEmsV8="; + hash = "sha256-17NieDQ57qVT2i4S26vLS9N6zALZ+eTtCCcBbhQ8fhQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 111678f0b98f2..17ede6dee378a 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/googleapis/python-grpc-google-iam-v1"; changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index aa06cb44f0caa..3c72da10f9d85 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.64.1"; + version = "1.65.4"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-FUNKohIyERNoZe1y5JzmaP6IausTewNgpv6765Efd1U="; + hash = "sha256-Ia92P8FT3+bv18k402znrt3QTDovPBCgCJ/Eqm8WDic="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 4822365f1b6a3..f23b61a8b8037 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.64.1"; + version = "1.65.4"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-VSOJ8/Jj32p/U8sk8opjGlhKMHIfn0Mp0nFZU+GX49s="; + hash = "sha256-HoQfbbBaAFGmLMSNQN0tzJ5xdYS7GQSa1R+2cygbnEo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 982711830d463..3ed0064e081f2 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.64.1"; + version = "1.65.4"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-43511hl02iKjtcJgSZKqLyFjlx6jeK2Fa047YyEJ88c="; + hash = "sha256-jGuWDD9DBoHoivWfafq1pXW3eyn1xqHXFuqsXPHBpJ0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 33ec8143c2657..7e4c7d8b206e3 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.64.1"; + version = "1.65.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-Nta9aurAzEg/iUlYE35Jz7uQ+syH4NMnHNuMGq7XEBw="; + hash = "sha256-iCbY9Ika+NWuBuFqt+FG+8VZTvQZMj4wMW9NDdBnWcY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fa204c048982c..7d859b3af7cd5 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Protobuf code generator for gRPC"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index dca383e92a6bd..44c591d783a28 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "HTTP/2-based RPC framework"; license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index c597b82ee57fc..e5ad36e1b19b5 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -9,12 +9,17 @@ # dependencies babel, - gruut-ipa, dateparser, + gruut-ipa, jsonlines, + networkx, num2words, + numpy, python-crfsuite, - networkx, + + # optional dependencies + pydub, + rapidfuzz, # checks glibcLocales, @@ -24,6 +29,7 @@ let langPkgs = [ "ar" + "ca" "cs" "de" "en" @@ -41,46 +47,53 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "2.3.4"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "gruut"; rev = "refs/tags/v${version}"; - hash = "sha256-DD7gnvH9T2R6E19+exWE7Si+XEpfh0Iy5FYbycjgzgM="; + hash = "sha256-iwde6elsAbICZ+Rc7CPgcZTOux1hweVZc/gf4K+hP9M="; }; pythonRelaxDeps = true; build-system = [ setuptools ]; - dependencies = - [ - babel - gruut-ipa - jsonlines - num2words - python-crfsuite - dateparser - networkx - ] - ++ (map ( - lang: - callPackage ./language-pack.nix { + dependencies = [ + babel + dateparser + gruut-ipa + jsonlines + networkx + num2words + numpy + python-crfsuite + ] ++ optional-dependencies.en; + + optional-dependencies = + { + train = [ + pydub + rapidfuzz + ]; + } + // lib.genAttrs langPkgs (lang: [ + (callPackage ./language-pack.nix { inherit lang version src build-system ; - } - ) langPkgs); + }) + ]); nativeCheckInputs = [ glibcLocales pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/rhasspy/gruut/issues/25 @@ -89,7 +102,6 @@ buildPythonPackage rec { # requires mishkal library "test_fa" "test_ar" - "test_lb" ]; preCheck = '' diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 48b8694650b4d..e280a1de734b5 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/glotzerlab/gsd"; changelog = "https://github.com/glotzerlab/gsd/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index d07e08d3eba96..efcc03f3bc2bd 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/burnash/gspread"; changelog = "https://github.com/burnash/gspread/blob/v${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index ccb4c30f24d4a..27d4d0f869641 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix new file mode 100644 index 0000000000000..e110489539863 --- /dev/null +++ b/pkgs/development/python-modules/gstools/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + numpy, + cython, + extension-helpers, + hankel, + emcee, + meshio, + pyevtk, + scipy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "gstools"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "GeoStat-Framework"; + repo = "GSTools"; + rev = "refs/tags/v${version}"; + hash = "sha256-QpdOARzcSRVFl/DbnE2JLBFZmTSh/fBOmzweuf+zfEs="; + }; + + build-system = [ + setuptools + setuptools-scm + numpy + cython + extension-helpers + ]; + + dependencies = [ + emcee + hankel + meshio + numpy + pyevtk + scipy + ]; + + # scipy derivation dont support numpy_2 and is patched to use version 1 + # Using numpy_2 in the derivation will cause a clojure duplicate error + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \ + ''; + + pythonImportsCheck = [ "gstools" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Geostatistical toolbox"; + homepage = "https://github.com/GeoStat-Framework/GSTools"; + changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix b/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix index 3ea28e1b8112d..50979a36d10aa 100644 --- a/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix +++ b/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c="; + hash = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index c4fc265a14fb8..a2533376cc5f1 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.5.1"; - format = "pyproject"; + version = "2.5.2"; + pyproject = true; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-CCxD73fpHGsO4zSifWLQtgDkbPvPEnA2357umhOCNoI="; + hash = "sha256-4GIrj5pIk27euo2gzSKpRQaXNyI6aH0E6HNAivJthCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index cc83c54b0f0c5..064758489e266 100644 --- a/pkgs/development/python-modules/gudhi/default.nix +++ b/pkgs/development/python-modules/gudhi/default.nix @@ -7,7 +7,7 @@ boost, eigen, gmp, - cgal, # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal + cgal, mpfr, tbb, numpy, @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "gudhi"; - version = "3.9.0"; + version = "3.10.1"; pyproject = true; src = fetchFromGitHub { @@ -29,7 +29,7 @@ buildPythonPackage rec { repo = "gudhi-devel"; rev = "tags/gudhi-release-${version}"; fetchSubmodules = true; - hash = "sha256-VL6RIPe8a2/cUHnHOql9e9EUMBB9QU311kMCaMZTbGI="; + hash = "sha256-zHjSGm3hk3FZQmyQ03y14vJp5xeoofvij1hczKidvVA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index ec73362550396..c86ecb59ef33e 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://guessit-io.github.io/guessit/"; changelog = "https://github.com/guessit-io/guessit/raw/v${version}/CHANGELOG.md"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index 9dc2cc10676d0..fe25ace59a5f1 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -17,14 +17,14 @@ let }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); hashes = rec { - cp311-aarch64-darwin = "sha256-jODaasqXupII5JDE1QLUK+Jd07WJfAtxB3NIHCeuDa4="; - cp311-aarch64-linux = "sha256-hx6BgCbI8ojXRA/NS4Qr7N8QBvQ0lfxPbj7G2bi6PXo="; + cp311-aarch64-darwin = "sha256-E4tL6PtC1JS4SEvUz6meoeUR6IYM2xFxNJ9PzgbZqgE="; + cp311-aarch64-linux = "sha256-hMWOFkyQ/B3ovAqsitJagrSp0webUGRzWCLOz1UrGyY="; cp311-x86_64-darwin = cp311-aarch64-darwin; - cp311-x86_64-linux = "sha256-hiZbepqPPlMcG77m5hwefQtoJk6XZ5W0z3rsaLnmbrg="; - cp312-aarch64-darwin = "sha256-H5J44n2CUqOo8jzn2G6gZPehWsbPnZtHXi4Iygx2RRM="; - cp312-aarch64-linux = "sha256-xFUR7yizqSsytyfStRigKlZ7q8uY+VgRR/j29DKPWp0="; + cp311-x86_64-linux = "sha256-2O7Vykgx0fELCM1wH3VIOyeBBzR1DUFKWzy25LpMF/M="; + cp312-aarch64-darwin = "sha256-BXAJeUaVEa7fy00BNsFhB30IU5O2pEnJjp/3gYdHJ5w="; + cp312-aarch64-linux = "sha256-t1KopNiYo8xZsGcKpEne6OIVnU9CDzADO6+W8Uo2UW0="; cp312-x86_64-darwin = cp312-aarch64-darwin; - cp312-x86_64-linux = "sha256-giNHTNfLX1hIiWOPQlLOnqjrbPWkKQrA4KXug6ujYxI="; + cp312-x86_64-linux = "sha256-0IppqYhLLHq4Q8mWe0R3DBfHOsVybbeoeUroXXwfxEY="; }; hash = hashes."${pyShortVersion}-${stdenv.system}" @@ -32,7 +32,7 @@ let in buildPythonPackage rec { pname = "gurobipy"; - version = "11.0.2"; + version = "11.0.3"; inherit format; src = fetchPypi { diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 8e1e2124c1036..860c7254b1006 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "24.6.0"; + version = "24.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-R8wpkzL2QxGdvc6vWtrbIGEiryc+QQ3OitdxMcpH+F4="; + hash = "sha256-m4wEAx2WyVIMi+xucqUCPr2PLxLo00haObjf+0swUdA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/gwcs/default.nix b/pkgs/development/python-modules/gwcs/default.nix index a6dd4fcae5072..07b235b410800 100644 --- a/pkgs/development/python-modules/gwcs/default.nix +++ b/pkgs/development/python-modules/gwcs/default.nix @@ -13,7 +13,6 @@ scipy, setuptools-scm, setuptools, - tomli, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index a385f55ca8999..a7e4271006d77 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1"; homepage = "https://github.com/python-hyper/h11"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index 7e216c2c8f62b..3666c7db9e648 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "https://github.com/python-hyper/h2"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index f5128692ce563..cc43f6d6dff2d 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/shoyer/h5netcdf"; changelog = "https://github.com/h5netcdf/h5netcdf/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index b2bd668d679bf..80eb055a1d6d2 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -4,15 +4,17 @@ buildPythonPackage, pythonOlder, setuptools, - wheel, numpy, hdf5, + pythonRelaxDepsHook, cython_0, pkgconfig, mpi4py ? null, openssh, pytestCheckHook, + pytest-mpi, cached-property, + stdenv, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -39,11 +41,13 @@ buildPythonPackage rec { ./mpi4py-requirement.patch ]; - # avoid strict pinning of numpy + # avoid strict pinning of numpy, can't be replaced with pythonRelaxDepsHook, + # see: https://github.com/NixOS/nixpkgs/issues/327941 postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "numpy >=2.0.0rc1" "numpy" ''; + pythonRelaxDeps = [ "mpi4py" ]; HDF5_DIR = "${hdf5}"; HDF5_MPI = if mpiSupport then "ON" else "OFF"; @@ -57,11 +61,10 @@ buildPythonPackage rec { preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc"; nativeBuildInputs = [ + pythonRelaxDepsHook cython_0 - numpy pkgconfig setuptools - wheel ]; buildInputs = [ hdf5 ] ++ lib.optional mpiSupport mpi; @@ -74,20 +77,31 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - # tests now require pytest-mpi, which isn't available and difficult to package - doCheck = false; nativeCheckInputs = [ pytestCheckHook + pytest-mpi openssh ]; + # https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cd $out + ''; + # For some reason these fail when mpi support is enabled, due to concurrent + # writings. There are a few open issues about this in the bug tracker, but + # not related to the tests. + disabledTests = lib.optionals mpiSupport [ "TestPageBuffering" ]; pythonImportsCheck = [ "h5py" ]; - meta = with lib; { + meta = { changelog = "https://github.com/h5py/h5py/blob/${version}/docs/whatsnew/${lib.versions.majorMinor version}.rst"; description = "Pythonic interface to the HDF5 binary data format"; homepage = "http://www.h5py.org/"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + # When importing `h5py` during the build, we get: + # + # ValueError: Not a datatype (not a datatype) + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 613b6a8315861..c08ffcd12132f 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -5,18 +5,14 @@ setuptools-scm, requests, tqdm, - nose, vcrpy, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "habanero"; version = "1.2.6"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "sckott"; @@ -25,9 +21,9 @@ buildPythonPackage rec { hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ requests tqdm ]; @@ -42,10 +38,10 @@ buildPythonPackage rec { # almost the entirety of the test suite makes network calls pytestFlagsArray = [ "test/test-filters.py" ]; - meta = with lib; { + meta = { description = "Python interface to Library Genesis"; homepage = "https://habanero.readthedocs.io/"; - license = licenses.mit; - maintainers = with maintainers; [ nico202 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nico202 ]; }; } diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 9e48a5da5b9c0..8126834a3c45d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -12,13 +12,11 @@ pythonOlder, setuptools, voluptuous, - websocket-client, - xmltodict, }: buildPythonPackage rec { pname = "hahomematic"; - version = "2024.6.0"; + version = "2024.8.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-6WG8N4LcQ52mbrVP1aPL+xkpSQ9u3e0vV+Hf3ybh3mA="; + hash = "sha256-myF10xrkq7xbov4veFiA1Jg6i+VS3khQPc/c2tx4gIc="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/hankel/default.nix b/pkgs/development/python-modules/hankel/default.nix new file mode 100644 index 0000000000000..ae04ed26f3c9c --- /dev/null +++ b/pkgs/development/python-modules/hankel/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + mpmath, + numpy, + scipy, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "hankel"; + version = "1.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "steven-murray"; + repo = "hankel"; + rev = "refs/tags/v${version}"; + hash = "sha256-/5PvbH8zz2siLS1YJYRSrl/Cpi0WToBu1TJhlek8VEE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + dependencies = [ + mpmath + numpy + scipy + ]; + + pythonImportsCheck = [ "hankel" ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; + + meta = { + description = "Implementation of Ogata's (2005) method for Hankel transforms"; + homepage = "https://github.com/steven-murray/hankel"; + changelog = "https://github.com/steven-murray/hankel/${src.rev}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/hass-splunk/default.nix b/pkgs/development/python-modules/hass-splunk/default.nix new file mode 100644 index 0000000000000..b5183c52b145d --- /dev/null +++ b/pkgs/development/python-modules/hass-splunk/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, +}: + +buildPythonPackage rec { + pname = "hass-splunk"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Bre77"; + repo = "hass_splunk"; + rev = "refs/tags/v${version}"; + hash = "sha256-bgF6gHAA57MiWdmpwilGa+l05/ETKdpyi2naVagkRlc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "hass_splunk" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Async single threaded connector to Splunk HEC using an asyncio session"; + homepage = "https://github.com/Bre77/hass_splunk"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 731aeeba52ced..7a070285d382a 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { mainProgram = "hatch-jupyter-builder"; homepage = "https://github.com/jupyterlab/hatch-jupyter-builder"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hatch-regex-commit/default.nix b/pkgs/development/python-modules/hatch-regex-commit/default.nix index 9cd936d5798f3..5c8afe46301cb 100644 --- a/pkgs/development/python-modules/hatch-regex-commit/default.nix +++ b/pkgs/development/python-modules/hatch-regex-commit/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - hatch-regex-commit, hatchling, pythonOlder, }: diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix index 12e304475c74c..3d4c69fec005e 100644 --- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Hatchling plugin to read project dependencies from requirements.txt"; homepage = "https://github.com/repo-helper/hatch-requirements-txt"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index b7c6c73820a25..ae7933207c3c9 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/mozilla-services/hawkauthlib"; description = "Hawk Access Authentication protocol"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index f2139a61bc254..5d3a7876e9545 100644 --- a/pkgs/development/python-modules/farm-haystack/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -90,7 +90,7 @@ }: buildPythonPackage rec { - pname = "farm-haystack"; + pname = "haystack-ai"; version = "2.2.3"; pyproject = true; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index e6439ea0f730f..3f8191b156e9c 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "2.0.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Nf4rkVkXPEPPZ+xBCnfKfYeggBfhsgijnAIJzByR46A="; + hash = "sha256-NlEpnSmNY8rcfCJVgKqufCmEMSp4UBr5Po2rh1V8OrA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 0b3fa2ab78a44..9fe99f93b30e5 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pdm-backend, - pythonRelaxDepsHook, pytestCheckHook, pythonOlder, pytz, diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 2d9ab83819536..0b175669db515 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -5,7 +5,6 @@ cython, numpy, oldest-supported-numpy, - pynose, pytestCheckHook, setuptools, }: @@ -20,6 +19,11 @@ buildPythonPackage rec { hash = "sha256-tHrssWdx4boHNlVyVdgK4CQLCRVr/0NDId5VmzWawtY="; }; + patches = [ + # https://github.com/daleroberts/hdmedians/pull/10 + ./replace-nose.patch + ]; + postPatch = '' substituteInPlace setup.py \ --replace-fail "'nose>=1.0'," "" @@ -36,7 +40,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "hdmedians" ]; nativeCheckInputs = [ - pynose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hdmedians/replace-nose.patch b/pkgs/development/python-modules/hdmedians/replace-nose.patch new file mode 100644 index 0000000000000..3cf12e42e3491 --- /dev/null +++ b/pkgs/development/python-modules/hdmedians/replace-nose.patch @@ -0,0 +1,91 @@ +diff --git a/hdmedians/tests/test_geomedian.py b/hdmedians/tests/test_geomedian.py +index 0bc37e9..ff5f938 100644 +--- a/hdmedians/tests/test_geomedian.py ++++ b/hdmedians/tests/test_geomedian.py +@@ -4,9 +4,9 @@ Tests. + + import numpy as np + import hdmedians as hd ++import pytest + + from numpy.testing import assert_equal, assert_array_almost_equal +-from nose.tools import assert_true, assert_raises + + # shape (6, 25) + DATA1 = np.array([[693, 990, 1281, 2101, 3524, 2577], +@@ -124,10 +124,12 @@ def test_nangeomedian_axis_one_two_good(): + def test_nangeomedian_axis_bad(): + data = np.array([[1.0, np.nan, 1.0], + [2.0, 1.0, 1.0]]) +- assert_raises(IndexError, hd.nangeomedian, data, axis=2) ++ with pytest.raises(IndexError): ++ hd.nangeomedian(data, axis=2) + + + def test_nangeomedian_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nangeomedian, data) ++ with pytest.raises(ValueError): ++ hd.nangeomedian(data) +diff --git a/hdmedians/tests/test_medoid.py b/hdmedians/tests/test_medoid.py +index c5e0a7f..4fbdf80 100644 +--- a/hdmedians/tests/test_medoid.py ++++ b/hdmedians/tests/test_medoid.py +@@ -4,9 +4,9 @@ Tests. + + import numpy as np + import hdmedians as hd ++import pytest + + from numpy.testing import assert_equal, assert_array_almost_equal +-from nose.tools import assert_true, assert_raises + + # shape (6, 25) + DATA1 = np.array([[693, 990, 1281, 2101, 3524, 2577], +@@ -59,7 +59,7 @@ def test_medoid_in_set_random(): + s = [list(x) for x in a.T] + m = hd.medoid(a) + idx = s.index(list(m)) +- assert_true(idx > -1) ++ assert(idx > -1) + + + def test_medoid_noaxis(): +@@ -85,7 +85,8 @@ def test_medoid_axis_one(): + + + def test_medoid_axis_bad(): +- assert_raises(IndexError, hd.medoid, DATA1, axis=2) ++ with pytest.raises(IndexError): ++ hd.medoid(DATA1, axis=2) + + + def test_medoid_noaxis_indexonly(): +@@ -136,7 +137,8 @@ def test_nanmedoid_two_obs(): + def test_nanmedoid_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nanmedoid, data) ++ with pytest.raises(ValueError): ++ hd.nanmedoid(data) + + + def test_nanmedoid_axis_zero(): +@@ -170,7 +172,8 @@ def test_nanmedoid_axis_one_indexonly(): + + + def test_nanmedoid_axis_bad(): +- assert_raises(IndexError, hd.nanmedoid, DATA1, axis=2) ++ with pytest.raises(IndexError): ++ hd.nanmedoid(DATA1, axis=2) + + + def test_nanmedoid_two_obs(): +@@ -184,4 +187,5 @@ def test_nanmedoid_two_obs(): + def test_nanmedoid_all_nan(): + data = np.array([[np.nan, np.nan, np.nan], + [np.nan, np.nan, np.nan]]) +- assert_raises(ValueError, hd.nanmedoid, data) ++ with pytest.raises(ValueError): ++ hd.nanmedoid(data) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 78baf88849c7f..4227da42494dd 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, setuptools, setuptools-scm, diff --git a/pkgs/development/python-modules/hexbytes/default.nix b/pkgs/development/python-modules/hexbytes/default.nix index 311644b15ce00..5d0845c9725b8 100644 --- a/pkgs/development/python-modules/hexbytes/default.nix +++ b/pkgs/development/python-modules/hexbytes/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/hexbytes"; changelog = "https://github.com/ethereum/hexbytes/blob/v${version}/docs/release_notes.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index b4597cd0c0d4f..4837f210b3f65 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -10,6 +10,7 @@ scipy, pandas, pytestCheckHook, + pytest-cov-stub, setuptools, }: @@ -25,11 +26,6 @@ buildPythonPackage rec { hash = "sha256-An5RzK0nnRaBI6JEUl5shLrA22RgWzEbC9NJiRvgxT4="; }; - postPatch = '' - substituteInPlace tox.ini \ - --replace-fail "--cov=./hickle" "" - ''; - build-system = [ setuptools ]; dependencies = [ @@ -42,6 +38,7 @@ buildPythonPackage rec { astropy pandas pytestCheckHook + pytest-cov-stub scipy ]; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index fe08c934ea61d..ee69705614c91 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.14.0"; + version = "0.14.0.post2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a7cb029286ced5426a381286526d9501846409701a29c2538615c3d1a612b8be"; + sha256 = "sha256-bA6XumsFmjCdUbSVqPDV77zqh1a2QNmLb2u5/e8kWKw="; }; nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index a8828ff93274e..25148892a0b40 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { libjpeg = [ pylibjpeg pylibjpeg-libjpeg - #pylibjpeg-openjpeg # not in nixpkgs yet + #pylibjpeg-openjpeg # broken on aarch64-linux ]; }; diff --git a/pkgs/development/python-modules/highspy/default.nix b/pkgs/development/python-modules/highspy/default.nix new file mode 100644 index 0000000000000..6d1847d100ddb --- /dev/null +++ b/pkgs/development/python-modules/highspy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + pytestCheckHook, + pythonOlder, + scikit-build-core, + pybind11, + numpy, + cmake, + ninja, + pathspec, + highs, +}: +buildPythonPackage { + pname = "highspy"; + version = highs.version; + pyproject = true; + + disabled = pythonOlder "3.8"; + + inherit (highs) src; + + build-system = [ + cmake + ninja + pathspec + scikit-build-core + pybind11 + ]; + + dontUseCmakeConfigure = true; + + dependencies = [ numpy ]; + + pythonImportsCheck = [ "highspy" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Linear optimization software"; + homepage = "https://github.com/ERGO-Code/HiGHS"; + license = licenses.mit; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix new file mode 100644 index 0000000000000..3d450a68de13d --- /dev/null +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + hikari, + sigparse, + pytestCheckHook, + python-dotenv, + pytest-asyncio, + croniter, + pynacl +}: + +buildPythonPackage rec { + pname = "hikari-crescent"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hikari-crescent"; + repo = "hikari-crescent"; + rev = "refs/tags/v${version}"; + hash = "sha256-0eDPdN+3lalgHiBNXuZUEJllAKFxdKK6paTFNHU5jIM="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + hikari + sigparse + ]; + + postPatch = '' + # pythonRelaxDepsHook did not work + substituteInPlace pyproject.toml \ + --replace-fail 'hikari = "==' 'hikari = ">=' + ''; + + pythonImportsCheck = [ "crescent" ]; + + nativeCheckInputs = [ + pytestCheckHook + python-dotenv + pytest-asyncio + croniter + pynacl + ]; + + disabledTests = [ "test_handle_resp" ]; + + meta = { + description = "A command handler for Hikari that keeps your project neat and tidy"; + license = lib.licenses.mit; + homepage = "https://github.com/hikari-crescent/hikari-crescent"; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "hikari-crescent"; + }; +} diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index f83a50b291609..026176e7a7b8d 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { pname = "hikari"; - version = "2.0.0.dev125"; + version = "2.0.0.dev126"; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; rev = version; - hash = "sha256-qxgIYquXUWrm8bS8EamERMHOnjI2aPyK7bQieVG66uA="; + hash = "sha256-KpF9P92IciILV7zlYTCgtMqhudT9uOR2SQJdWDtxYaA="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -64,14 +64,15 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; postPatch = '' - substituteInPlace hikari/_about.py --replace "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" + substituteInPlace hikari/_about.py \ + --replace-fail "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" ''; - meta = with lib; { + meta = { description = "Discord API wrapper for Python written with asyncio"; homepage = "https://www.hikari-py.dev/"; changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ tomodachi94 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 9c05025ddfd9a..0edd09dc64ac8 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.29"; + version = "0.0.30"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-3RUbHVbnfC0L9u6/VMKK2BhTuc2y5kD83Cn8dQ24kQQ="; + hash = "sha256-+ine7Q60dT9GyFWGHtbH6G1E4TzTQaY5y9Yxxxbgnp8="; }; build-system = [ diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index c062f293c4161..f04e486fd73ca 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pynose, + nose, setuptools, }: @@ -22,7 +22,7 @@ buildPythonPackage { pythonImportsCheck = [ "hkdf" ]; - nativeCheckInputs = [ pynose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 22948219d3db2..a289f7d77d1ad 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.52"; + version = "0.54"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-sLtszBu/eyhfIW8xdkHb3FWx2pW/E8cxPeNa4o7DnIs="; + hash = "sha256-/mpbNuCnADuguI1v8cpYUdhBN8DjhjklCDVmMOsRvkM="; }; build-system = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index ae765df32b4b5..eb17dd0534001 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -1,34 +1,36 @@ { lib, - bokeh, buildPythonPackage, colorcet, fetchPypi, - ipython, - matplotlib, - notebook, + hatch-vcs, + hatchling, numpy, pandas, panel, param, pythonOlder, pyviz-comms, - scipy, }: buildPythonPackage rec { pname = "holoviews"; version = "1.19.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-yrFSL3WptGN3+TZLZ1vv15gS4iAFlxRHCljiFHXVMbo="; }; - propagatedBuildInputs = [ + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ colorcet numpy pandas @@ -47,6 +49,6 @@ buildPythonPackage rec { mainProgram = "holoviews"; homepage = "https://www.holoviews.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index aa2629ff2d802..ad1ce2a29102c 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -6,27 +6,25 @@ requests-oauthlib, pythonOlder, setuptools, - six, }: buildPythonPackage rec { pname = "homeconnect"; - version = "0.7.4"; - format = "pyproject"; + version = "0.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lkal6Dy4cRRZ893I3/jyQ3+sDZMrHN0UMGff0ab4pvk="; + hash = "sha256-W475a+TlGiKRR1EDYiFVmApmQfmft85iBQLRnbEmcuA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests requests-oauthlib - six ]; # Project has no tests @@ -38,7 +36,7 @@ buildPythonPackage rec { description = "Python client for the BSH Home Connect REST API"; homepage = "https://github.com/DavidMStraub/homeconnect"; changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index f4aa29cfcb8d9..28a7cfb3b969b 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-VMHInAmNO0Nw0ohZnIJ9c77h35YSSNNnPNYaUpBlKOQ="; + hash = "sha256-f1KjBYwLqQbA6TbQ3ZZ8TgvGe1USbYYNjsni2vsnTP8="; }; build-system = [ diff --git a/pkgs/development/python-modules/homf/default.nix b/pkgs/development/python-modules/homf/default.nix new file mode 100644 index 0000000000000..2e411eedc7e84 --- /dev/null +++ b/pkgs/development/python-modules/homf/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # pytestCheckHook, + pythonOlder, + + hatchling, + packaging, +}: + +buildPythonPackage rec { + pname = "homf"; + version = "1.0.0"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "duckinator"; + repo = "homf"; + rev = "refs/tags/v${version}"; + hash = "sha256-PU5VjBIVSMupTBh/qvVuZSFWpBbJOylCR02lONn9/qw="; + }; + + build-system = [ hatchling ]; + + pythonRelaxDeps = [ "packaging" ]; + + dependencies = [ packaging ]; + + pythonImportsCheck = [ + "homf" + "homf.api" + "homf.api.github" + "homf.api.pypi" + ]; + + # There are currently no checks which do not require network access, which breaks the check hook somehow? + # nativeCheckInputs = [ pytestCheckHook ]; + # pytestFlagsArray = [ "-m 'not network'" ]; + + meta = with lib; { + description = "Asset download tool for GitHub Releases, PyPi, etc."; + mainProgram = "homf"; + homepage = "https://github.com/duckinator/homf"; + license = licenses.mit; + maintainers = with maintainers; [ nicoo ]; + }; +} diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index 28836e4854ce1..e48cc94bccc4f 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -66,5 +66,8 @@ buildPythonPackage rec { license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; maintainers = [ ]; + # Has compilation errors since some dependencies got updated, will probably + # be fixed if updated by itself to the latest version. + broken = true; }; } diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index e02917523c226..2741dbc3675ab 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -1,8 +1,5 @@ { - lib, - stdenv, buildPythonPackage, - callPackage, horizon-eda, mesa, pycairo, diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index dc614456f8926..53995d2de5d70 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { description = "Instant coding answers via the command line"; homepage = "https://github.com/gleitz/howdoi"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index a6042315c3779..df23b4ec3c8ee 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Pure-Python HPACK header compression"; homepage = "https://github.com/python-hyper/hpack"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hsh/default.nix b/pkgs/development/python-modules/hsh/default.nix index 0b724c03d0896..f7efbc14e8aec 100644 --- a/pkgs/development/python-modules/hsh/default.nix +++ b/pkgs/development/python-modules/hsh/default.nix @@ -6,7 +6,6 @@ unittestCheckHook, pexpect, naked, - nix-update-script, setuptools, wheel, }: diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index e0943982dc7e6..64ed6cba12e97 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.7.1"; + version = "2024.8.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-WCmUYYPx8tJJ1Z3utjS8k6vePx/pZ6OZ+D0YjovqizQ="; + hash = "sha256-zVBwV+pCmZAnTJi8oyTCs9FxUktDFOxctGeB8fZcsfw="; }; build-system = [ setuptools ]; @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index 5db9e10b2679c..5a3ff0947db83 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, hatchling, lxml, + lxml-html-clean, beautifulsoup4, pytestCheckHook, pythonOlder, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "2.3.1"; + version = "2.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,13 +21,14 @@ buildPythonPackage rec { owner = "matthiask"; repo = "html-sanitizer"; rev = "refs/tags/${version}"; - hash = "sha256-NWJLD70783Ie6efyCvGopxMIlP3rLz0uM/D1rLQwBXE="; + hash = "sha256-6OWFLsuefeDzQ1uHnLmboKDgrbY/xJCwqsSQlDaJlRs="; }; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ lxml + lxml-html-clean beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/html-table-parser-python3/default.nix b/pkgs/development/python-modules/html-table-parser-python3/default.nix new file mode 100644 index 0000000000000..c4f3f8fc46aaf --- /dev/null +++ b/pkgs/development/python-modules/html-table-parser-python3/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "html-table-parser-python3"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "schmijos"; + repo = "html-table-parser-python3"; + rev = "v${version}"; + hash = "sha256-okYl0T12wVld7GVbFQH2hgEVKXSScipJN/vYaiRVdGY="; + }; + + build-system = [ poetry-core ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "html_table_parser" ]; + + meta = { + description = "Small and simple HTML table parser not requiring any external dependency."; + homepage = "https://github.com/schmijos/html-table-parser-python3"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 236b312e343da..b114029aadacb 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { homepage = "https://github.com/Alir3z4/html2text/"; changelog = "https://github.com/Alir3z4/html2text/blob/${src.rev}/ChangeLog.rst"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "html2text"; }; } diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 6658642d4a0ef..2a3e0dfb42c3d 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Fast C based HTML 5 parsing for python"; homepage = "https://html5-parser.readthedocs.io"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix index cf3b6ac8bf936..527e3660481b1 100644 --- a/pkgs/development/python-modules/html5tagger/default.nix +++ b/pkgs/development/python-modules/html5tagger/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Create HTML documents from Python"; homepage = "https://github.com/sanic-org/html5tagger"; license = licenses.unlicense; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix index f2f6b2110688d..5bd467bed3851 100644 --- a/pkgs/development/python-modules/htmllistparse/default.nix +++ b/pkgs/development/python-modules/htmllistparse/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Python parser for Apache/nginx-style HTML directory listing"; mainProgram = "rehttpfs"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/htmltools/default.nix b/pkgs/development/python-modules/htmltools/default.nix new file mode 100644 index 0000000000000..f7375cab0b772 --- /dev/null +++ b/pkgs/development/python-modules/htmltools/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, packaging +, typing-extensions +, pytestCheckHook +, syrupy +}: + +buildPythonPackage rec { + pname = "htmltools"; + version = "0.5.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "posit-dev"; + repo = "py-htmltools"; + rev = "refs/tags/v${version}"; + hash = "sha256-+BSbJdWmqoEQGEJWBgoTVe4bbvlGJiMyfvvj0lAy9ZA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + packaging + typing-extensions + ]; + + pythonImportsCheck = [ "htmltools" ]; + + nativeCheckInputs = [ + pytestCheckHook + syrupy + ]; + + meta = { + description = "Tools for HTML generation and output"; + homepage = "https://github.com/posit-dev/py-htmltools"; + changelog = "https://github.com/posit-dev/py-htmltools/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 4765b346752e6..d4010abc52426 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -2,38 +2,39 @@ lib, buildPythonPackage, cryptography, - fetchPypi, - mock, - pynose, + fetchFromGitHub, + setuptools, + pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "http-ece"; - version = "1.2.0"; + version = "1.2.1"; + pyproject = true; - src = fetchPypi { - pname = "http_ece"; - inherit version; - sha256 = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; + src = fetchFromGitHub { + owner = "web-push-libs"; + repo = "encrypted-content-encoding"; + rev = version; + hash = "sha256-HjXJWoOvCVOdEto4Ss4HPUuf+uNcQkfvj/cxJGHOhQ8="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail '"nose",' "" \ - --replace-fail '"coverage",' "" - ''; + sourceRoot = "${src.name}/python"; - propagatedBuildInputs = [ cryptography ]; + build-system = [ setuptools ]; + + dependencies = [ cryptography ]; nativeCheckInputs = [ - mock - pynose + pytestCheckHook + pytest-cov-stub ]; - meta = with lib; { + meta = { description = "Encipher HTTP Messages"; - homepage = "https://github.com/martinthomson/encrypted-content-encoding"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + homepage = "https://github.com/web-push-libs/encrypted-content-encoding"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index e99a7eaea0f5c..80362a801d36b 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; + hash = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; }; doCheck = false; @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "WSGI HTTP Digest Authentication middleware"; homepage = "https://github.com/jonashaag/httpauth"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index a4e867d981716..4b670b4c17bde 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -75,6 +75,6 @@ buildPythonPackage rec { description = "HTTP Request and Response Service"; homepage = "https://github.com/psf/httpbin"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 9802b960702f4..aba7e3fe32c13 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, installShellFiles, pandoc, - pythonOlder, # BuildInputs charset-normalizer, defusedxml, @@ -15,8 +14,6 @@ requests-toolbelt, setuptools, rich, - pysocks, - # CheckInputs pip, pytest-httpbin, pytest-lazy-fixture, diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 303fccac56086..67e38601cfa51 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, cryptography, fetchFromGitHub, - isPy27, mock, pyparsing, pytest-forked, diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 38a386dc19c3f..ea38f414e32a4 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -4,7 +4,6 @@ fetchPypi, sure, six, - pytest, freezegun, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index cc91c40429926..c6d2c176a5f6d 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/MagicStack/httptools"; changelog = "https://github.com/MagicStack/httptools/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 1e93ee5ac744f..64049235003aa 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -2,7 +2,6 @@ lib, async-timeout, buildPythonPackage, - curio, fetchFromGitHub, flask, httpcore, @@ -14,7 +13,6 @@ python-socks, pythonOlder, setuptools, - sniffio, starlette, tiny-proxy, trio, diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 15c7fcf81e0d7..fd331c7036709 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -6,24 +6,27 @@ pycryptodomex, pytestCheckHook, requests, + setuptools, xmltodict, }: buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.8.1"; - format = "setuptools"; + version = "1.9.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-KmkoCQDZ1NC3CKfV5DZBukExF9fUTojvWv2ZLTCzRZU="; + hash = "sha256-D3PABCFjy7ZhP4L02rUvmKttejDPUE5whxqQih0MvpU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pycryptodomex requests xmltodict diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 0f09ffe98a4e3..69defdd36bfb4 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -3,7 +3,11 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies filelock, fsspec, packaging, @@ -15,7 +19,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.23.4"; + version = "0.24.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +28,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-6UAuNKeltaclhnQ7J2X0EziGitROMKmOlIWGw87y66E="; + hash = "sha256-iDfE64Gw86q+ddOJXfGnR5u5jQM9hXugPUEZz2/lV24="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index d0c9389ed1b23..dbc0bdf1caef4 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -6,13 +6,14 @@ gettext, pytestCheckHook, pythonOlder, + python, hatch-vcs, hatchling, }: buildPythonPackage rec { pname = "humanize"; - version = "4.9.0"; + version = "4.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "python-humanize"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sLlgR6c65RmUNZdH2pHuxzo7dm71uUZXGqzcqyxCrk4="; + hash = "sha256-zzasFAaWH284IEnWwWKvCL1lt/ItNfdbWhq1K30gSPU="; }; nativeBuildInputs = [ @@ -30,12 +31,18 @@ buildPythonPackage rec { gettext ]; + postPatch = '' + # Remove dependency on pytest-cov + substituteInPlace pyproject.toml --replace-fail \ + '"ignore:sys.monitoring isn'"'"'t available, using default core:coverage.exceptions.CoverageWarning",' "" + ''; + postBuild = '' scripts/generate-translation-binaries.sh ''; postInstall = '' - cp -r 'src/humanize/locale' "$out/lib/"*'/site-packages/humanize/' + cp -r 'src/humanize/locale' "$out/${python.sitePackages}/humanize/" ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 0f46eef1eee35..a7a6525e942da 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { mainProgram = "hupper"; homepage = "https://github.com/Pylons/hupper"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 74002cade8430..67429f81efe0d 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/ianunruh/hvac"; changelog = "https://github.com/hvac/hvac/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 4082631646215..7884f61cbcb6e 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -7,21 +7,24 @@ holoviews, pandas, pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "hvplot"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-6HSGqVv+FRq1LvFjpek9nL0EOZLPC3Vcyt0r82/t03Y="; }; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ bokeh colorcet holoviews @@ -38,6 +41,6 @@ buildPythonPackage rec { homepage = "https://hvplot.pyviz.org"; changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix index 971583742ef88..84ffe3bcc7e3b 100644 --- a/pkgs/development/python-modules/hydrawiser/default.nix +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio - pytest-cov + pytest-cov-stub pytestCheckHook requests requests-mock diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 81bcf358efce5..a1e3a703955dd 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, + pythonAtLeast, fetchPypi, requests, six, @@ -11,6 +12,8 @@ buildPythonPackage rec { version = "0.21"; format = "setuptools"; + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index 5842ced668fc1..e82b3b21c8b62 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "HTTP/2 framing layer for Python"; homepage = "https://github.com/python-hyper/hyperframe/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index faaacf939f8aa..6c0285e8cadd6 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -6,7 +6,6 @@ fetchpatch, pytestCheckHook, pythonOlder, - pythonAtLeast, poetry-core, pytest-aiohttp, pytest-asyncio, diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 6067efde3ed3b..eca2ca1014572 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index a76b8e2ff29d3..9590857b3480d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -120,6 +120,6 @@ buildPythonPackage rec { lib.replaceStrings [ "." ] [ "-" ] version }"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index be40b4375e41b..a69c0c08214e4 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/Zac-HD/hypothesmith"; changelog = "https://github.com/Zac-HD/hypothesmith/blob/master/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix index 84eedf9e3b69d..2300af2347841 100644 --- a/pkgs/development/python-modules/ibis/default.nix +++ b/pkgs/development/python-modules/ibis/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Lightweight template engine"; homepage = "https://github.com/dmulholland/ibis"; license = licenses.publicDomain; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 3a3a86731df35..9acf56259bc87 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,6 +7,7 @@ python-dateutil, pythonAtLeast, pythonOlder, + pythonRelaxDepsHook, requests, responses, setuptools, @@ -24,8 +25,12 @@ buildPythonPackage rec { hash = "sha256-nE1JIlYlJ5O3L7FQD5L+JvLnVs7nq4Ff6dmHvgXjj0M="; }; + pythonRelaxDeps = [ "requests" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + dependencies = [ pyjwt python-dateutil diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix deleted file mode 100644 index e9ef6393f22f4..0000000000000 --- a/pkgs/development/python-modules/icoextract/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pefile, - pillow, - pythonOlder, - setuptools, -}: - -buildPythonPackage rec { - pname = "icoextract"; - version = "0.1.5"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit pname version; - extension = "tar.gz"; - hash = "sha256-/UxnWNyRNtwI4Rxx97i5QyjeMrUr5Sq+TfLTmU0xWyc="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - pefile - pillow - ]; - - # tests expect mingw and multiarch - doCheck = false; - - pythonImportsCheck = [ "icoextract" ]; - - postInstall = '' - mkdir -p $out/share/thumbnailers - substituteAll ${./exe-thumbnailer.thumbnailer} $out/share/thumbnailers/exe-thumbnailer.thumbnailer - ''; - - meta = with lib; { - description = "Extract icons from Windows PE files"; - homepage = "https://github.com/jlu5/icoextract"; - changelog = "https://github.com/jlu5/icoextract/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ - bryanasdev000 - donovanglover - ]; - }; -} diff --git a/pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer b/pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer deleted file mode 100644 index c275ac919b6ba..0000000000000 --- a/pkgs/development/python-modules/icoextract/exe-thumbnailer.thumbnailer +++ /dev/null @@ -1,3 +0,0 @@ -[Thumbnailer Entry] -Exec=@out@/bin/exe-thumbnailer -v -s %s %i %o -MimeType=application/x-ms-dos-executable;application/x-dosexec;application/x-msdownload diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index 2f973a6dc9812..b1d4dd9a1f052 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "http://icspy.readthedocs.org/"; changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index e6e8f306bf0d5..5ffd7c74df529 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.36"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; rev = "refs/tags/v${version}"; - hash = "sha256-CO+qP0FIUdPFXy6/7FgrKZbUp48XbgqqGV2GAX9ogMY="; + hash = "sha256-ZusDe675QdQyiiGSdmWT+l1jGEGXEY+Dobm4y20WWX8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 5c67a8ee5c2de..6e17149079cf6 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "IfcOpenShell"; rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "sha256-fCgxSambC01qb14EoZTrVxNNw8H3nX8oMi6gk0O/HmQ="; + hash = "sha256-fCgxSambC01qb14EoZTrVxNNw8H3nX8oMi6gk0O/HmQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 53bd1e5269097..3f13cf77b7293 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.11.5"; + version = "0.11.6"; disabled = pythonOlder "3.8"; @@ -25,21 +25,24 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-nfXCAjTKxtslVk17h60+v/JQusQTmaTRCPvvFG4/OPk="; + postFetch = '' + # export-subst prevents reproducability + rm $out/.git_archival.json + ''; + hash = "sha256-DXYNFSvmKiulMnWL8w5l9lWGtS9Sff/Hn4x538nrvzo="; }; postPatch = '' rm -r vendor ''; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + nativeBuildInputs = [ pkg-config ]; + + build-system = [ setuptools ]; buildInputs = [ igraph ]; - propagatedBuildInputs = [ texttable ]; + dependencies = [ texttable ]; passthru.optional-dependencies = { cairo = [ cairocffi ]; diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index d281d66369cb7..ff87abcfa20aa 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.2"; + version = "1.3"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-lQ7/A/RT8/5gLozsToti+4g1Jc++GtjzOU4XZ+feqDs="; + hash = "sha256-ywZdhumFFeImODeFn8VYD0CR1DZMlAg52wMNRjEItec="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 7a16b64e86f36..c23fc8ad870f1 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/ICRAR/ijson"; changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/image-diff/default.nix b/pkgs/development/python-modules/image-diff/default.nix index ac5a22947a413..1b64799cb0af7 100644 --- a/pkgs/development/python-modules/image-diff/default.nix +++ b/pkgs/development/python-modules/image-diff/default.nix @@ -1,6 +1,5 @@ { lib, - python, buildPythonPackage, fetchFromGitHub, pillow, diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 1ce7dea4645b3..d914f72b94bcb 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -3,24 +3,27 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "imap-tools"; - version = "1.6.0"; + version = "1.7.2"; disabled = pythonOlder "3.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "refs/tags/v${version}"; - hash = "sha256-T4sA/PsoTfS2L0RwJyJP6BY33MJuybVqruHnwwstnXA="; + hash = "sha256-KW6YyArM3rHOkhXJCRWWy9OSwMwRFr16njeN+EcSGz0="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index ee070a516981c..e3bdcc2a059e9 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -12,7 +12,6 @@ scipy, tensorflow, threadpoolctl, - pytest-xdist, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 0cd1fdf91d0c3..241599652ab58 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.26.0"; + version = "2.28.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pRIz+/HC4AiqWE+e6mW2ww7VZiTk3qXU5TNwzNhMm04="; + hash = "sha256-ZkauC2akdg4CzXNxHUYKbPI3U4K3jOg0QUF1FZVZaq0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 69a93830c5f61..7dec7e5dadd07 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pytestCheckHook, astunparse, setuptools, diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 72afded7d0c01..2341129dfec50 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index d8a3c80a30b70..632a3aefb8d90 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -14,19 +14,17 @@ buildPythonPackage rec { pname = "imread"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; src = fetchPypi { - inherit version; - pname = "imread"; - hash = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; + inherit pname version; + hash = "sha256-ULPXCJyGJQTCKyVu9R/kWFGzRhbbFMDr/FU2AByZYBU="; }; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg @@ -35,7 +33,7 @@ buildPythonPackage rec { libwebp ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -56,7 +54,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to load images as numpy arrays"; - homepage = "https://imread.readthedocs.io/en/latest/"; + homepage = "https://imread.readthedocs.io/"; + changelog = "https://github.com/luispedro/imread/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index 8f4b2e960ebc8..7af06bcc03682 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.3"; + version = "0.6.3-1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "incomfort-client"; rev = "refs/tags/v${version}"; - hash = "sha256-GD5NsVvmuCuEXw8KvojSj5b67/i0skvhYW8ko+9iysU="; + hash = "sha256-I6MAFvODkw2QadzXJacFl/TwA6exfBB1PSDslmT7Ysw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 9077ddae4b4b1..db600c27aa1af 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -40,7 +40,7 @@ let homepage = "https://github.com/twisted/incremental"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 8d0fe80336c6c..50d7deb1660bb 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,31 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, - more-itertools, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, setuptools-scm, - pydantic, - pytestCheckHook, + + # dependencies + more-itertools, typeguard, + + # checks + pytestCheckHook, }: buildPythonPackage rec { pname = "inflect"; - version = "7.2.1"; - disabled = isPy27; - format = "pyproject"; + version = "7.3.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-p85eI9Z5hzTyVsGtntUhhrjsJ28QsYzj0+yxnCHrbLY="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "inflect"; + rev = "refs/tags/v${version}"; + hash = "sha256-J0XgSKPzZIt/7WnMGARXpyYzagBGiqRiuNmNnGKDBrs="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ more-itertools - pydantic typeguard ]; @@ -38,11 +49,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "inflect" ]; - meta = with lib; { + meta = { description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles"; homepage = "https://github.com/jaraco/inflect"; changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; - license = licenses.mit; - maintainers = teams.tts.members; + license = lib.licenses.mit; + maintainers = lib.teams.tts.members; }; } diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 1f7e7c017501a..b2270ef112486 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -5,7 +5,6 @@ mock, msgpack, pandas, - pynose, pytestCheckHook, python-dateutil, pytz, @@ -25,6 +24,11 @@ buildPythonPackage rec { hash = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; + patches = [ + # https://github.com/influxdata/influxdb-python/pull/835 + ./remove-nose.patch + ]; + postPatch = '' for f in influxdb/tests/dataframe_client_test.py influxdb/tests/influxdb08/dataframe_client_test.py; do substituteInPlace "$f" \ @@ -52,7 +56,6 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pandas - pynose pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/influxdb/remove-nose.patch b/pkgs/development/python-modules/influxdb/remove-nose.patch new file mode 100644 index 0000000000000..b3d00c999581d --- /dev/null +++ b/pkgs/development/python-modules/influxdb/remove-nose.patch @@ -0,0 +1,713 @@ +diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py +index 115fbc4..5b348c7 100644 +--- a/influxdb/tests/client_test.py ++++ b/influxdb/tests/client_test.py +@@ -32,7 +32,6 @@ import requests + import requests.exceptions + import requests_mock + +-from nose.tools import raises + from urllib3.connection import HTTPConnection + + from influxdb import InfluxDBClient +@@ -383,12 +382,12 @@ class TestInfluxDBClient(unittest.TestCase): + received_data.decode() + ) + +- @raises(Exception) + def test_write_points_fails(self): + """Test write points fail for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- with _mocked_session(cli, 'post', 500): +- cli.write_points([]) ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'post', 500): ++ cli.write_points([]) + + def test_write_points_with_precision(self): + """Test write points with precision for TestInfluxDBClient object.""" +@@ -541,12 +540,12 @@ class TestInfluxDBClient(unittest.TestCase): + consistency='boo' + ) + +- @raises(Exception) + def test_write_points_with_precision_fails(self): + """Test write points w/precision fail for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- with _mocked_session(cli, 'post', 500): +- cli.write_points_with_precision([]) ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'post', 500): ++ cli.write_points_with_precision([]) + + def test_query(self): + """Test query method for TestInfluxDBClient object.""" +@@ -651,11 +650,11 @@ class TestInfluxDBClient(unittest.TestCase): + [example_object, example_object] + ) + +- @raises(Exception) + def test_query_fail(self): + """Test query failed for TestInfluxDBClient object.""" +- with _mocked_session(self.cli, 'get', 401): +- self.cli.query('select column_one from foo;') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 401): ++ self.cli.query('select column_one from foo;') + + def test_ping(self): + """Test ping querying InfluxDB version.""" +@@ -697,11 +696,11 @@ class TestInfluxDBClient(unittest.TestCase): + 'create database "123"' + ) + +- @raises(Exception) + def test_create_database_fails(self): + """Test create database fail for TestInfluxDBClient object.""" +- with _mocked_session(self.cli, 'post', 401): +- self.cli.create_database('new_db') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'post', 401): ++ self.cli.create_database('new_db') + + def test_drop_database(self): + """Test drop database for TestInfluxDBClient object.""" +@@ -762,12 +761,12 @@ class TestInfluxDBClient(unittest.TestCase): + [{'name': 'new_db_1'}, {'name': 'new_db_2'}] + ) + +- @raises(Exception) + def test_get_list_database_fails(self): + """Test get list of dbs fail for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_database() ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_database() + + def test_get_list_measurements(self): + """Test get list of measurements for TestInfluxDBClient object.""" +@@ -840,12 +839,12 @@ class TestInfluxDBClient(unittest.TestCase): + self.cli.get_list_series(tags={'region': 'us-west'}), + ['cpu_load_short,host=server01,region=us-west']) + +- @raises(Exception) + def test_get_list_series_fails(self): + """Test get a list of series from the database but fail.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_series() ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_series() + + def test_create_retention_policy_default(self): + """Test create default ret policy for TestInfluxDBClient object.""" +@@ -971,12 +970,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'alter retention policy "somename" on "db" default' + ) + +- @raises(Exception) + def test_alter_retention_policy_invalid(self): + """Test invalid alter ret policy for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.alter_retention_policy('somename', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.alter_retention_policy('somename', 'db') + + def test_drop_retention_policy(self): + """Test drop retention policy for TestInfluxDBClient object.""" +@@ -994,12 +993,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'drop retention policy "somename" on "db"' + ) + +- @raises(Exception) + def test_drop_retention_policy_fails(self): + """Test failed drop ret policy for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'delete', 401): +- cli.drop_retention_policy('default', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'delete', 401): ++ cli.drop_retention_policy('default', 'db') + + def test_get_list_retention_policies(self): + """Test get retention policies for TestInfluxDBClient object.""" +@@ -1179,12 +1178,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'grant all privileges to "test"' + ) + +- @raises(Exception) + def test_grant_admin_privileges_invalid(self): + """Test grant invalid admin privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.grant_admin_privileges('') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.grant_admin_privileges('') + + def test_revoke_admin_privileges(self): + """Test revoke admin privs for TestInfluxDBClient object.""" +@@ -1203,12 +1202,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'revoke all privileges from "test"' + ) + +- @raises(Exception) + def test_revoke_admin_privileges_invalid(self): + """Test revoke invalid admin privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.revoke_admin_privileges('') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.revoke_admin_privileges('') + + def test_grant_privilege(self): + """Test grant privs for TestInfluxDBClient object.""" +@@ -1227,12 +1226,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'grant read on "testdb" to "test"' + ) + +- @raises(Exception) + def test_grant_privilege_invalid(self): + """Test grant invalid privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.grant_privilege('', 'testdb', 'test') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.grant_privilege('', 'testdb', 'test') + + def test_revoke_privilege(self): + """Test revoke privs for TestInfluxDBClient object.""" +@@ -1251,12 +1250,12 @@ class TestInfluxDBClient(unittest.TestCase): + 'revoke read on "testdb" from "test"' + ) + +- @raises(Exception) + def test_revoke_privilege_invalid(self): + """Test revoke invalid privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- self.cli.revoke_privilege('', 'testdb', 'test') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ self.cli.revoke_privilege('', 'testdb', 'test') + + def test_get_list_privileges(self): + """Test get list of privs for TestInfluxDBClient object.""" +@@ -1278,12 +1277,12 @@ class TestInfluxDBClient(unittest.TestCase): + {'database': 'db3', 'privilege': 'NO PRIVILEGES'}] + ) + +- @raises(Exception) + def test_get_list_privileges_fails(self): + """Test failed get list of privs for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_privileges('test') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_privileges('test') + + def test_get_list_continuous_queries(self): + """Test getting a list of continuous queries.""" +@@ -1333,11 +1332,11 @@ class TestInfluxDBClient(unittest.TestCase): + ] + ) + +- @raises(Exception) + def test_get_list_continuous_queries_fails(self): + """Test failing to get a list of continuous queries.""" +- with _mocked_session(self.cli, 'get', 400): +- self.cli.get_list_continuous_queries() ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 400): ++ self.cli.get_list_continuous_queries() + + def test_create_continuous_query(self): + """Test continuous query creation.""" +@@ -1366,11 +1365,12 @@ class TestInfluxDBClient(unittest.TestCase): + '"6_months"."events" from "events" group by time(10m) end' + ) + +- @raises(Exception) + def test_create_continuous_query_fails(self): + """Test failing to create a continuous query.""" +- with _mocked_session(self.cli, 'get', 400): +- self.cli.create_continuous_query('cq_name', 'select', 'db_name') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 400): ++ self.cli.create_continuous_query('cq_name', 'select', ++ 'db_name') + + def test_drop_continuous_query(self): + """Test dropping a continuous query.""" +@@ -1387,11 +1387,11 @@ class TestInfluxDBClient(unittest.TestCase): + 'drop continuous query "cq_name" on "db_name"' + ) + +- @raises(Exception) + def test_drop_continuous_query_fails(self): + """Test failing to drop a continuous query.""" +- with _mocked_session(self.cli, 'get', 400): +- self.cli.drop_continuous_query('cq_name', 'db_name') ++ with self.assertRaises(Exception): ++ with _mocked_session(self.cli, 'get', 400): ++ self.cli.drop_continuous_query('cq_name', 'db_name') + + def test_invalid_port_fails(self): + """Test invalid port fail for TestInfluxDBClient object.""" +diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py +index 87b8e0d..a8c8416 100644 +--- a/influxdb/tests/dataframe_client_test.py ++++ b/influxdb/tests/dataframe_client_test.py +@@ -13,7 +13,6 @@ import unittest + import warnings + import requests_mock + +-from nose.tools import raises + from influxdb.tests import skip_if_pypy, using_pypy + + from .client_test import _mocked_session +@@ -597,35 +596,35 @@ class TestDataFrameClient(unittest.TestCase): + m.last_request.body, + ) + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_without_time_index(self): + """Test failed write points from df without time index.""" + dataframe = pd.DataFrame(data=[["1", 1, 1.0], ["2", 2, 2.0]], + columns=["column_one", "column_two", + "column_three"]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series", +- status_code=204) ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series", ++ status_code=204) + +- cli = DataFrameClient(database='db') +- cli.write_points(dataframe, "foo") ++ cli = DataFrameClient(database='db') ++ cli.write_points(dataframe, "foo") + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_with_series(self): + """Test failed write points from df with series.""" + now = pd.Timestamp('1970-01-01 00:00+00:00') + dataframe = pd.Series(data=[1.0, 2.0], + index=[now, now + timedelta(hours=1)]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series", +- status_code=204) ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series", ++ status_code=204) + +- cli = DataFrameClient(database='db') +- cli.write_points(dataframe, "foo") ++ cli = DataFrameClient(database='db') ++ cli.write_points(dataframe, "foo") + + def test_create_database(self): + """Test create database for TestInfluxDBClient object.""" +@@ -657,12 +656,12 @@ class TestDataFrameClient(unittest.TestCase): + 'create database "123"' + ) + +- @raises(Exception) + def test_create_database_fails(self): + """Test create database fail for TestInfluxDBClient object.""" + cli = DataFrameClient(database='db') +- with _mocked_session(cli, 'post', 401): +- cli.create_database('new_db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'post', 401): ++ cli.create_database('new_db') + + def test_drop_database(self): + """Test drop database for TestInfluxDBClient object.""" +@@ -709,12 +708,12 @@ class TestDataFrameClient(unittest.TestCase): + 'drop database "123"' + ) + +- @raises(Exception) + def test_get_list_database_fails(self): + """Test get list of dbs fail for TestInfluxDBClient object.""" + cli = DataFrameClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 401): +- cli.get_list_database() ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 401): ++ cli.get_list_database() + + def test_get_list_measurements(self): + """Test get list of measurements for TestInfluxDBClient object.""" +@@ -819,12 +818,12 @@ class TestDataFrameClient(unittest.TestCase): + 'alter retention policy "somename" on "db" default' + ) + +- @raises(Exception) + def test_alter_retention_policy_invalid(self): + """Test invalid alter ret policy for TestInfluxDBClient object.""" + cli = DataFrameClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'get', 400): +- cli.alter_retention_policy('somename', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'get', 400): ++ cli.alter_retention_policy('somename', 'db') + + def test_drop_retention_policy(self): + """Test drop retention policy for TestInfluxDBClient object.""" +@@ -843,12 +842,12 @@ class TestDataFrameClient(unittest.TestCase): + 'drop retention policy "somename" on "db"' + ) + +- @raises(Exception) + def test_drop_retention_policy_fails(self): + """Test failed drop ret policy for TestInfluxDBClient object.""" + cli = DataFrameClient('host', 8086, 'username', 'password') +- with _mocked_session(cli, 'delete', 401): +- cli.drop_retention_policy('default', 'db') ++ with self.assertRaises(Exception): ++ with _mocked_session(cli, 'delete', 401): ++ cli.drop_retention_policy('default', 'db') + + def test_get_list_retention_policies(self): + """Test get retention policies for TestInfluxDBClient object.""" +diff --git a/influxdb/tests/influxdb08/client_test.py b/influxdb/tests/influxdb08/client_test.py +index 39ab52d..d20a411 100644 +--- a/influxdb/tests/influxdb08/client_test.py ++++ b/influxdb/tests/influxdb08/client_test.py +@@ -13,7 +13,6 @@ import requests + import requests.exceptions + import requests_mock + +-from nose.tools import raises + from mock import patch + + from influxdb.influxdb08 import InfluxDBClient +@@ -131,12 +130,12 @@ class TestInfluxDBClient(unittest.TestCase): + cli.switch_database('another_database') + self.assertEqual(cli._database, 'another_database') + +- @raises(FutureWarning) + def test_switch_db_deprecated(self): + """Test deprecated switch database for TestInfluxDBClient object.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'database') +- cli.switch_db('another_database') +- self.assertEqual(cli._database, 'another_database') ++ with self.assertRaises(FutureWarning): ++ cli.switch_db('another_database') ++ self.assertEqual(cli._database, 'another_database') + + def test_switch_user(self): + """Test switch user for TestInfluxDBClient object.""" +@@ -288,12 +287,13 @@ class TestInfluxDBClient(unittest.TestCase): + time_precision='ms' + ) + +- @raises(Exception) + def test_write_points_fails(self): + """Test failed write points for TestInfluxDBClient object.""" +- with _mocked_session('post', 500): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.write_points([]) ++ with self.assertRaises(Exception): ++ with _mocked_session('post', 500): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.write_points([]) + + def test_write_points_with_precision(self): + """Test write points with precision.""" +@@ -313,12 +313,13 @@ class TestInfluxDBClient(unittest.TestCase): + time_precision='g' + ) + +- @raises(Exception) + def test_write_points_with_precision_fails(self): + """Test write points where precision fails.""" +- with _mocked_session('post', 500): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.write_points_with_precision([]) ++ with self.assertRaises(Exception): ++ with _mocked_session('post', 500): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.write_points_with_precision([]) + + def test_delete_points(self): + """Test delete points for TestInfluxDBClient object.""" +@@ -333,30 +334,31 @@ class TestInfluxDBClient(unittest.TestCase): + {'u': 'username', 'p': 'password'}) + self.assertEqual(kwds['url'], 'http://host:8086/db/db/series/foo') + +- @raises(Exception) + def test_delete_points_with_wrong_name(self): + """Test delete points with wrong name.""" +- with _mocked_session('delete', 400): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_points("nonexist") ++ with self.assertRaises(Exception): ++ with _mocked_session('delete', 400): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.delete_points("nonexist") + +- @raises(NotImplementedError) + def test_create_scheduled_delete(self): + """Test create scheduled deletes.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.create_scheduled_delete([]) ++ with self.assertRaises(NotImplementedError): ++ cli.create_scheduled_delete([]) + +- @raises(NotImplementedError) + def test_get_list_scheduled_delete(self): + """Test get schedule list of deletes TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.get_list_scheduled_delete() ++ with self.assertRaises(NotImplementedError): ++ cli.get_list_scheduled_delete() + +- @raises(NotImplementedError) + def test_remove_scheduled_delete(self): + """Test remove scheduled delete TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.remove_scheduled_delete(1) ++ with self.assertRaises(NotImplementedError): ++ cli.remove_scheduled_delete(1) + + def test_query(self): + """Test query for TestInfluxDBClient object.""" +@@ -438,12 +440,13 @@ class TestInfluxDBClient(unittest.TestCase): + [example_object, example_object] + ) + +- @raises(Exception) + def test_query_fail(self): + """Test failed query for TestInfluxDBClient.""" +- with _mocked_session('get', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.query('select column_one from foo;') ++ with self.assertRaises(Exception): ++ with _mocked_session('get', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.query('select column_one from foo;') + + def test_query_bad_precision(self): + """Test query with bad precision for TestInfluxDBClient.""" +@@ -460,12 +463,13 @@ class TestInfluxDBClient(unittest.TestCase): + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') + self.assertTrue(cli.create_database('new_db')) + +- @raises(Exception) + def test_create_database_fails(self): + """Test failed create database for TestInfluxDBClient.""" +- with _mocked_session('post', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.create_database('new_db') ++ with self.assertRaises(Exception): ++ with _mocked_session('post', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.create_database('new_db') + + def test_delete_database(self): + """Test delete database for TestInfluxDBClient.""" +@@ -473,12 +477,13 @@ class TestInfluxDBClient(unittest.TestCase): + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') + self.assertTrue(cli.delete_database('old_db')) + +- @raises(Exception) + def test_delete_database_fails(self): + """Test failed delete database for TestInfluxDBClient.""" +- with _mocked_session('delete', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_database('old_db') ++ with self.assertRaises(Exception): ++ with _mocked_session('delete', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.delete_database('old_db') + + def test_get_list_database(self): + """Test get list of databases for TestInfluxDBClient.""" +@@ -490,23 +495,23 @@ class TestInfluxDBClient(unittest.TestCase): + self.assertEqual(len(cli.get_list_database()), 1) + self.assertEqual(cli.get_list_database()[0]['name'], 'a_db') + +- @raises(Exception) + def test_get_list_database_fails(self): + """Test failed get list of databases for TestInfluxDBClient.""" +- with _mocked_session('get', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password') +- cli.get_list_database() ++ with self.assertRaises(Exception): ++ with _mocked_session('get', 401): ++ cli = InfluxDBClient('host', 8086, 'username', 'password') ++ cli.get_list_database() + +- @raises(FutureWarning) + def test_get_database_list_deprecated(self): + """Test deprecated get database list for TestInfluxDBClient.""" + data = [ + {"name": "a_db"} + ] +- with _mocked_session('get', 200, data): +- cli = InfluxDBClient('host', 8086, 'username', 'password') +- self.assertEqual(len(cli.get_database_list()), 1) +- self.assertEqual(cli.get_database_list()[0]['name'], 'a_db') ++ with self.assertRaises(FutureWarning): ++ with _mocked_session('get', 200, data): ++ cli = InfluxDBClient('host', 8086, 'username', 'password') ++ self.assertEqual(len(cli.get_database_list()), 1) ++ self.assertEqual(cli.get_database_list()[0]['name'], 'a_db') + + def test_delete_series(self): + """Test delete series for TestInfluxDBClient.""" +@@ -514,12 +519,13 @@ class TestInfluxDBClient(unittest.TestCase): + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') + cli.delete_series('old_series') + +- @raises(Exception) + def test_delete_series_fails(self): + """Test failed delete series for TestInfluxDBClient.""" +- with _mocked_session('delete', 401): +- cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_series('old_series') ++ with self.assertRaises(Exception): ++ with _mocked_session('delete', 401): ++ cli = InfluxDBClient('host', 8086, 'username', ++ 'password', 'db') ++ cli.delete_series('old_series') + + def test_get_series_list(self): + """Test get list of series for TestInfluxDBClient.""" +@@ -662,29 +668,30 @@ class TestInfluxDBClient(unittest.TestCase): + } + ) + +- @raises(NotImplementedError) + def test_get_list_database_admins(self): + """Test get list of database admins for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.get_list_database_admins() ++ with self.assertRaises(NotImplementedError): ++ cli.get_list_database_admins() + +- @raises(NotImplementedError) + def test_add_database_admin(self): + """Test add database admins for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.add_database_admin('admin', 'admin_secret_password') ++ with self.assertRaises(NotImplementedError): ++ cli.add_database_admin('admin', 'admin_secret_password') + +- @raises(NotImplementedError) + def test_update_database_admin_password(self): + """Test update database admin pass for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.update_database_admin_password('admin', 'admin_secret_password') ++ with self.assertRaises(NotImplementedError): ++ cli.update_database_admin_password('admin', ++ 'admin_secret_password') + +- @raises(NotImplementedError) + def test_delete_database_admin(self): + """Test delete database admin for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.delete_database_admin('admin') ++ with self.assertRaises(NotImplementedError): ++ cli.delete_database_admin('admin') + + def test_get_database_users(self): + """Test get database users for TestInfluxDBClient.""" +@@ -842,11 +849,11 @@ class TestInfluxDBClient(unittest.TestCase): + + self.assertIsNone(m.last_request.body) + +- @raises(NotImplementedError) + def test_update_permission(self): + """Test update permission for TestInfluxDBClient.""" + cli = InfluxDBClient('host', 8086, 'username', 'password', 'db') +- cli.update_permission('admin', []) ++ with self.assertRaises(NotImplementedError): ++ cli.update_permission('admin', []) + + @mock.patch('requests.Session.request') + def test_request_retry(self, mock_request): +diff --git a/influxdb/tests/influxdb08/dataframe_client_test.py b/influxdb/tests/influxdb08/dataframe_client_test.py +index 0a766af..104ae6b 100644 +--- a/influxdb/tests/influxdb08/dataframe_client_test.py ++++ b/influxdb/tests/influxdb08/dataframe_client_test.py +@@ -10,8 +10,6 @@ import warnings + + import requests_mock + +-from nose.tools import raises +- + from influxdb.tests import skip_if_pypy, using_pypy + + from .client_test import _mocked_session +@@ -191,33 +189,33 @@ class TestDataFrameClient(unittest.TestCase): + cli.write_points({"foo": dataframe}, time_precision='u') + self.assertListEqual(json.loads(m.last_request.body), points_us) + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_without_time_index(self): + """Test write points from dataframe that fails without time index.""" + dataframe = pd.DataFrame(data=[["1", 1, 1.0], ["2", 2, 2.0]], + columns=["column_one", "column_two", + "column_three"]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series") ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series") + +- cli = DataFrameClient(database='db') +- cli.write_points({"foo": dataframe}) ++ cli = DataFrameClient(database='db') ++ cli.write_points({"foo": dataframe}) + +- @raises(TypeError) + def test_write_points_from_dataframe_fails_with_series(self): + """Test failed write points from dataframe with series.""" + now = pd.Timestamp('1970-01-01 00:00+00:00') + dataframe = pd.Series(data=[1.0, 2.0], + index=[now, now + timedelta(hours=1)]) + +- with requests_mock.Mocker() as m: +- m.register_uri(requests_mock.POST, +- "http://localhost:8086/db/db/series") ++ with self.assertRaises(TypeError): ++ with requests_mock.Mocker() as m: ++ m.register_uri(requests_mock.POST, ++ "http://localhost:8086/db/db/series") + +- cli = DataFrameClient(database='db') +- cli.write_points({"foo": dataframe}) ++ cli = DataFrameClient(database='db') ++ cli.write_points({"foo": dataframe}) + + def test_query_into_dataframe(self): + """Test query into a dataframe.""" diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index 2aa2705a8879f..8fc53603db006 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -4,7 +4,6 @@ certifi, fetchFromGitHub, pyarrow, - pytestCheckHook, python-dateutil, pythonOlder, reactivex, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-xu1uWVhZCFIjyOjE144X0JFtYY/nIoBHp/eHtysARYc="; + hash = "sha256-jncJUurkH1XzC6Hjcpet1fZejcYjcPq2OWI//FmZcmI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index ada4397a03d49..fcf045c944114 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, substituteAll, fetchPypi, - hatch-vcs, hatchling, }: @@ -37,6 +36,6 @@ buildPythonPackage rec { description = "brain-dead simple parsing of ini files"; homepage = "https://github.com/pytest-dev/iniconfig"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index b3ade47dcaf7b..a03e4070326f4 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Small INI library for Python"; homepage = "https://github.com/mitsuhiko/python-inifile"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 15aaddd0069b8..154848eae3510 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, inkscape, + fetchpatch, poetry-core, cssselect, lxml, @@ -25,6 +26,17 @@ buildPythonPackage { inherit (inkscape) src; + patches = [ + # Fix “distribute along path” test with Python 3.12. + # https://gitlab.com/inkscape/extensions/-/issues/580 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch"; + extraPrefix = "share/extensions/"; + stripLen = 1; + hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/inlinestyler/default.nix b/pkgs/development/python-modules/inlinestyler/default.nix index 3228d0f5b4554..2fd63571eb286 100644 --- a/pkgs/development/python-modules/inlinestyler/default.nix +++ b/pkgs/development/python-modules/inlinestyler/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/dlanger/inlinestyler"; changelog = "https://github.com/dlanger/inlinestyler/blob/${src.rev}/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/inscriptis/default.nix b/pkgs/development/python-modules/inscriptis/default.nix index 5de7c6e10b1ce..b98b7fdfa07b4 100644 --- a/pkgs/development/python-modules/inscriptis/default.nix +++ b/pkgs/development/python-modules/inscriptis/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/weblyzard/inscriptis"; changelog = "https://github.com/weblyzard/inscriptis/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 0951b6218b0b0..80907730ffcf4 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -137,6 +137,6 @@ buildPythonPackage rec { homepage = "https://github.com/ContinuumIO/intake"; changelog = "https://github.com/intake/intake/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index 09417bc2cc9fb..4c3d1d477c5a6 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "intbitset" ]; - meta = with lib; { + meta = { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 5ac98f31c5534..019ebd243f2cd 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Pythonic task execution"; homepage = "https://www.pyinvoke.org/"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/iocsearcher/default.nix b/pkgs/development/python-modules/iocsearcher/default.nix index be8c0cef7007e..26d3939d1772a 100644 --- a/pkgs/development/python-modules/iocsearcher/default.nix +++ b/pkgs/development/python-modules/iocsearcher/default.nix @@ -15,14 +15,13 @@ phonenumbers, python-magic, readabilipy, - pytestCheckHook, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "iocsearcher"; - version = "2.3-unstable-2024-03-04"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix index 5c296986b58d4..a9942a37580f0 100644 --- a/pkgs/development/python-modules/ionoscloud/default.nix +++ b/pkgs/development/python-modules/ionoscloud/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Python API client for ionoscloud"; changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index ace7c4f03f09a..53159f5a84571 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/ipy/default.nix b/pkgs/development/python-modules/ipy/default.nix index 7db51ef648b17..5a5876b8b2be3 100644 --- a/pkgs/development/python-modules/ipy/default.nix +++ b/pkgs/development/python-modules/ipy/default.nix @@ -2,25 +2,26 @@ lib, buildPythonPackage, fetchPypi, - nose, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "ipy"; version = "1.01"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "IPy"; inherit version; - sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"; + hash = "sha256-7eynQd6i1UrKVo+iN0AojD/obA8+pwA0RXHp7xSnzBo="; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - checkPhase = '' - nosetests -e fuzz - ''; + pythonImportsCheck = [ "IPy" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Class and tools for handling of IPv4 and IPv6 addresses and networks"; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 45695a23166e5..cacce82794b83 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -3,8 +3,7 @@ buildPythonPackage, fetchPypi, isPy27, - pytest, - pytest-cov, + pytestCheckHook, nbval, jupyter-packaging, ipywidgets, @@ -37,13 +36,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest - pytest-cov + pytestCheckHook nbval ]; - checkPhase = "pytest ipydatawidgets/tests"; - meta = { description = "Widgets to help facilitate reuse of large datasets across different widgets"; homepage = "https://github.com/vidartf/ipydatawidgets"; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 3ef98a9a8eb8e..7fd7702193015 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.29.4"; + version = "6.29.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PUQHAGD5R1rCCSt2ASP63xBdLiSTwkhItmkafE9Cr1w="; + hash = "sha256-8JOiLEpA+IKPjjMKnCl8uT3KsTvZZ43tbejlz4HFYhU="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipython-genutils/default.nix b/pkgs/development/python-modules/ipython-genutils/default.nix index a0f8717de4b66..980e828c44a54 100644 --- a/pkgs/development/python-modules/ipython-genutils/default.nix +++ b/pkgs/development/python-modules/ipython-genutils/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, setuptools, - nose, pytestCheckHook, - pythonAtLeast, }: buildPythonPackage rec { @@ -13,27 +12,23 @@ buildPythonPackage rec { version = "0.2.0"; pyproject = true; - # uses the imp module, upstream says "DO NOT USE" - disabled = pythonAtLeast "3.12"; - src = fetchPypi { pname = "ipython_genutils"; inherit version; hash = "sha256-6y4RbnXs751NIo/cZq9UJpr6JqtEYwQuM3hbiHxii6g="; }; - nativeBuildInputs = [ setuptools ]; - - nativeCheckInputs = [ - nose - pytestCheckHook + patches = [ + (fetchpatch { + name = "ipython_genutils-denose.patch"; + url = "https://build.opensuse.org/public/source/devel:languages:python:jupyter/python-ipython_genutils/denose.patch?rev=9"; + hash = "sha256-At0aq6rLw/L64Own069m0p/WQm7iDa24fm0SPLLRBdE="; + }) ]; - preCheck = '' - substituteInPlace ipython_genutils/tests/test_path.py \ - --replace "setUp" "setup_method" \ - --replace "tearDown" "teardown_method" - ''; + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ipython_genutils" ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index b73810bf3b8ac..c7408868ad916 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "irc"; - version = "20.4.1"; + version = "20.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-J1aYebrlzYmRwhfNy0ZRkNe08YpqJnSeSNBT/QtaUsw="; + hash = "sha256-dXguOB679BBEP3kU/XTKF/vcRBTRTUjaVhSZ6wlY0AI="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/irc"; changelog = "https://github.com/jaraco/irc/blob/v${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 520b7f615978b..8bf7e67b9ecd2 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -1,31 +1,55 @@ { lib, buildPythonPackage, - fetchPypi, - nose, - coverage, - pythonOlder, + fetchFromGitHub, + pytestCheckHook, + pytest-cov, + setuptools, }: buildPythonPackage rec { pname = "isbnlib"; version = "3.10.14"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-lvkIZMd7AfVfoR5b/Kn9kJUB2YQvO8cQ1Oq4UZXZBTk="; + src = fetchFromGitHub { + owner = "xlcnd"; + repo = "isbnlib"; + rev = "v${version}"; + hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ - nose - coverage + pytestCheckHook + pytest-cov + ]; + + pytestFlagsArray = [ "isbnlib/test/" ]; + + # All disabled tests require a network connection + disabledTests = [ + "test_cache" + "test_editions_any" + "test_editions_merge" + "test_editions_thingl" + "test_editions_wiki" + "test_isbn_from_words" + "test_desc" + "test_cover" ]; - # requires network connection - doCheck = false; + disabledTestPaths = [ + "isbnlib/test/test_cache_decorator.py" + "isbnlib/test/test_goom.py" + "isbnlib/test/test_metadata.py" + "isbnlib/test/test_openl.py" + "isbnlib/test/test_rename.py" + "isbnlib/test/test_webservice.py" + "isbnlib/test/test_wiki.py" + "isbnlib/test/test_words.py" + ]; pythonImportsCheck = [ "isbnlib" diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index 7356db3a27449..79de8ce0df387 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; + hash = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; }; propagatedBuildInputs = [ numpy ]; @@ -33,6 +33,6 @@ buildPythonPackage rec { many far from the implicit surface. ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/isounidecode/default.nix b/pkgs/development/python-modules/isounidecode/default.nix index 9ac5d454b2fc5..c8b0607b0244b 100644 --- a/pkgs/development/python-modules/isounidecode/default.nix +++ b/pkgs/development/python-modules/isounidecode/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Python package for conversion and transliteration of unicode into ascii or iso-8859-1"; homepage = "https://github.com/redvasily/isounidecode"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index ac9250637a3ae..b501fa5927c4c 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/itemadapter"; changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index ac904ef15253e..bd6e8b884ac10 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/itemloaders"; changelog = "https://github.com/scrapy/itemloaders/raw/v${version}/docs/release-notes.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix index 5dc9382baad19..ae4db9f10b3ec 100644 --- a/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/pkgs/development/python-modules/iteration-utilities/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/MSeifert04/iteration_utilities"; changelog = "https://github.com/MSeifert04/iteration_utilities/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix index 705c7e9b56b89..12b647499c732 100644 --- a/pkgs/development/python-modules/itunespy/default.nix +++ b/pkgs/development/python-modules/itunespy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "itunespy"; - version = "1.6"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "sleepyfran"; repo = pname; - rev = version; - sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-QvSKJAZa8v0tGURXwo4Dwo73JqsYs1xsBHW0lcaM7bk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 771f91a461acf..a1e83de89c125 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Simple immutable types for python"; homepage = "https://github.com/tomchristie/itypes"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ixia/default.nix b/pkgs/development/python-modules/ixia/default.nix index ae07ed052eed0..cf9001cb7edb3 100644 --- a/pkgs/development/python-modules/ixia/default.nix +++ b/pkgs/development/python-modules/ixia/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonImportsCheck = [ "ixia" ]; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/ixia/blob/${src.rev}/CHANGELOG.md"; description = "Connecting secrets' security with random's versatility"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://trag1c.github.io/ixia"; - maintainers = with maintainers; [ sigmanificient ]; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index ad361c560a719..87cd4d3e022f1 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, jinja2, + pythonAtLeast, pyyaml, setuptools, }: @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "j2cli"; version = "0.3.10"; format = "setuptools"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jaconv/default.nix b/pkgs/development/python-modules/jaconv/default.nix index 474b168c6042b..d56e02f9d6748 100644 --- a/pkgs/development/python-modules/jaconv/default.nix +++ b/pkgs/development/python-modules/jaconv/default.nix @@ -2,29 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, pythonOlder, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "jaconv"; version = "0.3.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ikegami-yukino"; - repo = pname; + repo = "jaconv"; rev = "refs/tags/v${version}"; hash = "sha256-9ruhOLaYNESeKOwJs3IN6ct66fSq7My9DOyA7/cH3d0="; }; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + patches = [ ./use-pytest.patch ]; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jaconv" ]; diff --git a/pkgs/development/python-modules/jaconv/use-pytest.patch b/pkgs/development/python-modules/jaconv/use-pytest.patch new file mode 100644 index 0000000000000..b91704ee4f32d --- /dev/null +++ b/pkgs/development/python-modules/jaconv/use-pytest.patch @@ -0,0 +1,34 @@ +diff --git a/test_jaconv.py b/test_jaconv.py +index 7e0a169..aaf180d 100644 +--- a/test_jaconv.py ++++ b/test_jaconv.py +@@ -1,11 +1,8 @@ + # -*- coding: utf-8 -*- + from __future__ import unicode_literals +-from nose.tools import assert_equal, nottest + import jaconv + from functools import partial + +-assert_equal.__self__.maxDiff = None +- + HIRAGANA = ('ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞた', + 'だちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽま', + 'みむめもゃやゅゆょよらりるれろわをんーゎゐゑゕゖゔゝゞ・「」。、') +@@ -25,13 +22,15 @@ FULL_ASCII = ('！＂＃＄％＆＇（）＊＋，－．／：；＜＝＞？ + FULL_DIGIT = '０１２３４５６７８９' + + +-@nottest ++def assert_equal(x, y): ++ assert x == y ++ ++ + def _compare(mathod, lhs, rhs): + for i in range(len(lhs)): + assert_equal(mathod(lhs[i]), rhs[i]) + + +-@nottest + def _concat(*iterables): + result = '' + for iterable in iterables: diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix index 61755ada57e0f..c976fca5d6344 100644 --- a/pkgs/development/python-modules/jaeger-client/default.nix +++ b/pkgs/development/python-modules/jaeger-client/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { downloadPage = "https://pypi.org/project/jaeger-client/"; homepage = "https://github.com/jaegertracing/jaeger-client-python"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index a6e843f7d4a2c..666f527fce405 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jaraco-abode"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-O7adVcczkEZ3B7qhZlIWp5A7ujHlEjLQG6OfR59eSO4="; + hash = "sha256-1omRBbUNS2/U2laK7E1M0uZfejZVMdGezG5oIGILj70="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix index 9992250b4cc9f..5b08f94e984d1 100644 --- a/pkgs/development/python-modules/jaraco-collections/default.nix +++ b/pkgs/development/python-modules/jaraco-collections/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.collections"; changelog = "https://github.com/jaraco/jaraco.collections/blob/v${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jaraco-envs/default.nix b/pkgs/development/python-modules/jaraco-envs/default.nix new file mode 100644 index 0000000000000..c2485c7fe7e3f --- /dev/null +++ b/pkgs/development/python-modules/jaraco-envs/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + path, + tox, + virtualenv, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "jaraco-envs"; + version = "2.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.envs"; + rev = "refs/tags/v${version}"; + hash = "sha256-yRMX0H6yWN8TiO/LGAr4HyrVS8ZhBjuR885/+UQscP0="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + path + tox + virtualenv + ]; + + pythonImportsCheck = [ "jaraco.envs" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # requires networking + "jaraco/envs.py" + ]; + + meta = { + changelog = "https://github.com/jaraco/jaraco.envs/blob/${src.rev}/NEWS.rst"; + description = "Classes for orchestrating Python (virtual) environments"; + homepage = "https://github.com/jaraco/jaraco.envs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index 722d707a18aea..4af7e125b83d6 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Additional functools in the spirit of stdlib's functools"; homepage = "https://github.com/jaraco/jaraco.functools"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index aeb99584cce78..3368ac4ae19e6 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/jaraco.logging"; changelog = "https://github.com/jaraco/jaraco.logging/blob/v${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jaraco-path/default.nix b/pkgs/development/python-modules/jaraco-path/default.nix new file mode 100644 index 0000000000000..9dc6c763a2ca5 --- /dev/null +++ b/pkgs/development/python-modules/jaraco-path/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + pytestCheckHook, + stdenv, +}: + +buildPythonPackage rec { + pname = "jaraco-path"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.path"; + rev = "refs/tags/v${version}"; + hash = "sha256-P22sA138guKTlOxSxUJ0mU41W16984yYlkZea06juOM="; + }; + + build-system = [ setuptools-scm ]; + + pythonImportsCheck = [ "jaraco.path" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + changelog = "https://github.com/jaraco/jaraco.path/blob/${src.rev}/NEWS.rst"; + description = "Miscellaneous path functions"; + homepage = "https://github.com/jaraco/jaraco.path"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + broken = stdenv.isDarwin; # pyobjc is missing + }; +} diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix index a3656f5cfbc2c..5ff8b117eb80d 100644 --- a/pkgs/development/python-modules/jaraco-text/default.nix +++ b/pkgs/development/python-modules/jaraco-text/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Module for text manipulation"; homepage = "https://github.com/jaraco/jaraco.text"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 2bc51a2041259..fecd77a50300c 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; + hash = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index 2c26ec97aea4a..bd8c9085a25d8 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Microsoft Azure API Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 1e7cf125ef304..0fc50fa9243f0 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -4,7 +4,7 @@ stdenv, # Build-time dependencies: - addOpenGLRunpath, + addDriverRunpath, autoAddDriverRunpath, bazel_6, binutils, diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index c8fba04ec260b..e28c6aecef3db 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -18,7 +18,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.31"; + version = "0.2.33"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-kuGFzp8sDLq6J/qq8ap3lD3n1pABHurXcbRUtDQyWwE="; + hash = "sha256-CL1EONbjjT3SCAn2o1x+1cgfuYWMEgQwbX9j34t+HGs="; }; build-system = [ diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index fa774a40b7e84..553500c47be67 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Jalali datetime binding"; homepage = "https://github.com/slashmili/python-jalali"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 26bd4a173dcb3..a47398cb9ca3e 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://github.com/davidhalter/jedi"; changelog = "https://github.com/davidhalter/jedi/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index a74c54dc4149e..6e4cb647e8651 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { mainProgram = "jenkins-jobs"; homepage = "https://jenkins-job-builder.readthedocs.io/en/latest/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix index 2f0dcad69c3f2..3e007d326d888 100644 --- a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix +++ b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Jinja2 Ansible Filters"; homepage = "https://pypi.org/project/jinja2-ansible-filters/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jinja2-git/default.nix b/pkgs/development/python-modules/jinja2-git/default.nix index 3623ea1c3b2db..df9ca0585d3b0 100644 --- a/pkgs/development/python-modules/jinja2-git/default.nix +++ b/pkgs/development/python-modules/jinja2-git/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "jinja2-git"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "wemake-services"; repo = "jinja2-git"; rev = "refs/tags/${version}"; - hash = "sha256-XuN2L3/HLcZ/WPWiCtufDOmkxj+q4I6IOgjrGQHfNLk="; + hash = "sha256-ZcKRLHcZ/rpiUyYK4ifDJaZriN+YyRF1RKCjIKum98U="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ jinja2 ]; + dependencies = [ jinja2 ]; # the tests need to be run on the git repository doCheck = false; diff --git a/pkgs/development/python-modules/jinja2-time/default.nix b/pkgs/development/python-modules/jinja2-time/default.nix index 5a2a020af9c37..b0783c69f4ba5 100644 --- a/pkgs/development/python-modules/jinja2-time/default.nix +++ b/pkgs/development/python-modules/jinja2-time/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/hackebrot/jinja2-time"; description = "Jinja2 Extension for Dates and Times"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 5e0a57983b5fb..2e2ff91c8b0a3 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { homepage = "https://github.com/pycontribs/jira"; changelog = "https://github.com/pycontribs/jira/releases/tag/${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "jirashell"; }; } diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index f6a15f0156f6a..a01dc0b7984d3 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; mainProgram = "jp.py"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index f56aa7a39197a..65b728b34e9ae 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { description = "Lightweight pipelining: using Python functions as pipeline jobs"; homepage = "https://joblib.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix index a48098db4a48a..a54844be9213d 100644 --- a/pkgs/development/python-modules/joserfc/default.nix +++ b/pkgs/development/python-modules/joserfc/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Implementations of JOSE RFCs in Python"; homepage = "https://github.com/authlib/joserfc"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jplephem/default.nix b/pkgs/development/python-modules/jplephem/default.nix index 654db8037d0da..4fd924c47358f 100644 --- a/pkgs/development/python-modules/jplephem/default.nix +++ b/pkgs/development/python-modules/jplephem/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, numpy, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix index 998b841e379a3..773327b85cfbd 100644 --- a/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Generate source code for Python classes from a JSON schema"; homepage = "https://github.com/microsoft/jschema-to-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jschon/default.nix b/pkgs/development/python-modules/jschon/default.nix index 8a1686095fbfb..82a125e4460be 100644 --- a/pkgs/development/python-modules/jschon/default.nix +++ b/pkgs/development/python-modules/jschon/default.nix @@ -58,6 +58,11 @@ buildPythonPackage rec { pytest-xdist # not used upstream, but massive speedup ]; + disabledTests = [ + # flaky, timing sensitive + "test_keyword_dependency_resolution" + ]; + disabledTestPaths = [ "tests/test_benchmarks.py" ]; diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index 44b508af55c8b..3a15b321e5cd2 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "JavaScript minifier"; homepage = "https://github.com/tikitu/jsmin/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix index ee5805e39a1ba..90f5d7b8a045f 100644 --- a/pkgs/development/python-modules/json-logging/default.nix +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://github.com/bobbui/json-logging-python"; changelog = "https://github.com/bobbui/json-logging-python/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix new file mode 100644 index 0000000000000..72037ce322b3a --- /dev/null +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "json-repair"; + version = "0.27.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mangiucugna"; + repo = "json_repair"; + rev = "refs/tags/${version}"; + hash = "sha256-kaTwdS2zRt94pJko9AKEvszLR4z62u3ZrKlfXkJr5TQ="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "tests/test_performance.py" ]; + + pythonImportsCheck = [ "json_repair" ]; + + meta = with lib; { + homepage = "https://github.com/mangiucugna/json_repair/"; + description = "repair invalid JSON, commonly used to parse the output of LLMs"; + license = licenses.mit; + maintainers = with maintainers; [ greg ]; + }; +} diff --git a/pkgs/development/python-modules/json2html/default.nix b/pkgs/development/python-modules/json2html/default.nix new file mode 100644 index 0000000000000..8a7ef46d72418 --- /dev/null +++ b/pkgs/development/python-modules/json2html/default.nix @@ -0,0 +1,34 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "json2html"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "softvar"; + repo = "json2html"; + rev = "v${version}"; + hash = "sha256-Y+mwJ0p4Q2TKMU8qQvuvo08RiMdsReO7psgXaiW9ntk="; + }; + + build-system = [ setuptools ]; + + # no proper test available + doCheck = false; + + pythonImportsCheck = [ "json2html" ]; + + meta = { + description = "Python module for converting complex JSON to HTML Table representation"; + homepage = "https://github.com/softvar/json2html"; + changelog = "https://github.com/softvar/json2html/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/development/python-modules/jsonable/default.nix b/pkgs/development/python-modules/jsonable/default.nix index 4dd7c96221e6f..705ff95a2d770 100644 --- a/pkgs/development/python-modules/jsonable/default.nix +++ b/pkgs/development/python-modules/jsonable/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, pytestCheckHook, + fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "jsonable"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "halfak"; @@ -18,17 +19,25 @@ buildPythonPackage rec { hash = "sha256-3FIzG2djSZOPDdoYeKqs3obQjgHrFtyp0sdBwZakkHA="; }; - nativeCheckInputs = [ - nose - pytestCheckHook + patches = [ + # https://github.com/halfak/python-jsonable/pull/2 + (fetchpatch2 { + name = "eq-to-assert.patch"; + url = "https://github.com/halfak/python-jsonable/pull/2/commits/335e61bb4926e644aef983f7313793bf506d2463.patch"; + hash = "sha256-tCVA0wG+UMyB6oaNf4nbZ2BPWkNumaGPcjP5VJKegBo="; + }) ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jsonable" ]; - meta = with lib; { + meta = { description = "Provides an abstract base class and utilities for defining trivially JSONable python objects"; homepage = "https://github.com/halfak/python-jsonable"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index d7622853b16af..a7d0d2ece3b10 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -1,7 +1,6 @@ { lib, argcomplete, - attrs, buildPythonPackage, docstring-parser, fetchFromGitHub, @@ -9,14 +8,12 @@ jsonnet, jsonschema, omegaconf, - pydantic, pytest-subtests, pytestCheckHook, pythonOlder, pyyaml, reconplogger, requests, - responses, ruyaml, setuptools, types-pyyaml, @@ -26,7 +23,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.31.0"; + version = "4.32.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -35,7 +32,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-wtiVUf7aA0++XKb2hVcXeyKneY4eq5M4FN1JbdxMh9Q="; + hash = "sha256-enI9MNaktDNC1RAMALqy82w66n7ZPm/mtAvrmzPr59c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 1e8a94e8e1c7c..fbe7007b248f1 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python library to simplify working with jsonlines and ndjson data"; homepage = "https://github.com/wbolster/jsonlines"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 5879be3b53592..208d4dd78fbcb 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/avian2/jsonmerge"; changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 09c61d708944e..42712f4e54e90 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Library to apply JSON Patches according to RFC 6902"; homepage = "https://github.com/stefankoegl/python-json-patch"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 9c5ce75a89b70..fbae39f1b548d 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/gazpachoking/jsonref"; changelog = "https://github.com/gazpachoking/jsonref/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 5cf7fe1f5b803..314e3433dadf2 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "JSON RPC client library - Pelix compatible fork"; homepage = "https://pypi.python.org/pypi/jsonrpclib-pelix/"; license = lib.licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index 153c584047a96..9add473d07cdd 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jsonschema-path"; - version = "0.3.2"; + version = "0.3.3"; disabled = pythonOlder "3.8"; @@ -22,19 +22,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "p1c2u"; repo = "jsonschema-path"; - rev = version; - hash = "sha256-HC0yfACKFIQEQoIa8/FUKyV8YS8TQ0BY7i3n9xCdKz8="; + rev = "refs/tags/${version}"; + hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4="; }; postPatch = '' sed -i '/--cov/d' pyproject.toml ''; - nativeBuildInputs = [ - poetry-core - ]; - - pythonRelaxDeps = [ "referencing" ]; + build-system = [ poetry-core ]; propagatedBuildInputs = [ pathable @@ -50,6 +46,7 @@ buildPythonPackage rec { ]; meta = { + changelog = "https://github.com/p1c2u/jsonschema-path/releases/tag/${version}"; description = "JSONSchema Spec with object-oriented paths"; homepage = "https://github.com/p1c2u/jsonschema-path"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix index 53f5ddb70523c..8f5420d194c8b 100644 --- a/pkgs/development/python-modules/jsonslicer/default.nix +++ b/pkgs/development/python-modules/jsonslicer/default.nix @@ -1,30 +1,36 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, + gitUpdater, + setuptools, pkg-config, yajl, }: buildPythonPackage rec { pname = "jsonslicer"; - version = "0.1.7"; - format = "setuptools"; + version = "0.1.8"; + pyproject = true; src = fetchFromGitHub { owner = "AMDmi3"; repo = "jsonslicer"; rev = version; - hash = "sha256-uKIe/nJLCTe8WFIMB7+g3c0Yv3addgZEKYaBI6EpBSY="; + hash = "sha256-nPifyqr+MaFqoCYFbFSSBDjvifpX0CFnHCdMCvhwYTA="; }; - nativeBuildInputs = [ pkg-config ]; + build-system = [ + setuptools + pkg-config + ]; buildInputs = [ yajl ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { - description = "Stream JSON parser for Python "; + description = "Stream JSON parser for Python"; homepage = "https://github.com/AMDmi3/jsonslicer"; license = licenses.mit; maintainers = with maintainers; [ jopejoe1 ]; diff --git a/pkgs/development/python-modules/junit2html/default.nix b/pkgs/development/python-modules/junit2html/default.nix index 2e26887b520ba..b53bf1edcea8a 100644 --- a/pkgs/development/python-modules/junit2html/default.nix +++ b/pkgs/development/python-modules/junit2html/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, jinja2, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/jupysql-plugin/default.nix b/pkgs/development/python-modules/jupysql-plugin/default.nix new file mode 100644 index 0000000000000..40ddfaab803f8 --- /dev/null +++ b/pkgs/development/python-modules/jupysql-plugin/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + hatchling, + hatch-jupyter-builder, + hatch-nodejs-version, + jupyterlab, + ploomber-core, +}: + +buildPythonPackage rec { + pname = "jupysql-plugin"; + version = "0.4.4"; + + pyproject = true; + disabled = pythonOlder "3.6"; + + # using pypi archive which includes pre-built assets + src = fetchPypi { + pname = "jupysql_plugin"; + inherit version; + hash = "sha256-kuaKknbc00nLGwCUsULgUFT52yoptUH2mnUyGYbYYKk="; + }; + + build-system = [ + hatchling + hatch-jupyter-builder + hatch-nodejs-version + jupyterlab + ]; + + dependencies = [ ploomber-core ]; + + # testing requires a circular dependency over jupysql + doCheck = false; + + pythonImportsCheck = [ "jupysql_plugin" ]; + + meta = with lib; { + description = "Better SQL in Jupyter"; + homepage = "https://github.com/ploomber/jupysql-plugin"; + changelog = "https://github.com/ploomber/jupysql-plugin/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix new file mode 100644 index 0000000000000..de21f76224e7c --- /dev/null +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -0,0 +1,111 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + prettytable, + sqlalchemy, + sqlparse, + ipython-genutils, + jinja2, + sqlglot, + jupysql-plugin, + ploomber-core, + ploomber-extension, + ipython, + duckdb, + duckdb-engine, + matplotlib, + polars, + ipywidgets, + numpy, + pandas, + js2py, + pyspark, + pyarrow, + grpcio, + pytestCheckHook, + psutil, +}: + +buildPythonPackage rec { + pname = "jupysql"; + version = "0.10.11"; + + pyproject = true; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ploomber"; + repo = "jupysql"; + rev = "refs/tags/${version}"; + hash = "sha256-A9zTjH+9RYKcgy4mI6uOMHOc46om06y1zK3IbxeVcWE="; + }; + + pythonRelaxDeps = [ "sqlalchemy" ]; + + build-system = [ setuptools ]; + + dependencies = [ + prettytable + sqlalchemy + sqlparse + ipython-genutils + jinja2 + sqlglot + jupysql-plugin + ploomber-core + ploomber-extension + ]; + + optional-dependencies.dev = [ + ipython + duckdb + duckdb-engine + matplotlib + polars + ipywidgets + numpy + pandas + js2py + pyspark + pyarrow + grpcio + ]; + + nativeCheckInputs = [ + pytestCheckHook + psutil + ] ++ optional-dependencies.dev; + + disabledTestPaths = [ + # require docker + "src/tests/integration" + + # require network access + "src/tests/test_telemetry.py" + + # want to download test data from the network + "src/tests/test_parse.py" + "src/tests/test_ggplot.py" + "src/tests/test_plot.py" + "src/tests/test_magic.py" + "src/tests/test_magic_plot.py" + ]; + + preCheck = '' + # tests need to write temp data + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "sql" ]; + + meta = with lib; { + description = "Better SQL in Jupyter"; + homepage = "https://github.com/ploomber/jupysql"; + changelog = "https://github.com/ploomber/jupysql/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index e0cc52123cfb5..727d5afa83cc7 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { homepage = "https://jupyterbook.org/"; changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "jupyter-book"; }; } diff --git a/pkgs/development/python-modules/jupyter-cache/default.nix b/pkgs/development/python-modules/jupyter-cache/default.nix index 1d57a7a5d8cfc..2815d9ee8105d 100644 --- a/pkgs/development/python-modules/jupyter-cache/default.nix +++ b/pkgs/development/python-modules/jupyter-cache/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/jupyter-cache"; changelog = "https://github.com/executablebooks/jupyter-cache/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 3c54a2140cabf..4e4bfd7b456c0 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-T1DCXG2BEmwW3q+S0r14o5svy4ZpDc5pa0AGt0DXHB8="; + hash = "sha256-uLbNYzszaSLnU4VcaDr5KBcRN+Xm/B471s+W9qJibsk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 0451a3fb74ef1..66de5a91ff5fd 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { mainProgram = "jupyter-events"; homepage = "https://github.com/jupyter/jupyter_events"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index 90ed978eba27b..54ce115af8dfc 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://jupyterlab-lsp.readthedocs.io/en/latest/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 2a5f0a783e14c..059de94c6982e 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyter-repo2docker"; - version = "2024.03.0"; + version = "2024.07.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = "refs/tags/${version}"; - hash = "sha256-D8sgeyfQjEkBYck/CikAVNZzUSl1R9uXSv75DTXT5U0="; + hash = "sha256-ZzZBuJBPDG4to1fSYn2xysupXbPS9Q6wqWr3Iq/Vds8="; }; nativeBuildInputs = [ setuptools ]; @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://repo2docker.readthedocs.io/"; changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.rev}/docs/source/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 58e1763006fdc..a3937b5d8bdb1 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "MathJax resources as a Jupyter Server Extension"; homepage = "https://github.com/jupyter-server/jupyter_server_mathjax"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix index 91ca1fb69273a..1d216f7b88055 100644 --- a/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -51,7 +51,7 @@ let description = "Jupyter Server Extension Providing Support for Terminals"; homepage = "https://github.com/jupyter-server/jupyter_server_terminals"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 7560b4a3c0ae1..a367bc3c0f35c 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.14.1"; + version = "2.14.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ElWNFY7HoGU7+WzCcrx6154BJ9UDuYLtFEOZNGaU9yY="; + hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 7898fa90de2a1..41ba6312e4058 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "2.0.1"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-cW3ajLiviB/sL7yIrqP7DTuyS764Cpmor/LgHQidWw0="; + hash = "sha256-HcvxOGGzZ4AA1pr07zi0njoS+AgbqFHGgDk8Lhi8S4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 56712d25f4f49..216beb5fc5fee 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/systemdspawner"; changelog = "https://github.com/jupyterhub/systemdspawner/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix new file mode 100644 index 0000000000000..8af2907fe0925 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jupyterlab +, jupyter-packaging +}: + +buildPythonPackage rec { + pname = "jupyterlab-execute-time"; + version = "3.1.2"; + pyproject = true; + + src = fetchPypi { + pname = "jupyterlab_execute_time"; + inherit version; + hash = "sha256-DiyGsoNXXh+ieMfpSrA6A/5c0ftNV9Ygs9Tl2/VEdbk="; + }; + + # jupyterlab is required to build from source but we use the pre-build package + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab~=4.0.0"' "" + ''; + + dependencies = [ + jupyterlab + jupyter-packaging + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "jupyterlab_execute_time" ]; + + meta = { + description = "JupyterLab extension for displaying cell timings"; + homepage = "https://github.com/deshaw/jupyterlab-execute-time"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vglfr ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 408a48c7faa68..4f39d7fdc536e 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix index 53c03dbdacdd6..204516e39d5a0 100644 --- a/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Jupyterlab syntax coloring theme for pygments"; homepage = "https://github.com/jupyterlab/jupyterlab_pygments"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index c7ba03645aa3b..2461e5ea0de34 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.27.2"; + version = "2.27.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-FcuzSdxF6VTgm6z4G5+byxCBX/Zg+yA07NdBfbOn6ic="; + hash = "sha256-6zbKylnnRHGYjwriXHeUVhC4h/d3JVqiH4Bl3vnlHtQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index e57ec6de6798d..cd538beade251 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Jupyter Widgets JupyterLab Extension"; homepage = "https://github.com/jupyter-widgets/ipywidgets"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 9f3df60d49ca1..ab4c0c705323f 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.2"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pTS2olcZqSpA1RT7Ezqf6PDZmBsLvOXYpfyqMzRKMDg="; + hash = "sha256-NDqXn7lYL9CMhRGCPjIHAygc0HKgBJvNr9x6/tp/JTc="; }; build-system = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 49ec1da72d0f8..4708b5363141c 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.16.2"; + version = "1.16.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hifdm+y769ecxKTtRyfYnXjmBrS0ZOq3I1ezsCkCOhQ="; + hash = "sha256-KOM/RvLOekH7nWd6SiyVMnKFV5tkyhBEN8S56x5BdOk="; }; build-system = [ diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 1a418d128dfe4..80e4159a03b74 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/latchset/jwcrypto"; changelog = "https://github.com/latchset/jwcrypto/releases/tag/v${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix index 480bddc93dede..3364b86686e74 100644 --- a/pkgs/development/python-modules/jxmlease/default.nix +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Converts between XML and intelligent Python data structures"; homepage = "https://github.com/Juniper/jxmlease"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index a7366d3851fbe..676fea31f8276 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, pythonOlder, fetchPypi, @@ -43,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/pythongssapi/k5test"; changelog = "https://github.com/pythongssapi/k5test/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index cacf76a6cb0de..ac4b1cf52f737 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Generic application framework, providing the foundation for other modules"; homepage = "https://github.com/freevo/kaa-base"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index 669060fa2ac43..bb8fe831c2b91 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = "https://github.com/freevo/kaa-metadata"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix new file mode 100644 index 0000000000000..4e3997d5ed1f6 --- /dev/null +++ b/pkgs/development/python-modules/kafka-python-ng/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools-scm, + crc32c, + lz4, + python-snappy, + zstandard, + botocore, + pytest-mock, + pytestCheckHook, + xxhash, +}: + +buildPythonPackage rec { + version = "2.2.2"; + pname = "kafka-python-ng"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wbarnha"; + repo = "kafka-python-ng"; + rev = "refs/tags/v${version}"; + hash = "sha256-ELJvcj91MQ2RTjT1dwgnTGSSG5lP6B6/45dFgtNY2Cc="; + }; + + build-system = [ setuptools-scm ]; + + passthru.optional-dependencies = { + crc32c = [ crc32c ]; + lz4 = [ lz4 ]; + snappy = [ python-snappy ]; + zstd = [ zstandard ]; + boto = [ botocore ]; + }; + + pythonImportsCheck = [ "kafka" ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + xxhash + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + meta = { + changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}"; + description = "Pure Python client for Apache Kafka"; + homepage = "https://github.com/wbarnha/kafka-python-ng"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 730c796c951b5..67e7febd7f177 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Pure Python client for Apache Kafka"; homepage = "https://github.com/dpkp/kafka-python"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 5d38eeaf6480b..ec647cf649f7a 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -1,37 +1,49 @@ { - buildPythonPackage, bleach, + buildPythonPackage, certifi, + charset-normalizer, fetchPypi, + hatchling, + idna, lib, python-dateutil, python-slugify, - six, requests, + setuptools, + six, + text-unidecode, tqdm, urllib3, + webencodings, }: buildPythonPackage rec { pname = "kaggle"; - version = "1.6.14"; - format = "setuptools"; + version = "1.6.17"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k="; + hash = "sha256-Q5p96h1QOfMg/WrV7CG2iNz6cNQFy0IJW4H0HtxAG4E="; }; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ bleach certifi + charset-normalizer + idna python-dateutil python-slugify requests + setuptools six + text-unidecode tqdm urllib3 - bleach + webencodings ]; # Tests try to access the network. diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index caed3ddfcf7b1..14795b0c1268d 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; # Other platforms are supported upstream. platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index a3c9ae63c784f..00d2e2802f09d 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -7,7 +7,7 @@ icu, pkg-config, fetchFromGitHub, - python3, + python, openblas, zlib, gfortran, @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - python3 + python gfortran ]; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { description = "Speech Recognition Toolkit"; homepage = "https://kaldi-asr.org"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 248a09630f518..c27221611b86e 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { mainProgram = "kaptan"; homepage = "https://kaptan.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index 8b0c78d705edd..21927ef81def0 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -5,10 +5,9 @@ six, eventlet, gevent, - pynose, mock, coverage, - pkgs, + openjdk8_headless, }: buildPythonPackage rec { @@ -25,10 +24,9 @@ buildPythonPackage rec { buildInputs = [ eventlet gevent - pynose mock coverage - pkgs.openjdk8 + openjdk8_headless ]; # not really needed @@ -48,5 +46,6 @@ buildPythonPackage rec { homepage = "https://kazoo.readthedocs.org"; description = "Higher Level Zookeeper Client"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index aeccbe375738e..eea875bc398cc 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -11,7 +11,6 @@ setuptools, setuptools-git-versioning, setuptools-scm, - unittestCheckHook, urllib3, }: diff --git a/pkgs/development/python-modules/keyring_24/default.nix b/pkgs/development/python-modules/keyring_24/default.nix new file mode 100644 index 0000000000000..9739a6f7b20a0 --- /dev/null +++ b/pkgs/development/python-modules/keyring_24/default.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + pythonOlder, + installShellFiles, + setuptools, + setuptools-scm, + shtab, + importlib-metadata, + jaraco-classes, + jaraco-context, + jaraco-functools, + jeepney, + secretstorage, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "keyring_24"; + # nixpkgs-update: no auto update + version = "24.3.1"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "keyring"; + hash = "sha256-wzJ7b/r8DovvvbWXys20ko/+XBIS92RfGG5tmVeomNs="; + }; + + nativeBuildInputs = [ + installShellFiles + shtab + ]; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = + [ + jaraco-classes + jaraco-context + jaraco-functools + ] + ++ lib.optionals stdenv.isLinux [ + jeepney + secretstorage + ] + ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ]; + + postInstall = '' + installShellCompletion --cmd keyring \ + --bash <($out/bin/keyring --print-completion bash) \ + --zsh <($out/bin/keyring --print-completion zsh) + ''; + + pythonImportsCheck = [ + "keyring" + "keyring.backend" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = + [ "tests/backends/test_macOS.py" ] + # These tests fail when sandboxing is enabled because they are unable to get a password from keychain. + ++ lib.optional stdenv.isDarwin "tests/test_multiprocess.py"; + + meta = with lib; { + description = "Store and access your passwords safely"; + homepage = "https://github.com/jaraco/keyring"; + changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst"; + license = licenses.mit; + mainProgram = "keyring"; + maintainers = with maintainers; [ jnsgruk ]; + }; +} diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 8aba622aee15c..931017a198ff6 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/fedora-infra/kitchen"; changelog = "https://github.com/fedora-infra/kitchen/blob/${version}/NEWS.rst"; license = licenses.lgpl2Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e68ff83c462ea..d71b613b58b8b 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Implementation of the Cassowary constraint solver"; homepage = "https://github.com/nucleic/kiwi"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index b568e57c9ff13..c120217683c6a 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, isPy3k, flask, pygments, @@ -31,6 +32,15 @@ buildPythonPackage rec { --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd" ''; + # TODO: remove in next version + patches = [ + (fetchpatch { + name = "distutils.patch"; + url = "https://github.com/jonashaag/klaus/commit/d50d2aab97fd86c11f3b5a4c1ecbcf1e085f395f.patch"; + hash = "sha256-gJ/ksm96VRNgqIBp+PX/ljzdfQJYbwTBmZaF2Ctu7Fc="; + }) + ]; + propagatedBuildInputs = [ flask pygments diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index dff908bf00e09..2732efae80fd9 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, scikit-learn, numpy, scipy, @@ -16,23 +17,27 @@ buildPythonPackage rec { pname = "kmapper"; - version = "2.0.1"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "scikit-tda"; repo = "kepler-mapper"; - rev = "v${version}"; - sha256 = "1jqqrn7ig9kylcc8xbslxmchzghr9jgffaab3g3y3nyghk8azlgj"; + rev = "refs/tags/v${version}"; + hash = "sha256-i909J0yI8v8BqGbCkcjBAdA02Io+qpILdDkojZj0wv4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ scikit-learn numpy scipy jinja2 ]; + pythonImportsCheck = [ "kmapper" ]; + nativeCheckInputs = [ pytestCheckHook networkx @@ -47,6 +52,5 @@ buildPythonPackage rec { homepage = "https://kepler-mapper.scikit-tda.org/"; license = licenses.mit; maintainers = [ ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index 6953cd45b8853..f61fe242dac16 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "knack"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ="; + hash = "sha256-cfKmtCrpowLkMkMyD6Be2wmxkzn88fMx9bbQe/l/UpE="; }; propagatedBuildInputs = [ @@ -55,6 +55,6 @@ buildPythonPackage rec { changelog = "https://github.com/microsoft/knack/blob/v${version}/HISTORY.rst"; platforms = platforms.all; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix new file mode 100644 index 0000000000000..b37f50cd5ac86 --- /dev/null +++ b/pkgs/development/python-modules/knocki/default.nix @@ -0,0 +1,60 @@ +{ + aiohttp, + aioresponses, + lib, + buildPythonPackage, + fetchFromGitHub, + mashumaro, + orjson, + poetry-core, + pythonOlder, + pytestCheckHook, + pytest-aiohttp, + syrupy, + yarl, +}: + +buildPythonPackage rec { + pname = "knocki"; + version = "0.3.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "swan-solutions"; + repo = "knocki-homeassistant"; + rev = "v${version}"; + hash = "sha256-tWtANsujAcdIddoUBrKWIPfiPzDqWhW94Goz0QQ2BfE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "addopts = \"--cov\"" "" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aioresponses + pytestCheckHook + pytest-aiohttp + syrupy + ]; + + pythonImportsCheck = [ "knocki" ]; + + meta = with lib; { + description = "Asynchronous Python client for Knocki vibration / door sensors"; + homepage = "https://github.com/swan-solutions/knocki-homeassistant"; + license = licenses.mit; + maintainers = with maintainers; [ mindstorms6 ]; + }; +} diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 060062891d9aa..2ef44b3cfcfb9 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2024.1.20.105944"; + version = "2024.7.25.204106"; format = "pyproject"; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-5u+BaZjbGpIpQd3k+u5NC099TQuiwGKdE/EoIWny01I="; + hash = "sha256-uy5by/abVeYTLpZM4fh1+3AUxhnkFtzcabf86LnC9SY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index a353418fd5a32..187d5a8bbba44 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -7,7 +7,6 @@ backports-zoneinfo, boto3, buildPythonPackage, - case, confluent-kafka, fetchPypi, hypothesis, @@ -16,7 +15,7 @@ pycurl, pymongo, #, pyro4 - pytest7CheckHook, + pytestCheckHook, pythonOlder, pyyaml, redis, @@ -28,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.7"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ARxM2aNVwUod6NNdJXMUodJFbVK3FAOIVhrKw88al78="; + hash = "sha256-rSAKjb2qorvF8m0u59cH2aH97TU6D0vXUc6MfZ9EnGA="; }; propagatedBuildInputs = @@ -46,7 +45,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { msgpack = [ msgpack ]; yaml = [ pyyaml ]; redis = [ redis ]; @@ -71,10 +70,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - case hypothesis - pytest7CheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "kombu" ]; diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index 79f9857e96770..5c3176db7ced9 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kornia"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DmXttvKoLqny0mt3SUonidNxDkNX7N0LdTxy/H32R/4="; + hash = "sha256-iEg27b2JVLtAYLFncaSqIh5FyvmmitKAKP7Tl0WWNdk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix index 8009a6264b531..fb756b65ae64a 100644 --- a/pkgs/development/python-modules/krakenex/default.nix +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "krakenex"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "veox"; repo = "python3-krakenex"; rev = "v${version}"; - hash = "sha256-aWALkM79VOm2/EQdp2rD1sm0NxhLKZOXzAs8m+t7M0s="; + hash = "sha256-htldEds3vf9bjFkJAew0e0fHDLD15OTcVYybSmIp3DI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; # no tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix index b8877b7a6462d..bb071fc3f0aaa 100644 --- a/pkgs/development/python-modules/kserve/default.nix +++ b/pkgs/development/python-modules/kserve/default.nix @@ -3,8 +3,12 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system deprecation, poetry-core, + + # dependencies async-timeout, cloudevents, fastapi, @@ -17,12 +21,16 @@ prometheus-client, protobuf, psutil, + pydantic, python-dateutil, + pyyaml, ray, six, tabulate, timing-asgi, uvicorn, + + # checks avro, azure-storage-blob, azure-storage-file-share, @@ -30,13 +38,14 @@ botocore, google-cloud-storage, grpcio-testing, + pytest-asyncio, pytestCheckHook, tomlkit, }: buildPythonPackage rec { pname = "kserve"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +54,7 @@ buildPythonPackage rec { owner = "kserve"; repo = "kserve"; rev = "refs/tags/v${version}"; - hash = "sha256-Fu+1AR7FU4EQ+PhMneHFr3at3N9cN7V24wm/VOfY8GA="; + hash = "sha256-wGS001PK+k21oCOaQCiAtytTDjfe0aiTVJ9spyOucYA="; }; sourceRoot = "${src.name}/python/kserve"; @@ -55,7 +64,6 @@ buildPythonPackage rec { poetry-core ]; - dependencies = [ async-timeout cloudevents @@ -69,7 +77,9 @@ buildPythonPackage rec { prometheus-client protobuf psutil + pydantic python-dateutil + pyyaml ray six tabulate @@ -84,6 +94,7 @@ buildPythonPackage rec { "protobuf" "ray" "uvicorn" + "psutil" ]; pythonImportsCheck = [ "kserve" ]; @@ -96,6 +107,7 @@ buildPythonPackage rec { botocore google-cloud-storage grpcio-testing + pytest-asyncio pytestCheckHook tomlkit ]; diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index d084fd43fac64..3542fb60b2818 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -4,9 +4,7 @@ fetchPypi, fonttools, pytestCheckHook, - python, rustPlatform, - unzip, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/l18n/default.nix b/pkgs/development/python-modules/l18n/default.nix index 3270550e87e3e..76491a4699ca2 100644 --- a/pkgs/development/python-modules/l18n/default.nix +++ b/pkgs/development/python-modules/l18n/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; + hash = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 405bbfa33810c..b283a72b09ed4 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -82,6 +82,11 @@ buildPythonPackage rec { pytest-dependency ]; + disabledtests = [ + # flaky, timing sensitive + "test_timing" + ]; + meta = with lib; { description = "Embedded control & testing library"; homepage = "https://labgrid.org"; diff --git a/pkgs/development/python-modules/laces/default.nix b/pkgs/development/python-modules/laces/default.nix index 16f104a01a69b..9f5c74af83295 100644 --- a/pkgs/development/python-modules/laces/default.nix +++ b/pkgs/development/python-modules/laces/default.nix @@ -4,7 +4,6 @@ django, fetchFromGitHub, flit-core, - python3, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 9a6db99302562..4f60e57a4dcd7 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -7,6 +7,7 @@ fetchFromGitHub, playwrightcapture, poetry-core, + pydantic, pythonOlder, redis, requests, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.10.0"; + version = "1.10.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,10 +26,11 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-hbMMKV/LJSfCgl293Tm4kkpwoYYpgydV/reri9ONj+4="; + hash = "sha256-6DBfmojU9p0QAojYxFSciQkc8uvQtRw37Fc8Mp5Eu/8="; }; pythonRelaxDeps = [ + "pydantic" "redis" "requests" ]; @@ -41,6 +43,7 @@ buildPythonPackage rec { defang dnspython playwrightcapture + pydantic redis requests sphinx diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock new file mode 100644 index 0000000000000..f3e4e103ff422 --- /dev/null +++ b/pkgs/development/python-modules/lancedb/Cargo.lock @@ -0,0 +1,7828 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "const-random", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argminmax" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" +dependencies = [ + "num-traits", +] + +[[package]] +name = "array-init-cursor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" + +[[package]] +name = "arrow" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219d05930b81663fd3b32e3bde8ce5bff3c4d23052a99f11a8fa50a3b47b2658" +dependencies = [ + "arrow-arith 51.0.0", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-csv 51.0.0", + "arrow-data 51.0.0", + "arrow-ipc 51.0.0", + "arrow-json 51.0.0", + "arrow-ord 51.0.0", + "arrow-row 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "arrow-string 51.0.0", +] + +[[package]] +name = "arrow" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" +dependencies = [ + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-csv 52.2.0", + "arrow-data 52.2.0", + "arrow-ipc 52.2.0", + "arrow-json 52.2.0", + "arrow-ord 52.2.0", + "arrow-row 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "arrow-string 52.2.0", + "pyo3", +] + +[[package]] +name = "arrow-arith" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0272150200c07a86a390be651abdd320a2d12e84535f0837566ca87ecd8f95e0" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-arith" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8010572cf8c745e242d1b632bd97bd6d4f40fefed5ed1290a8f433abaa686fea" +dependencies = [ + "ahash", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-array" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" +dependencies = [ + "ahash", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "chrono-tz 0.9.0", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0a2432f0cba5692bf4cb757469c66791394bac9ec7ce63c1afe74744c37b27" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9abc10cd7995e83505cc290df9384d6e5412b207b79ce6bdff89a10505ed2cba" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "atoi", + "base64 0.22.1", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-cast" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "atoi", + "base64 0.22.1", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-csv" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cbcba196b862270bf2a5edb75927380a7f3a163622c61d40cbba416a6305f2" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-csv" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13c36dc5ddf8c128df19bab27898eea64bf9da2b555ec1cd17a8ff57fba9ec2" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-data" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2742ac1f6650696ab08c88f6dd3f0eb68ce10f8c253958a18c943a68cd04aec5" +dependencies = [ + "arrow-buffer 51.0.0", + "arrow-schema 51.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-data" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" +dependencies = [ + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42ea853130f7e78b9b9d178cb4cd01dee0f78e64d96c2949dc0a915d6d9e19d" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "flatbuffers 23.5.26", +] + +[[package]] +name = "arrow-ipc" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "flatbuffers 24.3.25", + "lz4_flex", + "zstd", +] + +[[package]] +name = "arrow-json" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaafb5714d4e59feae964714d724f880511500e3569cc2a94d02456b403a2a49" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "half", + "indexmap 2.3.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-json" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb22284c5a2a01d73cebfd88a33511a3234ab45d66086b2ca2d1228c3498e445" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "indexmap 2.3.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e6b61e3dc468f503181dccc2fc705bdcc5f2f146755fa5b56d0a6c5943f412" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-ord" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848ee52bb92eb459b811fb471175ea3afcf620157674c8794f539838920f9228" +dependencies = [ + "ahash", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "half", + "hashbrown 0.14.5", +] + +[[package]] +name = "arrow-row" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" +dependencies = [ + "ahash", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "half", +] + +[[package]] +name = "arrow-schema" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d9483aaabe910c4781153ae1b6ae0393f72d9ef757d38d09d450070cf2e528" + +[[package]] +name = "arrow-schema" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "arrow-select" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849524fa70e0e3c5ab58394c770cb8f514d0122d20de08475f7b472ed8075830" +dependencies = [ + "ahash", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "num", +] + +[[package]] +name = "arrow-select" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" +dependencies = [ + "ahash", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "num", +] + +[[package]] +name = "arrow-string" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9373cb5a021aee58863498c37eb484998ef13377f69989c6c5ccfbd258236cdb" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "memchr", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "arrow-string" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "memchr", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-convert" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d416feee97712e43152cd42874de162b8f9b77295b1c85e5d92725cc8310bae" +dependencies = [ + "async-trait", +] + +[[package]] +name = "async-openai" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" +dependencies = [ + "async-convert", + "backoff", + "base64 0.22.1", + "bytes", + "derive_builder", + "futures", + "rand", + "reqwest 0.12.5", + "reqwest-eventsource", + "secrecy", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "async-priority-channel" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acde96f444d31031f760c5c43dc786b97d3e1cb2ee49dd06898383fe9a999758" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "async_cell" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atoi_simd" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "aws-config" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf6cfe2881cb1fcbba9ae946fb9a6480d3b7a714ca84c74925014a89ef3387a" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "hex", + "http 0.2.12", + "hyper 0.14.30", + "ring", + "time", + "tokio", + "tracing", + "url", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-runtime" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87c5f920ffd1e0526ec9e70e50bf444db50b204395a0fa7016bbf9e31ea1698f" +dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 0.2.12", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-dynamodb" +version = "1.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2fdd26fcd839ffa0df7a589a34f5e1a2d4c4c6d8127fe18100bf8b4d57f5d4c" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-kms" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91f43512620f4b0d9e67ccf7d768fab5ed310ac2229ebb9422177abe99c36ba" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-s3" +version = "1.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "558bbcec8db82a1a8af1610afcb3b10d00652d25ad366a0558eecdff2400a1d1" +dependencies = [ + "ahash", + "aws-credential-types", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "fastrand", + "hex", + "hmac", + "http 0.2.12", + "http-body 0.4.6", + "lru", + "once_cell", + "percent-encoding", + "regex-lite", + "sha2", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6acca681c53374bf1d9af0e317a41d12a44902ca0f2d1e10e5cb5bb98ed74f35" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b79c6bdfe612503a526059c05c9ccccbf6bd9530b003673cb863e547fd7c0c9a" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e6ecdb2bd756f3b2383e6f0588dc10a4e65f5d551e70a56e0bfe0c884673ce" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "crypto-bigint 0.5.5", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.1.0", + "once_cell", + "p256", + "percent-encoding", + "ring", + "sha2", + "subtle", + "time", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-async" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.60.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c4134cf3adaeacff34d588dbe814200357b0c466d730cf1c0d8054384a2de4" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc32c", + "crc32fast", + "hex", + "http 0.2.12", + "http-body 0.4.6", + "md-5", + "pin-project-lite", + "sha1", + "sha2", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.60.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.60.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "hyper 0.14.30", + "hyper-rustls 0.24.2", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls 0.21.12", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.60.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version", + "tracing", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom", + "instant", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitpacking" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" +dependencies = [ + "crunchy", +] + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "bytemuck" +version = "1.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + +[[package]] +name = "camino" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +dependencies = [ + "serde", +] + +[[package]] +name = "candle-core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" +dependencies = [ + "byteorder", + "gemm", + "half", + "memmap2 0.9.4", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-nn" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" +dependencies = [ + "candle-core", + "half", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-transformers" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" +dependencies = [ + "byteorder", + "candle-core", + "candle-nn", + "fancy-regex", + "num-traits", + "rand", + "rayon", + "serde", + "serde_json", + "serde_plain", + "tracing", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.23", + "serde", + "serde_json", +] + +[[package]] +name = "cc" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "census" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chrono-tz" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +dependencies = [ + "chrono", + "chrono-tz-build 0.2.1", + "phf", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build 0.3.0", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "comfy-table" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +dependencies = [ + "crossterm", + "strum", + "strum_macros 0.26.4", + "unicode-width", +] + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "conv" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" +dependencies = [ + "custom_derive", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32c" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "libc", + "parking_lot", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +dependencies = [ + "quote", + "syn 2.0.72", +] + +[[package]] +name = "custom_derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.72", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "datafusion" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "bytes", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-array", + "datafusion-optimizer", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "datafusion-physical-plan", + "datafusion-sql", + "futures", + "glob", + "half", + "hashbrown 0.14.5", + "indexmap 2.3.0", + "itertools 0.12.1", + "log", + "num_cpus", + "object_store", + "parking_lot", + "paste", + "pin-project-lite", + "rand", + "sqlparser 0.47.0", + "tempfile", + "tokio", + "url", + "uuid", +] + +[[package]] +name = "datafusion-common" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "hashbrown 0.14.5", + "instant", + "libc", + "num_cpus", + "object_store", + "sqlparser 0.47.0", +] + +[[package]] +name = "datafusion-common-runtime" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +dependencies = [ + "tokio", +] + +[[package]] +name = "datafusion-execution" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +dependencies = [ + "arrow 52.2.0", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-expr", + "futures", + "hashbrown 0.14.5", + "log", + "object_store", + "parking_lot", + "rand", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-expr" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "chrono", + "datafusion-common", + "paste", + "serde_json", + "sqlparser 0.47.0", + "strum", + "strum_macros 0.26.4", +] + +[[package]] +name = "datafusion-functions" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +dependencies = [ + "arrow 52.2.0", + "base64 0.22.1", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "hashbrown 0.14.5", + "hex", + "itertools 0.12.1", + "log", + "rand", + "regex", + "unicode-segmentation", + "uuid", +] + +[[package]] +name = "datafusion-functions-aggregate" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "log", + "paste", + "sqlparser 0.47.0", +] + +[[package]] +name = "datafusion-functions-array" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "itertools 0.12.1", + "log", + "paste", +] + +[[package]] +name = "datafusion-optimizer" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +dependencies = [ + "arrow 52.2.0", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "hashbrown 0.14.5", + "indexmap 2.3.0", + "itertools 0.12.1", + "log", + "paste", + "regex-syntax", +] + +[[package]] +name = "datafusion-physical-expr" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-string 52.2.0", + "base64 0.22.1", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "half", + "hashbrown 0.14.5", + "hex", + "indexmap 2.3.0", + "itertools 0.12.1", + "log", + "paste", + "petgraph", + "regex", +] + +[[package]] +name = "datafusion-physical-expr-common" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +dependencies = [ + "ahash", + "arrow 52.2.0", + "datafusion-common", + "datafusion-expr", + "hashbrown 0.14.5", + "rand", +] + +[[package]] +name = "datafusion-physical-plan" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "futures", + "half", + "hashbrown 0.14.5", + "indexmap 2.3.0", + "itertools 0.12.1", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "rand", + "tokio", +] + +[[package]] +name = "datafusion-sql" +version = "40.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common", + "datafusion-expr", + "log", + "regex", + "sqlparser 0.47.0", + "strum", +] + +[[package]] +name = "deepsize" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb987ec36f6bf7bfbea3f928b75590b736fc42af8e54d97592481351b2b96c" +dependencies = [ + "deepsize_derive", +] + +[[package]] +name = "deepsize_derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990101d41f3bc8c1a45641024377ee284ecc338e5ecf3ea0f0e236d897c72796" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.72", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint 0.4.9", + "der", + "digest", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "ethnum" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "eventsource-stream" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fef4569247a5f429d9156b9d0a2599914385dd189c539334c625d8099d90ab" +dependencies = [ + "futures-core", + "nom", + "pin-project-lite", +] + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" + +[[package]] +name = "fastdivide" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flatbuffers" +version = "23.5.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" +dependencies = [ + "bitflags 1.3.2", + "rustc_version", +] + +[[package]] +name = "flatbuffers" +version = "24.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f" +dependencies = [ + "bitflags 1.3.2", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs4" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +dependencies = [ + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "fsst" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b5be8e6f9ffb7860aa8dd5998142374e4bfdf5c8c7f28fe963ce4b182829aab" +dependencies = [ + "arrow 51.0.0", + "rand", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gemm" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid 10.7.0", + "rayon", + "seq-macro", + "sysctl", +] + +[[package]] +name = "gemm-f16" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid 10.7.0", + "seq-macro", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand", + "rand_distr", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", + "rayon", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror", + "ureq", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.30", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs 0.7.1", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.30", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperloglogplus" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3" +dependencies = [ + "serde", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "itoap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lance" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d4c2e52b6ebad7e60e033ecca7f3369facdfb41823d4d3e87a1c32b84d6cfa" +dependencies = [ + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-row 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-recursion", + "async-trait", + "async_cell", + "aws-credential-types", + "aws-sdk-dynamodb", + "byteorder", + "bytes", + "chrono", + "dashmap", + "datafusion", + "datafusion-functions", + "datafusion-physical-expr", + "deepsize", + "futures", + "half", + "itertools 0.12.1", + "lance-arrow", + "lance-core", + "lance-datafusion", + "lance-datagen", + "lance-encoding", + "lance-file", + "lance-index", + "lance-io", + "lance-linalg", + "lance-table", + "lazy_static", + "log", + "lru_time_cache", + "moka", + "num_cpus", + "object_store", + "ordered-float", + "pin-project", + "prost", + "prost-build", + "rand", + "roaring", + "serde", + "serde_json", + "snafu", + "tantivy", + "tempfile", + "tokio", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "lance-arrow" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18599d887554d3cb4c4b056850c452cc51f6788fecec6c3af2a4dffebbeea184" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "getrandom", + "half", + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "lance-core" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112becb10992ae62b5e5e7ea02e60302f9072afd0b4e3c45cecad58d6379879e" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "byteorder", + "bytes", + "chrono", + "datafusion-common", + "datafusion-sql", + "deepsize", + "futures", + "lance-arrow", + "lazy_static", + "libc", + "log", + "mock_instant", + "moka", + "num_cpus", + "object_store", + "pin-project", + "prost", + "rand", + "roaring", + "serde_json", + "snafu", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "lance-datafusion" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cfb7663ed20daa3c9a910f971b7b521e37841046ae224aa032ab4c5e762fe7e" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-trait", + "datafusion", + "datafusion-common", + "datafusion-functions", + "datafusion-physical-expr", + "futures", + "lance-arrow", + "lance-core", + "log", + "prost", + "snafu", + "tokio", +] + +[[package]] +name = "lance-datagen" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbfd57d950044b31b0d69c3e7637306aab56497f99668609b03304800292dea" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-cast 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "futures", + "hex", + "rand", + "rand_xoshiro", +] + +[[package]] +name = "lance-encoding" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a52cbffee5cf5263b98bfd9adccb10506aee5419e75f07980f5e6f298f112dca" +dependencies = [ + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "bytes", + "fsst", + "futures", + "hyperloglogplus", + "lance-arrow", + "lance-core", + "lance-datagen", + "log", + "num-traits", + "num_cpus", + "prost", + "prost-build", + "prost-types", + "rand", + "rand_xoshiro", + "snafu", + "tokio", + "tracing", + "zstd", +] + +[[package]] +name = "lance-file" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d4597be8c9380c63e1f164eca091804397fd2846a5f50bb2bf0cbf528a598f7" +dependencies = [ + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-recursion", + "async-trait", + "byteorder", + "bytes", + "datafusion-common", + "deepsize", + "futures", + "lance-arrow", + "lance-core", + "lance-datagen", + "lance-encoding", + "lance-io", + "lance-testing", + "log", + "num-traits", + "num_cpus", + "object_store", + "prost", + "prost-build", + "prost-types", + "roaring", + "snafu", + "tempfile", + "tokio", + "tracing", +] + +[[package]] +name = "lance-index" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e6bfd777b30acbc80d7b5bf2f60739deaba752e2ec79f6ef07ba4eee50cbc7" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-recursion", + "async-trait", + "bitvec", + "bytes", + "crossbeam-queue", + "datafusion", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "datafusion-sql", + "deepsize", + "futures", + "half", + "itertools 0.12.1", + "lance-arrow", + "lance-core", + "lance-datafusion", + "lance-encoding", + "lance-file", + "lance-io", + "lance-linalg", + "lance-table", + "lazy_static", + "log", + "num-traits", + "num_cpus", + "object_store", + "prost", + "prost-build", + "rand", + "rayon", + "roaring", + "rustc_version", + "serde", + "serde_json", + "snafu", + "tantivy", + "tempfile", + "tokio", + "tracing", +] + +[[package]] +name = "lance-io" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c27b9892790fc463920c6092704d52f456f75ffa8ebe48d3c47aa9c253abbe" +dependencies = [ + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-priority-channel", + "async-recursion", + "async-trait", + "aws-config", + "aws-credential-types", + "byteorder", + "bytes", + "chrono", + "deepsize", + "futures", + "lance-arrow", + "lance-core", + "lazy_static", + "num_cpus", + "object_store", + "path_abs", + "pin-project", + "prost", + "prost-build", + "rand", + "shellexpand", + "snafu", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "lance-linalg" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a843ddcd2ffb1db81501fb432dbf2376ca01545ab48a26da7c8f33e4d79ece40" +dependencies = [ + "arrow-array 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "bitvec", + "cc", + "deepsize", + "futures", + "half", + "lance-arrow", + "lance-core", + "lazy_static", + "log", + "num-traits", + "num_cpus", + "rand", + "rayon", + "tokio", + "tracing", +] + +[[package]] +name = "lance-table" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a06930044e2b40cfe8b4f4d099e556875b484c79328dab1b8034e613e020c" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "aws-credential-types", + "aws-sdk-dynamodb", + "byteorder", + "bytes", + "chrono", + "deepsize", + "futures", + "lance-arrow", + "lance-core", + "lance-datagen", + "lance-file", + "lance-io", + "lazy_static", + "log", + "object_store", + "prost", + "prost-build", + "prost-types", + "rand", + "rangemap", + "roaring", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "lance-testing" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745542780246b10d9f6dbbd103029ada56d4d06933ed89faccc0b856df7da461" +dependencies = [ + "arrow-array 52.2.0", + "arrow-schema 52.2.0", + "lance-arrow", + "num-traits", + "rand", +] + +[[package]] +name = "lancedb" +version = "0.7.2" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-ipc 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "async-openai", + "async-trait", + "aws-config", + "aws-sdk-dynamodb", + "aws-sdk-kms", + "aws-sdk-s3", + "aws-smithy-runtime", + "bytes", + "candle-core", + "candle-nn", + "candle-transformers", + "chrono", + "datafusion-physical-plan", + "futures", + "half", + "hf-hub", + "lance", + "lance-datafusion", + "lance-index", + "lance-linalg", + "lance-testing", + "lazy_static", + "log", + "num-traits", + "object_store", + "pin-project", + "polars", + "polars-arrow", + "rand", + "regex", + "reqwest 0.11.27", + "serde", + "serde_json", + "serde_with", + "snafu", + "tempfile", + "tokenizers", + "tokio", + "url", + "uuid", + "walkdir", +] + +[[package]] +name = "lancedb-jni" +version = "0.4.18" +dependencies = [ + "arrow 52.2.0", + "arrow-schema 52.2.0", + "jni", + "lance", + "lancedb", + "lazy_static", + "serde", + "serde_json", + "snafu", + "tokio", +] + +[[package]] +name = "lancedb-node" +version = "0.7.2" +dependencies = [ + "arrow-array 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "chrono", + "conv", + "env_logger 0.11.5", + "futures", + "half", + "lance", + "lance-index", + "lance-linalg", + "lancedb", + "lzma-sys", + "neon", + "object_store", + "once_cell", + "snafu", + "tokio", +] + +[[package]] +name = "lancedb-nodejs" +version = "0.0.0" +dependencies = [ + "arrow-ipc 52.2.0", + "futures", + "lancedb", + "lzma-sys", + "napi", + "napi-build", + "napi-derive", +] + +[[package]] +name = "lancedb-python" +version = "0.11.0" +dependencies = [ + "arrow 52.2.0", + "env_logger 0.10.2", + "futures", + "lancedb", + "lzma-sys", + "pin-project", + "pyo3", + "pyo3-asyncio-0-21", + "pyo3-build-config 0.20.3", + "tokio", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "levenshtein_automata" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" + +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libloading" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "lru_time_cache" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" + +[[package]] +name = "lz4" +version = "1.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68" +dependencies = [ + "libc", + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lz4_flex" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "measure_time" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" +dependencies = [ + "instant", + "log", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mock_instant" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" +dependencies = [ + "once_cell", +] + +[[package]] +name = "moka" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa6e72583bf6830c956235bff0d5afec8cf2952f579ebad18ae7821a917d950f" +dependencies = [ + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "once_cell", + "parking_lot", + "quanta", + "rustc_version", + "scheduled-thread-pool", + "skeptic", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] + +[[package]] +name = "monostate" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "multiversion" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" +dependencies = [ + "multiversion-macros", + "target-features", +] + +[[package]] +name = "multiversion-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "target-features", +] + +[[package]] +name = "murmurhash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" + +[[package]] +name = "napi" +version = "2.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1bd081bbaef43600fd2c5dd4c525b8ecea7dfdacf40ebc674e87851dce6559e" +dependencies = [ + "bitflags 2.6.0", + "ctor", + "napi-derive", + "napi-sys", + "once_cell", + "tokio", +] + +[[package]] +name = "napi-build" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" + +[[package]] +name = "napi-derive" +version = "2.16.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13934cae1f98599ae96d461d14ce3a9199215de1e9a9a201b64b118b3dfa329" +dependencies = [ + "cfg-if", + "convert_case", + "napi-derive-backend", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "napi-derive-backend" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "632d41c6057955f455824a7585ce19bc69b2c83472d16581e8f0175fcf4759b7" +dependencies = [ + "convert_case", + "once_cell", + "proc-macro2", + "quote", + "regex", + "semver 1.0.23", + "syn 2.0.72", +] + +[[package]] +name = "napi-sys" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" +dependencies = [ + "libloading 0.8.5", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "neon" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" +dependencies = [ + "neon-build", + "neon-macros", + "neon-runtime", + "semver 0.9.0", + "smallvec", +] + +[[package]] +name = "neon-build" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" + +[[package]] +name = "neon-macros" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf" +dependencies = [ + "quote", + "syn 1.0.109", + "syn-mid", +] + +[[package]] +name = "neon-runtime" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" +dependencies = [ + "cfg-if", + "libloading 0.6.7", + "smallvec", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "now" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0" +dependencies = [ + "chrono", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +dependencies = [ + "memchr", +] + +[[package]] +name = "object_store" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" +dependencies = [ + "async-trait", + "base64 0.22.1", + "bytes", + "chrono", + "futures", + "humantime", + "hyper 1.4.1", + "itertools 0.13.0", + "md-5", + "parking_lot", + "percent-encoding", + "quick-xml", + "rand", + "reqwest 0.12.5", + "ring", + "rustls-pemfile 2.1.3", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oneshot" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "ownedbytes" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parquet-format-safe" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "path_abs" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" +dependencies = [ + "serde", + "serde_derive", + "std_prelude", + "stfu8", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.3.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "planus" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" +dependencies = [ + "array-init-cursor", +] + +[[package]] +name = "polars" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea21b858b16b9c0e17a12db2800d11aa5b4bd182be6b3022eb537bbfc1f2db5" +dependencies = [ + "getrandom", + "polars-arrow", + "polars-core", + "polars-error", + "polars-io", + "polars-lazy", + "polars-ops", + "polars-parquet", + "polars-sql", + "polars-time", + "polars-utils", + "version_check", +] + +[[package]] +name = "polars-arrow" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "725b09f2b5ef31279b66e27bbab63c58d49d8f6696b66b1f46c7eaab95e80f75" +dependencies = [ + "ahash", + "atoi", + "atoi_simd", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "dyn-clone", + "either", + "ethnum", + "fast-float", + "foreign_vec", + "getrandom", + "hashbrown 0.14.5", + "itoa", + "itoap", + "lz4", + "multiversion", + "num-traits", + "polars-arrow-format", + "polars-error", + "polars-utils", + "ryu", + "simdutf8", + "streaming-iterator", + "strength_reduce", + "version_check", + "zstd", +] + +[[package]] +name = "polars-arrow-format" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b0ef2474af9396b19025b189d96e992311e6a47f90c53cd998b36c4c64b84c" +dependencies = [ + "planus", + "serde", +] + +[[package]] +name = "polars-compute" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a796945b14b14fbb79b91ef0406e6fddca2be636e889f81ea5d6ee7d36efb4fe" +dependencies = [ + "bytemuck", + "either", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "strength_reduce", + "version_check", +] + +[[package]] +name = "polars-core" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465f70d3e96b6d0b1a43c358ba451286b8c8bd56696feff020d65702aa33e35c" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "comfy-table", + "either", + "hashbrown 0.14.5", + "indexmap 2.3.0", + "num-traits", + "once_cell", + "polars-arrow", + "polars-compute", + "polars-error", + "polars-row", + "polars-utils", + "rand", + "rand_distr", + "rayon", + "regex", + "smartstring", + "thiserror", + "version_check", + "xxhash-rust", +] + +[[package]] +name = "polars-error" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5224d5d05e6b8a6f78b75951ae1b5f82c8ab1979e11ffaf5fd41941e3d5b0757" +dependencies = [ + "polars-arrow-format", + "regex", + "simdutf8", + "thiserror", +] + +[[package]] +name = "polars-io" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c8589e418cbe4a48228d64b2a8a40284a82ec3c98817c0c2bcc0267701338b" +dependencies = [ + "ahash", + "atoi_simd", + "bytes", + "chrono", + "fast-float", + "home", + "itoa", + "memchr", + "memmap2 0.7.1", + "num-traits", + "once_cell", + "percent-encoding", + "polars-arrow", + "polars-core", + "polars-error", + "polars-time", + "polars-utils", + "rayon", + "regex", + "ryu", + "simdutf8", + "smartstring", +] + +[[package]] +name = "polars-lazy" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2632b1af668e2058d5f8f916d8fbde3cac63d03ae29a705f598e41dcfeb7f" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "glob", + "once_cell", + "polars-arrow", + "polars-core", + "polars-io", + "polars-ops", + "polars-pipe", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", + "smartstring", + "version_check", +] + +[[package]] +name = "polars-ops" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efdbdb4d9a92109bc2e0ce8e17af5ae8ab643bb5b7ee9d1d74f0aeffd1fbc95f" +dependencies = [ + "ahash", + "argminmax", + "base64 0.21.7", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "either", + "hashbrown 0.14.5", + "hex", + "indexmap 2.3.0", + "memchr", + "num-traits", + "polars-arrow", + "polars-compute", + "polars-core", + "polars-error", + "polars-utils", + "rayon", + "regex", + "smartstring", + "unicode-reverse", + "version_check", +] + +[[package]] +name = "polars-parquet" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b421d2196f786fdfe162db614c8485f8308fe41575d4de634a39bbe460d1eb6a" +dependencies = [ + "ahash", + "base64 0.21.7", + "ethnum", + "num-traits", + "parquet-format-safe", + "polars-arrow", + "polars-error", + "polars-utils", + "seq-macro", + "simdutf8", + "streaming-decompression", +] + +[[package]] +name = "polars-pipe" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48700f1d5bd56a15451e581f465c09541492750360f18637b196f995470a015c" +dependencies = [ + "crossbeam-channel", + "crossbeam-queue", + "enum_dispatch", + "hashbrown 0.14.5", + "num-traits", + "polars-arrow", + "polars-compute", + "polars-core", + "polars-io", + "polars-ops", + "polars-plan", + "polars-row", + "polars-utils", + "rayon", + "smartstring", + "uuid", + "version_check", +] + +[[package]] +name = "polars-plan" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb8e2302e20c44defd5be8cad9c96e75face63c3a5f609aced8c4ec3b3ac97d" +dependencies = [ + "ahash", + "bytemuck", + "chrono-tz 0.8.6", + "hashbrown 0.14.5", + "once_cell", + "percent-encoding", + "polars-arrow", + "polars-core", + "polars-io", + "polars-ops", + "polars-time", + "polars-utils", + "rayon", + "recursive", + "regex", + "smartstring", + "strum_macros 0.25.3", + "version_check", +] + +[[package]] +name = "polars-row" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a515bdc68c2ae3702e3de70d89601f3b71ca8137e282a226dddb53ee4bacfa2e" +dependencies = [ + "bytemuck", + "polars-arrow", + "polars-error", + "polars-utils", +] + +[[package]] +name = "polars-sql" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4bb7cc1c04c3023d1953b2f1dec50515e8fd8169a5a2bf4967b3b082232db7" +dependencies = [ + "hex", + "polars-arrow", + "polars-core", + "polars-error", + "polars-lazy", + "polars-plan", + "rand", + "serde", + "serde_json", + "sqlparser 0.39.0", +] + +[[package]] +name = "polars-time" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efc18e3ad92eec55db89d88f16c22d436559ba7030cf76f86f6ed7a754b673f1" +dependencies = [ + "atoi", + "chrono", + "chrono-tz 0.8.6", + "now", + "once_cell", + "polars-arrow", + "polars-core", + "polars-error", + "polars-ops", + "polars-utils", + "regex", + "smartstring", +] + +[[package]] +name = "polars-utils" +version = "0.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c760b6c698cfe2fbbbd93d6cfb408db14ececfe1d92445dae2229ce1b5b21ae8" +dependencies = [ + "ahash", + "bytemuck", + "hashbrown 0.14.5", + "indexmap 2.3.0", + "num-traits", + "once_cell", + "polars-error", + "raw-cpuid 11.1.0", + "rayon", + "smartstring", + "stacker", + "sysinfo", + "version_check", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.72", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.72", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "pulldown-cmark" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +dependencies = [ + "bitflags 2.6.0", + "memchr", + "unicase", +] + +[[package]] +name = "pulp" +version = "0.18.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "pyo3" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config 0.21.2", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-asyncio-0-21" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fde289486f7d5cee0ac7c20b2637a0657654681079cc5eedc90d9a2a79af1e5" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "pyo3-asyncio-macros-0-21", + "tokio", +] + +[[package]] +name = "pyo3-asyncio-macros-0-21" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5ffc4e987e866bf54b781235a6c3b91e7e67df14f73ce716625ee78728554a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +dependencies = [ + "libc", + "pyo3-build-config 0.21.2", +] + +[[package]] +name = "pyo3-macros" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config 0.21.2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid 10.7.0", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quick-xml" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.12", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "raw-cpuid" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] +name = "recursive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" +dependencies = [ + "recursive-proc-macro-impl", + "stacker", +] + +[[package]] +name = "recursive-proc-macro-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" +dependencies = [ + "quote", + "syn 2.0.72", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.12", + "rustls-native-certs 0.7.1", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls 0.26.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg 0.52.0", +] + +[[package]] +name = "reqwest-eventsource" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "632c55746dbb44275691640e7b40c907c16a2dc1a5842aa98aaec90da6ec6bde" +dependencies = [ + "eventsource-stream", + "futures-core", + "futures-timer", + "mime", + "nom", + "pin-project-lite", + "reqwest 0.12.5", + "thiserror", +] + +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint 0.4.9", + "hmac", + "zeroize", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "roaring" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" +dependencies = [ + "bytemuck", + "byteorder", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.23", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "safetensors" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "serde", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "serde_json" +version = "1.0.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.3.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "sketches-ddsketch" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" +dependencies = [ + "serde", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + +[[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "sqlparser" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +dependencies = [ + "log", +] + +[[package]] +name = "sqlparser" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +dependencies = [ + "log", + "sqlparser_derive", +] + +[[package]] +name = "sqlparser_derive" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "std_prelude" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" + +[[package]] +name = "stfu8" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51f1e89f093f99e7432c491c382b88a6860a5adbe6bf02574bf0a08efff1978" + +[[package]] +name = "streaming-decompression" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3" +dependencies = [ + "fallible-streaming-iterator", +] + +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.72", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.72", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn-mid" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] +name = "sysinfo" +version = "0.30.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "windows", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] +name = "tantivy" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" +dependencies = [ + "aho-corasick", + "arc-swap", + "base64 0.22.1", + "bitpacking", + "byteorder", + "census", + "crc32fast", + "crossbeam-channel", + "downcast-rs", + "fastdivide", + "fnv", + "fs4", + "htmlescape", + "itertools 0.12.1", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2 0.9.4", + "num_cpus", + "once_cell", + "oneshot", + "rayon", + "regex", + "rust-stemmers", + "rustc-hash", + "serde", + "serde_json", + "sketches-ddsketch", + "smallvec", + "tantivy-bitpacker", + "tantivy-columnar", + "tantivy-common", + "tantivy-fst", + "tantivy-query-grammar", + "tantivy-stacker", + "tantivy-tokenizer-api", + "tempfile", + "thiserror", + "time", + "uuid", + "winapi", +] + +[[package]] +name = "tantivy-bitpacker" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" +dependencies = [ + "bitpacking", +] + +[[package]] +name = "tantivy-columnar" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" +dependencies = [ + "downcast-rs", + "fastdivide", + "itertools 0.12.1", + "serde", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-sstable", + "tantivy-stacker", +] + +[[package]] +name = "tantivy-common" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" +dependencies = [ + "async-trait", + "byteorder", + "ownedbytes", + "serde", + "time", +] + +[[package]] +name = "tantivy-fst" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" +dependencies = [ + "byteorder", + "regex-syntax", + "utf8-ranges", +] + +[[package]] +name = "tantivy-query-grammar" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" +dependencies = [ + "nom", +] + +[[package]] +name = "tantivy-sstable" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" +dependencies = [ + "tantivy-bitpacker", + "tantivy-common", + "tantivy-fst", + "zstd", +] + +[[package]] +name = "tantivy-stacker" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" +dependencies = [ + "murmurhash32", + "rand_distr", + "tantivy-common", +] + +[[package]] +name = "tantivy-tokenizer-api" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" +dependencies = [ + "serde", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-features" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokenizers" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e500fad1dd3af3d626327e6a3fe5050e664a6eaa4708b8ca92f1794aaf73e6fd" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.3.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "triomphe" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-reverse" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls 0.23.12", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.72", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zip" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "indexmap 2.3.0", + "num_enum", + "thiserror", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix new file mode 100644 index 0000000000000..7064980591d7c --- /dev/null +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + buildPythonPackage, + rustPlatform, + fetchFromGitHub, + darwin, + libiconv, + pkg-config, + protobuf, + attrs, + cachetools, + deprecation, + overrides, + packaging, + pydantic, + pylance, + requests, + retry, + tqdm, + aiohttp, + pandas, + polars, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "lancedb"; + version = "0.11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lancedb"; + repo = "lancedb"; + rev = "refs/tags/python-v${version}"; + hash = "sha256-JT6HNuMjFO/q+6LlYRT+vKa0aV9DOC9b21ulHXq1gjY="; + }; + + # ratelimiter only support up to python310 and it has been removed from nixpkgs + patches = [ ./remove-ratelimiter.patch ]; + + buildAndTestSubdir = "python"; + + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ rustPlatform.maturinBuildHook ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.cargoSetupHook + ]; + + buildInputs = + [ + libiconv + protobuf + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + IOKit + Security + SystemConfiguration + ] + ); + + pythonRemoveDeps = [ "ratelimiter" ]; + + dependencies = [ + attrs + cachetools + deprecation + overrides + packaging + pydantic + pylance + requests + retry + tqdm + ]; + + pythonImportsCheck = [ "lancedb" ]; + + nativeCheckInputs = [ + aiohttp + pandas + polars + pytest-asyncio + pytestCheckHook + ]; + + preCheck = '' + cd python/python/tests + ''; + + pytestFlagsArray = [ "-m 'not slow'" ]; + + disabledTests = [ + # require tantivy which is not packaged in nixpkgs + "test_basic" + ]; + + disabledTestPaths = [ + # touch the network + "test_s3.py" + ]; + + meta = { + description = "Developer-friendly, serverless vector database for AI applications"; + homepage = "https://github.com/lancedb/lancedb"; + changelog = "https://github.com/lancedb/lancedb/releases/tag/python-v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/lancedb/remove-ratelimiter.patch b/pkgs/development/python-modules/lancedb/remove-ratelimiter.patch new file mode 100644 index 0000000000000..bdfbdc4622ae1 --- /dev/null +++ b/pkgs/development/python-modules/lancedb/remove-ratelimiter.patch @@ -0,0 +1,26 @@ +diff --git a/python/python/lancedb/embeddings/utils.py b/python/python/lancedb/embeddings/utils.py +index 813631c..4ae6025 100644 +--- a/python/python/lancedb/embeddings/utils.py ++++ b/python/python/lancedb/embeddings/utils.py +@@ -111,7 +111,7 @@ class FunctionWrapper: + + if len(self.rate_limiter_kwargs) > 0: + v = int(sys.version_info.minor) +- if v >= 11: ++ if True: + print( + "WARNING: rate limit only support up to 3.10, proceeding " + "without rate limiter" +diff --git a/python/python/tests/test_embeddings.py b/python/python/tests/test_embeddings.py +index ed7b105..28ca9cb 100644 +--- a/python/python/tests/test_embeddings.py ++++ b/python/python/tests/test_embeddings.py +@@ -35,7 +35,7 @@ def mock_embed_func(input_data): + + def test_with_embeddings(): + for wrap_api in [True, False]: +- if wrap_api and sys.version_info.minor >= 11: ++ if wrap_api: + # ratelimiter package doesn't work on 3.11 + continue + data = pa.Table.from_arrays( diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix new file mode 100644 index 0000000000000..7fb03157345bb --- /dev/null +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -0,0 +1,76 @@ +{ + lib, + azure-identity, + buildPythonPackage, + fetchFromGitHub, + freezegun, + langchain-core, + langchain-openai, + lark, + pandas, + poetry-core, + pytest-asyncio, + pytest-mock, + pytest-socket, + pytestCheckHook, + pythonOlder, + requests-mock, + responses, + syrupy, + toml, +}: + +buildPythonPackage rec { + pname = "langchain-azure-dynamic-sessions"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-azure-dynamic-sessions==${version}"; + hash = "sha256-jz4IBMnWuk8FsSsyfLN14B0xWZrmZrvEW95a45S+FOo="; + }; + + sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions"; + + build-system = [ poetry-core ]; + + dependencies = [ + azure-identity + langchain-core + langchain-openai + ]; + + nativeCheckInputs = [ + freezegun + lark + pandas + pytest-asyncio + pytest-mock + pytest-socket + pytestCheckHook + requests-mock + responses + syrupy + toml + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_azure_dynamic_sessions" ]; + + passthru = { + updateScript = langchain-core.updateScript; + }; + + meta = { + description = "Integration package connecting Azure Container Apps dynamic sessions and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/azure-dynamic-sessions"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-azure-dynamic-sessions==${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index 8afb70b1a467a..2331babc4d7e4 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.2.9"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; + rev = "refs/tags/langchain-chroma==${version}"; + hash = "sha256-PQ3bepiAqzWhQdKofQSzQKxRrwI6dxBfSNV91462aJE="; }; sourceRoot = "${src.name}/libs/partners/chroma"; @@ -44,8 +44,9 @@ buildPythonPackage rec { }; meta = { - description = "Build context-aware reasoning applications"; - homepage = "https://github.com/langchain-ai/langchain"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-chroma==${version}"; + description = "Integration package connecting Chroma and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/chroma"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 4bf2cd9bd0f9a..78150a083a165 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -6,10 +6,10 @@ pythonOlder, aiohttp, dataclasses-json, - duckdb-engine, langchain, langchain-core, langsmith, + httpx, lark, numpy, pandas, @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.9"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,12 +37,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; + rev = "refs/tags/langchain-community==${version}"; + hash = "sha256-r0YSJkYPcwjHyw1xST5Zrgg9USjN9GOsvhV97imSFCQ="; }; sourceRoot = "${src.name}/libs/community"; + preConfigure = '' + ln -s ${src}/libs/standard-tests/langchain_standard_tests ./langchain_standard_tests + + substituteInPlace pyproject.toml \ + --replace-fail "path = \"../standard-tests\"" "path = \"./langchain_standard_tests\"" + ''; + build-system = [ poetry-core ]; dependencies = [ @@ -58,14 +65,14 @@ buildPythonPackage rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; }; pythonImportsCheck = [ "langchain_community" ]; nativeCheckInputs = [ - duckdb-engine + httpx lark pandas pytest-asyncio @@ -88,12 +95,16 @@ buildPythonPackage rec { disabledTests = [ # Test require network access "test_ovhcloud_embed_documents" + # duckdb-engine needs python-wasmer which is not yet available in Python 3.12 + # See https://github.com/NixOS/nixpkgs/pull/326337 and https://github.com/wasmerio/wasmer-python/issues/778 + "test_table_info" + "test_sql_database_run" ]; meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-community==${version}"; description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; - changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index f55d59b850591..8e32b2f3f6d7a 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -1,9 +1,11 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, freezegun, grandalf, + httpx, jsonpatch, langsmith, numpy, @@ -23,7 +25,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.9"; + version = "0.2.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,18 +34,19 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; + hash = "sha256-8qEN03iimGLnhg6TdpPal+MXBZJ/QHJKwjxRF96abBw="; }; sourceRoot = "${src.name}/libs/core"; - pythonRelaxDeps = [ - "langsmith" - "packaging" - ]; + preConfigure = '' + ln -s ${src}/libs/standard-tests/langchain_standard_tests ./langchain_standard_tests - build-system = [ poetry-core ]; + substituteInPlace pyproject.toml \ + --replace-fail "path = \"../standard-tests\"" "path = \"./langchain_standard_tests\"" + ''; + build-system = [ poetry-core ]; dependencies = [ jsonpatch @@ -59,6 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun grandalf + httpx numpy pytest-asyncio pytest-mock @@ -69,13 +73,6 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit_tests" ]; - disabledTests = [ - # Fail for an unclear reason with: - # AssertionError: assert '6a92363c-4ac...-d344769ab6ac' == '09af124a-2ed...-671c64c72b70' - "test_config_traceable_handoff" - "test_config_traceable_async_handoff" - ]; - passthru = { updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell @@ -89,6 +86,16 @@ buildPythonPackage rec { ''; }; + disabledTests = [ + # flaky, sometimes fail to strip uuid from AIMessageChunk before comparing to test value + "test_map_stream" + ] + ++ lib.optionals stdenv.isDarwin [ + # Langchain-core the following tests due to the test comparing execution time with magic values. + "test_queue_for_streaming_via_sync_call" + "test_same_event_loop" + ]; + meta = { description = "Building applications with LLMs through composability"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix new file mode 100644 index 0000000000000..6f52e35b341ad --- /dev/null +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -0,0 +1,80 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + freezegun, + huggingface-hub, + langchain-core, + sentence-transformers, + tokenizers, + transformers, + lark, + pandas, + poetry-core, + pytest-asyncio, + pytest-mock, + pytest-socket, + pytestCheckHook, + pythonOlder, + requests-mock, + responses, + syrupy, + toml, +}: + +buildPythonPackage rec { + pname = "langchain-huggingface"; + version = "0.0.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-huggingface==${version}"; + hash = "sha256-4k3C6T2N7SBM/wP8KAwMQqt9DkXDdYNt2i/OkZilWw0="; + }; + + sourceRoot = "${src.name}/libs/partners/huggingface"; + + build-system = [ poetry-core ]; + + dependencies = [ + huggingface-hub + langchain-core + sentence-transformers + tokenizers + transformers + ]; + + nativeCheckInputs = [ + freezegun + lark + pandas + pytest-asyncio + pytest-mock + pytest-socket + pytestCheckHook + requests-mock + responses + syrupy + toml + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_huggingface" ]; + + passthru = { + updateScript = langchain-core.updateScript; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-huggingface==${version}"; + description = "An integration package connecting Huggingface related classes and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/huggingface"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix new file mode 100644 index 0000000000000..360fa099f937c --- /dev/null +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -0,0 +1,76 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + freezegun, + langchain, + langchain-core, + pymongo, + lark, + pandas, + poetry-core, + pytest-asyncio, + pytest-mock, + pytest-socket, + pytestCheckHook, + pythonOlder, + requests-mock, + responses, + syrupy, + toml, +}: + +buildPythonPackage rec { + pname = "langchain-mongodb"; + version = "0.1.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-mongodb==${version}"; + hash = "sha256-p/cdWFPc2Oi5aRmjj1oAixM6aDKw0TbyzMdP4h2acG4="; + }; + + sourceRoot = "${src.name}/libs/partners/mongodb"; + + build-system = [ poetry-core ]; + + dependencies = [ + langchain-core + pymongo + ]; + + nativeCheckInputs = [ + freezegun + langchain + lark + pandas + pytest-asyncio + pytest-mock + pytest-socket + pytestCheckHook + requests-mock + responses + syrupy + toml + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langchain_mongodb" ]; + + passthru = { + updateScript = langchain-core.updateScript; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-mongodb==${version}"; + description = "Integration package connecting MongoDB and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/mongodb"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix new file mode 100644 index 0000000000000..58eecb2a9f2a9 --- /dev/null +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -0,0 +1,101 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + freezegun, + langchain, + langchain-core, + openai, + tiktoken, + lark, + pandas, + poetry-core, + pytest-asyncio, + pytest-mock, + pytest-socket, + pytestCheckHook, + pythonOlder, + requests-mock, + responses, + syrupy, + toml, +}: + +buildPythonPackage rec { + pname = "langchain-openai"; + version = "0.1.17"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-openai==${version}"; + hash = "sha256-ELD1KXCVx3SmiJodagtOHgBGKdjRWiRVCCNYcL63eCY="; + }; + + sourceRoot = "${src.name}/libs/partners/openai"; + + preConfigure = '' + ln -s ${src}/libs/standard-tests/langchain_standard_tests ./langchain_standard_tests + + substituteInPlace pyproject.toml \ + --replace-fail "path = \"../../standard-tests\"" "path = \"./langchain_standard_tests\"" \ + --replace-fail "--cov=langchain_openai" "" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + langchain + langchain-core + openai + tiktoken + ]; + + nativeCheckInputs = [ + freezegun + lark + pandas + pytest-asyncio + pytest-mock + pytest-socket + pytestCheckHook + requests-mock + responses + syrupy + toml + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + disabledTests = [ + # These tests require network access + "test__get_encoding_model" + "test_get_token_ids" + "test_azure_openai_secrets" + "test_azure_openai_api_key_is_secret_string" + "test_get_num_tokens_from_messages" + "test_azure_openai_api_key_masked_when_passed_from_env" + "test_azure_openai_api_key_masked_when_passed_via_constructor" + "test_azure_openai_uses_actual_secret_value_from_secretstr" + "test_azure_serialized_secrets" + "test_openai_get_num_tokens" + "test_chat_openai_get_num_tokens" + ]; + + pythonImportsCheck = [ "langchain_openai" ]; + + passthru = { + updateScript = langchain-core.updateScript; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-openai==${version}"; + description = "Integration package connecting OpenAI and LangChain"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/openai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index beb4c5d8c332c..d35c78c22ceda 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.2.9"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; + rev = "refs/tags/langchain-text-splitters==${version}"; + hash = "sha256-SixF3ZkN+gjQ4KYLhGoezdQAOQ1AlGEC6IBzHePF6/o="; }; sourceRoot = "${src.name}/libs/text-splitters"; @@ -43,9 +43,9 @@ buildPythonPackage rec { }; meta = { - description = "Build context-aware reasoning applications"; + changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-text-splitters==${version}"; + description = "LangChain utilities for splitting into chunks a wide variety of text documents"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; - changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 73c6050f01fd2..8475a6bbbce59 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-/BUn/NxaE9l3VY6dPshr1JJaHTGzn9NMQhSQ2De65Jg="; + rev = "refs/tags/langchain==${version}"; + hash = "sha256-HSr1watEDC28SZTsJWbXGrZsQd0O/wgxmj7pTsxMBOA="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 52f4c384f8060..981b90bbc5ec1 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; + hash = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix new file mode 100644 index 0000000000000..66c09ae1d2c6a --- /dev/null +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + click, + fetchFromGitHub, + nix-update-script, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "langgraph-cli"; + version = "0.1.50"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/cli==${version}"; + hash = "sha256-FCPYrs7WPDQ0CBkey4BCn0SWa9jRDcjlygDGIiRArWw="; + }; + + sourceRoot = "${src.name}/libs/cli"; + + build-system = [ poetry-core ]; + + dependencies = [ click ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit_tests" ]; + + pythonImportsCheck = [ "langgraph_cli" ]; + + disabledTests = [ + # Flaky tests that generate a Docker configuration then compare to exact text + "test_config_to_docker_simple" + "test_config_to_docker_pipconfig" + "test_config_to_compose_env_vars" + "test_config_to_compose_env_file" + "test_config_to_compose_end_to_end" + "test_config_to_compose_simple_config" + "test_config_to_compose_watch" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "cli==(.*)" + ]; + }; + + meta = { + description = "Official CLI for LangGraph API"; + homepage = "https://github.com/langchain-ai/langgraph/libs/cli"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; + mainProgram = "langgraph"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix new file mode 100644 index 0000000000000..d002f958fb407 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + httpx, + httpx-sse, + orjson, + poetry-core, + pythonOlder, + writeScript, +}: + +buildPythonPackage rec { + pname = "langgraph-sdk"; + version = "0.1.26"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/sdk==${version}"; + hash = "sha256-o7JrB2WSWfPm927tDRMcjzx+6Io6Q+Yjp4XPVs2+F4o="; + }; + + sourceRoot = "${src.name}/libs/sdk-py"; + + build-system = [ poetry-core ]; + + dependencies = [ + httpx + httpx-sse + orjson + ]; + + pythonImportsCheck = [ "langgraph_sdk" ]; + + passthru = { + # python3Packages.langgraph-sdk depends on python3Packages.langgraph. langgraph-cli is independent of both. + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update --commit --version-regex '(.*)' python3Packages.langgraph + nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk + ''; + }; + + meta = { + description = "SDK for interacting with the LangGraph Cloud REST API"; + homepage = "https://github.com/langchain-ai/langgraphtree/main/libs/sdk-py"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/sdk==${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix new file mode 100644 index 0000000000000..7a0c6756f4198 --- /dev/null +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + aiosqlite, + dataclasses-json, + fetchFromGitHub, + grandalf, + httpx, + langchain-core, + langgraph-sdk, + langsmith, + poetry-core, + pydantic, + pytest-asyncio, + pytest-mock, + pytest-xdist, + pytestCheckHook, + pythonOlder, + syrupy, +}: + +buildPythonPackage rec { + pname = "langgraph"; + version = "0.1.9"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/${version}"; + hash = "sha256-sBjSfKzcILkHgvo8g/NHC+/yUjQSyZB/8xaSCY3rPDs="; + }; + + sourceRoot = "${src.name}/libs/langgraph"; + + build-system = [ poetry-core ]; + + dependencies = [ langchain-core ]; + + pythonImportsCheck = [ "langgraph" ]; + + nativeCheckInputs = [ + aiosqlite + dataclasses-json + grandalf + httpx + langsmith + pydantic + pytest-asyncio + pytest-mock + pytest-xdist + pytestCheckHook + syrupy + ]; + + pytestFlagsArray = [ "--snapshot-update" ]; + + disabledTests = [ + "test_doesnt_warn_valid_schema" # test is flaky due to pydantic error on the exception + ]; + + passthru = { + updateScript = langgraph-sdk.updateScript; + }; + + meta = { + description = "Build resilient language agents as graphs"; + homepage = "https://github.com/langchain-ai/langgraph"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 97ed19193113b..8c68c36105ef9 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.80"; + version = "0.1.85"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-bkbJKg2ikdkTenAP+GD+Ss13nF8KrizLNM72oDgQgJM="; + hash = "sha256-IPbamCfaurikFAqKnvMp8+x5ULCeQ61d5oZFO9+s4SQ="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 822b51053c17b..c2890bf591ec2 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; + hash = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix index 7ac0756259023..da58622e26846 100644 --- a/pkgs/development/python-modules/launchpadlib/default.nix +++ b/pkgs/development/python-modules/launchpadlib/default.nix @@ -2,47 +2,43 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, httplib2, - keyring, lazr-restfulclient, lazr-uri, setuptools, six, testresources, - wadllib, pytestCheckHook, }: buildPythonPackage rec { pname = "launchpadlib"; - version = "1.11.0"; - format = "pyproject"; + version = "2.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AYmMk3R3sMZKdTOK2wl3Ao1zRqigGesCPPaP7ZmFAUY="; + hash = "sha256-XUqQlekXc6dWXUwVlZSuMOynkv1fm4ne1FnXEUhKlss="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ httplib2 - keyring lazr-restfulclient lazr-uri - setuptools six - testresources - wadllib ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + testresources + ]; preCheck = '' export HOME=$TMPDIR ''; - doCheck = isPy3k; - pythonImportsCheck = [ "launchpadlib" "launchpadlib.apps" diff --git a/pkgs/development/python-modules/laundrify-aio/default.nix b/pkgs/development/python-modules/laundrify-aio/default.nix index a34e6a533fd37..3499534e9def8 100644 --- a/pkgs/development/python-modules/laundrify-aio/default.nix +++ b/pkgs/development/python-modules/laundrify-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "laundrify-aio"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "laundrify"; repo = "laundrify-pypi"; rev = "v${version}"; - hash = "sha256-XhdIKitUyC5RWW/o98ZyhG7BuVCINsiNWlh3liITKCs="; + hash = "sha256-iFQ0396BkGWM7Ma/I0gbXucd2/yPmEVF4IC3/bMK2SA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy-imports/default.nix b/pkgs/development/python-modules/lazy-imports/default.nix index 4efed32b70d66..f52db38bf30dd 100644 --- a/pkgs/development/python-modules/lazy-imports/default.nix +++ b/pkgs/development/python-modules/lazy-imports/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, diff --git a/pkgs/development/python-modules/lazy-loader/default.nix b/pkgs/development/python-modules/lazy-loader/default.nix index 974288e365f3f..ad51358ccb78d 100644 --- a/pkgs/development/python-modules/lazy-loader/default.nix +++ b/pkgs/development/python-modules/lazy-loader/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/scientific-python/lazy_loader"; changelog = "https://github.com/scientific-python/lazy_loader/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix index 02008f02c2afe..27d9716cd1284 100644 --- a/pkgs/development/python-modules/lcd-i2c/default.nix +++ b/pkgs/development/python-modules/lcd-i2c/default.nix @@ -1,6 +1,5 @@ { lib, - python3, fetchPypi, buildPythonPackage, smbus2, diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix index 01b5ddcbdefe0..91258c86a08b8 100644 --- a/pkgs/development/python-modules/lcgit/default.nix +++ b/pkgs/development/python-modules/lcgit/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "lcgit"; - version = "0.2.1"; - format = "setuptools"; + version = "1.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,14 +18,16 @@ buildPythonPackage rec { owner = "cisagov"; repo = "lcgit"; rev = "refs/tags/v${version}"; - hash = "sha256-bLeblC68+j+YwvgnV1wgJiWm/jxZFzhTSDwXpoSzUTg="; + hash = "sha256-aMwjgN9//jAnTYnbJJvQyfE/f+5QosKxF1l4vF+3myc="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov" "" + --replace-fail " --cov" "" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "lcgit" ]; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 7cf35cfe2c466..14534ef1d15ab 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/ldap3"; description = "Strictly RFC 4510 conforming LDAP V3 pure Python client library"; license = licenses.lgpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ldapdomaindump/default.nix b/pkgs/development/python-modules/ldapdomaindump/default.nix index 8b7ba429025ca..e154108d063c5 100644 --- a/pkgs/development/python-modules/ldapdomaindump/default.nix +++ b/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/dirkjanm/ldapdomaindump/"; changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 1b9c9f6ec8a20..ead49289a35ff 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -5,11 +5,9 @@ twisted, passlib, pyparsing, - service-identity, six, zope-interface, pythonOlder, - python, }: buildPythonPackage rec { @@ -46,6 +44,6 @@ buildPythonPackage rec { description = "Pure-Python Twisted library for LDAP"; homepage = "https://github.com/twisted/ldaptor"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/leanblueprint/default.nix b/pkgs/development/python-modules/leanblueprint/default.nix new file mode 100644 index 0000000000000..20a8a51b0a7d2 --- /dev/null +++ b/pkgs/development/python-modules/leanblueprint/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + plasTeX, + plastexshowmore, + plastexdepgraph, + click, + rich, + rich-click, + tomlkit, + jinja2, + gitpython, +}: +buildPythonPackage { + pname = "leanblueprint"; + version = "0.0.10"; + pyproject = true; + + src = fetchFromGitHub { + repo = "leanblueprint"; + owner = "PatrickMassot"; + rev = "v0.0.10"; + hash = "sha256-CUYdxEXgTf2vKDiOoeW4RV6tQ6prFhA4qMc0olZtZBM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + plasTeX + plastexshowmore + plastexdepgraph + click + rich + rich-click + tomlkit + jinja2 + gitpython + ]; + + pythonImportsCheck = [ "leanblueprint" ]; + + meta = { + description = "This plasTeX plugin allowing to write blueprints for Lean 4 projects"; + homepage = "https://github.com/PatrickMassot/leanblueprint"; + maintainers = with lib.maintainers; [ niklashh ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 137fb2070f2cf..6cac7476142f0 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; + hash = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; }; propagatedBuildInputs = [ six ]; @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python charting library"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index b2100be0cbe28..8afa1ea14cb51 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -7,13 +7,13 @@ click, construct, ecdsa, - flit-core, hidapi, intelhex, pillow, - protobuf3, + protobuf, requests, setuptools, + setuptools-scm, tabulate, toml, AppKit, @@ -21,19 +21,19 @@ buildPythonPackage rec { pname = "ledgerwallet"; - version = "0.2.4"; + version = "0.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "LedgerHQ"; repo = "ledgerctl"; rev = "v${version}"; - hash = "sha256-IcStYYkKEdZxwgJKL8l2Y1BtO/Oncd4aKUAZD8umbHs="; + hash = "sha256-PBULYvyO3+YaW+a1/enJtKB/DR4ndL/o/WdpETbWyZ0="; }; buildInputs = [ - flit-core setuptools + setuptools-scm ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography @@ -43,12 +43,23 @@ buildPythonPackage rec { hidapi intelhex pillow - protobuf3 + protobuf requests tabulate toml ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"protobuf >=3.20,<4"' '"protobuf >=3.20"' + ''; + + # Regenerate protobuf bindings to lift the version upper-bound and enable + # compatibility the current default protobuf library. + preBuild = '' + protoc --python_out=. --pyi_out=. ledgerwallet/proto/*.proto + ''; + pythonImportsCheck = [ "ledgerwallet" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix new file mode 100644 index 0000000000000..e7c3e0a198d3d --- /dev/null +++ b/pkgs/development/python-modules/legacy-cgi/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "legacy-cgi"; + version = "2.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jackrosenthal"; + repo = "legacy-cgi"; + rev = "refs/tags/v${version}"; + hash = "sha256-hhWZoRswkuwvgkcKthNhMkPPhhoRH4TjdNp+orluQTQ="; + }; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ + "cgi" + "cgitb" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594"; + homepage = "https://github.com/jackrosenthal/legacy-cgi"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index a7913fd5b0970..dab384316fb74 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, cmake, cython, @@ -37,12 +36,6 @@ buildPythonPackage rec { buildInputs = [ rapidfuzz-cpp ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ - "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 - ] - ); - dependencies = [ rapidfuzz ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index e444e10bbe008..6cdbefeb65dae 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.7.1"; + version = "0.7.2"; format = "setuptools"; src = fetchFromGitHub { owner = "anthonyharrison"; repo = pname; rev = "v${version}"; - hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4="; + hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY="; }; dependencies = [ diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 5422e877bacfb..b68c21f7c7cfb 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/schwehr/libais"; changelog = "https://github.com/schwehr/libais/blob/master/Changelog.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix index fb66d88b942bb..b60c3992faf28 100644 --- a/pkgs/development/python-modules/libclang/default.nix +++ b/pkgs/development/python-modules/libclang/default.nix @@ -53,6 +53,6 @@ buildPythonPackage { meta = libclang.meta // { description = "Python bindings for the C language family frontend for LLVM"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 8c3481cdecffb..8fe46bd9572a7 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://libcloud.apache.org/"; changelog = "https://github.com/apache/libcloud/blob/v${version}/CHANGES.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 140c919d70810..ab176fd8252f1 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -95,6 +95,6 @@ buildPythonPackage rec { asl20 psfl ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix deleted file mode 100644 index 7645f8bc74276..0000000000000 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - stdenv, - lib, - addOpenGLRunpath, - buildPythonPackage, - fetchFromGitHub, - cmake, - cython_0, - numpy, - six, - nose, - mako, - config, - cudaSupport ? config.cudaSupport, - cudaPackages ? { }, - openclSupport ? true, - ocl-icd, - clblas, -}: - -buildPythonPackage rec { - pname = "libgpuarray"; - version = "0.7.6"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "Theano"; - repo = "libgpuarray"; - rev = "v${version}"; - sha256 = "0ksil18c9ign4xrv5k323flhvdy6wdxh8szdd3nivv31jc3zsdri"; - }; - - # requires a GPU - doCheck = false; - - configurePhase = "cmakeConfigurePhase"; - - libraryPath = lib.makeLibraryPath ( - lib.optionals cudaSupport ( - with cudaPackages; - [ - cudatoolkit.lib - cudatoolkit.out - ] - ) - ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) - ); - - preBuild = '' - make -j$NIX_BUILD_CORES - make install - - export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE" - - cd .. - ''; - - postFixup = - '' - rm $out/lib/libgpuarray-static.a - '' - + lib.optionalString (!stdenv.isDarwin) '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:$libraryPath" $1 - } - - fixRunPath $out/lib/libgpuarray.so - '' - + lib.optionalString cudaSupport '' - addOpenGLRunpath $out/lib/libgpuarray.so - ''; - - propagatedBuildInputs = [ - numpy - six - mako - ]; - - nativeBuildInputs = [ - cmake - cython_0 - ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; - - buildInputs = [ nose ]; - - meta = with lib; { - homepage = "https://github.com/Theano/libgpuarray"; - description = "Library to manipulate tensors on GPU"; - license = licenses.free; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 7800dbd0f6b57..effdecfa624fb 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.7"; + version = "3.3.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3t/YYP7Hnua3fZ4PPN59BcPKHWukygUlcBGfNPOjJAE="; + hash = "sha256-RG2NOFQC6rxeutawn3ArZy9uNLn+gPmEqrv1E0YYJx4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 97f5e0dec10a2..5f5725a6a8ce5 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -77,7 +77,6 @@ buildPythonPackage rec { pypaBuildPhase ''; - pythonRemoveDeps = [ "scikit-build" ]; pythonImportsCheck = [ "libmambapy" diff --git a/pkgs/development/python-modules/libpysal/default.nix b/pkgs/development/python-modules/libpysal/default.nix index 8ec004d6c4810..bc6120a1c6933 100644 --- a/pkgs/development/python-modules/libpysal/default.nix +++ b/pkgs/development/python-modules/libpysal/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "libpysal"; - version = "4.11.0"; + version = "4.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pysal"; repo = "libpysal"; rev = "refs/tags/v${version}"; - hash = "sha256-1JZ82wO0kisbTrhsn+BYeNZpkMJUEzuflQ6GqpAYH/c="; + hash = "sha256-m7jcTi51ngAXXWYJGkjMVA3KwAxL2aJysdjiS1pWEIQ="; }; build-system = [ setuptools-scm ]; @@ -60,6 +60,7 @@ buildPythonPackage rec { # requires network access disabledTestPaths = [ + "libpysal/graph/tests/test_summary.py" "libpysal/cg/tests/test_geoJSON.py" "libpysal/examples/tests/test_available.py" "libpysal/graph/tests/test_base.py" diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index e2e98bc1e6edb..628f2ab1922f6 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -6,7 +6,6 @@ protobuf, pycryptodomex, pyogg, - pytestCheckHook, requests, websocket-client, zeroconf, diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 13322dd79ba75..acb94983dcf6c 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "sass" ]; - meta = with lib; { + meta = { description = "Python binding for libsass to compile Sass/SCSS"; mainProgram = "pysassc"; homepage = "https://sass.github.io/libsass-python/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 40650afa0e720..f53bf2e56550c 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Python extension to thumbor"; homepage = "https://github.com/heynemann/libthumbor"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/libusbsio/default.nix b/pkgs/development/python-modules/libusbsio/default.nix index 7e60f9ab22897..4ebd50e349ece 100644 --- a/pkgs/development/python-modules/libusbsio/default.nix +++ b/pkgs/development/python-modules/libusbsio/default.nix @@ -1,25 +1,26 @@ { lib, buildPythonPackage, + fetchPypi, libusbsio, }: buildPythonPackage rec { pname = "libusbsio"; format = "setuptools"; - inherit (libusbsio) version; + version = "2.1.12"; + # If the versions come back into sync switch back to inheriting from c lib + # inherit (libusbsio) version; - src = "${libusbsio.src}/python"; - - # The source includes both the python module directly and also a source tarball for it. - # The direct files lack setup information, the tarball includes unwanted binaries. - # This takes only the setup files from the tarball. - postUnpack = '' - tar -C python --strip-components=1 -xf python/dist/libusbsio-${version}.tar.gz libusbsio-${version}/{setup.py,setup.cfg,pyproject.toml} - rm -r python/dist - ''; + src = fetchPypi { + inherit pname version; + hash = "sha256-RdUhwilBOwg19ay3Po3zsxqlBV9FTy3btJDbO4YEKS8="; + }; + # The source includes both the python module directly and also prebuilt binaries + # Delete the binaries and patch the wrapper to use binary from Nixpkgs instead postPatch = '' + rm -rf libusbsio/bin substituteInPlace libusbsio/libusbsio.py \ --replace "dllpath = LIBUSBSIO._lookup_dll_path(dfltdir, dllname)" 'dllpath = "${libusbsio}/lib/" + dllname' ''; @@ -31,8 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "libusbsio" ]; meta = with lib; { - description = "NXP Secure Provisioning SDK"; - homepage = "https://github.com/NXPmicro/spsdk"; + description = "LIBUSBSIO Host Library for USB Enabled MCUs"; + homepage = "https://www.nxp.com/design/design-center/software/development-software/libusbsio-host-library-for-usb-enabled-mcus:LIBUSBSIO"; license = licenses.bsd3; maintainers = with maintainers; [ frogamic diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 9af39f33d3d5e..6dbb2c8671125 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "10.4.0"; + version = "10.5.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-Qwn07C8N2ZZzE5+qCo2HtBSm5/zGBqbiLnJePxuEJjs="; + hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 7e001e79b5f5d..1825350631d36 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix index c0d0c8b5c71c5..ec823cf5fbf4a 100644 --- a/pkgs/development/python-modules/lifelines/default.nix +++ b/pkgs/development/python-modules/lifelines/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "lifelines"; - version = "0.28.0"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "CamDavidsonPilon"; repo = "lifelines"; rev = "refs/tags/v${version}"; - hash = "sha256-6j+RgKeBCvpcREf7j8NE2x+IUI/LaoT6jsnHny4ccVo="; + hash = "sha256-9ZmecbFjUnWGNf4P3yphiMqG+/ktOYyvMtoZ6sEp1xY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 16465624d65ae..6e07d603b1b42 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -34,19 +34,19 @@ cudaPackages, }: -assert gpuSupport -> cudaSupport != true; -assert cudaSupport -> gpuSupport != true; +assert gpuSupport -> !cudaSupport; +assert cudaSupport -> !gpuSupport; buildPythonPackage rec { pname = "lightgbm"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nop2QJEUgRNOYJh9XR4c0Vf0MMO0s43o02/FXDArwpk="; + hash = "sha256-4c17rwMY1OMIomV1pjpGNfCN+GatNiKp2OPXHZY3obo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 504b5e616c125..393a965535e71 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, - pythonAtLeast, # build setuptools, # runtime + looseversion, packaging, typing-extensions, @@ -18,19 +19,27 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.11.3.post0"; + version = "0.11.6"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-pOy8BCNwuPcM6cvUl295y+0QrcWOq2rT9iZMKyBxpqg="; + hash = "sha256-Bw28mLz9GaMucqP+EqR1F3OKLxDJiIVacrCBIV35G/I="; }; + postPatch = '' + substituteInPlace src/lightning_utilities/install/requirements.py \ + --replace-fail "from distutils.version import LooseVersion" "from looseversion import LooseVersion" + ''; + build-system = [ setuptools ]; dependencies = [ + looseversion packaging typing-extensions ]; @@ -61,18 +70,11 @@ buildPythonPackage rec { "src/lightning_utilities/install/requirements.py" ]; - pytestFlagsArray = [ - # warns about distutils removal in python 3.12 - "-W" - "ignore::DeprecationWarning" - ]; - meta = { changelog = "https://github.com/Lightning-AI/utilities/releases/tag/v${version}"; description = "Common Python utilities and GitHub Actions in Lightning Ecosystem"; homepage = "https://github.com/Lightning-AI/utilities"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; - broken = pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 9edaed6ee6bf3..cf53ab4a50e03 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -99,6 +99,6 @@ buildPythonPackage rec { homepage = "https://github.com/alisaifee/limits"; changelog = "https://github.com/alisaifee/limits/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index f8384033690fa..edc94e07471c4 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Modified version of Supybot, an IRC bot"; homepage = "https://github.com/ProgVal/Limnoria"; license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix index d3a0e21faa000..1a8bfb7964107 100644 --- a/pkgs/development/python-modules/linear-garage-door/default.nix +++ b/pkgs/development/python-modules/linear-garage-door/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "linear-garage-door"; - version = "0.2.9"; + version = "0.2.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "IceBotYT"; repo = "linear-garage-door"; rev = "refs/tags/${version}"; - hash = "sha256-hWWJgZnEItYaSxka7zBHPeVlTEiOqRnA2vg6/MvpJGE="; + hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4="; }; postPatch = '' @@ -29,9 +29,9 @@ buildPythonPackage rec { -e "/--no-cov/d" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp dnspython tenacity diff --git a/pkgs/development/python-modules/linien-client/default.nix b/pkgs/development/python-modules/linien-client/default.nix index 631413a4e9cb5..ad1882af81826 100644 --- a/pkgs/development/python-modules/linien-client/default.nix +++ b/pkgs/development/python-modules/linien-client/default.nix @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client components of the Linien spectroscopy lock application"; homepage = "https://github.com/linien-org/linien/tree/develop/linien-client"; + changelog = "https://github.com/linien-org/linien/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fsagbuya diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix index 513c4c11df204..6904fccd83bf4 100644 --- a/pkgs/development/python-modules/linien-common/default.nix +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Shared components of the Linien spectroscopy lock application"; homepage = "https://github.com/linien-org/linien/tree/develop/linien-common"; + changelog = "https://github.com/linien-org/linien/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fsagbuya diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix index b070abf40e0d8..40a69986187c9 100644 --- a/pkgs/development/python-modules/linien-common/tests.nix +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, linien-common, linien-client, diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index 856d30a024ab9..81296c611ca12 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Links recognition library with full unicode support"; homepage = "https://github.com/tsutsu3/linkify-it-py"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/linode-metadata/default.nix b/pkgs/development/python-modules/linode-metadata/default.nix new file mode 100644 index 0000000000000..a7b47d18efdcb --- /dev/null +++ b/pkgs/development/python-modules/linode-metadata/default.nix @@ -0,0 +1,44 @@ +{ + buildPythonPackage, + fetchPypi, + httpx, + lib, + linode-cli, + pytest, + pytest-asyncio, + setuptools, +}: + +buildPythonPackage rec { + pname = "linode-metadata"; + version = "0.3.0"; + + src = fetchPypi { + pname = "linode_metadata"; + inherit version; + hash = "sha256-ZFCv9f4hbiBaJuKvzs/BGFoP+mAFwVa8OFF22b22voI="; + }; + + pyproject = true; + + dependencies = [ + httpx + setuptools + ]; + + checkInputs = [ + pytest + pytest-asyncio + ]; + + pythonImportsCheck = [ "linode_metadata" ]; + + meta = { + description = "Python package for interacting with the Linode Metadata Service"; + downloadPage = "https://pypi.org/project/linode-metadata/"; + homepage = "https://github.com/linode/py-metadata"; + changelog = "https://github.com/linode/py-metadata/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = linode-cli.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index 07143b4c30f80..ce34a64ee913d 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/ghickman/linode"; description = "Thin python wrapper around Linode's API"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index 6d4aec66c7505..bce9db1f7ec38 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { mainProgram = "lit"; homepage = "http://llvm.org/docs/CommandGuide/lit.html"; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 253b53a00788e..69dccd2811d3b 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -7,6 +7,7 @@ backoff, buildPythonPackage, click, + cryptography, fastapi, fastapi-sso, fetchFromGitHub, @@ -14,11 +15,14 @@ gunicorn, importlib-metadata, jinja2, + jsonschema, openai, orjson, poetry-core, prisma, + pydantic, pyjwt, + pynacl, python-dotenv, python-multipart, pythonOlder, @@ -26,7 +30,6 @@ requests, resend, rq, - streamlit, tiktoken, tokenizers, uvicorn, @@ -34,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.40.16"; + version = "1.42.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -43,13 +46,9 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-CK/b0PVBOzfhnTk+iu/buu7BIjAGdz3aXYAGgB4s/pw="; + hash = "sha256-Wd6u2bOZjdL3jexT3CkiXX3zfcXwMlNEifG/6ak5Qbw="; }; - postPatch = '' - rm -rf dist - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -57,9 +56,11 @@ buildPythonPackage rec { click importlib-metadata jinja2 + jsonschema openai - requests + pydantic python-dotenv + requests tiktoken tokenizers ]; @@ -68,6 +69,7 @@ buildPythonPackage rec { proxy = [ apscheduler backoff + cryptography fastapi fastapi-sso gunicorn @@ -83,15 +85,14 @@ buildPythonPackage rec { azure-keyvault-secrets google-cloud-kms prisma + pynacl resend - streamlit ]; }; - # the import check phase fails trying to do a network request to openai - # pythonImportsCheck = [ "litellm" ]; + pythonImportsCheck = [ "litellm" ]; - # no tests + # access network doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix new file mode 100644 index 0000000000000..f949eef4cf6b9 --- /dev/null +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + httpx, + poetry-core, + pydantic, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "llama-cloud"; + version = "0.0.11"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_cloud"; + inherit version; + hash = "sha256-EAiCtSiJIGUhFDbaBIJS1X7KFNhoPS/eb4nusglQrBg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + httpx + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "llama_cloud" ]; + + meta = with lib; { + description = "LlamaIndex Python Client"; + homepage = "https://pypi.org/project/llama-cloud/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 6073a4e60427b..c7a1d2e46676d 100644 --- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-agent-openai"; - version = "0.2.7"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_agent_openai"; inherit version; - hash = "sha256-E85TXwPjLIIXY8AeJq9CIvOYEXhiJBTThoAToZRugSQ="; + hash = "sha256-3r6G2m2dmD2zK0Rd3KfHmKwUD+WVc7r97XNZWzmV89U="; }; pythonRelaxDeps = [ "llama-index-llms-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index f17ff8e511a6b..5d6795dce9729 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-cli"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_cli"; inherit version; - hash = "sha256-PPH3BsPGnGsaqwf8p/qtOVnbFwmAjv1QSRtmnTiwtYA="; + hash = "sha256-hhR97UQ5+6sdbHwNcujyMdKTXan99cnT8N3k811Eqlk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 6e8ab30f934ab..f6dab9b1f0fbc 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -22,6 +22,7 @@ pytest-mock, pytestCheckHook, pythonOlder, + pyvis, pyyaml, requests, spacy, @@ -46,7 +47,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.48.post1"; + version = "0.10.60"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +56,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-O8mHttYMRUzWvhydQsOux7tynhDuMKapsSDJQXL0MRQ="; + hash = "sha256-CH/YTG0/SVDhwY1iN+K1s7cdTDFDZboO6N9208qLFf4="; }; sourceRoot = "${src.name}/${pname}"; @@ -91,6 +92,7 @@ buildPythonPackage rec { openai pandas pillow + pyvis pyyaml requests spacy diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 05558eb389421..466f936533375 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -5,7 +5,6 @@ google-generativeai, llama-index-core, poetry-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix index cd0031854496d..db3ef8d5b9947 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -2,16 +2,14 @@ lib, buildPythonPackage, fetchPypi, - google-generativeai, llama-index-core, poetry-core, - pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-embeddings-ollama"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-qeCAm93S5K2IjySVGe3H49M5x05OA/xaQMMGDcQdR6k="; + hash = "sha256-S9HdMjDJvgTPpFsow6gGbkbBZU1DYPy+zcFxiskBPso="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 06d00b774787c..3700c2bc96ba4 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.6"; + version = "0.2.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-xv/Z/HLFUEfLqjE4052bc8aBJq3bvreYD/XZw1vijQQ="; + hash = "sha256-nXKpwbE28vq2Ew8Vrw0rxveHBVbu6542wt+aM1t4xl0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index f6eb083b391b1..eeef4efe2ed8c 100644 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, poetry-core, + llama-cloud, llama-index-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - version = "0.1.6"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_indices_managed_llama_cloud"; inherit version; - hash = "sha256-dLOw6ev500jTBU+fwMZXAxrM65NRwxEWrY1aeuRyn1w="; + hash = "sha256-1+m0zFAhSzz8116mPKzOTuNgkstnLAA/Ff0jujHEnsA="; }; build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-cloud + llama-index-core + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix index d8680ab104a19..998759b62920d 100644 --- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -3,13 +3,14 @@ buildPythonPackage, fetchPypi, llama-index-core, + ollama, poetry-core, pythonOlder, }: buildPythonPackage rec { pname = "llama-index-llms-ollama"; - version = "0.1.5"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,12 +18,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_ollama"; inherit version; - hash = "sha256-dWl9lshg2H6AzOkMnqQly9I2kYRY4P6q7gNZcGi6mEQ="; + hash = "sha256-DH8ZLLi3aHB71RVLl+KkEoRzLWIHDrdhkN7hJelSReo="; }; build-system = [ poetry-core ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-index-core + ollama + ]; # Tests are only available in the mono repo doCheck = false; diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 3c3a3ff12b5c6..5a10557cc9cc6 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.22"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-cpvy6nBDUXRl4dWFCJUSt32LPOkiM6Z8E41dYhBh7VY="; + hash = "sha256-N8LRFZtWYH06gH2QJg7iW08AIIbWJRxycq+8U/JRRgM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 76fa73298cd4f..963f054cd6ef1 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.1.6"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-EN51qHekRK81MGOF+q2bnwYkOR5VMJlwVkEUoICgV4w="; + hash = "sha256-XiyUpkFaJQnK0DXM6jRGGVmuMnpZANPoIEF+nruaE+w="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix index e542c0f8a4e63..781e03a06a447 100644 --- a/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-program-openai"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_program_openai"; inherit version; - hash = "sha256-xqSYDF6oJgiLKLTe4zZ+2yAiHm0F6w4FAZBJGQEx13I="; + hash = "sha256-v362GgczgXFL5aBJ2TtABE3+Ub1DM77lOdFTK3QHYh8="; }; pythonRelaxDeps = [ "llama-index-agent-openai" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 4e96733d29b70..ee6c4453e4d52 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.25"; + version = "0.1.27"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-I43dmKo3fWpEMiAT64SAVgN8gK2EVx6lv0UaZA//TVw="; + hash = "sha256-BMm8MGOpQJ/Nh3932bKr/VAuBydjqm3XiODGN0GLhmQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index 575c703b795f3..877acc82c84d6 100644 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; - version = "0.1.4"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_llama_parse"; inherit version; - hash = "sha256-eGCLGTyBiJSu/u4KowPwK3+A8uTK8Thmwv07CxAj4sA="; + hash = "sha256-BPLc+7D7h85wiQ9aL0+JlB15vmqBi0NzjwU1YOS0Uc8="; }; pythonRelaxDeps = [ "llama-parse" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 078e7a7b3d597..a07dd4e6f02da 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.11"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-ziP/lUnFJpvcy6Y4h1uSH6qkpYHO+3U+mfg2XIJIeg4="; + hash = "sha256-aqSSgXb1fmEY98pj8xNQolDLOFbsq/UOXCVZReHYgD4="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 47fbc28659176..38bf71e355196 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.2.10"; + version = "0.2.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-kFUZiE7rtVQQzaTstKOaM2XkKZQ7ydqVR/2xyPdVtt8="; + hash = "sha256-+wwwZNQXt2NBSVqYcF5ATiy5K2Cku+Auuhuni7usnKI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 575c61c89f41f..e8bc753eb2739 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,8 +1,6 @@ { - lib, buildPythonPackage, poetry-core, - pythonRelaxDepsHook, llama-index-agent-openai, llama-index-cli, llama-index-core, @@ -26,10 +24,6 @@ buildPythonPackage { build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "llama-index-core" ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 147183c046344..051fc5745af2c 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.4.4"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-tFwtszoNa3otX1nj0Ox+5/gieoUuqlawSqErEvLA1SE="; + hash = "sha256-ZX+PpffTmfFMBFT8BcrmA02gNz8ZHfbPyhehtKcE74c="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 899a95ab3b269..388077b389445 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -5,10 +5,22 @@ fetchFromGitHub, makeWrapper, pytestCheckHook, - python3, + python, pythonOlder, ruff, setuptools, + click-default-group, + numpy, + openai, + pip, + pluggy, + pydantic, + python-ulid, + pyyaml, + sqlite-migrate, + cogapp, + pytest-httpx, + sqlite-utils, }: let llm = buildPythonPackage rec { @@ -29,7 +41,7 @@ let nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ click-default-group numpy openai @@ -43,7 +55,7 @@ let sqlite-utils ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ cogapp numpy pytest-httpx @@ -89,7 +101,7 @@ let installPhase = '' makeWrapper ${llm}/bin/llm $out/bin/llm \ - --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH" + --prefix PYTHONPATH : "${llm}/${python.sitePackages}:$PYTHONPATH" ln -sfv ${llm}/lib $out/lib ''; diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix new file mode 100644 index 0000000000000..fd6d202f0f4cb --- /dev/null +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pydantic, + interegular, + pyyaml, + poetry-core, +}: + +buildPythonPackage rec { + pname = "lm-format-enforcer"; + version = "0.10.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "noamgat"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-GOnMj910rgzYeIeN2yLcXZDDel/Hu6nv7ov5BrlHJLg="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + interegular + pydantic + pyyaml + ]; + + doCheck = false; # most tests require internet access + + pythonImportsCheck = [ "lmformatenforcer" ]; + + meta = with lib; { + description = "Enforce the output format (JSON Schema, Regex etc) of a language model"; + changelog = "https://github.com/noamgat/lm-format-enforcer/releases/tag/v${version}"; + homepage = "https://github.com/noamgat/lm-format-enforcer"; + license = licenses.mit; + maintainers = with maintainers; [ cfhammill ]; + }; +} diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix index f62cdc60622dd..926944ee55e36 100644 --- a/pkgs/development/python-modules/lmfit/default.nix +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "lmfit"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vDhiRK29EO8aKixPnRez3vkFVSwKZK74VPCtRswwnMU="; + hash = "sha256-Mb7q4fAnwbjBTc1/LoSIqAt1+zied/ymd1Sb3C/ll7s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix index 6024da51f2fac..6bb69be09fcec 100644 --- a/pkgs/development/python-modules/lml/default.nix +++ b/pkgs/development/python-modules/lml/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Load me later. A lazy plugin management system for Python"; homepage = "http://lml.readthedocs.io/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index 10cfa9c8958ad..638f4328abf49 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Lightweight Python client for LocalStack"; homepage = "https://github.com/localstack/localstack-python-client"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index b0287a226a67a..4ebb8c0b41850 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "Extensions for LocalStack"; homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 7bcb46fa595c0..637e411ea65e9 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -4,8 +4,10 @@ fetchFromGitHub, apispec, boto3, + build, cachetools, click, + cryptography, localstack-client, localstack-ext, plux, @@ -16,33 +18,31 @@ requests, rich, semver, + setuptools, tailer, }: buildPythonPackage rec { pname = "localstack"; - version = "3.5.0"; - format = "setuptools"; + version = "3.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-Sd5B4+pvUwNXfP3hsqBkUoHo06YyzUGCUHzc8f77Vx4="; + hash = "sha256-MAECVYO6+1JqSZN8PFvHcMWizeYBUnU+7o7l48uwpv4="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "requests>=2.20.0,<2.26" "requests~=2.20" \ - --replace "cachetools~=5.0.0" "cachetools~=5.0" \ - --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ apispec boto3 + build cachetools click + cryptography localstack-client localstack-ext plux @@ -56,19 +56,26 @@ buildPythonPackage rec { tailer ]; + pythonRelaxDeps = [ "dill" ]; + pythonImportsCheck = [ "localstack" ]; # Test suite requires boto, which has been removed from nixpkgs # Just do minimal test, buildPythonPackage maps checkPhase # to installCheckPhase, so we can test that entrypoint point works. checkPhase = '' + runHook preCheck + + export HOME=$(mktemp -d) $out/bin/localstack --version + + runHook postCheck ''; meta = with lib; { description = "Fully functional local Cloud stack"; homepage = "https://github.com/localstack/localstack"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 76f818210e1a0..6b3791c29ac51 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -1,65 +1,53 @@ { lib, - betamax, buildPythonPackage, cachetools, coloredlogs, - emoji, fetchPypi, - nose, pythonOlder, pytz, requests, + setuptools, }: buildPythonPackage rec { pname = "locationsharinglib"; version = "5.0.3"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-ar5/gyDnby0aceqqHe8lTQaHafOub+IPKglmct4xEGM="; }; - propagatedBuildInputs = [ + postPatch = '' + # Tests requirements want to pull in multiple modules which we don't need + substituteInPlace setup.py \ + --replace-fail "tests_require=test_requirements" "tests_require=[]" + cp .VERSION locationsharinglib/.VERSION + ''; + + build-system = [ setuptools ]; + + dependencies = [ coloredlogs requests cachetools pytz ]; - nativeCheckInputs = [ - betamax - emoji - nose - ]; - - postPatch = '' - # Tests requirements want to pull in multiple modules which we don't need - substituteInPlace setup.py \ - --replace "tests_require=test_requirements" "tests_require=[]" - substituteInPlace requirements.txt \ - --replace "coloredlogs>=15.0.1" "coloredlogs" \ - --replace "pytz>=2023.3" "pytz" - ''; - - checkPhase = '' - runHook preCheck - # Only coverage no real unit tests - nosetests - runHook postCheck - ''; + # There are no tests + doCheck = false; pythonImportsCheck = [ "locationsharinglib" ]; - meta = with lib; { + meta = { description = "Python package to retrieve coordinates from a Google account"; homepage = "https://locationsharinglib.readthedocs.io/"; changelog = "https://github.com/costastf/locationsharinglib/blob/${version}/HISTORY.rst"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index deb05ac31daca..5423a1abb300f 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -4,7 +4,7 @@ fetchPypi, setuptools, pbr, - pynose, + nose, }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - nativeCheckInputs = [ pynose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 1d7de41098500..62a00fa1c8fab 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://logbook.readthedocs.io/"; changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 3e2797b6d675c..cac45f9dd0073 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "https://logilab-common.readthedocs.io/"; changelog = "https://forge.extranet.logilab.fr/open-source/logilab-common/-/blob/branch/default/CHANGELOG.md"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "logilab-pytest"; }; } diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix index 419ef5b4d1c70..fb98ada28f7cd 100644 --- a/pkgs/development/python-modules/logilab/constraint.nix +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://forge.extranet.logilab.fr/open-source/logilab-constraint"; changelog = "https://forge.extranet.logilab.fr/open-source/logilab-constraint/-/blob/${version}/CHANGELOG.md"; license = licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index b79e6af6c9786..eb0e1ebd53685 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Logging utilities"; homepage = "https://bitbucket.org/vinay.sajip/logutils/"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/lottie/default.nix b/pkgs/development/python-modules/lottie/default.nix new file mode 100644 index 0000000000000..a1ced236e8c8f --- /dev/null +++ b/pkgs/development/python-modules/lottie/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + distutils, + fetchPypi, + setuptools, +}: +buildPythonPackage rec { + pname = "lottie"; + version = "0.7.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-oyQvi6NwUfvddQPs0WggOgjkrybxe+LsygimSvHn08E="; + }; + + build-system = [ setuptools ]; + + dependencies = [ distutils ]; + + pythonImportsCheck = [ "lottie" ]; + + meta = with lib; { + description = "Framework to work with lottie files and telegram animated stickers (tgs)"; + homepage = "https://gitlab.com/mattbas/python-lottie/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ Scrumplex ]; + }; +} diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix new file mode 100644 index 0000000000000..c221624049975 --- /dev/null +++ b/pkgs/development/python-modules/lox/default.nix @@ -0,0 +1,61 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + + pathos, + pytestCheckHook, + pytest-mock, + setuptools, + tqdm, +}: + +buildPythonPackage rec { + pname = "lox"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BrianPugh"; + repo = "lox"; + rev = "refs/tags/v${version}"; + hash = "sha256-Iv3ZdfsvFLU6lhlH1n+eQ+KIrXESsnC1S2lVFnKFV08="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pathos ]; + + pythonRemoveDeps = [ "sphinx-rtd-theme" ]; + + # setup.py requires pytest-runner for setuptools, which is wrong + postPatch = '' + substituteInPlace setup.py --replace-fail '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ "lox" ]; + + disabledTests = [ + # Benchmark, performance testing + "test_perf_lock" + "test_perf_qlock" + + # time sensitive testing + "test_bathroom_example" + "test_RWLock_r" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + tqdm + ]; + + meta = { + description = "Threading and Multiprocessing made easy"; + changelog = "https://github.com/BrianPugh/lox/releases/tag/v${version}"; + homepage = "https://github.com/BrianPugh/lox"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.greg ]; + }; +} diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index 2dc8597727590..a0530544a9380 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools-generate -, setuptools-scm -, colorama -, jinja2 -, jsonschema -, pygls -, tree-sitter0_21 -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-generate, + setuptools-scm, + colorama, + jinja2, + jsonschema, + pygls, + tree-sitter, + pytestCheckHook, }: buildPythonPackage rec { @@ -33,16 +34,9 @@ buildPythonPackage rec { jinja2 jsonschema pygls - # The build won't fail if we had used tree-sitter (version > 0.21), but - # this package is only a dependency of autotools-language-server which also - # depends on tree-sitter-languages which must use tree-sitter0_21 and not - # tree-sitter. Hence we avoid different tree-sitter versions dependency - # mismatch by defaulting here to this lower version. - tree-sitter0_21 - ]; - nativeCheckInputs = [ - pytestCheckHook + tree-sitter ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "lsp_tree_sitter" ]; diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index a0e72f975ffd0..fd1f6c474fa04 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - poetry-core, pythonOlder, }: diff --git a/pkgs/development/python-modules/lxml-html-clean/default.nix b/pkgs/development/python-modules/lxml-html-clean/default.nix index 7c9b1b9de985d..0215f85215dc4 100644 --- a/pkgs/development/python-modules/lxml-html-clean/default.nix +++ b/pkgs/development/python-modules/lxml-html-clean/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lxml-html-clean"; - version = "0.1.1"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fedora-python"; repo = "lxml_html_clean"; rev = "refs/tags/${version}"; - hash = "sha256-vnRsSkhjeDxZ2bYbIe+2D4GjymZWcIVo2LAPuCaYIZo="; + hash = "sha256-3ifuEgjCLDj0dBh9AbjAT/hNFGfINbvyjgRuxIRuarw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index f53979f98d7c4..bc09e20503e9a 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index c37eeab5cc12f..627aa8a446a87 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-lz4/python-lz4"; changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 88f09710151ff..75f1e94f3bb26 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/m2crypto/m2crypto"; changelog = "https://gitlab.com/m2crypto/m2crypto/-/blob/${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 28131581936f7..9fc1cf12fb4a3 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; + hash = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; }; patches = [ diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index b48572c49a2ed..b4a28dce28098 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "m3u8"; - version = "5.0.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "globocom"; repo = "m3u8"; rev = "refs/tags/${version}"; - hash = "sha256-sI260BR22Ft5y/2lKn1ihu52y6soyk+yzj24TEOKJlA="; + hash = "sha256-1SOuKKNBg67Yc0a6Iqb1goTE7sraptzpFIB2lvrbMQg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix index ed94e0261f9e5..e9eb357839964 100644 --- a/pkgs/development/python-modules/macaroonbakery/default.nix +++ b/pkgs/development/python-modules/macaroonbakery/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, nix-update-script, - protobuf3, + protobuf, pymacaroons, pynacl, pyrfc3339, @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - protobuf3 + protobuf pymacaroons pynacl pyrfc3339 diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 065713f2f05d0..77e82746e77d6 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MacFSEvents"; inherit version; - sha256 = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; + hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 6f1aa28e9f0c9..52ebece153147 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -25,14 +25,13 @@ typing-extensions, watchdog, xattr, - fetchpatch, pytestCheckHook, nixosTests, }: buildPythonPackage rec { pname = "maestral"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +40,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-h7RDaCVICi3wl6/b1s01cINhFirDOpOXoxTPZIBH3jE="; + hash = "sha256-akh0COltpUU4Z4kfubg6A7k6W8ICoqVYkmFpMkTC8H8="; }; build-system = [ setuptools ]; @@ -67,14 +66,6 @@ buildPythonPackage rec { xattr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; - patches = [ - (fetchpatch { - name = "upgrade-dropbox-version-bounds"; - url = "https://github.com/samschott/maestral/commit/8fd581fa503391534913afbc33a61132ff2e21ce.patch"; - hash = "sha256-2Dke9iF/5Ptsf3CSRHUkjdFRrmdKY+L3sILRMyYrUH0="; - }) - ]; - makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them "--prefix PYTHONPATH : ${makePythonPath dependencies}" diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index af4cb08de9e01..f43cf4c4afee2 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -21,9 +21,6 @@ buildPythonPackage rec { version = "0.4.1"; pyproject = true; - # python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41 - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs="; @@ -38,13 +35,14 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs + autobahn + setuptools # pkg_resources is referenced at runtime six twisted - autobahn ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; pythonImportsCheck = [ "wormhole_mailbox_server" ]; @@ -66,5 +64,7 @@ buildPythonPackage rec { changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; + # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41 + broken = pythonOlder "3.7" || pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index 39b7d93ce0f2c..bf8b990fe0d9d 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -16,17 +16,16 @@ buildPythonPackage rec { version = "0.2.1"; pyproject = true; - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; - src = fetchPypi { inherit pname version; hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ autobahn + setuptools # pkg_resources is referenced at runtime twisted ]; @@ -38,11 +37,15 @@ buildPythonPackage rec { twisted ]; + __darwinAllowLocalNetworking = true; + meta = { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; + # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-transit-relay/issues/35 + broken = pythonOlder "3.7" || pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 528b710632740..90fc7a9a2cbdf 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -44,20 +44,32 @@ buildPythonPackage rec { hash = "sha256-AG0jn4i/98N7wu/2CgBOJj+vklj3J5GS0Gugyc7WsIA="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = + # enable tests by fixing the location of the wormhole binary + '' + substituteInPlace src/wormhole/test/test_cli.py --replace-fail \ + 'locations = procutils.which("wormhole")' \ + 'return "${placeholder "out"}/bin/wormhole"' + '' + # fix the location of the ifconfig binary + + lib.optionalString stdenv.isLinux '' + sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py + ''; - propagatedBuildInputs = [ - spake2 - pynacl - six + build-system = [ setuptools ]; + + dependencies = [ attrs - twisted autobahn automat - tqdm click humanize iterable-io + pynacl + six + spake2 + tqdm + twisted txtorcon zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; @@ -66,43 +78,33 @@ buildPythonPackage rec { dilation = [ noiseprotocol ]; }; - nativeCheckInputs = [ - mock - magic-wormhole-transit-relay - magic-wormhole-mailbox-server - pytestCheckHook - ] ++ passthru.optional-dependencies.dilation ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; - - disabledTests = lib.optionals stdenv.isDarwin [ - # These tests doesn't work within Darwin's sandbox - "test_version" - "test_text" - "test_receiver" - "test_sender" - "test_sender_allocation" - "test_text_wrong_password" - "test_override" - "test_allocate_port" - "test_allocate_port_no_reuseaddr" - "test_ignore_localhost_hint" - "test_ignore_localhost_hint_orig" - "test_keep_only_localhost_hint" - "test_get_direct_hints" - "test_listener" - "test_success_direct" - "test_direct" - "test_relay" - ]; + nativeCheckInputs = + # For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies, + # which are not yet supported with this version. + lib.optionals (!magic-wormhole-mailbox-server.meta.broken) [ magic-wormhole-mailbox-server ] + ++ lib.optionals (!magic-wormhole-transit-relay.meta.broken) [ magic-wormhole-transit-relay ] + ++ [ + mock + pytestCheckHook + ] + ++ passthru.optional-dependencies.dilation + ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ - # These tests doesn't work within Darwin's sandbox - "src/wormhole/test/test_xfer_util.py" - "src/wormhole/test/test_wormhole.py" - ]; + __darwinAllowLocalNetworking = true; - postPatch = lib.optionalString stdenv.isLinux '' - sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py - ''; + disabledTestPaths = + # For Python 3.12, remove the tests depending on magic-wormhole-mailbox-server and magic-wormhole-transit-relay, + # which are not yet supported with this version. + lib.optionals + (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay.meta.broken) + [ + "src/wormhole/test/dilate/test_full.py" + "src/wormhole/test/test_args.py" + "src/wormhole/test/test_cli.py" + "src/wormhole/test/test_wormhole.py" + "src/wormhole/test/test_xfer_util.py" + ] + ++ lib.optionals magic-wormhole-transit-relay.meta.broken [ "src/wormhole/test/test_transit.py" ]; postInstall = '' install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index ece4f85008c67..6a727d666f59a 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - pythonAtLeast, # build-system setuptools, @@ -14,12 +13,12 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.15.2"; + version = "1.15.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FvKis02e4MK1eMlgoYCMl04oIs959um5xFWqzhCILUU="; + hash = "sha256-n5uZBOfDl3WTdKiPTFd4H7qypFjex430s+5ics2fsBA="; }; postPatch = '' @@ -34,11 +33,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/smarie/python-makefun/issues/102 - "test_args_order_and_kind" - ]; - pythonImportsCheck = [ "makefun" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 2e31d43b92b70..5e58f90b58d8f 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, pythonOlder, @@ -49,15 +50,18 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - disabledTests = lib.optionals isPyPy [ - # https://github.com/sqlalchemy/mako/issues/315 - "test_alternating_file_names" - # https://github.com/sqlalchemy/mako/issues/238 - "test_file_success" - "test_stdin_success" - # fails on pypy2.7 - "test_bytestring_passthru" - ]; + disabledTests = + lib.optionals isPyPy [ + # https://github.com/sqlalchemy/mako/issues/315 + "test_alternating_file_names" + # https://github.com/sqlalchemy/mako/issues/238 + "test_file_success" + "test_stdin_success" + # fails on pypy2.7 + "test_bytestring_passthru" + ] + # https://github.com/sqlalchemy/mako/issues/408 + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "test_future_import"; meta = with lib; { description = "Super-fast templating language"; diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 41c059aa1da2a..942643cc457c1 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mandown"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; rev = "refs/tags/v${version}"; - hash = "sha256-K5/ij0VzQJGj+VvASllaV8/YBCiu2Lv+JdeSHLYMV7I="; + hash = "sha256-eMZXXOGe9jKf9bXEinIIu6w3i4SOkLnDWnxmT5G0RWA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 8dab6aa755209..d1ca10b9e81c3 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pytest, @@ -10,12 +9,12 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "bada20a25b547b395d472e2e08928f0437df26bbdbda4797c55863198e29a21f"; + sha256 = "sha256-Nmj9r4OzPJQ9tOdQ4MVU4xwg9jM4SWiV3U1kEGgNnEs="; }; # test_help expects architecture-dependent Linux signal numbers. diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index b3bdfbf34fab0..35b713babb5fb 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.6"; + version = "1.7"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-gOWu01Z1lxhMJELyxvU5A5AskVEqCoLV/auydM5/QCE="; + hash = "sha256-CLYySNkMysd81ZBA2yfHGSvBuuf8vEvVXkzVsTeEoNM="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/manifestoo/default.nix b/pkgs/development/python-modules/manifestoo/default.nix index 140c78d26632d..45c59f1c23094 100644 --- a/pkgs/development/python-modules/manifestoo/default.nix +++ b/pkgs/development/python-modules/manifestoo/default.nix @@ -2,25 +2,22 @@ buildPythonPackage, fetchPypi, hatch-vcs, - importlib-metadata, lib, manifestoo-core, nix-update-script, pytestCheckHook, - pythonOlder, textual, typer, - typing-extensions, }: buildPythonPackage rec { pname = "manifestoo"; - version = "0.7"; + version = "1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-gCGchc+fShBgt6fVJAx80+QnH+vxWo3jsIyePkFwhYE="; + hash = "sha256-iP9QVyAvKMTo8GuceiXWALmWKQ9yLX2qxl0S7IT+kMA="; }; nativeBuildInputs = [ hatch-vcs ]; @@ -32,9 +29,7 @@ buildPythonPackage rec { manifestoo-core textual typer - ] - ++ typer.passthru.optional-dependencies.all - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 545f9df3c5a54..d96b03dfd35af 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -271,6 +271,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ManimCommunity/manim"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index b7fe03e24f8af..c7359364b2fb6 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mapbox-earcut"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "skogler"; repo = "mapbox_earcut_python"; rev = "refs/tags/v${version}"; - hash = "sha256-+Vxvo++bkoCsJFmt/u1eaqhgpz8Uddz06iIi66ju+MQ="; + hash = "sha256-xR+nO5xdoDUhWZM19DOid3lsEXBood5NofQ0SezJ9OE="; }; nativeBuildInputs = [ @@ -44,6 +44,6 @@ buildPythonPackage rec { library, which provides very fast and quite robust triangulation of 2D polygons. ''; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix index a2027a59f02f0..d166277a459a9 100644 --- a/pkgs/development/python-modules/mariadb/default.nix +++ b/pkgs/development/python-modules/mariadb/default.nix @@ -1,35 +1,43 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, libmysqlclient, lib, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "mariadb"; - version = "1.1.4"; - format = "setuptools"; + version = "1.1.10"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-c6CsvSrOOB7BvPxhztenmlGeZsAsJOEq5tJ7qgNxeHY="; - extension = "zip"; + src = fetchFromGitHub { + owner = "mariadb-corporation"; + repo = "mariadb-connector-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-YpA65J8ozKJfpOc4hZLdgCcT3j/lqRiNeX7k8U/aYkE="; }; - nativeBuildInputs = [ libmysqlclient ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ + libmysqlclient # for mariadb_config + ]; + + buildInputs = [ libmysqlclient ]; # Requires a running MariaDB instance doCheck = false; pythonImportsCheck = [ "mariadb" ]; - meta = with lib; { + meta = { description = "MariaDB Connector/Python"; homepage = "https://github.com/mariadb-corporation/mariadb-connector-python"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ vanilla ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index e76a008c9edb8..58c37357a0dce 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -4,15 +4,16 @@ fetchPypi, pythonOlder, setuptools, - black, click, docutils, itsdangerous, jedi, markdown, + packaging, psutil, pygments, pymdown-extensions, + ruff, starlette, tomlkit, uvicorn, @@ -23,28 +24,32 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.25"; + version = "0.7.19"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zv1mlaR/3nRhZBjjcXaOSR574NE2um48DqHhHirRfSU="; + hash = "sha256-YZ5XmBFyU48OC8sI2tyZShwqmfwywbtEjlRBGScfeo0="; }; build-system = [ setuptools ]; + # ruff is not packaged as a python module in nixpkgs + pythonRemoveDeps = [ "ruff" ]; + dependencies = [ - black click docutils itsdangerous jedi markdown + packaging psutil pygments pymdown-extensions + ruff starlette tomlkit uvicorn diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix index 3ee1e476665d8..dbc7a43d30f99 100644 --- a/pkgs/development/python-modules/markdown-include/default.nix +++ b/pkgs/development/python-modules/markdown-include/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Extension to Python-Markdown which provides an include function"; homepage = "https://github.com/cmacmackin/markdown-include"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index ab0025afd9835..587e819855321 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; changelog = "https://github.com/marshmallow-code/marshmallow-sqlalchemy/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index f1ca3d6d68808..7dc7dcd2d431f 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -9,7 +9,6 @@ bubblewrap, exiftool, ffmpeg, - mailcap, wrapGAppsHook3, gdk-pixbuf, gobject-introspection, diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index aab6d31a18767..304f143b884b0 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Library for pattern matching on symbolic expressions"; homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix index 527726401f82b..4da3d1907e5df 100644 --- a/pkgs/development/python-modules/material-color-utilities/default.nix +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -13,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; + hash = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; }; pythonRelaxDeps = [ "Pillow" ]; diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix new file mode 100644 index 0000000000000..b1e11ba6de23a --- /dev/null +++ b/pkgs/development/python-modules/materialx/default.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + cmake, + setuptools, + darwin, + libX11, + libXt, + libGL, + openimageio, + imath, + python, +}: + +buildPythonPackage rec { + pname = "materialx"; + version = "1.38.10"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "MaterialX"; + rev = "v${version}"; + hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; + }; + + format = "other"; + + nativeBuildInputs = [ + cmake + setuptools + ]; + + buildInputs = + [ + openimageio + imath + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + OpenGL + Cocoa + ] + ) + ++ lib.optionals (!stdenv.isDarwin) [ + libX11 + libXt + libGL + ]; + + cmakeFlags = [ + (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) + (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) + # don't build MSL shader back-end on x86_x64-darwin, as it requires a newer SDK with metal support + (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (stdenv.isLinux || (stdenv.isAarch64 && stdenv.isDarwin))) + ]; + + pythonImportsCheck = [ "MaterialX" ]; + + postInstall = '' + # Make python lib properly accessible + target_dir=$out/${python.sitePackages} + mkdir -p $(dirname $target_dir) + # required for cmake to find the bindings, when included in other projects + ln -s $out/python $target_dir + ''; + + meta = { + changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; + description = "Open standard for representing rich material and look-development content in computer graphics"; + homepage = "https://materialx.org"; + maintainers = [ lib.maintainers.gador ]; + platforms = lib.platforms.unix; + license = lib.licenses.mpl20; + }; +} diff --git a/pkgs/development/python-modules/materialyoucolor/default.nix b/pkgs/development/python-modules/materialyoucolor/default.nix new file mode 100644 index 0000000000000..3cb67e4aefd96 --- /dev/null +++ b/pkgs/development/python-modules/materialyoucolor/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchurl, + fetchPypi, + setuptools, + pybind11, + requests, + rich, + pillow, +}: + +let + test-image = fetchurl { + name = "test-image.jpg"; + url = "https://unsplash.com/photos/u9tAl8WR3DI/download"; + hash = "sha256-shGNdgOOydgGBtl/JCbTJ0AYgl+2xWvCgHBL+bEoTaE="; + }; +in +buildPythonPackage rec { + pname = "materialyoucolor"; + version = "2.0.9"; + pyproject = true; + + # PyPI sources contain additional vendored sources + src = fetchPypi { + inherit pname version; + hash = "sha256-J35//h3tWn20f5ej6OXaw4NKnxung9q7m0E4Zf9PUw4="; + }; + + build-system = [ + setuptools + pybind11 + ]; + + nativeCheckInputs = [ + requests + rich + pillow + ]; + + checkPhase = '' + runHook preCheck + python tests/test_all.py ${test-image} 1 + runHook postCheck + ''; + + pythonImportsCheck = [ + "materialyoucolor" + "materialyoucolor.quantize" # ext + ]; + + meta = { + description = "Material You color generation algorithms in python"; + homepage = "https://github.com/T-Dynamos/materialyoucolor-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix index 603809455ffc4..e12969a95c141 100644 --- a/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Matplotlib Inline Back-end for IPython and Jupyter"; homepage = "https://github.com/ipython/matplotlib-inline"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 307ae00b4642f..3f6b50d6e265b 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index fc2bb57ced92d..9895f64171841 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.4"; + version = "0.20.6"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-A9d/r4Caeo4tO82/MMXgU5xKvXRDnK0iQUm8AFhDPLM="; + hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/maxcube-api/default.nix b/pkgs/development/python-modules/maxcube-api/default.nix index e87568c88e517..f82fc861bb4eb 100644 --- a/pkgs/development/python-modules/maxcube-api/default.nix +++ b/pkgs/development/python-modules/maxcube-api/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "eQ-3/ELV MAX! Cube Python API"; homepage = "https://github.com/hackercowboy/python-maxcube-api"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 0457ad15cd50c..d510be3b3a2cd 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python"; changelog = "https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index ccb9936a71511..05b5367517d7f 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/timofurrer/maya"; changelog = "https://github.com/timofurrer/maya/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index b9fa608772b73..32929cfe2353e 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, envisage, fetchPypi, - fetchpatch, numpy, packaging, pyface, @@ -19,7 +18,6 @@ buildPythonPackage rec { pname = "mayavi"; - # TODO: Remove meta.broken on next release. version = "4.8.2"; format = "setuptools"; @@ -30,30 +28,6 @@ buildPythonPackage rec { hash = "sha256-sQ/pFF8hxI5JAvDnRrNgOzy2lNEUVlFaRoIPIaCnQik="; }; - patches = [ - # Adds compatibility with Python 3.11. - # https://github.com/enthought/mayavi/pull/1199 - (fetchpatch { - name = "python311-compat.patch"; - url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch"; - hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0="; - includes = [ "tvtk/src/*" ]; - }) - # Fixes an incompatible function pointer conversion error - # https://github.com/enthought/mayavi/pull/1266 - (fetchpatch { - name = "incompatible-pointer-conversion.patch"; - url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch"; - hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo="; - }) - ]; - - postPatch = '' - # building the docs fails with the usual Qt xcb error, so skip: - substituteInPlace setup.py \ - --replace "build.build.run(self)" "build.build.run(self); return" - ''; - nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ @@ -84,8 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/enthought/mayavi"; license = licenses.bsdOriginal; maintainers = with maintainers; [ knedlsepp ]; - # Should be fixed in a version from after March 26, see: - # https://github.com/enthought/mayavi/issues/1284#issuecomment-2020631244 - broken = pythonAtLeast "3.12"; + mainProgram = "mayavi2"; }; } diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index c8cb357cdc980..7c556d0b382f6 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -3,9 +3,6 @@ buildPythonPackage, fetchPypi, pytest, - hypothesis, - hypothesmith, - python, }: buildPythonPackage rec { @@ -27,6 +24,6 @@ buildPythonPackage rec { description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index a201b8c7911e8..efc9e7b2dbb1f 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat-admon"; - version = "2.0.3"; + version = "2.0.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-admon"; rev = "refs/tags/v${version}"; - hash = "sha256-zKc0kKap4ipZ+P+RYDXcwqyzq9NKcTnCmx64cApFxFg="; + hash = "sha256-YyEiqry1dAm/2EEuQjPFEfdpLI+NiLhVcyx4jAyXs4E="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix index 759fced980207..9b0e35c2eed23 100644 --- a/pkgs/development/python-modules/mdformat-footnote/default.nix +++ b/pkgs/development/python-modules/mdformat-footnote/default.nix @@ -3,8 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - linkify-it-py, - markdown-it-py, mdformat, mdit-py-plugins, pythonOlder, diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index 335aaae953178..85c054258d76d 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -3,8 +3,6 @@ buildPythonPackage, fetchFromGitHub, flit-core, - linkify-it-py, - markdown-it-py, mdformat, mdit-py-plugins, ruamel-yaml, diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index cd5a89c825122..d7cf61de83b77 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.1.1"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-hBkHVYlcHCXfE8Z2gLv6Rt0tQSkx2LYqbEtCncDByrI="; + hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix index 29a370944110e..caeb23a214f3c 100644 --- a/pkgs/development/python-modules/mdformat-simple-breaks/default.nix +++ b/pkgs/development/python-modules/mdformat-simple-breaks/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, flit-core, mdformat, - mdit-py-plugins, pythonOlder, }: diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index cf97895b53947..713eefc5ec961 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, flit-core, mdformat, - mdit-py-plugins, pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/mdformat-toc/default.nix b/pkgs/development/python-modules/mdformat-toc/default.nix index c48467077d3f8..c97e29248c0e4 100644 --- a/pkgs/development/python-modules/mdformat-toc/default.nix +++ b/pkgs/development/python-modules/mdformat-toc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, mdformat, - mdit-py-plugins, poetry-core, pytestCheckHook, pythonOlder, diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 5d8233dcf2cf3..28df80388d876 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -1,16 +1,13 @@ { lib, - buildPythonApplication, buildPythonPackage, fetchFromGitHub, importlib-metadata, - makeWrapper, markdown-it-py, pytestCheckHook, pythonOlder, setuptools, tomli, - typing-extensions, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index a209f36ed4f1d..730b78a7b42d9 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/mdit-py-plugins"; changelog = "https://github.com/executablebooks/mdit-py-plugins/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index a84fe51da4f2b..97fa01697e491 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-mechanize/mechanize"; changelog = "https://github.com/python-mechanize/mechanize/blob/v${version}/ChangeLog"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/medpy/default.nix b/pkgs/development/python-modules/medpy/default.nix index 0fc6d1fc97aad..239919e4eb352 100644 --- a/pkgs/development/python-modules/medpy/default.nix +++ b/pkgs/development/python-modules/medpy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "medpy"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "loli"; repo = "medpy"; rev = "refs/tags/${version}"; - hash = "sha256-kzOTYBcXAAEYoe/m/BjWNaQX4ljG17NxndevAt5KxjQ="; + hash = "sha256-M46d8qiR3+ioiuRhzIaU5bV1dnfDm819pjn78RYlcG0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index fdb89697ce0c8..d034595d03e4b 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 279bf1169f693..9af00cebb90b0 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.31.3"; + version = "0.31.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-8O0tTif5ii12lD0SXD2rDiRK8xOWkYrZ+K2MTG+Pj7A="; + hash = "sha256-+1VqnAIqiLaPl75dH4tf3/GFRuwkSrKpqOcv9dGYsb8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/memory-profiler/default.nix b/pkgs/development/python-modules/memory-profiler/default.nix index 8e0736e99271a..a23929a52be25 100644 --- a/pkgs/development/python-modules/memory-profiler/default.nix +++ b/pkgs/development/python-modules/memory-profiler/default.nix @@ -12,7 +12,7 @@ python.pkgs.buildPythonPackage rec { src = fetchPypi { pname = "memory_profiler"; inherit version; - sha256 = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; + hash = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/python-modules/memory-tempfile/default.nix b/pkgs/development/python-modules/memory-tempfile/default.nix new file mode 100644 index 0000000000000..7255e35f18ef3 --- /dev/null +++ b/pkgs/development/python-modules/memory-tempfile/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch2 +, poetry-core +}: + +buildPythonPackage rec { + pname = "memory-tempfile"; + version = "2.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mbello"; + repo = "memory-tempfile"; + rev = "v${version}"; + hash = "sha256-4fz2CLkZdy2e1GwGw/afG54LkUVJ4cza70jcbX3rVlQ="; + }; + + patches = [ + (fetchpatch2 { + # Migrate to poetry-core build backend + # https://github.com/mbello/memory-tempfile/pull/13 + name = "poetry-core.patch"; + url = "https://github.com/mbello/memory-tempfile/commit/938a3a3abf01756b1629eca6c69e970021bbc7c0.patch"; + hash = "sha256-q3027MwKXtX09MH7T2UrX19BImK1FJo+YxADfxcdTME="; + }) + ]; + + build-system = [ poetry-core ]; + + doCheck = false; # constrained selection of memory backed filesystems due to build sandbox + + pythonImportsCheck = [ "memory_tempfile" ]; + + meta = with lib; { + description = "Create temporary files and temporary dirs in memory-based filesystems on Linux"; + homepage = "https://github.com/mbello/memory-tempfile"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 628a8c5861625..b3ed0bc72832f 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.46.0"; + version = "1.49.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-f3K+59+9NO33GO1SBZhKfqHPO9p5kivDeLNd780cZu8="; + hash = "sha256-4/FiF8eEziaD3ka/XVdAxDI8WWuWlYoMoLupQXVCBA8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index 3d96e2e1108f7..b40b9aca05a36 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; + hash = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; }; nativeBuildInputs = [ setuptools ]; @@ -28,6 +28,6 @@ buildPythonPackage rec { mainProgram = "merge3"; homepage = "https://github.com/breezy-team/merge3"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 523f034a9a596..2359d5fc340b8 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, paho-mqtt, - pytestCheckHook, pythonOlder, pycryptodomex, requests, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.7.1"; + version = "0.4.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-BcWluaNyo6G7OuIV6yXzc7xcBgQlRR9HbjbNnLigZcE="; + hash = "sha256-Ne9m6umPmX3uXAyY9/Ucvi/rPdHrGJgD5IrZ+BBQweI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 4c5d9928d070e..e7ce8351b1b37 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -4,10 +4,16 @@ buildPythonPackage, dotmap, fetchFromGitHub, + hypothesis, packaging, + parse, pexpect, + platformdirs, + ppk2-api, + print-color, protobuf, - pygatt, + pyarrow, + pyparsing, pypubsub, pyqrcode, pyserial, @@ -19,6 +25,7 @@ setuptools, tabulate, timeago, + webencodings, }: buildPythonPackage rec { @@ -35,15 +42,22 @@ buildPythonPackage rec { hash = "sha256-s56apVx7+EXkdw3FUjyGKGFjP+IVbO0/VDB4urXEtXQ="; }; + pythonRelaxDeps = [ "protobuf" ]; + build-system = [ setuptools ]; dependencies = [ bleak dotmap packaging + parse pexpect + platformdirs + ppk2-api + print-color protobuf - pygatt + pyarrow + pyparsing pypubsub pyqrcode pyserial @@ -52,6 +66,7 @@ buildPythonPackage rec { setuptools tabulate timeago + webencodings ]; passthru.optional-dependencies = { @@ -59,9 +74,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytap2 + hypothesis pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' export PATH="$PATH:$out/bin"; @@ -79,6 +94,7 @@ buildPythonPackage rec { "test_main_support" "test_MeshInterface" "test_message_to_json_shows_all" + "test_node" "test_SerialInterface_single_port" "test_support_info" "test_TCPInterface" diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 31361667f45da..33cc35411bc09 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, - colorama, meson, ninja, pyproject-metadata, diff --git a/pkgs/development/python-modules/metawear/default.nix b/pkgs/development/python-modules/metawear/default.nix index c95efd8e31884..526e216a23091 100644 --- a/pkgs/development/python-modules/metawear/default.nix +++ b/pkgs/development/python-modules/metawear/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, - gcc, cython, boost, bluez, diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index ecd06217faf73..6593253d647b3 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; + hash = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index 259893de05044..cfdb7161ea7b2 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-http"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-http-python"; rev = "refs/tags/v${version}"; - hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; + hash = "sha256-9Xf/M9d+lScCTWXakJ+BMeBbbRGshtzRzhOg5FGbC5o="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 56bb4f5f8670e..50e6ff352ce4c 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-serialization-json"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-serialization-json-python"; rev = "refs/tags/v${version}"; - hash = "sha256-/Bar1tQ3w8kfC53OuKxTlS+Dq4sX47lev7fjJeo6JJ0="; + hash = "sha256-hGD8MhdQgF+mkoG4eOCSPyaArV8OrqAtgOwiNR8kado="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 270604f782ea8..33b06eadfbd3c 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://mido.readthedocs.io"; changelog = "https://github.com/mido/mido/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index 76c1cbba0da1c..910b46a512127 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -1,31 +1,36 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + setuptools, colorama, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "migen"; - version = "unstable-2022-09-02"; - format = "setuptools"; + version = "unstable-2024-07-21"; + pyproject = true; src = fetchFromGitHub { owner = "m-labs"; repo = "migen"; - rev = "639e66f4f453438e83d86dc13491b9403bbd8ec6"; - hash = "sha256-IPyhoFZLhY8d3jHB8jyvGdbey7V+X5eCzBZYSrJ18ec="; + rev = "9279e8623f8433bc4f23ac51e5e2331bfe544417"; + hash = "sha256-z3LRhNmKZrjr6rFD0yxtccSa/SWvFIYmb+G/D5d2Jd8="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ colorama ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "migen" ]; - meta = with lib; { + meta = { description = " A Python toolbox for building complex digital hardware"; homepage = "https://m-labs.hk/migen"; - license = licenses.bsd2; - maintainers = with maintainers; [ l-as ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ l-as ]; }; } diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix index 55c7f7d573ad3..934c77440529d 100644 --- a/pkgs/development/python-modules/mike/default.nix +++ b/pkgs/development/python-modules/mike/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { mainProgram = "mike"; homepage = "https://github.com/jimporter/mike"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index ce4638f6e3ba8..e7e98b265e2d7 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -2,8 +2,8 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, + setuptools, miniaudio, cffi, pytestCheckHook, @@ -24,41 +24,41 @@ let in buildPythonPackage rec { pname = "miniaudio"; - version = "1.59"; - - disabled = pythonOlder "3.6"; - - format = "setuptools"; + version = "1.61"; + pyproject = true; src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - hash = "sha256-tMQOGqEThtownW3cnNpCzWye0Uo/Es7E8abVySo1QnQ="; + hash = "sha256-H3o2IWGuMqLrJTzQ7w636Ito6f57WBtMXpXXzrZ7UD8="; }; postPatch = '' rm -r miniaudio ln -s ${miniaudio'} miniaudio substituteInPlace build_ffi_module.py \ - --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; + --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; substituteInPlace miniaudio.c \ - --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; + --replace-fail "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; ''; + build-system = [ setuptools ]; + buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cffi ]; + dependencies = [ cffi ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "miniaudio" ]; meta = with lib; { + changelog = "https://github.com/irmen/pyminiaudio/releases/tag/v${version}"; description = "Python bindings for the miniaudio library and its decoders"; homepage = "https://github.com/irmen/pyminiaudio"; license = licenses.mit; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index c4ec910b6425a..a23ef91c8a813 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; + hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/misoc/default.nix b/pkgs/development/python-modules/misoc/default.nix index a7b2198041fb5..e573760769be3 100644 --- a/pkgs/development/python-modules/misoc/default.nix +++ b/pkgs/development/python-modules/misoc/default.nix @@ -9,16 +9,16 @@ numpy, }: -buildPythonPackage rec { +buildPythonPackage { pname = "misoc"; - version = "unstable-2022-10-08"; + version = "0-unstable-2024-05-14"; format = "setuptools"; src = fetchFromGitHub { owner = "m-labs"; repo = "misoc"; - rev = "6a7c670ab6120b8136f652c41d907eb0fb16ed54"; - hash = "sha256-dLDp0xg5y5b443hD7vbJFobHxbhtnj68RdZnQ7ckgp4="; + rev = "fea9de558c730bc394a5936094ae95bb9d6fa726"; + hash = "sha256-zZ9LnUwvTvBL9iNFfmNTklQnd0I4PmV0BApMSblTnc0="; }; propagatedBuildInputs = [ @@ -32,10 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "misoc" ]; - meta = with lib; { + meta = { description = "Original high performance and small footprint system-on-chip based on Migen"; homepage = "https://github.com/m-labs/misoc"; - license = licenses.bsd2; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 6a32ea2e058d6..ec33d7bec8396 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mistletoe"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "miyuchina"; repo = "mistletoe"; rev = "refs/tags/v${version}"; - hash = "sha256-MMBfH4q5AtC/azQUj1a1tMz1MdUf4ad5/tl7lcQCTOw="; + hash = "sha256-jFU16vdASGVSPq+TJ/6cN7IGkE/61SL9BWCOPsVqNaU="; }; pythonImportsCheck = [ "mistletoe" ]; diff --git a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock index 9efa7356904c6..c5fad70fb8455 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock +++ b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -43,48 +43,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] -name = "anyhow" -version = "1.0.75" +name = "anstyle-parse" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ - "backtrace", + "utf8parse", ] [[package]] -name = "apple-security-framework" -version = "2.9.2" +name = "anstyle-query" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07831f002eaa83d94f7e2c1300f3268a8f949c35a41dd99faceb6575c191d871" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ - "apple-security-framework-sys", - "bitflags 2.4.0", - "core-foundation", - "core-foundation-sys", - "libc", + "windows-sys 0.52.0", ] [[package]] -name = "apple-security-framework-sys" -version = "2.9.1" +name = "anstyle-wincon" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09acfa027e87e9f590474e9ef19d0f12158bf1c72af80ac76806f17e84959a42" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ - "core-foundation-sys", - "libc", + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +dependencies = [ + "backtrace", ] [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" @@ -111,34 +131,25 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", -] - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", + "syn 2.0.68", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -187,9 +198,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -208,15 +219,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bitflags" @@ -226,9 +231,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake2" @@ -240,6 +245,12 @@ dependencies = [ ] [[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -274,27 +285,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cast" @@ -304,12 +315,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] name = "cfg-if" @@ -318,6 +326,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] name = "chacha20" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -343,9 +357,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -354,18 +368,18 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half 1.8.2", + "half", ] [[package]] @@ -381,18 +395,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstyle", "clap_lex", @@ -400,21 +414,51 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] -name = "color_quant" -version = "1.1.0" +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "colorchoice" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "console-api" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" dependencies = [ "futures-core", "prost", @@ -425,9 +469,9 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" dependencies = [ "console-api", "crossbeam-channel", @@ -435,6 +479,7 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", + "prost", "prost-types", "serde", "serde_json", @@ -449,9 +494,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -459,24 +504,48 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -518,53 +587,38 @@ dependencies = [ ] [[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - -[[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -601,26 +655,26 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "defmt" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98" +checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0" dependencies = [ "bitflags 1.3.2", "defmt-macros", @@ -628,27 +682,36 @@ dependencies = [ [[package]] name = "defmt-macros" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54f0216f6c5acb5ae1a47050a6645024e6edafc2ee32d421955eccfef12ef92e" +checksum = "e3a9f309eff1f79b3ebdf252954d90ae440599c26c2c553fe87a2d17195f2dcb" dependencies = [ "defmt-parser", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "defmt-parser" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269924c02afd7f94bc4cecbfa5c379f6ffcf9766b3408fe63d22c728654eccd0" +checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" dependencies = [ "thiserror", ] [[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -661,42 +724,59 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] -name = "env_logger" -version = "0.10.1" +name = "enum-as-inner" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", ] [[package]] -name = "errno" -version = "0.3.3" +name = "env_logger" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -709,26 +789,10 @@ dependencies = [ ] [[package]] -name = "exr" -version = "1.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" -dependencies = [ - "bit_field", - "flume", - "half 2.2.1", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -741,46 +805,73 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", ] [[package]] -name = "flume" -version = "0.11.0" +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ - "spin 0.9.8", + "foreign-types-macros", + "foreign-types-shared", ] [[package]] -name = "fnv" -version = "1.0.7" +name = "foreign-types-macros" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -793,9 +884,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -803,15 +894,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -820,38 +911,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -877,9 +968,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -887,26 +978,16 @@ dependencies = [ ] [[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] name = "gimli" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -914,7 +995,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -923,24 +1004,19 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] @@ -952,12 +1028,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] name = "hdrhistogram" -version = "7.5.2" +version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "byteorder", "flate2", "nom", @@ -966,22 +1048,25 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version", - "spin 0.9.8", "stable_deref_trait", ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -990,6 +1075,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hickory-proto" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "hickory-server" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be0e43c556b9b3fdb6c7c71a9a32153a2275d02419e3de809e520bfcfe40c37" +dependencies = [ + "async-trait", + "bytes", + "cfg-if", + "enum-as-inner", + "futures-util", + "hickory-proto", + "serde", + "thiserror", + "time", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -999,10 +1149,21 @@ dependencies = [ ] [[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1011,9 +1172,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1022,9 +1183,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1040,9 +1201,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -1055,7 +1216,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1075,21 +1236,35 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "image" -version = "0.24.7" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", "num-traits", "png", - "qoi", "tiff", ] @@ -1100,14 +1275,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", ] [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -1126,9 +1311,9 @@ checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16" [[package]] name = "internet-packet" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d8d20ad61a92e71edf571fa568e14aeba0c5f00548acd491fbf694ce9a5ad8" +checksum = "f0273209b868758e751e5db7f59f72d152750d3e30f08f6eb06722357dcfe453" dependencies = [ "internet-checksum", "smoltcp", @@ -1157,17 +1342,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" [[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys", + "libc", + "windows-sys 0.52.0", ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1178,66 +1387,63 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] -name = "lebe" -version = "0.5.2" +name = "libc" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] -name = "libc" -version = "0.2.150" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1245,9 +1451,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] [[package]] name = "lru_time_cache" @@ -1257,9 +1472,18 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" [[package]] name = "macos-certificate-truster" -version = "0.5.1" +version = "0.6.3" dependencies = [ - "apple-security-framework", + "security-framework", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", ] [[package]] @@ -1269,6 +1493,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" [[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1285,15 +1515,15 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1312,9 +1542,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -1322,18 +1552,18 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "mitm-wg-test-client" -version = "0.5.1" +version = "0.6.3" dependencies = [ "anyhow", "boringtun", @@ -1344,36 +1574,43 @@ dependencies = [ [[package]] name = "mitmproxy" -version = "0.5.1" +version = "0.6.3" dependencies = [ "anyhow", - "apple-security-framework", - "async-trait", "boringtun", + "cocoa", "console-subscriber", + "core-foundation", + "core-graphics", "criterion", + "data-encoding", "env_logger", "futures-util", + "hickory-resolver", + "hickory-server", "image", "internet-packet", "log", "lru_time_cache", - "nix 0.27.1", + "nix 0.29.0", + "objc", "once_cell", "pretty-hex", "prost", "rand", "rand_core", + "security-framework", "smoltcp", + "sysinfo", "tokio", "tokio-util", - "windows 0.52.0", + "windows 0.57.0", "x25519-dalek", ] [[package]] name = "mitmproxy_rs" -version = "0.5.1" +version = "0.6.3" dependencies = [ "anyhow", "boringtun", @@ -1384,7 +1621,7 @@ dependencies = [ "mitmproxy", "once_cell", "pyo3", - "pyo3-asyncio", + "pyo3-asyncio-0-21", "pyo3-log", "rand_core", "tar", @@ -1405,12 +1642,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases", "libc", ] @@ -1425,31 +1663,25 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "ntapi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ - "autocfg", - "num-traits", + "winapi", ] [[package]] -name = "num-rational" -version = "0.4.1" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1465,19 +1697,28 @@ dependencies = [ ] [[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] name = "object" -version = "0.32.1" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -1487,15 +1728,15 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1503,48 +1744,48 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1554,15 +1795,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "platforms" -version = "3.1.2" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "0e4c7666f2019727f9e8e14bf14456e99c707d780922869f1ba473eee101fa49" [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -1573,24 +1814,24 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1611,6 +1852,18 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1618,9 +1871,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6b968ed37d62e35b4febaba13bfa231b0b7929d68b8a94e65445a17e2d35f" +checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" [[package]] name = "proc-macro-error" @@ -1648,18 +1901,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -1667,31 +1920,31 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "prost-types" -version = "0.12.1" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] [[package]] name = "pyo3" -version = "0.19.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ "anyhow", "cfg-if", @@ -1699,6 +1952,7 @@ dependencies = [ "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -1706,10 +1960,10 @@ dependencies = [ ] [[package]] -name = "pyo3-asyncio" -version = "0.19.0" +name = "pyo3-asyncio-0-21" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2cc34c1f907ca090d7add03dc523acdd91f3a4dab12286604951e2f5152edad" +checksum = "8fde289486f7d5cee0ac7c20b2637a0657654681079cc5eedc90d9a2a79af1e5" dependencies = [ "futures", "once_cell", @@ -1720,9 +1974,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" dependencies = [ "once_cell", "target-lexicon", @@ -1730,9 +1984,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" dependencies = [ "libc", "pyo3-build-config", @@ -1740,9 +1994,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443" dependencies = [ "arc-swap", "log", @@ -1751,41 +2005,40 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ + "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] -name = "qoi" -version = "0.4.1" +name = "quick-error" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1822,9 +2075,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -1832,9 +2085,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -1842,23 +2095,32 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] +name = "redox_syscall" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] name = "regex" -version = "1.9.5" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1872,13 +2134,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.4", ] [[package]] @@ -1889,9 +2151,19 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] [[package]] name = "ring" @@ -1902,7 +2174,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", + "spin", "untrusted 0.7.1", "web-sys", "winapi", @@ -1910,9 +2182,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1925,28 +2197,28 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1964,36 +2236,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "semver" -version = "1.0.19" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2002,18 +2297,18 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2035,15 +2330,14 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smoltcp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2e3a36ac8fea7b94e666dfa3871063d6e0a5c9d5d4fec9a1a6b7b6760f0229" +version = "0.11.0" +source = "git+https://github.com/smoltcp-rs/smoltcp?rev=ef67e7b46cabf49783053cbf68d8671ed97ff8d4#ef67e7b46cabf49783053cbf68d8671ed97ff8d4" dependencies = [ "bitflags 1.3.2", "byteorder", @@ -2057,22 +2351,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2082,15 +2366,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2098,9 +2373,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2109,15 +2384,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.37" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -2131,10 +2405,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -2143,44 +2432,35 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2188,9 +2468,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -2198,6 +2478,25 @@ dependencies = [ ] [[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2208,10 +2507,25 @@ dependencies = [ ] [[package]] +name = "tinyvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] name = "tokio" -version = "1.34.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2220,10 +2534,10 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2238,20 +2552,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2260,16 +2574,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2283,14 +2596,14 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.4", + "base64 0.21.7", "bytes", "h2", "http", @@ -2316,7 +2629,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand", @@ -2342,11 +2655,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2354,20 +2666,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -2375,9 +2687,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "once_cell", @@ -2390,9 +2702,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -2401,16 +2713,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "universal-hash" @@ -2435,6 +2762,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2448,9 +2792,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2473,9 +2817,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2483,24 +2827,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2508,28 +2852,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2537,9 +2881,15 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -2559,11 +2909,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2606,26 +2956,51 @@ dependencies = [ [[package]] name = "windows" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-targets 0.52.0", + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] name = "windows-redirector" -version = "0.5.1" +version = "0.6.3" dependencies = [ "anyhow", "env_logger", @@ -2641,6 +3016,15 @@ dependencies = [ ] [[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2650,6 +3034,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] name = "windows-targets" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2666,17 +3059,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2687,9 +3081,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2699,9 +3093,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2711,9 +3105,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2723,9 +3123,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2735,9 +3135,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2747,9 +3147,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2759,9 +3159,19 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] [[package]] name = "winres" @@ -2786,18 +3196,20 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -2810,14 +3222,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", + "syn 2.0.68", ] diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index 79941e67fd7b1..bc2ed1694071f 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -6,22 +6,28 @@ rustPlatform, darwin, libiconv, + mitmproxy, mitmproxy-macos, }: buildPythonPackage rec { pname = "mitmproxy-rs"; - version = "0.5.1"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy_rs"; rev = version; - hash = "sha256-nrm1T2yaGVmYsubwNJHPnPDC/A/jYiKVzwBKmuc9MD4="; + hash = "sha256-rnM2MNJ9ZVmwFjhXU8kPEQjpqNIzVZ3bVtm43WvGj5E="; }; - cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + cargoDeps = rustPlatform.importCargoLock { + outputHashes = { + "smoltcp-0.11.0" = "sha256-KC9nTKd2gfZ1ICjrkLK//M2bbqYlfcCK18gBdN0RqWQ="; + }; + lockFile = ./Cargo.lock; + }; buildAndTestSubdir = "mitmproxy-rs"; @@ -41,8 +47,8 @@ buildPythonPackage rec { meta = with lib; { description = "Rust bits in mitmproxy"; homepage = "https://github.com/mitmproxy/mitmproxy_rs"; - changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md#${lib.replaceStrings ["."] [""] version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + inherit (mitmproxy.meta) maintainers; }; } diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index e04490dd46425..b50216ece8adb 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -21,7 +21,7 @@ mitmproxy-rs, msgpack, passlib, - protobuf, + protobuf5, publicsuffix2, pyopenssl, pyparsing, @@ -30,7 +30,7 @@ setuptools, sortedcontainers, tornado, - urwid-mitmproxy, + urwid, wsproto, zstandard, # Additional check requirements @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.3.1"; + version = "10.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,15 +54,12 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/v${version}"; - hash = "sha256-rIyRY1FolbdoaI4OgFG7D2/mot8NiRHalgittPzledw="; + hash = "sha256-1OMVgV6dFKoG/upv+RWbYqftqejeQLBlsycuy2+Na6E="; }; pythonRelaxDeps = [ - "aioquic" - "cryptography" - "pyperclip" - "tornado" + "urwid" ]; propagatedBuildInputs = [ @@ -81,7 +78,7 @@ buildPythonPackage rec { mitmproxy-rs msgpack passlib - protobuf + protobuf5 publicsuffix2 pyopenssl pyparsing @@ -90,7 +87,7 @@ buildPythonPackage rec { setuptools sortedcontainers tornado - urwid-mitmproxy + urwid wsproto zstandard ] ++ lib.optionals stdenv.isDarwin [ mitmproxy-macos ]; @@ -126,6 +123,23 @@ buildPythonPackage rec { # FileNotFoundError: [Errno 2] No such file or directory # likely wireguard is also not working in the sandbox "test_wireguard" + # test require a DNS server + # RuntimeError: failed to get dns servers: io error: entity not found + "test_errorcheck" + "test_errorcheck" + "test_dns" + "test_order" + ]; + + disabledTestPaths = [ + # test require a DNS server + # RuntimeError: failed to get dns servers: io error: entity not found + "test/mitmproxy/addons/test_dns_resolver.py" + "test/mitmproxy/tools/test_dump.py" + "test/mitmproxy/tools/test_main.py" + "test/mitmproxy/tools/web/test_app.py" + "test/mitmproxy/tools/web/test_app.py" # 2 out of 31 tests work + "test/mitmproxy/tools/web/test_master.py" ]; dontUsePytestXdist = true; diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index a7de51b4f8cb1..6eb309283df69 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.7"; + version = "0.3.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = "mitogen"; rev = "refs/tags/v${version}"; - hash = "sha256-RcgAyBF5qNw8Hp//aq6UuvElhUjJXS+ySSXsSweyFXE="; + hash = "sha256-6fuSmigLtNKrdOOSlmvPvzCIdFuvCuz/etNBXr5O0WQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mixins/default.nix b/pkgs/development/python-modules/mixins/default.nix index c6632f3b6a786..655f129b8ab68 100644 --- a/pkgs/development/python-modules/mixins/default.nix +++ b/pkgs/development/python-modules/mixins/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; + hash = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; }; pythonImportsCheck = [ "mixins" ]; diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index ecc1667175c2c..9c58ad4d5527f 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -1,28 +1,34 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, + + # build-system + setuptools-scm, + + # dependencies matplotlib, palettable, pandas, - pytestCheckHook, - pythonOlder, scipy, - setuptools-scm, + + # checks + pytestCheckHook, }: buildPythonPackage rec { pname = "mizani"; - version = "0.11.4"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-2XBvjlVSEjeNc7UlPZ00cNrWVuHh/FgDwkvWus7ndr4="; + hash = "sha256-NQu1vzISMa0UnnSqU8ypp3pc3n6MUI1j5nYUPU14r9U="; }; build-system = [ setuptools-scm ]; @@ -43,11 +49,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "mizani" ]; - meta = with lib; { + meta = { description = "Scales for Python"; homepage = "https://github.com/has2k1/mizani"; changelog = "https://github.com/has2k1/mizani/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ samuela ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix new file mode 100644 index 0000000000000..8799dfcd380a8 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-awesome-pages-plugin/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + mkdocs, + wcmatch, + natsort, + pytestCheckHook, + beautifulsoup4, + mock-open, + importlib-metadata, + pythonOlder, +}: +buildPythonPackage rec { + pname = "mkdocs-awesome-pages-plugin"; + version = "2.9.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "lukasgeiter"; + repo = "mkdocs-awesome-pages-plugin"; + rev = "refs/tags/v${version}"; + hash = "sha256-jDPoMAJ20n9bQu11CRNvKLQthRUh3+jR6t+fM3+vGzY="; + }; + + propagatedBuildInputs = [ + mkdocs + wcmatch + natsort + ]; + + nativeBuildInputs = [poetry-core]; + + nativeCheckInputs = [ + pytestCheckHook + beautifulsoup4 + mock-open + importlib-metadata + ]; + + meta = with lib; { + description = "An MkDocs plugin that simplifies configuring page titles and their order"; + homepage = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin"; + changelog = "https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [phaer]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix index 68725065cb0b5..76807fa2df397 100644 --- a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix +++ b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix @@ -5,26 +5,34 @@ isPy3k, lib, mkdocs, + poetry-core, + livereload, + tornado, }: buildPythonPackage rec { pname = "mkdocs-drawio-exporter"; version = "0.9.1"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchPypi { - inherit pname version; + pname = "mkdocs_drawio_exporter"; + inherit version; hash = "sha256-x8X8hvN/tL8C6VhgMCEHDh2hILjBoyLgQfsFD1+qXgo="; }; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ mkdocs drawio-headless + livereload + tornado ]; - pythonImportsCheck = [ "mkdocsdrawioexporter" ]; + pythonImportsCheck = [ "mkdocs_drawio_exporter" ]; meta = with lib; { description = "Exports your Draw.io diagrams at build time for easier embedding into your documentation"; diff --git a/pkgs/development/python-modules/mkdocs-exclude/default.nix b/pkgs/development/python-modules/mkdocs-exclude/default.nix index 9958faed05c22..431eeb44cc53a 100644 --- a/pkgs/development/python-modules/mkdocs-exclude/default.nix +++ b/pkgs/development/python-modules/mkdocs-exclude/default.nix @@ -1,6 +1,5 @@ { lib, - callPackage, buildPythonPackage, fetchFromGitHub, mkdocs, diff --git a/pkgs/development/python-modules/mkdocs-get-deps/default.nix b/pkgs/development/python-modules/mkdocs-get-deps/default.nix index 72d4fce4fa10d..3b36dfb7fea22 100644 --- a/pkgs/development/python-modules/mkdocs-get-deps/default.nix +++ b/pkgs/development/python-modules/mkdocs-get-deps/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "An extra command for MkDocs that infers required PyPI packages from `plugins` in mkdocs.yml"; homepage = "https://github.com/mkdocs/get-deps"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index 2b75fe35c0b77..89ea4ba0a5cc3 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -8,7 +8,6 @@ mkdocs, pytz, pytestCheckHook, - git, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/mkdocs-macros/default.nix b/pkgs/development/python-modules/mkdocs-macros/default.nix index a8940953123b7..bc73fe8848e13 100644 --- a/pkgs/development/python-modules/mkdocs-macros/default.nix +++ b/pkgs/development/python-modules/mkdocs-macros/default.nix @@ -4,14 +4,10 @@ buildPythonPackage, fetchPypi, mkdocs, - mkdocs-macros, - mkdocs-material, jinja2, python-dateutil, termcolor, pyyaml, - runCommand, - setuptools, }: buildPythonPackage rec { @@ -20,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg="; + hash = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix b/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix index 3b8b53693b20a..75e935d9469c3 100644 --- a/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix +++ b/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix @@ -1,10 +1,7 @@ { lib, - callPackage, buildPythonPackage, fetchPypi, - runCommand, - setuptools, }: # Is required for properly testing mkdocs-macros diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 595333762f125..b5f17fbe9cd4a 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.27"; + version = "9.5.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-iuQmZJ5iJEeD54SxNO6ppcI74zyUL2WdSNhDNnmC7ZY="; + hash = "sha256-VgOPmOwPAwTqCCDxtiQ3dReTdjfXYL7/1CdSqTgw+uo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix index 890bdc7b0a347..0056beaa92225 100644 --- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; changelog = "https://github.com/fralau/mkdocs-mermaid2-plugin/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 485ab55189db0..72fced65d1e93 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -1,6 +1,5 @@ { lib, - callPackage, buildPythonPackage, fetchFromGitHub, mkdocs, diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 78a1467554038..36863323f9683 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -2,7 +2,6 @@ lib, beautifulsoup4, buildPythonPackage, - drawio-headless, fetchFromGitHub, mkdocs, pathspec, diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 011442e70f2a5..b15b9a728d1f2 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.25.1"; + version = "0.25.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-Z4mX6EXEFmNd/CNa39hN9mwJSv9OkqwEmWMzJ9r+EBM="; + hash = "sha256-720qF1t/xl2voOMtkOR7U3lFXia4nI0VirgEFHpb39k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index 9a2cd468db2ac..fd5e8e9927758 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -3,30 +3,44 @@ buildPythonPackage, fetchFromGitHub, cython, + setuptools, mkl, - nose, - six, + pytestCheckHook, }: buildPythonPackage rec { pname = "mkl-service"; version = "2.4.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "refs/tags/v${version}"; - sha256 = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; + hash = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; }; - MKLROOT = mkl; + build-system = [ + cython + setuptools + ]; + + env.MKLROOT = mkl; + + dependencies = [ mkl ]; + + pythonImportsCheck = [ "mkl" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = '' + cd $out + ''; - nativeCheckInputs = [ nose ]; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ - mkl - six + disabledTests = [ + # require SIMD compilation + "test_cbwr_all" + "test_cbwr_branch" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 43d029108317e..35490069b5ec8 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -41,22 +41,19 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.14.0"; + version = "2.14.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Nt4xBdhB/ZraEX5sgtDyp6DAm35FsgkjsuxN30QeAV8="; + hash = "sha256-KSyuS4NXSgyyIxF+IkyqZ5iTMHivAjNxnCthK+pkVhc="; }; # Remove currently broken dependency `shap`, a model explainability package. # This seems quite unprincipled especially with tests not being enabled, # but not mlflow has a 'skinny' install option which does not require `shap`. - nativeBuildInputs = [ - setuptools - ]; pythonRemoveDeps = [ "shap" ]; pythonRelaxDeps = [ "packaging" @@ -95,6 +92,7 @@ buildPythonPackage rec { requests scikit-learn scipy + setuptools #shap simplejson sqlalchemy diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index b65f87105d2dc..2084b8c19f759 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildPythonPackage, @@ -8,7 +7,6 @@ cmake, xcbuild, zsh, - darwin, blas, lapack, }: diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix index 547c7f7b884a4..9e09b91850d32 100644 --- a/pkgs/development/python-modules/mmh3/default.nix +++ b/pkgs/development/python-modules/mmh3/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/hajimes/mmh3"; changelog = "https://github.com/hajimes/mmh3/blob/v${version}/CHANGELOG.md"; license = licenses.cc0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index f471c1027dbf0..460d128f5a9e8 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -73,6 +73,11 @@ buildPythonPackage rec { export MNE_SKIP_NETWORK_TESTS=1 ''; + disabledTests = [ + # Fails due to changes in Numpy types + "mne.stats._adjacency.combine_adjacency" + ]; + pythonImportsCheck = [ "mne" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index 839367cc8e315..4250e048430e3 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + poetry-core, }: buildPythonPackage rec { pname = "mnemonic"; - version = "0.20"; - format = "setuptools"; + version = "0.21"; + pyproject = true; src = fetchFromGitHub { owner = "trezor"; - repo = "python-${pname}"; + repo = "python-mnemonic"; rev = "v${version}"; - hash = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; + hash = "sha256-D1mS/JQhefYmwrShfWR9SdiGsBUM+jmuCkfWix9tDOU="; }; + build-system = [ poetry-core ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mnemonic" ]; diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix index 82065268cfeb5..cfa7d4e698c84 100644 --- a/pkgs/development/python-modules/mobi/default.nix +++ b/pkgs/development/python-modules/mobi/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { mainProgram = "mobiunpack"; homepage = "https://github.com/iscc/mobi"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index c5b32f6397c4e..20c78bf4f18eb 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; + hash = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index a76b460857af3..323633d3a4398 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -106,6 +106,6 @@ buildPythonPackage rec { description = "Socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix index 7f069557ed7a0..5e6da22c91d41 100644 --- a/pkgs/development/python-modules/mockfs/default.nix +++ b/pkgs/development/python-modules/mockfs/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/mockfs/mockfs"; changelog = "https://github.com/mockfs/mockfs/blob/${src.rev}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/modbus-tk/default.nix b/pkgs/development/python-modules/modbus-tk/default.nix new file mode 100644 index 0000000000000..5d82d3aec56ca --- /dev/null +++ b/pkgs/development/python-modules/modbus-tk/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + pythonOlder, + pyserial, +}: + +buildPythonPackage rec { + pname = "modbus-tk"; + version = "1.1.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + pname = "modbus_tk"; + inherit version; + hash = "sha256-aQ+nu4bql4mSRl0tYci1rMY5zg6LgzoKqW1N0XLFZEo="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pyserial ]; + + # Source no tagged anymore and PyPI doesn't ship tests + doCheck = false; + + pythonImportsCheck = [ "modbus_tk" ]; + + meta = with lib; { + description = "Module for simple Modbus interactions"; + homepage = "https://github.com/ljean/modbus-tk"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 0729ec702479a..45395bb1035d0 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.18.1"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-QsfVKPasGFzcLIwx7t9H9I2o2JNUFLKbKc86tntltg8="; + hash = "sha256-OSLRFuBG4GamSOpZvkPvoBanmRdDM8lCTNOwwZVjyEQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index e8472d3233e5e..f06f4ed471a64 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.4.9"; + version = "0.4.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-BUkbCllM2qN5yKTvte2iwnmBXQAzu2N8LTGRfvOTKUQ="; + hash = "sha256-bgVtOpWx5jytVxSz/WKLqLm+hVKbwIy+Fy5nEj/Nwt4="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index 4fab29c45967a..5054fcae7b79e 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -2,33 +2,38 @@ lib, buildPythonPackage, fetchPypi, - mock, - nose, - pytest, + fetchpatch2, + pytestCheckHook, six, + setuptools, }: buildPythonPackage rec { pname = "mohawk"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; + hash = "sha256-0qDjqxCiCcx56V4o8t1UvUpz/RmY/+J7e6D5Yra+lyM="; }; - propagatedBuildInputs = [ six ]; - - nativeCheckInputs = [ - mock - nose - pytest + patches = [ + (fetchpatch2 { + # https://github.com/kumar303/mohawk/pull/59 + name = "nose-to-pytest.patch"; + url = "https://github.com/kumar303/mohawk/compare/b7899166880e890f01cf2531b5686094ba08df8f...66157c7efbf6b0d18c30a9ffe5dfd84bef27bd3a.patch"; + hash = "sha256-w3sP5XeBqOwoPGsWzYET4djYwuKPaS4OOlC3HBPD0NI="; + }) ]; - checkPhase = '' - pytest mohawk/tests.py - ''; + build-system = [ setuptools ]; + + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "mohawk/tests.py" ]; meta = { description = "Python library for Hawk HTTP authorization"; diff --git a/pkgs/development/python-modules/molbar/default.nix b/pkgs/development/python-modules/molbar/default.nix index f69bfb6f17c25..be23018274faa 100644 --- a/pkgs/development/python-modules/molbar/default.nix +++ b/pkgs/development/python-modules/molbar/default.nix @@ -1,5 +1,4 @@ { buildPythonPackage -, python , lib , gfortran , fetchgit diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index e2861df3571ff..67100465874ee 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.6.1"; + version = "24.7.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-QcGQOllyl8JgK9BZ4Qe17y4yydokeX3LeP+Yc8ZhXuY="; + hash = "sha256-2yx/pZkj6b8j1hqSpbGdaIHsnuX+lu2enp1wCwJyPwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix index ebb110d12caa1..6b551d58a909e 100644 --- a/pkgs/development/python-modules/momepy/default.nix +++ b/pkgs/development/python-modules/momepy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "momepy"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pysal"; repo = "momepy"; rev = "v${version}"; - hash = "sha256-HVp2a0z+5fbfkNSxnTfZPCgG2SJMlKX/zso14M18mCk="; + hash = "sha256-r2iGzk54MsrkYB3Sp9/B1QGKnvqPGUj3MQhk6yqIoXE="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 645ed9a05811e..d190facc17e7f 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, fetchpatch, pythonOlder, - pythonAtLeast, ninja, ignite, numpy, @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "monai"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "Project-MONAI"; repo = "MONAI"; rev = "refs/tags/${version}"; - hash = "sha256-YjEJbDM9+PiC3Kse8NA/b/yJBsReaK6yIyEB9uktiEc="; + hash = "sha256-wm4n3FuIXbE99RRLsGnZDeHtR/Tmj6C0s29pvflZg+o="; }; patches = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 0c7a285228d4a..4cf2f42fa31b4 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.5.24"; + version = "2024.7.29"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-c2RG38lsYWtwdCzrRTH/l9o4k6UPUOFC+wwV9zjoDvk="; + hash = "sha256-ydt1T2agKUCBiMZ4uvQ3qshEiAQ0PP9EjPiWDXgH3Wo="; }; postPatch = '' @@ -63,6 +63,8 @@ buildPythonPackage rec { "test_Path_objects" "test_zopen" "test_zpath" + # flaky, precision/rounding error + "TestJson.test_datetime" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix index 78b46a115f53c..799f788d6f120 100644 --- a/pkgs/development/python-modules/monzopy/default.nix +++ b/pkgs/development/python-modules/monzopy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "monzopy"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JakeMartin-ICL"; repo = "monzopy"; rev = "refs/tags/v${version}"; - hash = "sha256-AoBfcQ0rilUPMvLCjU2Y+P/wVnb+I40vmq+5lS5eSto="; + hash = "sha256-9Gj0312NOumoIWN/ES+dgPL3IblgvBSCPZA97OKuhZQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 7ac84ff2131d1..8798668d6c28f 100644 --- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mopeka-iot-ble"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wF3ZSR9kjn6qWaB7SRKsQuHfbNMwdKS/5qR9nStsw1c="; + hash = "sha256-CKLC0p66JapE9qNePE11ttoGMVd4kA7g28kA+pYLXCE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 0130714fecf73..ea2b3c43509d0 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { changelog = "https://more-itertools.readthedocs.io/en/stable/versions.html"; description = "Expansion of the itertools module"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix index 6cc5ccc507f2f..ec5e39c6b8ab1 100644 --- a/pkgs/development/python-modules/mortgage/default.nix +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Mortgage calculator"; homepage = "https://github.com/jlumbroso/mortgage"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index ddf43e7c065bc..451d4e0edfa2f 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.23"; + version = "0.6.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-f5R58p6tMVqmXAjybae8qjeNI3vxtGJ7qxZOl9H5iKw="; + hash = "sha256-4ao0FalOFrr4or7iUqx5aAw93yqI2i3/uF4rdHOsa7M="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pycryptodomex ]; + dependencies = [ pycryptodomex ]; - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ "motionblinds" ]; diff --git a/pkgs/development/python-modules/motmetrics/default.nix b/pkgs/development/python-modules/motmetrics/default.nix index 891497a702a10..74a0fade7bd99 100644 --- a/pkgs/development/python-modules/motmetrics/default.nix +++ b/pkgs/development/python-modules/motmetrics/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Bar_chart: Benchmark multiple object trackers (MOT) in Python"; homepage = "https://github.com/cheind/py-motmetrics"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 7f1196b461a96..1c9e917b60abb 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -16,7 +16,7 @@ scipy, setuptools, tqdm, - youtube-dl, + yt-dlp, }: buildPythonPackage rec { @@ -56,7 +56,7 @@ buildPythonPackage rec { scikit-image scikit-learn scipy - youtube-dl + yt-dlp ]; }; @@ -94,6 +94,6 @@ buildPythonPackage rec { homepage = "https://zulko.github.io/moviepy/"; changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix new file mode 100644 index 0000000000000..0714dd07bcff1 --- /dev/null +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + poetry-core, + aenum, + aioconsole, + aiohttp, + inflection, + pydantic, + python-dateutil, + typing-extensions, + urllib3, + websockets, + zeroconf, +}: + +buildPythonPackage rec { + pname = "mozart-api"; + version = "3.4.1.8.6"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "mozart_api"; + inherit version; + hash = "sha256-a0yjVS1FnR/n7Hjw/VRFztkUFD0gQQg7OXbyPTf+Kus="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + aenum + aioconsole + aiohttp + inflection + pydantic + python-dateutil + typing-extensions + urllib3 + websockets + zeroconf + ]; + + # Package has no tests + doCheck = false; + + pythonImportsCheck = [ "mozart_api" ]; + + meta = { + description = "REST API for the Bang & Olufsen Mozart platform"; + homepage = "https://github.com/bang-olufsen/mozart-open-api"; + changelog = "https://github.com/bang-olufsen/mozart-open-api/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 43c4040fba72d..1aba824408888 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,61 +1,62 @@ { lib, - fetchPypi, - python, + fetchFromGitHub, buildPythonPackage, + cython, + setuptools, mpi, - mpiCheckPhaseHook, openssh, + pytestCheckHook, + mpiCheckPhaseHook, }: buildPythonPackage rec { pname = "mpi4py"; - version = "3.1.6"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-yPpiXg+SsILvlVv7UvGfpmkdKSc9fXETXSlaoUPe5ss="; - }; - - passthru = { - inherit mpi; + # See https://github.com/mpi4py/mpi4py/issues/386 . Part of the changes since + # the last release include Python 3.12 fixes. + version = "3.1.6-unstable-2024-07-08"; + pyproject = true; + + src = fetchFromGitHub { + repo = "mpi4py"; + owner = "mpi4py"; + rev = "e9a59719bbce1b9c351e1e30ecd3be3b459e97cd"; + hash = "sha256-C/nidWGr8xsLV73u7HRtnXoQgYmoRJkD45DFrdXXTPI="; }; - postPatch = '' - substituteInPlace test/test_spawn.py --replace \ - "unittest.skipMPI('openmpi(<3.0.0)')" \ - "unittest.skipMPI('openmpi')" - ''; - - configurePhase = ""; - - installPhase = '' - mkdir -p "$out/${python.sitePackages}" - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/${python.sitePackages} \ - --prefix="$out" - - # --install-lib: - # sometimes packages specify where files should be installed outside the usual - # python lib prefix, we override that back so all infrastructure (setup hooks) - # work as expected - ''; - - nativeBuildInputs = [ mpi ]; + build-system = [ + cython + setuptools + mpi + ]; + dependencies = [ + mpi + ]; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + pytestCheckHook openssh mpiCheckPhaseHook ]; + # Most tests pass, (besides `test_spawn.py`), but when reaching ~80% tests + # progress, an orted process hangs and the tests don't finish. This issue is + # probably due to the sandbox. + doCheck = false; + disabledTestPaths = [ + # Almost all tests in this file fail (TODO: Report about this upstream..) + "test/test_spawn.py" + ]; + + passthru = { + inherit mpi; + }; - meta = with lib; { + meta = { description = "Python bindings for the Message Passing Interface standard"; homepage = "https://github.com/mpi4py/mpi4py"; - license = licenses.bsd2; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/mpi4py/tests.patch b/pkgs/development/python-modules/mpi4py/tests.patch deleted file mode 100644 index 168e3b4b38d36..0000000000000 --- a/pkgs/development/python-modules/mpi4py/tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/test/test_dl.py w/test/test_dl.py -index a3211a3..9d25569 100644 ---- i/test/test_dl.py -+++ w/test/test_dl.py -@@ -12,7 +12,7 @@ class TestDL(unittest.TestCase): - if sys.platform == 'darwin': - libm = 'libm.dylib' - else: -- libm = 'libm.so' -+ libm = 'libm.so.6' - - handle = dl.dlopen(libm, dl.RTLD_LOCAL|dl.RTLD_LAZY) - self.assertTrue(handle != 0) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 1daa1bc2170fa..a9d0fb10eabe3 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.49"; + version = "0.3.50"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Hxqk0eSEOWSpomrS/vTdJV9/1mKQ/yCJQOBpm9tAvqo="; + hash = "sha256-xHdZdfTiKbDGu6oYIiTd8P/npH2kUjz7s8A9+CBJN0A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix index bbd0befe1415e..cae321df5c0b4 100644 --- a/pkgs/development/python-modules/mpyq/default.nix +++ b/pkgs/development/python-modules/mpyq/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { mainProgram = "mpyq"; homepage = "https://github.com/eagleflo/mpyq"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index deb6e0c6ca627..669fee8887fb0 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "Run MapReduce jobs on Hadoop or Amazon Web Services"; homepage = "https://github.com/Yelp/mrjob"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 07b88859e2edd..cf03f7a027bbd 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.28.1"; + version = "1.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1yu/4tXC8lVfS8YgW+RFDd/RKXZhDdmhapqw8Fxotk0="; + hash = "sha256-j2cl8Jl1JVP5sv6EEl4qXr5HtJ+S6syjPr7dOp66riU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 8bc1b7489301b..a22a45e5714cd 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-bQW1piSypfj3YAfzuEk/AkrB1x0lrHoIDyZv+KeCYgE="; + hash = "sha256-Wc/FWwBZ6IkGoZKKhyybcfKqPpDCJx3YcxOAUcUy2JM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 5740955f6d63f..2f676433386cb 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -3,6 +3,7 @@ azure-identity, buildPythonPackage, fetchFromGitHub, + flit-core, microsoft-kiota-abstractions, microsoft-kiota-authentication-azure, microsoft-kiota-http, @@ -12,12 +13,11 @@ microsoft-kiota-serialization-text, msgraph-core, pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.4.0"; + version = "1.5.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,10 +26,10 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-afnxk79duKzTykNnSHPE6lZhMkOt+9JhEskj/KjQpQI="; + hash = "sha256-Ty9e+xJ3+h4d0hmwtiZA9k5WMeuvT4iwNpR06KRpnfI="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ azure-identity diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index e37cb697318d6..1af1b9814a160 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - msgpack, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 3a664b3933f23..beec1bb17ee5f 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/mt940"; changelog = "https://github.com/wolph/mt940/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index c7d8258e89797..b104034ea550d 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-fPiIdSbwcedBHcAs4c1mXjm0tgg/3/Sf4TSKgtIxRlE="; + hash = "sha256-HDN6KA2JYDZqad/MybsX1oV/VvXPshb0mi0UBZq47Qs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 15ff5d914afd6..e3f20311123cf 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; + hash = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; # No tests in archive diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 57e69de0e7854..98a3ad4c563b6 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Multiprocessing and multithreading in Python"; homepage = "https://github.com/uqfoundation/multiprocess"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/multiscale-spatial-image/default.nix b/pkgs/development/python-modules/multiscale-spatial-image/default.nix new file mode 100644 index 0000000000000..41b4a720fc50c --- /dev/null +++ b/pkgs/development/python-modules/multiscale-spatial-image/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + hatchling, + dask, + numpy, + python-dateutil, + spatial-image, + xarray, + xarray-datatree, + zarr, + dask-image, + fsspec, + jsonschema, + nbmake, + pooch, + pytestCheckHook, + pytest-mypy, + urllib3, +}: + +buildPythonPackage rec { + pname = "multiscale-spatial-image"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "spatial-image"; + repo = "multiscale-spatial-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-s/88N8IVkj+9MZYAtEJSpmmDdjIxf4S6U5gYr86Ikrw="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + dask + numpy + python-dateutil + spatial-image + xarray + xarray-datatree + zarr + ]; + + optional-dependencies = { + dask-image = [ dask-image ]; + #itk = [ + # itk-filtering # not in nixpkgs yet + #]; + test = [ + dask-image + fsspec + #ipfsspec # not in nixpkgs + #itk-filtering # not in nixpkgs + jsonschema + nbmake + pooch + pytest-mypy + urllib3 + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.test; + + doCheck = false; # all test files try to download data + + pythonImportsCheck = [ "multiscale_spatial_image" ]; + + meta = { + description = "Generate a multiscale, chunked, multi-dimensional spatial image data structure that can serialized to OME-NGFF"; + homepage = "https://github.com/spatial-image/multiscale-spatial-image"; + changelog = "https://github.com/spatial-image/multiscale-spatial-image/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index d5b6fe944ae27..6f7bf72c4a6e2 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { description = "Script to change email tags in a mu indexed maildir"; homepage = "https://github.com/aroig/mutag"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "mutag"; }; } diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index e7219e60753fd..c66f33c6d9889 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { lib.replaceStrings [ "." ] [ "-" ] version }"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 72fa00155f380..1bdc53e90d012 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Python client library to the MediaWiki API"; license = licenses.mit; homepage = "https://github.com/mwclient/mwclient"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/mwtypes/default.nix b/pkgs/development/python-modules/mwtypes/default.nix index e913286898294..727d5e61821cd 100644 --- a/pkgs/development/python-modules/mwtypes/default.nix +++ b/pkgs/development/python-modules/mwtypes/default.nix @@ -3,38 +3,45 @@ buildPythonPackage, fetchPypi, jsonable, - nose, pytestCheckHook, + fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "mwtypes"; - version = "0.3.2"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-3BF2xZZWKcEj6FmzGa5hUdTjhVMemngWBMDUyjQ045k="; + inherit version pname; + hash = "sha256-PgcGUk/27cAIvzfLvRoVX2vHOCab59m+4bciDPmtlW8="; }; - propagatedBuildInputs = [ jsonable ]; - - nativeCheckInputs = [ - nose - pytestCheckHook + patches = [ + # https://github.com/mediawiki-utilities/python-mwtypes/pull/6 + (fetchpatch2 { + name = "nose-to-pytest.patch"; + url = "https://github.com/mediawiki-utilities/python-mwtypes/commit/58d7f59e4927aaa6278f84576794df713c673058.patch"; + hash = "sha256-jh1uEqqhIK2DyNvVN0XYGM7BXTmypnoC4VoB0V+9JmE="; + }) ]; - disabledTests = [ - "test_normalize_path_bad_extension" - "test_open_file" - ]; + build-system = [ setuptools ]; + + dependencies = [ jsonable ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Even with 7z included, this test does not pass + disabledTests = [ "test_open_file" ]; pythonImportsCheck = [ "mwtypes" ]; - meta = with lib; { + meta = { description = "Set of classes for working with MediaWiki data types"; homepage = "https://github.com/mediawiki-utilities/python-mwtypes"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/mwxml/default.nix b/pkgs/development/python-modules/mwxml/default.nix index 93090939a80ad..7b24ef4c8bb4e 100644 --- a/pkgs/development/python-modules/mwxml/default.nix +++ b/pkgs/development/python-modules/mwxml/default.nix @@ -2,43 +2,50 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, jsonschema, mwcli, mwtypes, - nose, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "mwxml"; - version = "0.3.3"; - format = "setuptools"; + version = "0.3.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CEjfDPLik3GPVUMRrPRxW9Z59jn05Sy+R9ggZYnbHTE="; + hash = "sha256-ejf3RfdwcEp0Ge+96dORuHS5Bx28GSs7H4HD1LUnde4="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/mediawiki-utilities/python-mwxml/pull/21 + (fetchpatch2 { + name = "nose-to-pytest.patch"; + url = "https://github.com/mediawiki-utilities/python-mwxml/compare/2b477be6aa9794064d03b5be38c7759d1570488b...71bbfd2b309e0720a34a4e783b71169aebc571ef.patch"; + hash = "sha256-4XxNvda1Dj+kFbD9t9gzucrMjdfXcoqYlvecXO2B2R0="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ jsonschema mwcli mwtypes ]; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; - - disabledTests = [ "test_page_with_discussion" ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mwxml" ]; - meta = with lib; { + meta = { description = "Set of utilities for processing MediaWiki XML dump data"; mainProgram = "mwxml"; homepage = "https://github.com/mediawiki-utilities/python-mwxml"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index ed6b434eb7e9f..8205ba66befeb 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -1,33 +1,40 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, - nose, + setuptools, minimock, + pytestCheckHook, }: buildPythonPackage rec { pname = "mypgoclient"; - version = "1.8"; + version = "1.9"; + pyproject = true; src = fetchFromGitHub { owner = "gpodder"; repo = "mygpoclient"; rev = version; - sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp"; + hash = "sha256-McHllitWiBiCdNuJlUg6K/vgr2l3ychu+KOx3r/UCv0="; }; + postPatch = '' + substituteInPlace mygpoclient/*_test.py \ + --replace-quiet "assertEquals" "assertEqual" \ + --replace-quiet "assert_" "assertTrue" + ''; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "mygpoclient" ]; + nativeCheckInputs = [ - nose minimock + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - - doCheck = (!stdenv.isDarwin); + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Gpodder.net client library"; @@ -37,6 +44,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/gpodder/mygpoclient"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/myhdl/default.nix b/pkgs/development/python-modules/myhdl/default.nix index ec9dfcaf82766..959856365d246 100644 --- a/pkgs/development/python-modules/myhdl/default.nix +++ b/pkgs/development/python-modules/myhdl/default.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, - verilog, + iverilog, ghdl, pytest, pytest-xdist, @@ -24,13 +24,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest pytest-xdist - verilog + iverilog ghdl ]; passthru = { # If using myhdl as a dependency, use these if needed and not ghdl and # verlog from all-packages.nix - inherit ghdl verilog; + inherit ghdl iverilog; }; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/mypermobil/default.nix b/pkgs/development/python-modules/mypermobil/default.nix new file mode 100644 index 0000000000000..052a9838ead7b --- /dev/null +++ b/pkgs/development/python-modules/mypermobil/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiocache, + aiohttp, + aiounittest, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "mypermobil"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Permobil-Software"; + repo = "mypermobil"; + rev = "refs/tags/v${version}"; + hash = "sha256-linnaRyA45EzqeSeNmvIE5gXkHA2F504U1++QBeRa90="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiocache + aiohttp + ]; + + pythonImportsCheck = [ "mypermobil" ]; + + nativeCheckInputs = [ + aiounittest + pytestCheckHook + ]; + + disabledTests = [ + # requires networking + "test_region" + ]; + + meta = { + changelog = "https://github.com/Permobil-Software/mypermobil/releases/tag/v${version}"; + description = "Python wrapper for the MyPermobil API"; + homepage = "https://github.com/Permobil-Software/mypermobil"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index af3d186fb5a31..409ea350ad248 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.24.0"; + version = "7.25.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,12 +30,12 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-RVpyCXIM7ze2iWJsi3i5N5JF2EyASAJ52DpYeebNk5A="; + hash = "sha256-DHGeljGY8NRndlcDqvK1Noud90wUQrkaS54489b/6RQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ black boto3 cryptography @@ -61,10 +61,10 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations builder for boto3"; - mainProgram = "mypy_boto3_builder"; homepage = "https://github.com/youtype/mypy_boto3_builder"; changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "mypy_boto3_builder"; }; } diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index ffdd8bc5ac2c2..0f264d2c86a1c 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + gitUpdater, pythonAtLeast, pythonOlder, @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "mypy"; - version = "1.10.0"; + version = "1.10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +41,10 @@ buildPythonPackage rec { owner = "python"; repo = "mypy"; rev = "refs/tags/v${version}"; - hash = "sha256-NCnc4C/YFKHN/kT7RTFCYs/yC00Kt1E7mWCoQuUjxG8="; + hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc="; + }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; }; build-system = [ diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index b15a4559aa983..e234bbef0e18d 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,8 +1,6 @@ { - stdenv, lib, buildPythonPackage, - django, dnspython, fetchFromGitHub, protobuf, @@ -68,7 +66,6 @@ buildPythonPackage rec { license = licenses.gpl2Only; maintainers = with maintainers; [ neosimsim - turion ]; }; } diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix index e342450c0e45b..6f3761d95fb03 100644 --- a/pkgs/development/python-modules/myst-docutils/default.nix +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -1,46 +1,72 @@ { lib, + beautifulsoup4, buildPythonPackage, + defusedxml, docutils, - fetchPypi, + fetchFromGitHub, flit-core, jinja2, markdown-it-py, mdit-py-plugins, + pytest-param-files, + pytest-regressions, + pytestCheckHook, pythonOlder, pyyaml, + sphinx-pytest, + sphinx, typing-extensions, }: buildPythonPackage rec { pname = "myst-docutils"; - version = "3.0.1"; - format = "pyproject"; + version = "4.0.0"; + pyproject = true; - src = fetchPypi { - pname = "myst_docutils"; - inherit version; - hash = "sha256-alQvF0OWNjDck022ORJ1Nl4t1jgzMZKEbJxPHsrmBcI="; + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "MyST-Parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ docutils jinja2 markdown-it-py mdit-py-plugins pyyaml + sphinx typing-extensions ]; + nativeCheckInputs = [ + beautifulsoup4 + defusedxml + pytest-param-files + pytest-regressions + pytestCheckHook + sphinx-pytest + ]; + pythonImportsCheck = [ "myst_parser" ]; + disabledTests = [ + # Tests require linkify + "test_cmdline" + "test_extended_syntaxes" + ]; + meta = with lib; { description = "Extended commonmark compliant parser, with bridges to docutils/sphinx"; homepage = "https://github.com/executablebooks/MyST-Parser"; + changelog = "https://github.com/executablebooks/MyST-Parser/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dpausp ]; - broken = pythonOlder "3.8"; # dependency networkx requires 3.8 }; } diff --git a/pkgs/development/python-modules/myst-nb/default.nix b/pkgs/development/python-modules/myst-nb/default.nix index 4be14e85100ea..97628a5e3e87d 100644 --- a/pkgs/development/python-modules/myst-nb/default.nix +++ b/pkgs/development/python-modules/myst-nb/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/MyST-NB"; changelog = "https://github.com/executablebooks/MyST-NB/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index daafd9190c16b..dffd114bd0754 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/derek73/python-nameparser"; changelog = "https://github.com/derek73/python-nameparser/releases/tag/v${version}"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nanoid/default.nix b/pkgs/development/python-modules/nanoid/default.nix index 48d1f3f44411b..1570c28f9e66a 100644 --- a/pkgs/development/python-modules/nanoid/default.nix +++ b/pkgs/development/python-modules/nanoid/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Tiny, secure, URL-friendly, unique string ID generator for Python"; homepage = "https://github.com/puyuan/py-nanoid"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index 995c56510d65a..59f9e82d48c4b 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/software-2/nanoleaf"; changelog = "https://github.com/software-2/nanoleaf/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index bfd35c2fd0994..c6eeef191ac4e 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -9,7 +9,6 @@ cffi, # dependencies - future, jinja2, junos-eznc, lxml, diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix index e7492f0f55ffc..a44fe0becfe31 100644 --- a/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "HP ProCurve Driver for NAPALM automation frontend"; homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index a71cad588f1ea..1d7e9c5966503 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - imageio, ipykernel, ipython, - napari-plugin-engine, pythonOlder, qtconsole, qtpy, diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index 419c949b4ebcb..63ad78e96617f 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools-scm, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index d8001e5bd1086..4183a65e56c0e 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/SethMMorton/natsort"; changelog = "https://github.com/SethMMorton/natsort/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix index dc60601b7e6c1..130ab24cbb8d5 100644 --- a/pkgs/development/python-modules/nbdev/default.nix +++ b/pkgs/development/python-modules/nbdev/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nbdev"; - version = "2.3.25"; + version = "2.3.27"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MntVdZ6LazdFCm+h5FaTxvzEwCtoJjrW/EJPTt2fdnU="; + hash = "sha256-vF79mY5dy00xfaGR8L9HPpdxOiEpiJ1AQt42hO9DIMs="; }; diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix deleted file mode 100644 index 5b825fa91a513..0000000000000 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, - nbformat, - nose, -}: - -buildPythonPackage rec { - pname = "nbmerge"; - version = "0.0.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "jbn"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ nbformat ]; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - runHook preCheck - - patchShebangs . - nosetests -v - PATH=$PATH:$out/bin ./cli_tests.sh - - runHook postCheck - ''; - - pythonImportsCheck = [ "nbmerge" ]; - - meta = { - description = "Tool to merge/concatenate Jupyter (IPython) notebooks"; - inherit (src.meta) homepage; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - mainProgram = "nbmerge"; - }; -} diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 4a15448d0839b..aac9c4e6ef259 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://nbsphinx.readthedocs.io/"; changelog = "https://github.com/spatialaudio/nbsphinx/blob/${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 7cc16ab27ff29..920314b9e45d5 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { homepage = "https://github.com/computationalmodelling/nbval"; changelog = "https://github.com/computationalmodelling/nbval/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 94715f4492035..07baf52739fd9 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "5.0.0"; + version = "5.0.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-WSeY9v1ELIZEWvbVHGZFq+8tZVVPkOwUwQ/4cOh8IwQ="; + hash = "sha256-p7BRUf0YECI8xW3GVOCXHKtKs/4MFKUZR3k1XmTKMZI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 7ebffc30c4492..6773eed000c8e 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; mainProgram = "ndg_httpclient"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 567476d4985cb..5bd31f3042a12 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -11,7 +11,7 @@ # tests hypothesis, - pytest-cov, + pytest-cov-stub, pytestCheckHook, }: @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=ndindex/ --cov-report=term-missing --flakes" "" + --replace "--flakes" "" ''; passthru.optional-dependencies.arrays = [ numpy ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytest-cov # uses cov markers + pytest-cov-stub pytestCheckHook ] ++ passthru.optional-dependencies.arrays; @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/Quansight-Labs/ndindex"; changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix index fbc52dd1fe2ed..6f56b321f1fcd 100644 --- a/pkgs/development/python-modules/nebula3-python/default.nix +++ b/pkgs/development/python-modules/nebula3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nebula3-python"; - version = "3.8.0"; + version = "3.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vesoft-inc"; repo = "nebula-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tpMm13iixtg3ZF4g7YgRLyd/VqJba51QPGPmFRpy0wA="; + hash = "sha256-AcfKcrfDBY5K5xDDA7rLzKnsnhwhtpLXHkPLd0SfC4M="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index b74e8c3a4df18..4358aef2f5553 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -2,39 +2,46 @@ lib, buildPythonPackage, fetchPypi, - nose, numpy, packaging, quantities, pythonOlder, setuptools, + pytestCheckHook, + pillow, + which, }: buildPythonPackage rec { pname = "neo"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gVhbKLZaTciakucc7TlCxdv9qnG90sw4U3G3ebVlTK0="; + hash = "sha256-aYDZVC55XVNR/VtdnTlBBKR/MNDvfwUR+spqe14ncrw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging quantities ]; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ + pytestCheckHook + pillow + which + ]; - checkPhase = '' - nosetests --exclude=iotest - ''; + disabledTestPaths = [ + # Requires network and export HOME dir + "neo/test/rawiotest/test_maxwellrawio.py" + ]; pythonImportsCheck = [ "neo" ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index d1a6903a666b0..03635a8017bf8 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.22.0"; + version = "5.23.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-/yilbKui0D49zviNM9MI5ElGAYPB3MlbMgpDyI1kVX8="; + hash = "sha256-0kxeBwdhiDRCA4mkvr/wU07mr4bdvegO8sqghrH7dYg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix index 66ae368c2b249..88e22c65c7bb3 100644 --- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -10,7 +10,6 @@ jinja2, mkdocs, pytestCheckHook, - pythonImportsCheckHook, rich, setuptools, }: diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 45dc089f74d5a..f73c569fddacc 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/erdewit/nest_asyncio"; changelog = "https://github.com/erdewit/nest_asyncio/releases/tag/v${version}"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index aaf776d9aabac..8d04bc106b075 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; + hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/netapp-lib/default.nix b/pkgs/development/python-modules/netapp-lib/default.nix index 4155d3bff0c9d..478831a9112e0 100644 --- a/pkgs/development/python-modules/netapp-lib/default.nix +++ b/pkgs/development/python-modules/netapp-lib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; + hash = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index 9a11c52d12dee..78d4c23fd6cce 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netapp-ontap"; - version = "9.15.1.0"; + version = "9.15.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "netapp_ontap"; inherit version; - hash = "sha256-cw8wfMKBbzN4HWLg8Xxzpnv05atKWeTZlBaBIaNWTvo="; + hash = "sha256-rzME9JdaaXW1JOtfcjb5mlwSl4dy7lofnKOB6X6kWuM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/development/python-modules/netbox-reorder-rack/default.nix new file mode 100644 index 0000000000000..bb079f2eda346 --- /dev/null +++ b/pkgs/development/python-modules/netbox-reorder-rack/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + netbox, + python, +}: + +buildPythonPackage rec { + pname = "netbox-reorder-rack"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox-reorder-rack"; + rev = "v${version}"; + hash = "sha256-UbTq3DHxSczDxQIUyAHCVJG3SZdqgyS9ULNvuDKQvEY="; + }; + + build-system = [ + setuptools + ]; + + checkInputs = [ netbox ]; + + preFixup = '' + export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH + ''; + + dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion; + pythonImportsCheck = [ "netbox_reorder_rack" ]; + + meta = with lib; { + description = "NetBox plugin to allow users to reorder devices within a rack using a drag and drop UI"; + homepage = "https://github.com/minitriga/netbox-reorder-rack/"; + license = licenses.asl20; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index d6b76137657eb..911ea8afefd95 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { description = "Interface to netCDF library (versions 3 and 4)"; homepage = "https://github.com/Unidata/netcdf4-python"; changelog = "https://github.com/Unidata/netcdf4-python/raw/v${version}/Changelog"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/nethsm/default.nix b/pkgs/development/python-modules/nethsm/default.nix index 77d25a7a1b1de..189bb4aa813b0 100644 --- a/pkgs/development/python-modules/nethsm/default.nix +++ b/pkgs/development/python-modules/nethsm/default.nix @@ -12,7 +12,7 @@ let pname = "nethsm"; - version = "1.1.0"; + version = "1.2.1"; in buildPythonPackage { @@ -21,7 +21,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-CQhheHQ0BlfznKjoOSRvbDtnlTvv/SLtl0GWd7LUSt8="; + hash = "sha256-EPxGJFCGGl3p3yLlM7NH7xtEVS2woRigKJhL57A0gAE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 381b8818e77d0..8133131a4277d 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Portable access to network interfaces from Python"; homepage = "https://github.com/al45tair/netifaces"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index e86e0c625573e..9ca4600148222 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.8.1"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-09SRSzA1RiBhJjq+dlln23myWvXFhr8krsPz7N80JKw="; + hash = "sha256-hB5ySup7vd01VPyRuNT5d3FufuMvbHF8x5ULOzR1TWY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 27a851e355102..30197c1683390 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "lukapecnik"; + owner = "firefly-cpp"; repo = "NiaAML"; rev = "refs/tags/${version}"; hash = "sha256-VMZLEirE01Q9eyQIhV18PepGWmBcxLIwNeuVf7EuSWE="; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python automated machine learning framework"; - homepage = "https://github.com/lukapecnik/NiaAML"; - changelog = "https://github.com/lukapecnik/NiaAML/releases/tag/${version}"; + homepage = "https://github.com/firefly-cpp/NiaAML"; + changelog = "https://github.com/firefly-cpp/NiaAML/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index b9ba6558b78dc..3240ea92711f8 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "lukapecnik"; + owner = "firefly-cpp"; repo = "NiaClass"; rev = "refs/tags/${version}"; hash = "sha256-C3EF18lzheE+dXHJA6WJNFECAH4HfPiCDo7QxtHvOLI="; @@ -51,8 +51,8 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for solving classification tasks using Nature-inspired algorithms"; - homepage = "https://github.com/lukapecnik/NiaClass"; - changelog = "https://github.com/lukapecnik/NiaClass/releases/tag/${version}"; + homepage = "https://github.com/firefly-cpp/NiaClass"; + changelog = "https://github.com/firefly-cpp/NiaClass/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix index 6a97617838382..84b83900d40a0 100644 --- a/pkgs/development/python-modules/nianet/default.nix +++ b/pkgs/development/python-modules/nianet/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - matplotlib, niapy, numpy, poetry-core, diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 79b7833c9efcb..c08da4abe5170 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -1,6 +1,5 @@ { lib, - aiohttp, aresponses, async-modbus, async-timeout, @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.10.1"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-rm0SV48vo68aiiFcvuSSGwCvQEsagIMh2EQXXmUU5dc="; + hash = "sha256-Sqwwk++iA/PsAKZRkUPjXuzgSrhnH4N02c072pIVEyw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 5ac5192eeb19d..da8452a437ed7 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -34,7 +34,6 @@ which, bash, glibcLocales, - callPackage, # causes Python packaging conflict with any package requiring rdflib, # so use the unpatched rdflib by default (disables Nipype provenance tracking); # see https://github.com/nipy/nipype/issues/2888: diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index e9a1ac4c3a18e..6cc35b662c000 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { hash = "sha256-4Ie8fuk9CKdn/64TsCfN2No2dU16ICpBRWYerqqF0/0="; }; - # Upstream wants to build against the oldest version of numpy possible, but - # we only want to build against the most recent version. + # Upstream wants to build against the newest version of numpy possible, but + # we only want to build against our default numpy. postPatch = '' substituteInPlace pyproject.toml \ - --replace "numpy==" "numpy>=" + --replace-fail "numpy>=2.0.0rc1,<3" "numpy" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix index a0b65797ff43e..5c4b270d2e7af 100644 --- a/pkgs/development/python-modules/nix-kernel/default.nix +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Simple jupyter kernel for nix-repl"; homepage = "https://github.com/GTrunSec/nix-kernel"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 2c71a15a021e8..8b4b88fbc15d0 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { mainProgram = "nltk"; homepage = "http://nltk.org/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix index 8f2ade7951a59..0a518c29013c0 100644 --- a/pkgs/development/python-modules/nmapthon2/default.nix +++ b/pkgs/development/python-modules/nmapthon2/default.nix @@ -1,6 +1,5 @@ { lib, - appdirs, buildPythonPackage, fetchFromGitHub, pytestCheckHook, diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 90815a55efb6e..72ca86fc28c1a 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Port of node-semver"; homepage = "https://github.com/podhmo/python-semver"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 6ee3b9033f3dd..45c8ed59fabdc 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/ekalinin/nodeenv"; changelog = "https://github.com/ekalinin/nodeenv/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix new file mode 100644 index 0000000000000..77a28354203ad --- /dev/null +++ b/pkgs/development/python-modules/nodriver/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + deprecated, + mss, + websockets, + setuptools, +}: + +buildPythonPackage { + pname = "nodriver"; + version = "0.34"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ultrafunkamsterdam"; + repo = "nodriver"; + rev = "082815916900450485bd14cf1c7a83593e51825d"; + hash = "sha256-MaOCC7yVLDqkpk8YiTov9WZKlYhME2CXHIrllmU0yLg="; + }; + + disabled = pythonOlder "3.9"; + + dependencies = [ + deprecated + mss + websockets + ]; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "nodriver" ]; + # no tests in upstream + doCheck = false; + + meta = { + homepage = "https://github.com/ultrafunkamsterdam/nodriver"; + license = lib.licenses.agpl3Only; + description = "Web automation framework which can bypass bot detection"; + longDescription = '' + Successor of Undetected-Chromedriver. Providing a blazing fast framework for web + automation, webscraping, bots and any other creative ideas which are normally + hindered by annoying anti bot systems like Captcha / CloudFlare / Imperva / hCaptcha + ''; + maintainers = with lib.maintainers; [ + liammurphy14 + toasteruwu + ]; + }; +} + diff --git a/pkgs/development/python-modules/noiseprotocol/default.nix b/pkgs/development/python-modules/noiseprotocol/default.nix index 8192e2dd4f30d..7e42d2eb2515a 100644 --- a/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/pkgs/development/python-modules/noiseprotocol/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/plizonczyk/noiseprotocol/"; changelog = "https://github.com/plizonczyk/noiseprotocol/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index 966e399b24780..9777c60b67232 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -39,10 +39,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "normality" ]; - meta = with lib; { + meta = { description = "Micro-library to normalize text strings"; homepage = "https://github.com/pudo/normality"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix deleted file mode 100644 index 62fc26fe7b7a8..0000000000000 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, -}: - -buildPythonPackage rec { - pname = "nose-pattern-exclude"; - version = "0.1.3"; - format = "setuptools"; - - propagatedBuildInputs = [ nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "0apzxx8lavsdlxlpaxqw1snx5p7q8v5dfbip6v32f9pj2vyain1i"; - }; - - # There are no tests - doCheck = false; - - meta = with lib; { - description = "Exclude specific files and directories from nosetests runs"; - homepage = "https://github.com/jakubroztocil/nose-pattern-exclude"; - license = licenses.bsd3; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix deleted file mode 100644 index a002e6bfb1dac..0000000000000 --- a/pkgs/development/python-modules/nose-timer/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nose, - mock, - parameterized, - termcolor, -}: - -buildPythonPackage rec { - pname = "nose-timer"; - version = "1.0.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "mahmoudimus"; - repo = pname; - rev = "v${version}"; - sha256 = "0xsai2l5i1av62y9y0q63wy2zk27klmf2jizgghhxg2y8nfa8x3x"; - }; - - propagatedBuildInputs = [ nose ]; - - nativeCheckInputs = [ - mock - nose - parameterized - termcolor - ]; - - checkPhase = '' - runHook preCheck - nosetests --verbosity 2 tests - runHook postCheck - ''; - - pythonImportsCheck = [ "nosetimer" ]; - - meta = with lib; { - description = "Timer plugin for nosetests"; - homepage = "https://github.com/mahmoudimus/nose-timer"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/development/python-modules/nose-warnings-filters/default.nix b/pkgs/development/python-modules/nose-warnings-filters/default.nix deleted file mode 100644 index 39ad8c46f723a..0000000000000 --- a/pkgs/development/python-modules/nose-warnings-filters/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - nose, -}: - -buildPythonPackage rec { - pname = "nose-warnings-filters"; - version = "0.1.5"; - format = "setuptools"; - - src = fetchPypi { - pname = "nose_warnings_filters"; - inherit version; - sha256 = "17dvfqfy2fm7a5cmiffw2dc3064kpx72fn5mlw01skm2rhn5nv25"; - }; - - disabled = !isPy3k; - - propagatedBuildInputs = [ nose ]; - - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests -v - ''; - - meta = { - description = "Allow injecting warning filters during nosetest"; - homepage = "https://github.com/Carreau/nose_warnings_filters"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/nose-xunitmp/default.nix b/pkgs/development/python-modules/nose-xunitmp/default.nix deleted file mode 100644 index 18c235dfaade0..0000000000000 --- a/pkgs/development/python-modules/nose-xunitmp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - wheel, - nose, -}: - -buildPythonPackage rec { - pname = "nose-xunitmp"; - version = "0.4.1"; - pyproject = true; - - src = fetchPypi { - pname = "nose_xunitmp"; - inherit version; - hash = "sha256-wt9y9HYHUdMBU9Rzgiqr8afD1GL2ZKp/f9uNxibcfEA="; - }; - - build-system = [ - setuptools - wheel - ]; - - dependencies = [ nose ]; - - pythonImportsCheck = [ "nose_xunitmp" ]; - - meta = { - description = "Xunit output when running multiprocess tests using nose"; - homepage = "https://pypi.org/project/nose_xunitmp/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ GaetanLepage ]; - }; -} diff --git a/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch b/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch new file mode 100644 index 0000000000000..67a671a8ae5f7 --- /dev/null +++ b/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch @@ -0,0 +1,576 @@ +diff --git a/LICENSE.cpython b/LICENSE.cpython +new file mode 100644 +index 0000000..14603b9 +--- /dev/null ++++ b/LICENSE.cpython +@@ -0,0 +1,277 @@ ++A. HISTORY OF THE SOFTWARE ++========================== ++ ++Python was created in the early 1990s by Guido van Rossum at Stichting ++Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands ++as a successor of a language called ABC. Guido remains Python's ++principal author, although it includes many contributions from others. ++ ++In 1995, Guido continued his work on Python at the Corporation for ++National Research Initiatives (CNRI, see https://www.cnri.reston.va.us) ++in Reston, Virginia where he released several versions of the ++software. ++ ++In May 2000, Guido and the Python core development team moved to ++BeOpen.com to form the BeOpen PythonLabs team. In October of the same ++year, the PythonLabs team moved to Digital Creations, which became ++Zope Corporation. In 2001, the Python Software Foundation (PSF, see ++https://www.python.org/psf/) was formed, a non-profit organization ++created specifically to own Python-related Intellectual Property. ++Zope Corporation was a sponsoring member of the PSF. ++ ++All Python releases are Open Source (see https://opensource.org for ++the Open Source Definition). Historically, most, but not all, Python ++releases have also been GPL-compatible; the table below summarizes ++the various releases. ++ ++ Release Derived Year Owner GPL- ++ from compatible? (1) ++ ++ 0.9.0 thru 1.2 1991-1995 CWI yes ++ 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes ++ 1.6 1.5.2 2000 CNRI no ++ 2.0 1.6 2000 BeOpen.com no ++ 1.6.1 1.6 2001 CNRI yes (2) ++ 2.1 2.0+1.6.1 2001 PSF no ++ 2.0.1 2.0+1.6.1 2001 PSF yes ++ 2.1.1 2.1+2.0.1 2001 PSF yes ++ 2.1.2 2.1.1 2002 PSF yes ++ 2.1.3 2.1.2 2002 PSF yes ++ 2.2 and above 2.1.1 2001-now PSF yes ++ ++Footnotes: ++ ++(1) GPL-compatible doesn't mean that we're distributing Python under ++ the GPL. All Python licenses, unlike the GPL, let you distribute ++ a modified version without making your changes open source. The ++ GPL-compatible licenses make it possible to combine Python with ++ other software that is released under the GPL; the others don't. ++ ++(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, ++ because its license has a choice of law clause. According to ++ CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 ++ is "not incompatible" with the GPL. ++ ++Thanks to the many outside volunteers who have worked under Guido's ++direction to make these releases possible. ++ ++ ++B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON ++=============================================================== ++ ++Python software and documentation are licensed under the ++Python Software Foundation License Version 2. ++ ++Starting with Python 3.8.6, examples, recipes, and other code in ++the documentation are dual licensed under the PSF License Version 2 ++and the Zero-Clause BSD license. ++ ++Some software incorporated into Python is under different licenses. ++The licenses are listed with code falling under that license. ++ ++ ++PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 ++-------------------------------------------- ++ ++1. This LICENSE AGREEMENT is between the Python Software Foundation ++("PSF"), and the Individual or Organization ("Licensee") accessing and ++otherwise using this software ("Python") in source or binary form and ++its associated documentation. ++ ++2. Subject to the terms and conditions of this License Agreement, PSF hereby ++grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, ++analyze, test, perform and/or display publicly, prepare derivative works, ++distribute, and otherwise use Python alone or in any derivative version, ++provided, however, that PSF's License Agreement and PSF's notice of copyright, ++i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved" ++are retained in Python alone or in any derivative version prepared by Licensee. ++ ++3. In the event Licensee prepares a derivative work that is based on ++or incorporates Python or any part thereof, and wants to make ++the derivative work available to others as provided herein, then ++Licensee hereby agrees to include in any such work a brief summary of ++the changes made to Python. ++ ++4. PSF is making Python available to Licensee on an "AS IS" ++basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR ++IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND ++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS ++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT ++INFRINGE ANY THIRD PARTY RIGHTS. ++ ++5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON ++FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS ++A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, ++OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. ++ ++6. This License Agreement will automatically terminate upon a material ++breach of its terms and conditions. ++ ++7. Nothing in this License Agreement shall be deemed to create any ++relationship of agency, partnership, or joint venture between PSF and ++Licensee. This License Agreement does not grant permission to use PSF ++trademarks or trade name in a trademark sense to endorse or promote ++products or services of Licensee, or any third party. ++ ++8. By copying, installing or otherwise using Python, Licensee ++agrees to be bound by the terms and conditions of this License ++Agreement. ++ ++ ++BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 ++------------------------------------------- ++ ++BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 ++ ++1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an ++office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the ++Individual or Organization ("Licensee") accessing and otherwise using ++this software in source or binary form and its associated ++documentation ("the Software"). ++ ++2. Subject to the terms and conditions of this BeOpen Python License ++Agreement, BeOpen hereby grants Licensee a non-exclusive, ++royalty-free, world-wide license to reproduce, analyze, test, perform ++and/or display publicly, prepare derivative works, distribute, and ++otherwise use the Software alone or in any derivative version, ++provided, however, that the BeOpen Python License is retained in the ++Software, alone or in any derivative version prepared by Licensee. ++ ++3. BeOpen is making the Software available to Licensee on an "AS IS" ++basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR ++IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND ++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS ++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT ++INFRINGE ANY THIRD PARTY RIGHTS. ++ ++4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE ++SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS ++AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY ++DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. ++ ++5. This License Agreement will automatically terminate upon a material ++breach of its terms and conditions. ++ ++6. This License Agreement shall be governed by and interpreted in all ++respects by the law of the State of California, excluding conflict of ++law provisions. Nothing in this License Agreement shall be deemed to ++create any relationship of agency, partnership, or joint venture ++between BeOpen and Licensee. This License Agreement does not grant ++permission to use BeOpen trademarks or trade names in a trademark ++sense to endorse or promote products or services of Licensee, or any ++third party. As an exception, the "BeOpen Python" logos available at ++http://www.pythonlabs.com/logos.html may be used according to the ++permissions granted on that web page. ++ ++7. By copying, installing or otherwise using the software, Licensee ++agrees to be bound by the terms and conditions of this License ++Agreement. ++ ++ ++CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ++--------------------------------------- ++ ++1. This LICENSE AGREEMENT is between the Corporation for National ++Research Initiatives, having an office at 1895 Preston White Drive, ++Reston, VA 20191 ("CNRI"), and the Individual or Organization ++("Licensee") accessing and otherwise using Python 1.6.1 software in ++source or binary form and its associated documentation. ++ ++2. Subject to the terms and conditions of this License Agreement, CNRI ++hereby grants Licensee a nonexclusive, royalty-free, world-wide ++license to reproduce, analyze, test, perform and/or display publicly, ++prepare derivative works, distribute, and otherwise use Python 1.6.1 ++alone or in any derivative version, provided, however, that CNRI's ++License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) ++1995-2001 Corporation for National Research Initiatives; All Rights ++Reserved" are retained in Python 1.6.1 alone or in any derivative ++version prepared by Licensee. Alternately, in lieu of CNRI's License ++Agreement, Licensee may substitute the following text (omitting the ++quotes): "Python 1.6.1 is made available subject to the terms and ++conditions in CNRI's License Agreement. This Agreement together with ++Python 1.6.1 may be located on the internet using the following ++unique, persistent identifier (known as a handle): 1895.22/1013. This ++Agreement may also be obtained from a proxy server on the internet ++using the following URL: http://hdl.handle.net/1895.22/1013". ++ ++3. In the event Licensee prepares a derivative work that is based on ++or incorporates Python 1.6.1 or any part thereof, and wants to make ++the derivative work available to others as provided herein, then ++Licensee hereby agrees to include in any such work a brief summary of ++the changes made to Python 1.6.1. ++ ++4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" ++basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR ++IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND ++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS ++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT ++INFRINGE ANY THIRD PARTY RIGHTS. ++ ++5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON ++1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS ++A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, ++OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. ++ ++6. This License Agreement will automatically terminate upon a material ++breach of its terms and conditions. ++ ++7. This License Agreement shall be governed by the federal ++intellectual property law of the United States, including without ++limitation the federal copyright law, and, to the extent such ++U.S. federal law does not apply, by the law of the Commonwealth of ++Virginia, excluding Virginia's conflict of law provisions. ++Notwithstanding the foregoing, with regard to derivative works based ++on Python 1.6.1 that incorporate non-separable material that was ++previously distributed under the GNU General Public License (GPL), the ++law of the Commonwealth of Virginia shall govern this License ++Agreement only as to issues arising under or with respect to ++Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this ++License Agreement shall be deemed to create any relationship of ++agency, partnership, or joint venture between CNRI and Licensee. This ++License Agreement does not grant permission to use CNRI trademarks or ++trade name in a trademark sense to endorse or promote products or ++services of Licensee, or any third party. ++ ++8. By clicking on the "ACCEPT" button where indicated, or by copying, ++installing or otherwise using Python 1.6.1, Licensee agrees to be ++bound by the terms and conditions of this License Agreement. ++ ++ ACCEPT ++ ++ ++CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 ++-------------------------------------------------- ++ ++Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, ++The Netherlands. All rights reserved. ++ ++Permission to use, copy, modify, and distribute this software and its ++documentation for any purpose and without fee is hereby granted, ++provided that the above copyright notice appear in all copies and that ++both that copyright notice and this permission notice appear in ++supporting documentation, and that the name of Stichting Mathematisch ++Centrum or CWI not be used in advertising or publicity pertaining to ++distribution of the software without specific, written prior ++permission. ++ ++STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO ++THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND ++FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE ++FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT ++OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ++ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION ++---------------------------------------------------------------------- ++ ++Permission to use, copy, modify, and/or distribute this software for any ++purpose with or without fee is hereby granted. ++ ++THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH ++REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, ++INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM ++LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR ++OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++PERFORMANCE OF THIS SOFTWARE. +diff --git a/nose/importer.py b/nose/importer.py +index e677658..77099eb 100644 +--- a/nose/importer.py ++++ b/nose/importer.py +@@ -7,9 +7,10 @@ the builtin importer. + import logging + import os + import sys ++import tokenize + from nose.config import Config +- +-from imp import find_module, load_module, acquire_lock, release_lock ++from importlib import _imp ++from importlib import machinery + + log = logging.getLogger(__name__) + +@@ -20,6 +21,244 @@ except AttributeError: + return (os.path.normcase(os.path.realpath(src)) == + os.path.normcase(os.path.realpath(dst))) + ++################################################################################ ++# BEGIN IMPORTLIB SHIMS ++################################################################################ ++ ++# Adapted from the CPython 3.11 imp.py code. ++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation; All Rights Reserved ++# Originally licensed under the PSLv2 (see LICENSE.cpython) and incorporated under the LGPL 2.1 (see lgpl.txt). ++ ++try: ++ from _imp import create_dynamic ++except ImportError: ++ # Platform doesn't support dynamic loading. ++ create_dynamic = None ++ ++from importlib._bootstrap import _ERR_MSG, _exec, _load, _builtin_from_name ++from importlib._bootstrap_external import SourcelessFileLoader ++ ++from importlib import machinery ++from importlib import util ++import importlib ++import os ++import sys ++import tokenize ++import types ++ ++ ++SEARCH_ERROR = 0 ++PY_SOURCE = 1 ++PY_COMPILED = 2 ++C_EXTENSION = 3 ++PY_RESOURCE = 4 ++PKG_DIRECTORY = 5 ++C_BUILTIN = 6 ++PY_FROZEN = 7 ++PY_CODERESOURCE = 8 ++IMP_HOOK = 9 ++ ++ ++def get_suffixes(): ++ extensions = [(s, 'rb', C_EXTENSION) for s in machinery.EXTENSION_SUFFIXES] ++ source = [(s, 'r', PY_SOURCE) for s in machinery.SOURCE_SUFFIXES] ++ bytecode = [(s, 'rb', PY_COMPILED) for s in machinery.BYTECODE_SUFFIXES] ++ ++ return extensions + source + bytecode ++ ++ ++class _HackedGetData: ++ ++ """Compatibility support for 'file' arguments of various load_*() ++ functions.""" ++ ++ def __init__(self, fullname, path, file=None): ++ super().__init__(fullname, path) ++ self.file = file ++ ++ def get_data(self, path): ++ """Gross hack to contort loader to deal w/ load_*()'s bad API.""" ++ if self.file and path == self.path: ++ # The contract of get_data() requires us to return bytes. Reopen the ++ # file in binary mode if needed. ++ if not self.file.closed: ++ file = self.file ++ if 'b' not in file.mode: ++ file.close() ++ if self.file.closed: ++ self.file = file = open(self.path, 'rb') ++ ++ with file: ++ return file.read() ++ else: ++ return super().get_data(path) ++ ++ ++class _LoadSourceCompatibility(_HackedGetData, machinery.SourceFileLoader): ++ ++ """Compatibility support for implementing load_source().""" ++ ++ ++def load_source(name, pathname, file=None): ++ loader = _LoadSourceCompatibility(name, pathname, file) ++ spec = util.spec_from_file_location(name, pathname, loader=loader) ++ if name in sys.modules: ++ module = _exec(spec, sys.modules[name]) ++ else: ++ module = _load(spec) ++ # To allow reloading to potentially work, use a non-hacked loader which ++ # won't rely on a now-closed file object. ++ module.__loader__ = machinery.SourceFileLoader(name, pathname) ++ module.__spec__.loader = module.__loader__ ++ return module ++ ++ ++class _LoadCompiledCompatibility(_HackedGetData, SourcelessFileLoader): ++ ++ """Compatibility support for implementing load_compiled().""" ++ ++ ++def load_compiled(name, pathname, file=None): ++ loader = _LoadCompiledCompatibility(name, pathname, file) ++ spec = util.spec_from_file_location(name, pathname, loader=loader) ++ if name in sys.modules: ++ module = _exec(spec, sys.modules[name]) ++ else: ++ module = _load(spec) ++ # To allow reloading to potentially work, use a non-hacked loader which ++ # won't rely on a now-closed file object. ++ module.__loader__ = SourcelessFileLoader(name, pathname) ++ module.__spec__.loader = module.__loader__ ++ return module ++ ++ ++def load_package(name, path): ++ if os.path.isdir(path): ++ extensions = (machinery.SOURCE_SUFFIXES[:] + ++ machinery.BYTECODE_SUFFIXES[:]) ++ for extension in extensions: ++ init_path = os.path.join(path, '__init__' + extension) ++ if os.path.exists(init_path): ++ path = init_path ++ break ++ else: ++ raise ValueError('{!r} is not a package'.format(path)) ++ spec = util.spec_from_file_location(name, path, ++ submodule_search_locations=[]) ++ if name in sys.modules: ++ return _exec(spec, sys.modules[name]) ++ else: ++ return _load(spec) ++ ++ ++def load_module(name, file, filename, details): ++ """ ++ ++ Load a module, given information returned by find_module(). ++ ++ The module name must include the full package name, if any. ++ ++ """ ++ suffix, mode, type_ = details ++ if mode and (not mode.startswith('r') or '+' in mode): ++ raise ValueError('invalid file open mode {!r}'.format(mode)) ++ elif file is None and type_ in {PY_SOURCE, PY_COMPILED}: ++ msg = 'file object required for import (type code {})'.format(type_) ++ raise ValueError(msg) ++ elif type_ == PY_SOURCE: ++ return load_source(name, filename, file) ++ elif type_ == PY_COMPILED: ++ return load_compiled(name, filename, file) ++ elif type_ == PKG_DIRECTORY: ++ return load_package(name, filename) ++ elif type_ == C_BUILTIN: ++ return init_builtin(name) ++ elif type_ == PY_FROZEN: ++ return _imp.init_frozen(name) ++ else: ++ msg = "Don't know how to import {} (type code {})".format(name, type_) ++ raise ImportError(msg, name=name) ++ ++ ++def find_module(name, path=None): ++ """ ++ ++ Search for a module. ++ ++ If path is omitted or None, search for a built-in, frozen or special ++ module and continue search in sys.path. The module name cannot ++ contain '.'; to search for a submodule of a package, pass the ++ submodule name and the package's __path__. ++ ++ """ ++ if not isinstance(name, str): ++ raise TypeError("'name' must be a str, not {}".format(type(name))) ++ elif not isinstance(path, (type(None), list)): ++ # Backwards-compatibility ++ raise RuntimeError("'path' must be None or a list, " ++ "not {}".format(type(path))) ++ ++ if path is None: ++ if _imp.is_builtin(name): ++ return None, None, ('', '', C_BUILTIN) ++ elif _imp.is_frozen(name): ++ return None, None, ('', '', PY_FROZEN) ++ else: ++ path = sys.path ++ ++ for entry in path: ++ package_directory = os.path.join(entry, name) ++ for suffix in ['.py', machinery.BYTECODE_SUFFIXES[0]]: ++ package_file_name = '__init__' + suffix ++ file_path = os.path.join(package_directory, package_file_name) ++ if os.path.isfile(file_path): ++ return None, package_directory, ('', '', PKG_DIRECTORY) ++ for suffix, mode, type_ in get_suffixes(): ++ file_name = name + suffix ++ file_path = os.path.join(entry, file_name) ++ if os.path.isfile(file_path): ++ break ++ else: ++ continue ++ break # Break out of outer loop when breaking out of inner loop. ++ else: ++ raise ImportError(_ERR_MSG.format(name), name=name) ++ ++ encoding = None ++ if 'b' not in mode: ++ with open(file_path, 'rb') as file: ++ encoding = tokenize.detect_encoding(file.readline)[0] ++ file = open(file_path, mode, encoding=encoding) ++ return file, file_path, (suffix, mode, type_) ++ ++ ++def reload(module): ++ """ ++ ++ Reload the module and return it. ++ ++ The module must have been successfully imported before. ++ ++ """ ++ return importlib.reload(module) ++ ++ ++def init_builtin(name): ++ """ ++ ++ Load and return a built-in module by name, or None is such module doesn't ++ exist ++ """ ++ try: ++ return _builtin_from_name(name) ++ except ImportError: ++ return None ++ ++ ++################################################################################ ++# END IMPORTLIB SHIMS ++################################################################################ ++ + + class Importer(object): + """An importer class that does only path-specific imports. That +@@ -73,7 +312,7 @@ class Importer(object): + else: + part_fqname = "%s.%s" % (part_fqname, part) + try: +- acquire_lock() ++ _imp.acquire_lock() + log.debug("find module part %s (%s) in %s", + part, part_fqname, path) + fh, filename, desc = find_module(part, path) +@@ -95,7 +334,7 @@ class Importer(object): + finally: + if fh: + fh.close() +- release_lock() ++ _imp.release_lock() + if parent: + setattr(parent, part, mod) + if hasattr(mod, '__path__'): +diff --git a/nose/result.py b/nose/result.py +index f974a14..228a42c 100644 +--- a/nose/result.py ++++ b/nose/result.py +@@ -13,7 +13,7 @@ try: + # 2.7+ + from unittest.runner import _TextTestResult + except ImportError: +- from unittest import _TextTestResult ++ from unittest import TextTestResult as _TextTestResult + from nose.config import Config + from nose.util import isclass, ln as _ln # backwards compat + diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index f864cfb9125f3..308039cc61d7e 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -5,24 +5,25 @@ isPy3k, isPyPy, python, - pythonAtLeast, + python312, coverage, + setuptools, }: buildPythonPackage rec { version = "1.3.7"; - format = "setuptools"; pname = "nose"; - - # unmaintained, relies on the imp module - disabled = pythonAtLeast "3.12"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; }; - # 2to3 was removed in setuptools 58 + build-system = [ setuptools ]; + + patches = lib.optional isPy3k [ ./0001-nose-python-3.12-fixes.patch ]; + postPatch = '' substituteInPlace setup.py \ --replace "'use_2to3': True," "" @@ -31,8 +32,9 @@ buildPythonPackage rec { --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" ''; - preBuild = lib.optionalString (isPy3k) '' - ${python.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests + # 2to3 is removed from Python 3.13, so always use Python 3.12 2to3 for now. + preBuild = lib.optionalString isPy3k '' + ${python312.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; @@ -56,6 +58,6 @@ buildPythonPackage rec { mainProgram = "nosetests"; homepage = "https://nose.readthedocs.io/"; license = licenses.lgpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 95a564c14c58d..b2a65a5648ef3 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "nose2"; homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nose2pytest/default.nix b/pkgs/development/python-modules/nose2pytest/default.nix new file mode 100644 index 0000000000000..a1aaa748db0be --- /dev/null +++ b/pkgs/development/python-modules/nose2pytest/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch2, + setuptools, + fissix, + pytestCheckHook, + nose, +}: + +let + version = "1.0.12"; +in + +buildPythonPackage { + pname = "nose2pytest"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "nose2pytest"; + rev = "v${version}"; + hash = "sha256-BYyj2ZOZvWBpmzQACpmxAzCdQhlZlDYt+HLMdft+wYY="; + }; + + patches = [ + # Drop Python 3.6 and 3.7 support + # + # Relaxes the runtime check for Python < 3.12. + (fetchpatch2 { + url = "https://github.com/pytest-dev/nose2pytest/commit/75ff506aaf11b5e20672441730657ee7540387e1.patch?full_index=1"; + hash = "sha256-BpazrsB4b1oMBx9OemdVxhj/Jqbc8RKv2GC6gqkdGK8="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ fissix ]; + + nativeCheckInputs = [ + pytestCheckHook + nose + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "nose2pytest.assert_tools" ]; + + meta = { + description = "Scripts to convert Python Nose tests to PyTest"; + homepage = "https://github.com/pytest-dev/nose2pytest"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.emily ]; + mainProgram = "nose2pytest"; + }; +} diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix deleted file mode 100644 index df0fde3fc4a35..0000000000000 --- a/pkgs/development/python-modules/nose3/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - coverage, - fetchPypi, - isPyPy, - isPy311, - python, - pythonAtLeast, - stdenv, -}: - -buildPythonPackage rec { - pname = "nose3"; - version = "1.3.8"; - format = "setuptools"; - - # https://github.com/jayvdb/nose3/issues/5 - disabled = pythonAtLeast "3.12"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y="; - }; - - propagatedBuildInputs = [ coverage ]; - - # PyPy hangs for unknwon reason - # Darwin and python 3.11 fail at various assertions and I didn't find an easy way to find skip those tests - doCheck = !isPyPy && !stdenv.isDarwin && !isPy311; - - checkPhase = '' - ${python.pythonOnBuildForHost.interpreter} selftest.py - ''; - - meta = with lib; { - description = "Fork of nose v1 not using lib2to3 for compatibility with Python 3"; - homepage = "https://github.com/jayvdb/nose3"; - license = licenses.lgpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 11c17bd7516f7..b61ef87c8873e 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/jupyter/notebook_shim"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 8d9095bc3c111..7718611df06cc 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, pythonOlder, diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index eb5f017e0e3da..47f23ed99fed2 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -31,6 +31,6 @@ buildPythonPackage { description = "Python wrapper around notmuch"; homepage = "https://notmuchmail.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/notmuch2/default.nix b/pkgs/development/python-modules/notmuch2/default.nix index 14eb6e67d09f6..e2bba858580e3 100644 --- a/pkgs/development/python-modules/notmuch2/default.nix +++ b/pkgs/development/python-modules/notmuch2/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, notmuch, diff --git a/pkgs/development/python-modules/nototools/default.nix b/pkgs/development/python-modules/nototools/default.nix index ea555a5e0977d..8dc075e2b47c6 100644 --- a/pkgs/development/python-modules/nototools/default.nix +++ b/pkgs/development/python-modules/nototools/default.nix @@ -102,6 +102,6 @@ buildPythonPackage rec { description = "Noto fonts support tools and scripts plus web site generation"; homepage = "https://github.com/googlefonts/nototools"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index afe74c20e94e4..bd52934394bda 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "packaging" + "psutil" "python-gnupg" ]; diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 478a401501806..722570a25870d 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/networktocode/ntc-templates"; changelog = "https://github.com/networktocode/ntc-templates/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nuclear/default.nix b/pkgs/development/python-modules/nuclear/default.nix new file mode 100644 index 0000000000000..5daade948aa86 --- /dev/null +++ b/pkgs/development/python-modules/nuclear/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + colorama, + mock, + pyyaml, + pydantic, + backoff, + setuptools, +}: + +buildPythonPackage rec { + pname = "nuclear"; + version = "2.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "igrek51"; + repo = "nuclear"; + rev = version; + hash = "sha256-UeU803SYMBLSWXjuxtWP2R2dBumRom+qsj2ljTiYFm0="; + }; + + build-system = [ setuptools ]; + dependencies = [ + colorama + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + pydantic + backoff + ]; + disabledTestPaths = [ + # Disabled because test tries to install bash in a non-NixOS way + "tests/autocomplete/test_bash_install.py" + ]; + pythonImportsCheck = [ "nuclear" ]; + + meta = with lib; { + homepage = "https://igrek51.github.io/nuclear/"; + description = "Binding glue for CLI Python applications"; + license = licenses.mit; + maintainers = with maintainers; [ parras ]; + }; +} diff --git a/pkgs/development/python-modules/nuitka/darwin-lto.patch b/pkgs/development/python-modules/nuitka/darwin-lto.patch deleted file mode 100644 index bd3a659054980..0000000000000 --- a/pkgs/development/python-modules/nuitka/darwin-lto.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/nuitka/build/SconsCompilerSettings.py b/nuitka/build/SconsCompilerSettings.py -index 319b72c4e..89d40f2a2 100644 ---- a/nuitka/build/SconsCompilerSettings.py -+++ b/nuitka/build/SconsCompilerSettings.py -@@ -173,8 +173,8 @@ def _enableLtoSettings( - lto_mode = False - reason = "known to be not supported (CondaCC)" - elif isMacOS() and env.gcc_mode and env.clang_mode: -- lto_mode = True -- reason = "known to be supported (macOS clang)" -+ lto_mode = False -+ reason = "known to not be supported (macOS nix clang)" - elif env.mingw_mode and env.clang_mode: - lto_mode = False - reason = "known to not be supported (new MinGW64 Clang)" diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index e4613db87f7f6..cce4467e73e5c 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, isPyPy, ordered-set, - python3, + python, setuptools, zstandard, wheel, @@ -23,9 +23,6 @@ buildPythonPackage rec { hash = "sha256-nKdCMgA92v9VsSgfktXDbSh3DyKsGlcTjpn0Y7u4rxU="; }; - # default lto off for darwin - patches = [ ./darwin-lto.patch ]; - build-system = [ setuptools wheel @@ -40,7 +37,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - ${python3.interpreter} tests/basics/run_all.py search + ${python.interpreter} tests/basics/run_all.py search runHook postCheck ''; diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 8e122271c4789..cde2beff63bd9 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { mainProgram = "num2words"; homepage = "https://github.com/savoirfairelinux/num2words"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; longDescription = "num2words is a library that converts numbers like 42 to words like forty-two. It supports multiple languages (see the list below for full list of languages) and can even generate ordinal numbers like forty-second"; }; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 4c79076be77ff..27b34f6a3b26b 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,7 +14,6 @@ importlib-metadata, substituteAll, runCommand, - symlinkJoin, writers, numba, diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix index dc2831a524725..29dee4bbbaa4b 100644 --- a/pkgs/development/python-modules/numdifftools/default.nix +++ b/pkgs/development/python-modules/numdifftools/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, numpy, - pytestCheckHook, pythonOlder, scipy, }: diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 0368e3217968c..f54dcb03b526b 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Fast numerical array expression evaluator for NumPy"; homepage = "https://github.com/pydata/numexpr"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/numpy-groupies/default.nix b/pkgs/development/python-modules/numpy-groupies/default.nix new file mode 100644 index 0000000000000..e09ce3abb7ba6 --- /dev/null +++ b/pkgs/development/python-modules/numpy-groupies/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + numpy, + numba, + pandas, + gitUpdater, +}: + +buildPythonPackage rec { + pname = "numpy-groupies"; + version = "0.11.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ml31415"; + repo = "numpy-groupies"; + rev = "refs/tags/v${version}"; + hash = "sha256-Eu+5SR28jIasKe1p7rvbq2yo3PGZRQWWdG3A5vGhnyM="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + numba + pandas + ]; + + pythonImportsCheck = [ "numpy_groupies" ]; + + passthru.updateScript = gitUpdater { tagPrefix = "v"; }; + + meta = with lib; { + homepage = "https://github.com/ml31415/numpy-groupies"; + changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/v${version}"; + description = "Optimised tools for group-indexing operations: aggregated sum and more"; + license = licenses.bsd2; + maintainers = [ maintainers.berquist ]; + }; +} diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 100adcfc424f7..fd1911a818756 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Library to make reading, writing and modifying both binary and ascii STL files easy"; homepage = "https://github.com/WoLpH/numpy-stl/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index b26e61b945ce3..dd5aca045f434 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -3,12 +3,18 @@ buildPythonPackage, pythonOlder, fetchPypi, + + # build-system setuptools, + + # dependencies jax, jaxlib, multipledispatch, numpy, tqdm, + + # checks funsor, pytestCheckHook, # TODO: uncomment when tensorflow-probability gets fixed. @@ -17,14 +23,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.15.0"; + version = "0.15.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-4WyfR8wx4qollYSgtslEMSCB0zypJAYCJjKtWEsOYA0="; + hash = "sha256-6G3TrDyQ5N2uuzLzzEus1czCtvg3M0wBorLo2vQZozE="; }; build-system = [ setuptools ]; @@ -69,11 +75,11 @@ buildPythonPackage rec { # TODO: remove when tensorflow-probability gets fixed. disabledTestPaths = [ "test/test_distributions.py" ]; - meta = with lib; { + meta = { description = "Library for probabilistic programming with NumPy"; homepage = "https://num.pyro.ai/"; changelog = "https://github.com/pyro-ppl/numpyro/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix new file mode 100644 index 0000000000000..3acda2fe55f13 --- /dev/null +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + libiconv, + numpy, + unittestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "nutils-poly"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nutils"; + repo = "poly-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-dxFv4Az3uz6Du5dk5KZJ+unVbt3aZjxXliAQZhmBWDM="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + hash = "sha256-+fnKvlSwM197rsyusFH7rs1W6livxel45UGbi1sB05k="; + }; + + nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + build-system = [ rustPlatform.maturinBuildHook ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "nutils_poly" ]; + + meta = { + description = "Low-level functions for evaluating and manipulating polynomials"; + homepage = "https://github.com/nutils/poly-py"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 86185683c4ce7..4495a40118bee 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -1,13 +1,15 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - numpy, - treelog, - stringly, flit-core, + appdirs, bottombar, + numpy, + nutils-poly, + psutil, + stringly, + treelog, pytestCheckHook, pythonOlder, }: @@ -15,9 +17,9 @@ buildPythonPackage rec { pname = "nutils"; version = "8.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "evalf"; @@ -26,15 +28,20 @@ buildPythonPackage rec { hash = "sha256-wxouS0FXrdIhm6nTVBuzkwHceJnZ7f7k8nMFxFsZchE="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ + appdirs + bottombar numpy - treelog + nutils-poly + psutil stringly - bottombar + treelog ]; + pythonRelaxDeps = [ "psutil" ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "nutils" ]; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index d0c88698a6c04..81be2102daddd 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -81,6 +81,6 @@ buildPythonPackage rec { homepage = "https://github.com/lilydjwg/nvchecker"; changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 52e7c04ca060f..b620f209337eb 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -3,7 +3,7 @@ fetchPypi, buildPythonPackage, substituteAll, - addOpenGLRunpath, + addDriverRunpath, }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; - inherit (addOpenGLRunpath) driverLink; + inherit (addDriverRunpath) driverLink; }) ]; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 9f5365633104c..6196910595cbf 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -3,7 +3,6 @@ blockdiag, fetchFromGitHub, buildPythonPackage, - pynose, pytestCheckHook, setuptools, pythonOlder, @@ -23,14 +22,13 @@ buildPythonPackage rec { hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; + patches = [ ./fix_test_generate.patch ]; + build-system = [ setuptools ]; dependencies = [ blockdiag ]; - nativeCheckInputs = [ - pynose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "src/nwdiag/tests/" ]; diff --git a/pkgs/development/python-modules/nwdiag/fix_test_generate.patch b/pkgs/development/python-modules/nwdiag/fix_test_generate.patch new file mode 100644 index 0000000000000..c05b5be45c1dc --- /dev/null +++ b/pkgs/development/python-modules/nwdiag/fix_test_generate.patch @@ -0,0 +1,22 @@ +diff --git a/src/nwdiag/tests/test_generate_diagram.py b/src/nwdiag/tests/test_generate_diagram.py +index 2065208..ac9b096 100644 +--- a/src/nwdiag/tests/test_generate_diagram.py ++++ b/src/nwdiag/tests/test_generate_diagram.py +@@ -16,16 +16,4 @@ + import os + + from blockdiag.tests.test_generate_diagram import (get_diagram_files, +- testcase_generator) +- +-import nwdiag.command +- +- +-def test_generate(): +- mainfunc = nwdiag.command.main +- basepath = os.path.dirname(__file__) +- files = get_diagram_files(basepath) +- options = [] +- +- for testcase in testcase_generator(basepath, mainfunc, files, options): +- yield testcase ++ test_generate_with_separate) diff --git a/pkgs/development/python-modules/oasatelematics/default.nix b/pkgs/development/python-modules/oasatelematics/default.nix index 5313b8a6fbd69..fca7740dc6de9 100644 --- a/pkgs/development/python-modules/oasatelematics/default.nix +++ b/pkgs/development/python-modules/oasatelematics/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, requests, }: diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index a45aa21abf37e..17ea759ce4f50 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { homepage = "https://github.com/simplegeo/python-oauth2"; description = "Library for OAuth version 1.0"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix index c6fc4b6b290c9..895c988381e9b 100644 --- a/pkgs/development/python-modules/oauth2client/default.nix +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { meta = with lib; { description = "Client library for OAuth 2.0"; homepage = "https://github.com/google/oauth2client/"; - license = licenses.bsd2; + license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 1f4ff0ea627f7..0c438815d8434 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -10,6 +10,7 @@ mwoauth, pyjwt, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, requests, requests-mock, @@ -31,11 +32,6 @@ buildPythonPackage rec { hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=oauthenticator" "" - ''; - build-system = [ setuptools ]; dependencies = [ @@ -58,6 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook requests-mock ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); @@ -85,6 +82,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/oauthenticator"; changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index 4d8a0d607dbf3..63d9c1d038462 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -77,5 +77,7 @@ buildPythonPackage rec { changelog = "https://github.com/google/objax/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; + # Tests test_syncbn_{0,1,2}d and other tests from tests/parallel.py fail + broken = true; }; } diff --git a/pkgs/development/python-modules/objexplore/default.nix b/pkgs/development/python-modules/objexplore/default.nix new file mode 100644 index 0000000000000..02d4ceeb21428 --- /dev/null +++ b/pkgs/development/python-modules/objexplore/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + setuptools, + blessed, + rich, + pytestCheckHook, + pandas +}: + +buildPythonPackage { + pname = "objexplore"; + version = "1.6.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kylepollina"; + repo = "objexplore"; + # tags for >1.5.4 are not availables on github + # see: https://github.com/kylepollina/objexplore/issues/25 + rev = "3c2196d26e5a873eed0a694cddca66352ea7c81e"; + hash = "sha256-BgeuRRuvbB4p99mwCjNxm3hYEZuGua8x2GdoVssQ7eI="; + }; + + pythonRelaxDeps = [ "blessed" "rich" ]; + + build-system = [ setuptools ]; + + dependencies = [ + blessed + rich + ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + ]; + + pythonImportsCheck = [ + "objexplore" + "objexplore.cached_object" + "objexplore.explorer" + "objexplore.filter" + "objexplore.help_layout" + "objexplore.objexplore" + "objexplore.overview" + "objexplore.stack" + "objexplore.utils" + ]; + + meta = { + description = "Terminal UI to interactively inspect and explore Python objects"; + homepage = "https://github.com/kylepollina/objexplore"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 37980cd904a1d..4c093aa744065 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -6,7 +6,6 @@ ghostscript, hypothesis, img2pdf, - importlib-resources, jbig2enc, packaging, pdfminer-six, @@ -23,14 +22,13 @@ setuptools-scm, substituteAll, tesseract, - tqdm, unpaper, installShellFiles, }: buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.4.1"; + version = "16.4.3"; disabled = pythonOlder "3.10"; @@ -46,7 +44,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-C/xyinjiJgwdLHTLqFQApgr7q1gmmWoYBPfAq4iPUi0="; + hash = "sha256-SHinfAWUqrPnHdDDXa1meVfxsyct17b1ak5U91GEc1w="; }; patches = [ diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 1701a73215d0e..3e2a3a5d507b9 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,5 +1,5 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index 94eec244..4bb15db9 100644 +index eaa48117..30201d97 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py @@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset( @@ -12,19 +12,19 @@ index 94eec244..4bb15db9 100644 log = logging.getLogger(__name__) diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py -index 5a34a95a..5ee1b333 100644 +index 1c6dd5fe..b689a091 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py +++ b/src/ocrmypdf/_exec/jbig2enc.py -@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run - +@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run def version() -> Version: -- return Version(get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*')) -+ return Version(get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*')) - - - def available(): -@@ -27,7 +27,7 @@ def available(): + try: +- version = get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*') ++ version = get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*') + except CalledProcessError as e: + # TeX Live for Windows provides an incompatible jbig2.EXE which may + # be on the PATH. +@@ -33,7 +33,7 @@ def available(): def convert_group(cwd, infiles, out_prefix, threshold): args = [ @@ -33,7 +33,7 @@ index 5a34a95a..5ee1b333 100644 '-b', out_prefix, '--symbol-mode', # symbol mode (lossy) -@@ -44,7 +44,7 @@ def convert_group(cwd, infiles, out_prefix, threshold): +@@ -50,7 +50,7 @@ def convert_group(cwd, infiles, out_prefix, threshold): def convert_single(cwd, infile, outfile, threshold): @@ -65,7 +65,7 @@ index 5b8600d0..fcad771b 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index fab92bb1..78b634a7 100644 +index 102bdab8..bfef4400 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py @@ -95,7 +95,7 @@ class TesseractVersion(Version): @@ -96,10 +96,10 @@ index fab92bb1..78b634a7 100644 args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index 493d9b3a..578c2dda 100644 +index d1165c46..7c732b15 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -70,7 +70,7 @@ class UnpaperImageTooLargeError(Exception): +@@ -48,7 +48,7 @@ class UnpaperImageTooLargeError(Exception): def version() -> Version: @@ -108,7 +108,7 @@ index 493d9b3a..578c2dda 100644 @contextmanager -@@ -92,7 +92,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: +@@ -70,7 +70,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: def run_unpaper( input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] ) -> None: diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index f9e9a5bee056f..1c3c8bf8ff4b1 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Shorthand syntax for building OrderedDicts"; homepage = "https://github.com/epsy/od"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/oddsprout/default.nix b/pkgs/development/python-modules/oddsprout/default.nix new file mode 100644 index 0000000000000..9aca78d9e063a --- /dev/null +++ b/pkgs/development/python-modules/oddsprout/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + dahlia, + ixia +}: + +buildPythonPackage rec { + pname = "oddsprout"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "trag1c"; + repo = "oddsprout"; + rev = "refs/tags/v${version}"; + hash = "sha256-k5/mBoW4PxGUbkwaZyHgS3MGI4533V/nNoGqEg+VXpM="; + }; + + build-system = [ poetry-core ]; + dependencies = [ dahlia ixia ]; + + pythonImportsCheck = [ "oddsprout" ]; + + meta = with lib; { + changelog = "https://github.com/trag1c/oddsprout/blob/${src.rev}/CHANGELOG.md"; + description = "Generate random JSON with no schemas involved"; + license = licenses.mit; + homepage = "https://trag1c.github.io/oddsprout"; + maintainers = with maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 39fb0bf3a4bc2..438078c56e73d 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.4"; + version = "3.5.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-2ZGzGJaVChd7XQM45qQF4vDw70iCEqxrVQP8lhGNfUg="; + hash = "sha256-4x7OgC5UKhAII2S1kDu+1RZyusr9F5cZDaRG9HFyhkA="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix index 7f4aa00dd213c..0110cfdba10dd 100644 --- a/pkgs/development/python-modules/ofxhome/default.nix +++ b/pkgs/development/python-modules/ofxhome/default.nix @@ -1,28 +1,37 @@ { lib, buildPythonPackage, - fetchPypi, - nose, + fetchFromGitHub, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { version = "0.3.3"; - format = "setuptools"; pname = "ofxhome"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "1rpyfqr2q9pnin47rjd4qapl8ngk1m9jx36iqckhdhr8s8gla445"; + src = fetchFromGitHub { + owner = "captin411"; + repo = "ofxhome"; + rev = "v${version}"; + hash = "sha256-i16bE9iuafhAKco2jYfg5T5QCWFHdnYVztf1z2XbO9g="; }; - buildInputs = [ nose ]; + build-system = [ setuptools ]; - # ImportError: No module named tests - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + # These are helper functions that should not be called as tests + disabledTests = [ + "testfile_name" + "testfile" + ]; + + meta = { homepage = "https://github.com/captin411/ofxhome"; description = "ofxhome.com financial institution lookup REST client"; - license = licenses.mit; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index 552267ee759d7..cbf5d5e3c0b2b 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + pytestCheckHook, pythonOlder, }: @@ -21,11 +21,11 @@ buildPythonPackage rec { hash = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc="; }; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; # override $HOME directory: # error: [Errno 13] Permission denied: '/homeless-shelter' - checkPhase = '' - HOME=$TMPDIR nosetests tests/*.py + preCheck = '' + export HOME=$(mktemp -d) ''; meta = with lib; { diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 239a204c0fb41..6a0331c36a171 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -1,15 +1,16 @@ { lib, - stdenv, aenum, aiohttp, buildPythonPackage, fetchPypi, flatdict, + jwcrypto, pycryptodome, pycryptodomex, pydash, pyfakefs, + pyjwt, pytest-asyncio, pytest-mock, pytest-recording, @@ -37,9 +38,11 @@ buildPythonPackage rec { aenum aiohttp flatdict + jwcrypto pycryptodome pycryptodomex pydash + pyjwt python-jose pyyaml xmltodict diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index d69d11a331e6d..adf8784a501e7 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; + hash = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index f253c73d88990..0858e4bc7b90f 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -10,7 +10,6 @@ pyparsing, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 33433bc17ac91..fae10081d33b9 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.2.1"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+1qhmz5WehbtjE+Dh/WTsqpiAmTjJg+tBjvYRQYkYy0="; + hash = "sha256-uz2mUcFFVeJ+85DElJ3kcxpke3DZjXl91FJ+6tYGj9c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/omemo-dr/default.nix b/pkgs/development/python-modules/omemo-dr/default.nix index e6b1317738c1d..83e221c729c61 100644 --- a/pkgs/development/python-modules/omemo-dr/default.nix +++ b/pkgs/development/python-modules/omemo-dr/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://dev.gajim.org/gajim/omemo-dr/"; changelog = "https://dev.gajim.org/gajim/omemo-dr/-/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix index a61bc96dc78f2..b20189e3e9726 100644 --- a/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; + hash = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/online-judge-api-client/default.nix b/pkgs/development/python-modules/online-judge-api-client/default.nix index 964f6232303bd..cc346e19231d2 100644 --- a/pkgs/development/python-modules/online-judge-api-client/default.nix +++ b/pkgs/development/python-modules/online-judge-api-client/default.nix @@ -11,7 +11,6 @@ markdown, python, requests, - substituteAll, toml, }: diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index b7475fd5b4800..c0227ee831f0f 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -59,6 +59,7 @@ buildPythonPackage { libcufft # libcufft.so.XX cudnn # libcudnn.soXX cuda_cudart # libcudart.so.XX + nccl # libnccl.so.XX ] ); diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index 371118f677d03..a36c97dd2cdac 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Common widgets for opcua-modeler og opcua-client-gui"; homepage = "https://github.com/FreeOpcUa/opcua-widgets"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix index 0fd3600d5d3e7..12e4cabb07688 100644 --- a/pkgs/development/python-modules/open-interpreter/default.nix +++ b/pkgs/development/python-modules/open-interpreter/default.nix @@ -5,74 +5,86 @@ pythonOlder, poetry-core, - appdirs, + setuptools, astor, inquirer, - litellm, pyyaml, rich, six, - tiktoken, tokentrim, wget, psutil, html2image, + send2trash, ipykernel, jupyter-client, matplotlib, toml, - posthog, - openai, - setuptools, + tiktoken, + platformdirs, + pydantic, + google-generativeai, + pynput, + pyperclip, + yaspin, + shortuuid, + litellm, + + nltk, }: buildPythonPackage rec { pname = "open-interpreter"; - version = "0.2.0"; + version = "0.3.6"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "KillianLucas"; - repo = pname; + repo = "open-interpreter"; rev = "v${version}"; - hash = "sha256-XeJ6cADtyXtqoTXwYJu+i9d3NYbJCLpYOeZYmdImtwI="; + hash = "sha256-TeBiRylrq5CrAG9XS47Z9GlruAv7V7Nsl4QbSV55isM="; }; - # Remove unused dependency - postPatch = '' - substituteInPlace pyproject.toml --replace 'git-python = "^1.0.3"' "" - ''; - - pythonRelaxDeps = [ "tiktoken" ]; + pythonRemoveDeps = [ "git-python" ]; - nativeBuildInputs = [ - poetry-core + pythonRelaxDeps = [ + "psutil" + "pynput" + "yaspin" ]; - propagatedBuildInputs = [ - appdirs + build-system = [ poetry-core ]; + + dependencies = [ + setuptools astor inquirer - litellm pyyaml rich six - tiktoken tokentrim wget psutil html2image + send2trash ipykernel jupyter-client matplotlib toml - posthog - openai + tiktoken + platformdirs + pydantic + google-generativeai + pynput + pyperclip + yaspin + shortuuid + litellm - # Not explicitly in pyproject.toml but required due to use of `pkgs_resources` - setuptools + # marked optional in pyproject.toml but still required? + nltk ]; pythonImportsCheck = [ "interpreter" ]; diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index d6933e1aeea1b..06d4a1f55d9ac 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -15,7 +15,7 @@ more-itertools, numba, numpy, - openai-triton, + triton, tiktoken, torch, tqdm, @@ -53,7 +53,7 @@ buildPythonPackage rec { tiktoken torch tqdm - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform openai-triton) [ openai-triton ]; + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform triton) [ triton ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 82094bf7923cd..39344e65cd5dc 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.9"; + version = "1.39.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-THsA284Z/LRQ3GJLnAR5GtFJUYw6EJJZzcFTsiCKxaY="; + hash = "sha256-jOtJu5Luvwnel2GLBjZHDP3MuXTWXFZKYHQfdmyEyTs="; }; build-system = [ diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index f8a3918055628..b64311ac4e675 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0"; homepage = "https://github.com/python-openapi/openapi-schema-validator"; license = licenses.bsd3; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix index b0e935061743a..4ab6b77465c1f 100644 --- a/pkgs/development/python-modules/openbabel-bindings/default.nix +++ b/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -8,9 +8,9 @@ buildPythonPackage rec { inherit (openbabel) pname version; - src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages"; + src = "${openbabel}/${python.sitePackages}"; - nativeBuildInputs = [ openbabel ]; + buildInputs = [ openbabel ]; # these env variables are used by the bindings to find libraries # they need to be included explicitly in your nix-shell for diff --git a/pkgs/development/python-modules/opencensus-context/default.nix b/pkgs/development/python-modules/opencensus-context/default.nix index 1cd1b16a14abd..1f3d568e27f32 100644 --- a/pkgs/development/python-modules/opencensus-context/default.nix +++ b/pkgs/development/python-modules/opencensus-context/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchPypi, lib, - unittestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/opencensus/default.nix b/pkgs/development/python-modules/opencensus/default.nix index dc52ff0d91802..d7d4ac6ddc0c8 100644 --- a/pkgs/development/python-modules/opencensus/default.nix +++ b/pkgs/development/python-modules/opencensus/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchPypi, lib, - unittestCheckHook, google-api-core, opencensus-context, }: diff --git a/pkgs/development/python-modules/opencontainers/default.nix b/pkgs/development/python-modules/opencontainers/default.nix index b2677b7044e40..b5672a5590f21 100644 --- a/pkgs/development/python-modules/opencontainers/default.nix +++ b/pkgs/development/python-modules/opencontainers/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python module for oci specifications"; homepage = "https://github.com/vsoch/oci-python"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index 5d5af060d8465..ccb32de341ea0 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -40,7 +40,7 @@ tabulate, tiktoken, transformers, - openai-triton, + triton, xformers, }: @@ -117,7 +117,7 @@ buildPythonPackage rec { # auto-gptq ]; # ++ autogptq.optional-dependencies.triton; grpc = [ bentoml ] ++ bentoml.optional-dependencies.grpc; - mpt = [ openai-triton ]; + mpt = [ triton ]; openai = [ openai tiktoken diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index a73c319fd10b2..90da26c44fe3b 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -12,6 +12,7 @@ requests, six, urllib3, + events, # optional-dependencies aiohttp, @@ -46,6 +47,7 @@ buildPythonPackage rec { requests six urllib3 + events ]; passthru.optional-dependencies.async = [ aiohttp ]; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 47809462a26dd..5bf0f23accba2 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -11,26 +11,48 @@ keystoneauth1, munch, netifaces, + openstackdocstheme, os-service-types, pbr, pythonOlder, pyyaml, requestsexceptions, + setuptools, + sphinxHook, }: buildPythonPackage rec { pname = "openstacksdk"; - version = "3.1.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; + outputs = [ + "out" + "man" + ]; + src = fetchPypi { inherit pname version; - hash = "sha256-cH8V1+wHSrJDS5peGYT6yrAPgi0nL0wqXeDSKgnrec0="; + hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA="; }; - propagatedBuildInputs = [ + postPatch = '' + # Disable rsvgconverter not needed to build manpage + substituteInPlace doc/source/conf.py \ + --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter'," + ''; + + build-system = [ + openstackdocstheme + setuptools + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ platformdirs cryptography dogpile-cache diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 0b71fc111b8b8..43633f98a0385 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -54,6 +54,11 @@ buildPythonPackage { openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress + openstack.tests.unit.test_resource.TestWaitForDelete.test_status + openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found openstack.tests.unit.test_resource.TestWaitForStatus.test_callback openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 8fde20af6cbf2..d81a0ed098126 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.25.0"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9mxgPYliGkNsZGOhF9YCmxZjP3hc2UUmxSpWY4IMLCo="; + hash = "sha256-slb1ZKGnfJRZiBh++S20en7U6RckspHHuMohHOz2Hts="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix index 0dc9b6a423822..cd23b6b9d1f02 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 5df83c4ad4330..3ddd107770b0d 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, @@ -38,7 +37,7 @@ buildPythonPackage { pytestCheckHook ]; - disabledTestPaths = [ "tests/performance/benchmarks/" ]; + pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix index 2bab0a3bb80cd..0599140c562bb 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, deprecated, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix index 710674a0b9bba..3bf2f7b04c2c2 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix index ef0d80d4b65ce..36b4b4cb5449f 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 0da97f5a23169..04c5debd2f5c7 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 9d745e0261d32..ac50e8d721837 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, @@ -36,6 +35,9 @@ buildPythonPackage { pytestCheckHook ]; + # Tests have issues starting with 0.47b0 + doCheck = false; + pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; meta = opentelemetry-instrumentation.meta // { diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-dbapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-dbapi/default.nix new file mode 100644 index 0000000000000..286102d97e61c --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-dbapi/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + pythonOlder, + pytestCheckHook, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-test-utils, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-dbapi"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-dbapi"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-semantic-conventions + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.dbapi" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-dbapi"; + description = "OpenTelemetry Database API instrumentation"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 30b2fd0e35fc0..5a85e42a04d35 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, django, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix index 178c39fffb34a..310d85e53f0e3 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fastapi, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 1d400f8e53b02..6dc01accb96dd 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -6,7 +6,6 @@ hatchling, opentelemetry-api, opentelemetry-instrumentation, - opentelemetry-sdk, opentelemetry-semantic-conventions, opentelemetry-test-utils, wrapt, @@ -28,7 +27,6 @@ buildPythonPackage { dependencies = [ opentelemetry-api opentelemetry-instrumentation - opentelemetry-sdk opentelemetry-semantic-conventions wrapt ]; @@ -55,5 +53,7 @@ buildPythonPackage { meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; description = "OpenTelemetry Instrumentation for grpc"; + # https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2483 + broken = lib.versionAtLeast grpcio.version "1.63"; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg2/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg2/default.nix new file mode 100644 index 0000000000000..2035b07c939fa --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg2/default.nix @@ -0,0 +1,42 @@ +{ + buildPythonPackage, + pythonOlder, + pytestCheckHook, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-instrumentation-dbapi, + opentelemetry-test-utils, + psycopg2, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-psycopg2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-psycopg2"; + + build-system = [ hatchling ]; + + dependencies = [ + psycopg2 + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-dbapi + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.psycopg2" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-psycopg2"; + description = "OpenTelemetry Psycopg Instrumentation"; + }; +} diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index eaca2e81e161a..e640ec9597540 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 1939a63fa6a14..9fba4ade03c0c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -1,29 +1,29 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, hatchling, opentelemetry-api, opentelemetry-test-utils, + pytestCheckHook, + pythonOlder, setuptools, wrapt, - pytestCheckHook, }: buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.46b0"; + version = "0.47b0"; pyproject = true; disabled = pythonOlder "3.8"; - # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta + # To avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-BC/RJL4GgC3vGe4bC9mavPNpE+j8ZIkOKCbK4I4LuGQ="; + hash = "sha256-XtJ4u891vI7wDtReoucm+qk3BkKJ+aZrYy7zfxmqfgk="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; @@ -46,8 +46,8 @@ buildPythonPackage rec { passthru.updateScript = opentelemetry-api.updateScript; meta = with lib; { - homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; diff --git a/pkgs/development/python-modules/opentelemetry-proto/default.nix b/pkgs/development/python-modules/opentelemetry-proto/default.nix index a2036ddfb77b0..8fcaf2a3b516b 100644 --- a/pkgs/development/python-modules/opentelemetry-proto/default.nix +++ b/pkgs/development/python-modules/opentelemetry-proto/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentelemetry-sdk/default.nix b/pkgs/development/python-modules/opentelemetry-sdk/default.nix index 29f69f428b885..cfa6e6249512b 100644 --- a/pkgs/development/python-modules/opentelemetry-sdk/default.nix +++ b/pkgs/development/python-modules/opentelemetry-sdk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, flaky, diff --git a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix index b6af8dea4f4fc..24ee1af9e91ad 100644 --- a/pkgs/development/python-modules/opentelemetry-test-utils/default.nix +++ b/pkgs/development/python-modules/opentelemetry-test-utils/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, asgiref, diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ee1d76c04a992..e1bcc59c2e8e4 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, hatchling, diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index c7edcd84370de..5a9c412dcd545 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -3,7 +3,6 @@ bitcoinlib, buildPythonPackage, fetchFromGitHub, - git, gitpython, pycryptodomex, pytestCheckHook, diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index a43b7c872e54a..48795497e5896 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-qL/H2F+/d/JWwmUbZhvoMlZZDGgEpRBmHabt1MWjGAs="; + hash = "sha256-Ui3731ChEUterRXb+QVMR1CNXhPYhBkZoUwbSJ47g+4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 3aea4088e47a1..062d611cf5f97 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-Rv5ttUUlBqa4yFEV5WWrZ+fhL/mrvjoYFsMN6xnFUhQ="; + hash = "sha256-juN9o1RPLDALND1po5S4WNMDkOWnr4hl38yxWnsoupg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix index 06b64b0cc7181..e20545e9e51ba 100644 --- a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix +++ b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix @@ -2,7 +2,9 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, setuptools, + versioneer, }: buildPythonPackage rec { @@ -10,24 +12,34 @@ buildPythonPackage rec { version = "0.2.2"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchPypi { pname = "opsdroid_get_image_size"; inherit version; hash = "sha256-Cp2tvsdCZ+/86DF7FRNwx5diGcUWLYcFwQns7nYXkog="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ setuptools ]; - # test data not included on pypi + nativeBuildInputs = [ versioneer ]; + + # Test data not included on PyPI doCheck = false; pythonImportsCheck = [ "get_image_size" ]; meta = with lib; { description = "Get image width and height given a file path using minimal dependencies"; - mainProgram = "get-image-size"; - license = licenses.mit; homepage = "https://github.com/opsdroid/image_size"; + changelog = "https://github.com/opsdroid/image_size/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ globin ]; + mainProgram = "get-image-size"; }; } diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index 14082067893a3..345b02ec26472 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -1,19 +1,27 @@ { lib, - absl-py, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system flit-core, + + # dependencies + absl-py, chex, - fetchFromGitHub, + jax, jaxlib, numpy, + etils, + + # checks callPackage, - pythonOlder, }: buildPythonPackage rec { pname = "optax"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +30,7 @@ buildPythonPackage rec { owner = "deepmind"; repo = "optax"; rev = "refs/tags/v${version}"; - hash = "sha256-sBiKUuQR89mttc9Njrh1aeUJOYdlcF7Nlj3/+Y7OMb4="; + hash = "sha256-D1qKei3IjDP9fC62hf6fNtvHlnn09O/dKuzTBdLwW64="; }; outputs = [ @@ -30,15 +38,16 @@ buildPythonPackage rec { "testsout" ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - buildInputs = [ jaxlib ]; - - propagatedBuildInputs = [ + dependencies = [ absl-py chex + etils + jax + jaxlib numpy - ]; + ] ++ etils.optional-dependencies.epy; postInstall = '' mkdir $testsout diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 07c80298754a7..844c6f1e6f988 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -3,29 +3,35 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + + # build-system + setuptools, + + # dependencies coloredlogs, datasets, + huggingface-hub, + numpy, + packaging, + sympy, + torch, + transformers, + + # optional-dependencies diffusers, evaluate, h5py, - huggingface-hub, - numpy, onnx, onnxruntime, - packaging, protobuf, - setuptools, - sympy, tensorflow, tf2onnx, timm, - torch, - transformers, }: buildPythonPackage rec { pname = "optimum"; - version = "1.20.0"; + version = "1.21.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,11 +40,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-aQNDVNWTgY2LEtug229SEZRMvKHpsQfiTPWW4Lh3hs4="; + hash = "sha256-eEfKWBwhtDkoAhsLH8P2ybM7aF/d2yREIv7/5RVz0Z8="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ "transformers" ]; + dependencies = [ coloredlogs datasets @@ -108,12 +116,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "optimum" ]; - meta = with lib; { + meta = { description = "Accelerate training and inference of 🤗 Transformers and 🤗 Diffusers with easy to use hardware optimization tools"; mainProgram = "optimum-cli"; homepage = "https://github.com/huggingface/optimum"; changelog = "https://github.com/huggingface/optimum/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; }; } diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index 27a057b24ddd8..7e54d04ff3a22 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -1,5 +1,4 @@ { - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.11.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metaopt"; repo = pname; - rev = "v${version}"; - hash = "sha256-VnnnEoXkYJO+S7baH+JZvsW18Tk3TiY9+Cd230OlZWo="; + rev = "refs/tags/v${version}"; + hash = "sha256-4GvB9Z7qnEjsUSl+x5wd8czV80F50MwJdlNdylUU0zY="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index 3e6ea255621db..4f7c86d2a4816 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -4,7 +4,7 @@ fetchpatch, isPy27, libopus, - pynose, + pytestCheckHook, lib, stdenv, substituteAll, @@ -46,7 +46,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ pynose ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "tests/{decoder,encoder,hl_decoder,hl_encoder}.py" + ]; meta = with lib; { description = "Python bindings to the libopus, IETF low-delay audio codec"; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index c1989cbe33b79..cac6da956644d 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hGTG8ClfMxja9sLHLIPC3Lw34T+P1E4+Of+GZfRC1rY="; + hash = "sha256-ubDE7CgLEAY+Z4m+0j3cJDWumFaevmTguaJweAuRA9U="; }; build-system = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index c1d58c0a1c546..650d8a634d51a 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.10.5"; + version = "3.10.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,13 +40,13 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-Q2zi3mNgCFrg7Ucana0+lmR9C9kkuUidEJj8GneR2W4="; + hash = "sha256-K3wCzwaGOsaiCm2LW4Oc4XOnp6agrdTxCxqEIMq0fuU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yhLKw4BhdIHgcu4iVlXQlHk/8J+3NK6LlmSWbm/5y4Q="; + hash = "sha256-SNdwqb47dJ084TMNsm2Btks1UCDerjSmSrQQUiGbx50="; }; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index a498127b4f116..20825a18b5500 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Async ORM"; homepage = "https://github.com/encode/orm"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 84443f5b7733e..7e03de25fabf3 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 0b083f5d2be70..ba8840da2fdc8 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.8.0"; + version = "1.8.3"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-YYcTZ4TB/wDl+T3yF5n2Wp0r4v8eWCTO2fjv/ygicmM="; + hash = "sha256-SREq0rZuCiILBG4RdvtxkTOGKJuYBS3GypLZnSdBvVI="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index 1ddfce166c382..fe80b0ac42d44 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { description = "Encryption library for Python"; homepage = "https://github.com/wbond/oscrypto"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 6b2c64de5d0c7..ad4e2a99b1955 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "15.1.0"; + version = "16.0.0"; pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-FqvjqOYf52zaLwPZx9xZEITRnvYU8xiHvylp7fsg6E4="; + hash = "sha256-8bNUjR8eEfLYEZfBwXix0lO2A474iDYdMQp2Aa7BfoE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index b812207a5abbf..d5573a7db8501 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "7.1.0"; + version = "7.2.0"; pyproject = true; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-XkLzOU0fH5duiZSsSgkYlm0vfq98dzgN1hLEpBSN2Y4="; + hash = "sha256-lPgFM5GjNQLatNhEZUAyYsoZ/9jP0poaXqPIqmIO9hA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 55553b98e1e3d..9aebaf81d38cb 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; + hash = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix new file mode 100644 index 0000000000000..f715056e3219d --- /dev/null +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -0,0 +1,112 @@ +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + + bitmath, + bpylist2, + click, + mako, + more-itertools, + objexplore, + packaging, + pathvalidate, + pip, + ptpython, + pytimeparse2, + pyyaml, + requests, + rich-theme-manager, + rich, + shortuuid, + strpdatetime, + tenacity, + textx, + toml, + wrapt, + wurlitzer, + xdg-base-dirs, + + pytestCheckHook, + pytest-mock, +}: + +buildPythonPackage rec { + pname = "osxphotos"; + version = "0.68.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "RhetTbull"; + repo = "osxphotos"; + rev = "refs/tags/v${version}"; + hash = "sha256-KgdKqmrWPr0kBtIB80BMmLUAmf7CpA7JJeE4DjLal78="; + }; + + build-system = [ setuptools ]; + dependencies = [ + bitmath + bpylist2 + click + mako + more-itertools + objexplore + packaging + pathvalidate + pip + ptpython + pytimeparse2 + pyyaml + requests + rich-theme-manager + rich + shortuuid + strpdatetime + tenacity + textx + toml + wrapt + wurlitzer + xdg-base-dirs + ]; + + pythonRelaxDeps = [ + "mako" + "more-itertools" + "objexplore" + "textx" + ]; + + pythonImportsCheck = [ "osxphotos" ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ "tests/test_comments.py" ]; + disabledTests = [ + "test_iphoto_info" + "test_from_to_date_tz" + "test_function_url" + "test_get_local_tz" + "test_datetime_naive_to_local" + "test_from_to_date_tz" + "test_query_from_to_date_alt_location" + "test_query_function_url" + ]; + + meta = { + description = "Export photos from Apple's macOS Photos app and query the Photos library database to access metadata about images"; + homepage = "https://github.com/RhetTbull/osxphotos"; + changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/outdated/default.nix b/pkgs/development/python-modules/outdated/default.nix new file mode 100644 index 0000000000000..3331966bb31f6 --- /dev/null +++ b/pkgs/development/python-modules/outdated/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + littleutils, + requests, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "outdated"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "alexmojaki"; + repo = "outdated"; + rev = "refs/tags/v${version}"; + hash = "sha256-5VpPmgIcVtY97F0Hb0m9MuSW0zjaUJ18ATA4GBRw+jc="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + littleutils + requests + ]; + + # checks rely on internet connection + doCheck = false; + + pythonImportsCheck = [ "outdated" ]; + + meta = { + description = "Mini-library which, given a package name and a version, checks if it's the latest version available on PyPI"; + homepage = "https://github.com/alexmojaki/outdated"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index b7e51351f7ef3..52ba16676fd04 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -6,9 +6,12 @@ setuptools-scm, interegular, cloudpickle, + datasets, diskcache, joblib, jsonschema, + pyairports, + pycountry, pydantic, lark, nest-asyncio, @@ -20,14 +23,14 @@ buildPythonPackage rec { pname = "outlines"; - version = "0.0.45"; + version = "0.0.46"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VJ/q3NBNatBv3gsV637sciiOHdDJRnMlcisu5GRmWM0="; + hash = "sha256-6VH9BcMRVRf2xvLcK3GNA1pGgAOs95UOlFQ6KxHXwKo="; }; nativeBuildInputs = [ @@ -38,6 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ interegular cloudpickle + datasets diskcache joblib jsonschema @@ -48,9 +52,14 @@ buildPythonPackage rec { scipy torch transformers + pycountry + pyairports ]; - pythonImportsCheck = [ "outlines" ]; + checkPhase = '' + export HOME=$(mktemp -d) + python3 -c 'import outlines' + ''; meta = with lib; { description = "Structured text generation"; diff --git a/pkgs/development/python-modules/outspin/default.nix b/pkgs/development/python-modules/outspin/default.nix index ae01566d9cd5e..4555e9cbca3c7 100644 --- a/pkgs/development/python-modules/outspin/default.nix +++ b/pkgs/development/python-modules/outspin/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/outspin/blob/${src.rev}/CHANGELOG.md"; description = "Conveniently read single char inputs in the console"; - license = licenses.mit; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 645715a4f0af5..53f7f9f24e076 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 8ce0a1ed40206..03ffee785ce99 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.15.1"; + version = "0.15.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "packageurl_python"; inherit version; - hash = "sha256-mje5p8rZoocrRhIVG6N0n9neyQSFV3wU03S25mt+3wM="; + hash = "sha256-y8ia/RXV9NBdtPG2EpfluXpD9h8oeZ9tKCr/Rn7S7pY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix index acca93d0c57b6..c47983b060f11 100644 --- a/pkgs/development/python-modules/packbits/default.nix +++ b/pkgs/development/python-modules/packbits/default.nix @@ -1,11 +1,6 @@ { - stdenv, buildPythonPackage, fetchPypi, - pyparsing, - six, - pytest, - pretend, lib, }: diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index b263cdc8e1b99..2388807940429 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -12,7 +12,7 @@ setuptools, cudaSupport ? config.cudaSupport or false, cudaPackages_11 ? { }, - addOpenGLRunpath, + addDriverRunpath, # runtime dependencies httpx, numpy, @@ -81,13 +81,13 @@ buildPythonPackage { p=$(patchelf --print-rpath $1) patchelf --set-rpath "$p:$libraryPath" $1 ${lib.optionalString cudaSupport '' - addOpenGLRunpath $1 + addDriverRunpath $1 ''} } fixRunPath $out/${python.sitePackages}/paddle/fluid/libpaddle.so ''; - nativeBuildInputs = [ addOpenGLRunpath ]; + nativeBuildInputs = [ addDriverRunpath ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix index 70f1e8d6670f7..60049696b4984 100644 --- a/pkgs/development/python-modules/pagelabels/default.nix +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pagelabels"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "07as5kzyvj66bfgvx8bph8gkyj6cgm4lhgxwb78bpdl4m8y8kpma"; + sha256 = "sha256-GAEyhECToKnIWBxnYTSOsYKZBjl50b/82mZ68i8I2ug="; }; buildInputs = [ pdfrw ]; diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix new file mode 100644 index 0000000000000..83582102767b8 --- /dev/null +++ b/pkgs/development/python-modules/paho-mqtt/1.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + isPy3k, + pytestCheckHook, + mock, + six, +}: + +buildPythonPackage rec { + pname = "paho-mqtt"; + version = "1.6.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.python"; + rev = "v${version}"; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + }; + + nativeCheckInputs = [ + pytestCheckHook + six + ] ++ lib.optionals (!isPy3k) [ mock ]; + + doCheck = !stdenv.isDarwin; + + pythonImportsCheck = [ "paho.mqtt" ]; + + meta = with lib; { + description = "MQTT version 3.1.1 client class"; + homepage = "https://eclipse.org/paho"; + license = licenses.epl10; + maintainers = with maintainers; [ + mog + dotlambda + ]; + }; +} diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 83582102767b8..437aa9884beb0 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -2,38 +2,57 @@ lib, stdenv, buildPythonPackage, + pythonOlder, fetchFromGitHub, - isPy3k, + hatchling, pytestCheckHook, - mock, - six, }: -buildPythonPackage rec { +let + testing = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.testing"; + rev = "a4dc694010217b291ee78ee13a6d1db812f9babd"; + hash = "sha256-SQoNdkWMjnasPjpXQF2yV97MUra8gb27pc3rNoA8Rjw="; + }; +in buildPythonPackage rec { pname = "paho-mqtt"; - version = "1.6.1"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.python"; rev = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY="; }; + build-system = [ + hatchling + ]; + nativeCheckInputs = [ pytestCheckHook - six - ] ++ lib.optionals (!isPy3k) [ mock ]; + ]; doCheck = !stdenv.isDarwin; pythonImportsCheck = [ "paho.mqtt" ]; + preCheck = '' + ln -s ${testing} paho.mqtt.testing + + # paho.mqtt not in top-level dir to get caught by this + export PYTHONPATH=".:$PYTHONPATH" + ''; + meta = with lib; { - description = "MQTT version 3.1.1 client class"; + changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${src.rev}/ChangeLog.txt"; + description = "MQTT version 5.0/3.1.1 client class"; homepage = "https://eclipse.org/paho"; - license = licenses.epl10; + license = licenses.epl20; maintainers = with maintainers; [ mog dotlambda diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix index 43d7e9aa33335..8ea9f3b6d9fac 100644 --- a/pkgs/development/python-modules/palace/default.nix +++ b/pkgs/development/python-modules/palace/default.nix @@ -7,7 +7,6 @@ cython_0, setuptools, alure2, - typing-extensions, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index acdf8eaf3a82d..aa7876f4644ae 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; + hash = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index ad16f250130fd..5f02936d92525 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; + hash = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; }; postUnpack = '' diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 322c3a39744af..843ae520be02e 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -1,9 +1,20 @@ { lib, stdenv, - beautifulsoup4, buildPythonPackage, + pythonOlder, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + numpy, + types-pytz, + + # tests + pytestCheckHook, + beautifulsoup4, html5lib, jinja2, lxml, @@ -11,16 +22,12 @@ odfpy, openpyxl, pandas, - poetry-core, pyarrow, pyreadstat, - pytestCheckHook, - pythonOlder, scipy, sqlalchemy, tables, tabulate, - types-pytz, typing-extensions, xarray, xlsxwriter, @@ -28,7 +35,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.2.0.240218"; + version = "2.2.2.240603"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,17 +44,18 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-416vyaHcSfTfkSNKZ05edozfsMmNKcpOZAoPenCLFzQ="; + hash = "sha256-wJ7lN1+BGNqhwgPLmmpb3foX6rIEy3R62rOvu0mr8xs="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - pandas + dependencies = [ + numpy types-pytz ]; nativeCheckInputs = [ + pytestCheckHook beautifulsoup4 html5lib jinja2 @@ -55,9 +63,9 @@ buildPythonPackage rec { matplotlib odfpy openpyxl + pandas pyarrow pyreadstat - pytestCheckHook scipy sqlalchemy tables @@ -65,19 +73,28 @@ buildPythonPackage rec { typing-extensions xarray xlsxwriter + + # missing dependencies in nixpkgs + # python-calamine ]; disabledTests = [ - # AttributeErrors, missing dependencies, error and warning checks - "test_types_groupby" - "test_frame_groupby_resample" - "test_orc" - "test_all_read_without_lxml_dtype_backend" + # Missing dependencies, error and warning checks + "test_all_read_without_lxml_dtype_backend" # pyarrow.orc + "test_orc" # pyarrow.orc + "test_read_excel" # python-calamine + "test_plotting" # UserWarning: No artists with labels found to put in legend. + "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0! "test_show_version" ] ++ lib.optionals stdenv.isDarwin [ - "test_plotting" # Fatal Python error: Illegal instruction + "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' + ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Disable tests for types that are not supported on aarch64 in `numpy` < 2.0 + "test_astype_float" # `f16` and `float128` + "test_astype_complex" # `c32` and `complex256` ]; pythonImportsCheck = [ "pandas" ]; diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix new file mode 100644 index 0000000000000..c2cdf7e679a28 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + panflute, + pytestCheckHook, + pandoc, +}: + +buildPythonPackage rec { + pname = "pandoc-latex-environment"; + version = "1.1.6.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chdemko"; + repo = "pandoc-latex-environment"; + rev = "refs/tags/${version}"; + hash = "sha256-yBVxQW042mGQAksTG5Vr8fExcKt2YnuiPL1cSZRJJYA="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + dependencies = [ panflute ]; + + pythonImportsCheck = [ "pandoc_latex_environment" ]; + nativeCheckInputs = [ + pytestCheckHook + pandoc + ]; + + meta = { + description = "Pandoc filter for adding LaTeX environment on specific div"; + homepage = "https://github.com/chdemko/pandoc-latex-environment"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 37ce5a14d7d06..876637cdfe516 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; + hash = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; }; # No tests available diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index f034d572b3b6c..d37aa9bdc6844 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/holoviz/panel"; changelog = "https://github.com/holoviz/panel/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/panphon/default.nix b/pkgs/development/python-modules/panphon/default.nix index 22bd61f6f9bc0..10c7e50099a76 100644 --- a/pkgs/development/python-modules/panphon/default.nix +++ b/pkgs/development/python-modules/panphon/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "panphon"; - version = "0.20.0"; + version = "0.21.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gio52n1NZWeyCK+eJW/Fp827wjvwnMNDFAR4pKa8VcY="; + hash = "sha256-Zgug40R1my1BPOoV9iOkbzouMKeQsc0YYFmBIoypDqk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/paperbush/default.nix b/pkgs/development/python-modules/paperbush/default.nix index e2a06a1f72d29..26f30a88908bf 100644 --- a/pkgs/development/python-modules/paperbush/default.nix +++ b/pkgs/development/python-modules/paperbush/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonImportsCheck = [ "paperbush" ]; - meta = with lib; { + meta = { changelog = "https://github.com/trag1c/paperbush/blob/${src.rev}/CHANGELOG.md"; description = "Super concise argument parsing tool for Python"; - license = licenses.mit; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 280f541b32f4c..2a5352b9d0580 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -107,7 +107,7 @@ buildPythonPackage rec { description = "Parametrize and run Jupyter and interact with notebooks"; homepage = "https://github.com/nteract/papermill"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "papermill"; }; } diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 8f9dfbe49291a..06c4f97cde5e9 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -21,7 +21,6 @@ pytestCheckHook, python-doi, python-slugify, - pythonAtLeast, pythonOlder, pyyaml, requests, diff --git a/pkgs/development/python-modules/para/default.nix b/pkgs/development/python-modules/para/default.nix index c5ef2bcdc1a75..f34260bf1531b 100644 --- a/pkgs/development/python-modules/para/default.nix +++ b/pkgs/development/python-modules/para/default.nix @@ -2,31 +2,30 @@ lib, buildPythonPackage, fetchPypi, - nose, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "para"; version = "0.0.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc="; }; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "para" ]; - meta = with lib; { + meta = { description = "Set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks"; homepage = "https://pypi.org/project/para"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 40d813731278e..8f5975a9517df 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "param"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "holoviz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9264KfRDuHsvDyIpGKs2VTPcTZOZIFLKe7xuplkfzf4="; + hash = "sha256-rGfFLDl5Y8D0OiO/1G05w2l3hAHZC368LuNADDzfBFs="; }; nativeBuildInputs = [ @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://param.holoviz.org/"; changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index 04bcad91f36f7..8af2b491701d1 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/wolever/parameterized"; changelog = "https://github.com/wolever/parameterized/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index e5909fca7b3c9..248dc1f513189 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -85,6 +85,6 @@ buildPythonPackage rec { between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index e0e55e49f35a8..4751f655974df 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { mainProgram = "parfive"; homepage = "https://parfive.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index f07e2a1e043f7..b187ba40a2780 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Parse human-readable date/time text"; homepage = "https://github.com/bear/parsedatetime"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 7dd87d5f6af48..07696140e7b31 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -20,7 +20,7 @@ google-auth-oauthlib, hatchling, imapclient, - kafka-python, + kafka-python-ng, lxml, mailsuite, msgraph-core, @@ -77,7 +77,7 @@ buildPythonPackage rec { google-auth-httplib2 google-auth-oauthlib imapclient - kafka-python + kafka-python-ng lxml mailsuite msgraph-core diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 1c25d44e39c6f..c99aafd447ea2 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Arbitrary-lookahead parser"; homepage = "https://github.com/erikrose/parsimonious"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 49771e8728eac..0fe769d05238e 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -10,20 +10,19 @@ pandas, pytestCheckHook, pythonOlder, - setuptools-scm, tabulate, }: buildPythonPackage rec { pname = "particle"; - version = "0.24.0"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-irS13UVHui2ug1SVWkNSEIkqV13/RvMjysbPQGALl2o="; + hash = "sha256-ji1fo2VV5q8hi2bpe5WFsdT1IIV4XZbAZ3NvCy5X9a0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 546699b2ab0c1..af12a98352838 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Allows parsing and manipulation of PEP 440 version numbers"; homepage = "https://github.com/RazerM/parver"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 786cfc618d5b2..413e6ecb1c943 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Password hashing library for Python"; homepage = "https://foss.heptapod.net/python-libs/passlib"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index cbe0e02928a9f..b7ac8fefb3a83 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonAtLeast, pythonOlder, setuptools, six, @@ -46,6 +45,6 @@ buildPythonPackage rec { homepage = "https://pythonpaste.readthedocs.io/"; changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index 1fc44b80b6833..384ca52949ec0 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -2,11 +2,10 @@ lib, buildPythonPackage, fetchPypi, - nose, - python, pytestCheckHook, six, paste, + setuptools, pastedeploy, pythonOlder, }: @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "pastescript"; version = "3.6.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-HCLSt81TUWRr7tKMb3DrSipLklZR2a/Ko1AdBsq7UXE="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ paste pastedeploy @@ -33,10 +34,7 @@ buildPythonPackage rec { # test suite seems to unset PYTHONPATH doCheck = false; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "appsetup/testfiles" ]; @@ -51,6 +49,6 @@ buildPythonPackage rec { mainProgram = "paster"; homepage = "https://github.com/cdent/pastescript/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 77b0b02fa0c84..1298fa3a1e265 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.17.4"; # note: `conan` package may require a hardcoded one + version = "1.18.0"; # note: `conan` package may require a hardcoded one format = "setuptools"; pname = "patch-ng"; src = fetchPypi { inherit pname version; - sha256 = "1kja1nn08w0k8k6j4kad48k581hh9drvjjb8x60v9j13sxdvqyk2"; + sha256 = "sha256-2gZ2KNbV/Z3FpV6rN5UdRr2VZhtyGfqzZLcRNmq8xpA="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index 9703edabc12f3..d7f28f166a052 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/path"; changelog = "https://github.com/jaraco/path/blob/v${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pathlib-abc/default.nix b/pkgs/development/python-modules/pathlib-abc/default.nix index 0eb8930822ad0..c1a8c632cbc68 100644 --- a/pkgs/development/python-modules/pathlib-abc/default.nix +++ b/pkgs/development/python-modules/pathlib-abc/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/barneygale/pathlib-abc"; changelog = "https://github.com/barneygale/pathlib-abc/blob/${version}/CHANGES.rst"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 5cbe0f41d36f9..c439b1b04cf9f 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems"; homepage = "https://pypi.org/project/pathlib2/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 75bdc9eaeb645..b548dd3c6f0ba 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://pathos.readthedocs.io/"; changelog = "https://github.com/uqfoundation/pathos/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 4804cfa1c7aa7..c340d74ac58aa 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, flit-core, unittestCheckHook, diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index a3c42d4738fc1..b34a24ea6f4bc 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Pattern matching and various utilities for file systems paths"; homepage = "https://github.com/gorakhargosh/pathtools"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 8eec65073f1c7..90b5b440d0d7f 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -4,7 +4,7 @@ cogapp, fetchPypi, mock, - nose, + setuptools, pytestCheckHook, pythonOlder, six, @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "paver"; version = "1.3.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +24,13 @@ buildPythonPackage rec { hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; checkInputs = [ cogapp mock - nose pytestCheckHook virtualenv ]; @@ -37,15 +38,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "paver" ]; disabledTestPaths = [ - # Test depends on distutils + # Tests depend on distutils "paver/tests/test_setuputils.py" + "paver/tests/test_doctools.py" + "paver/tests/test_tasks.py" ]; - meta = with lib; { + meta = { description = "Python-based build/distribution/deployment scripting tool"; mainProgram = "paver"; homepage = "https://github.com/paver/paver"; - license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lovek323 ]; }; } diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix index e665813250708..ed728e0fe1e8b 100644 --- a/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { fullName = "PayPal SDK License"; url = "https://github.com/paypal/PayPal-Python-SDK/blob/master/LICENSE"; }; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pbar/default.nix b/pkgs/development/python-modules/pbar/default.nix new file mode 100644 index 0000000000000..3ae769d74e824 --- /dev/null +++ b/pkgs/development/python-modules/pbar/default.nix @@ -0,0 +1,29 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "pbar"; + version = "2.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "darvil82"; + repo = "PBar"; + rev = "refs/tags/v${version}"; + hash = "sha256-FsEjfusk8isOD52xkjndGQdVC8Vc7N3spLLWQTi3Svc="; + }; + + build-system = [ setuptools ]; + pythonImportsCheck = [ "pbar" ]; + + meta = with lib; { + description = "Display customizable progress bars on the terminal easily"; + license = licenses.mit; + homepage = "https://darvil82.github.io/PBar"; + maintainers = with maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index a905568ffc7b1..fb0068dd31a60 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/frostming/pbs-installer"; changelog = "https://github.com/frostming/pbs-installer/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 8ba9c4b5deb19..7e56799e9e293 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, git, pc-ble-driver, - pythonAtLeast, pythonOlder, scikit-build, setuptools, diff --git a/pkgs/development/python-modules/pcapy-ng/default.nix b/pkgs/development/python-modules/pcapy-ng/default.nix index 3e4ac41c1673d..97313c157072e 100644 --- a/pkgs/development/python-modules/pcapy-ng/default.nix +++ b/pkgs/development/python-modules/pcapy-ng/default.nix @@ -6,7 +6,6 @@ libpcap, pkgconfig, pytestCheckHook, - python, pythonOlder, }: diff --git a/pkgs/development/python-modules/pcodedmp/default.nix b/pkgs/development/python-modules/pcodedmp/default.nix index 4a5a1b153f7e1..eef04412632a0 100644 --- a/pkgs/development/python-modules/pcodedmp/default.nix +++ b/pkgs/development/python-modules/pcodedmp/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index a0311740164d4..0fb4547ffd01e 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "ned14"; repo = "pcpp"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; + hash = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index d07e11c8fcbfd..1f736189e85c4 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -2,12 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, - isPy3k, cryptography, charset-normalizer, pythonOlder, - typing-extensions, pytestCheckHook, setuptools, substituteAll, @@ -16,16 +13,16 @@ buildPythonPackage rec { pname = "pdfminer-six"; - version = "20231228"; + version = "20240706"; pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; - rev = version; - hash = "sha256-LXPECQQojD3IY9zRkrDBufy4A8XUuYiRpryqUx/I3qo="; + rev = "refs/tags/${version}"; + hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0="; }; patches = [ @@ -35,17 +32,12 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = - [ - charset-normalizer - cryptography - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions - ]; + dependencies = [ + charset-normalizer + cryptography + ]; postInstall = '' for file in $out/bin/*.py; do @@ -67,6 +59,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md"; description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch index 2dec0e147b9f3..809cc024ff2e1 100644 --- a/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch +++ b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch @@ -1,13 +1,15 @@ +diff --git a/setup.py b/setup.py +index 42764e2..e7b93d3 100644 --- a/setup.py +++ b/setup.py -@@ -7,10 +7,7 @@ +@@ -19,10 +19,7 @@ if sys.version_info < (3, 12): setup( name="pdfminer.six", - setuptools_git_versioning={ - "enabled": True, - }, -- setup_requires=["setuptools-git-versioning<2"], +- setup_requires=["setuptools-git-versioning<3"], + version="@version@", packages=["pdfminer"], package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]}, diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 6bdd81de8bbca..c8759c4601fea 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF"; mainProgram = "pdfx"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pdm-build-locked/default.nix b/pkgs/development/python-modules/pdm-build-locked/default.nix new file mode 100644 index 0000000000000..9c8026d32d215 --- /dev/null +++ b/pkgs/development/python-modules/pdm-build-locked/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pdm-backend, + tomli, + build, + hatchling, + pkginfo, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pdm-build-locked"; + version = "0.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pdm-project"; + repo = "pdm-build-locked"; + rev = "refs/tags/${version}"; + hash = "sha256-tgLC1tUgmyX7QvlLpNb/SMQRTDZ+DNFV3o0JELAZEeo="; + }; + + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail '"pdm.pytest"' "" + sed -i "/addopts/d" pyproject.toml + ''; + + build-system = [ pdm-backend ]; + + dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; + + pythonImportsCheck = [ "pdm_build_locked" ]; + + nativeCheckInputs = [ + build + hatchling + pkginfo + pytestCheckHook + ]; + + disabledTestPaths = [ + # circular import of pdm + "tests/unit/test_build_command.py" + ]; + + meta = { + description = "Pdm-build-locked is a pdm plugin to publish locked dependencies as optional-dependencies"; + homepage = "https://github.com/pdm-project/pdm-build-locked"; + changelog = "https://github.com/pdm-project/pdm-build-locked/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 0e08e9bd8a830..f914b5b86ed91 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, git, pytestCheckHook, diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index c1657025e0a69..a7c2b3feb9b64 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.5.1"; + version = "14.6.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-YtoY/Sp9r6yIviXFKPYc+N8PjfKX+cZxtCZmR6fr1Tc="; + hash = "sha256-kQBW8bN8WYvWzpqM6JatB3bB/bAQqpHGd98prznyO+g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 03fb3fd84c2f2..e9def284c26cb 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/peewee-migrate/default.nix b/pkgs/development/python-modules/peewee-migrate/default.nix index ba31350184f27..cca95fd385c00 100644 --- a/pkgs/development/python-modules/peewee-migrate/default.nix +++ b/pkgs/development/python-modules/peewee-migrate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "peewee-migrate"; - version = "1.12.2"; + version = "1.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "klen"; repo = "peewee_migrate"; rev = "refs/tags/${version}"; - hash = "sha256-jxM2cvlDsoiUlVoxdS3wpUKlwMveMraiR431A8kIdgI="; + hash = "sha256-sC63WH/4EmoQYfvl3HyBHDzT/jMZW/G7mTC138+ZHHU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 93b27731359c7..e1c9505b40df6 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.5"; + version = "3.17.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = "peewee"; rev = "refs/tags/${version}"; - hash = "sha256-2SrqWPyeDBKOweLu7bEcDIAqCCtnKv0VBdzfpaA22ow="; + hash = "sha256-HluoCXblqwaOb+gtAhvaYshTj9CtHoegn0QUaq0V+eA="; }; build-system = [ setuptools ]; @@ -56,7 +56,7 @@ buildPythonPackage rec { homepage = "http://peewee-orm.com"; changelog = "https://github.com/coleifer/peewee/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "pwiz.py"; }; } diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 76eaac3b2df22..73a1d47855d3d 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FV/S/N9wA+rUos/uQIzvPWmWCIFi8wi2Tt6jMzvYfYQ="; + hash = "sha256-7LYlqWiOPTvQyJgpUZeZ5Wl17RswhYyit0/MaHyN5Ak="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index fb412e99c0d5c..627769ff18c8f 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/rust"; + sourceRoot = "${src.name}/rust"; name = "${pname}-${version}"; hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; postPatch = '' @@ -92,6 +92,6 @@ buildPythonPackage rec { homepage = "https://github.com/sdispater/pendulum"; changelog = "https://github.com/sdispater/pendulum/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index 01e2928707979..7a9c442d4219c 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Python style guide checker"; mainProgram = "pep8"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index b8c37ed5d6f97..78cd6bdaf9994 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/perfplot"; changelog = "https://github.com/nschloe/perfplot/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 25a575e146918..31b5b0a4500fb 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "periodictable"; - version = "1.7.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Qg5XwrGdalIbHAteOH2lkKMahFbkzBwAvKXOLcXwXqk="; + hash = "sha256-Q9fbcjPWszli+D156lT0fDuSPT6DQDy8A/WPNTr0tSw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 058b613fa2f4f..59892262e6978 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://persim.scikit-tda.org"; changelog = "https://github.com/scikit-tda/persim/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix index ac91a7fa4ef05..bbadd55d3afe3 100644 --- a/pkgs/development/python-modules/persist-queue/default.nix +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; + hash = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index cffa4633a117f..644ac8d2e5173 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/persistent/"; changelog = "https://github.com/zopefoundation/persistent/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 4abf1e9f092ce..2df4dd4b8ff0a 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.7.0"; + version = "2.12.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tL+Roe2GHSVm6tIxIWXI6ek8rOMN8Ak2+Xe5ebn497E="; + hash = "sha256-KBD9sRqtQT02RfyXurUiGy28bucB7l/irF/fPmVeGwc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 4fe0061f3392b..edf70ea2cb9dc 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "PostgreSQL Languages AST and statements prettifier"; changelog = "https://github.com/lelit/pglast/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "pgpp"; }; } diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index c0a4919f8a723..7f1c482977a32 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -1,6 +1,5 @@ { lib, - python, fetchPypi, buildPythonPackage, postgresql, diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 6ce163dd74c40..e632972198900 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/dbcli/pgspecial"; changelog = "https://github.com/dbcli/pgspecial/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index ab45d086eacd0..114a16888632c 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -10,8 +10,6 @@ dlinfo, typing-extensions, espeak-ng, - pytestCheckHook, - pytest-cov, }: buildPythonPackage rec { @@ -54,6 +52,6 @@ buildPythonPackage rec { description = "Simple text to phones converter for multiple languages"; mainProgram = "phonemize"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 5f76029900231..68c5148f7eb46 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -9,7 +9,6 @@ gwcs, matplotlib, numpy, - photutils, pythonOlder, rasterio, scikit-image, @@ -18,9 +17,7 @@ setuptools-scm, setuptools, shapely, - tomli, tqdm, - python, wheel, }: diff --git a/pkgs/development/python-modules/piano-transcription-inference/default.nix b/pkgs/development/python-modules/piano-transcription-inference/default.nix index 4727cee21c43b..788c3cf0bfc26 100644 --- a/pkgs/development/python-modules/piano-transcription-inference/default.nix +++ b/pkgs/development/python-modules/piano-transcription-inference/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index f6a71c1a37c15..d520087a17d0a 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/pika/pika"; homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 4674a8b39c99b..d512839a797c0 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system cmake, @@ -28,16 +29,24 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; rev = "refs/tags/v${version}"; - hash = "sha256-TpK6VK2YoOtc4ueag33m5n1umcUWOUgcda/MZEEOR7g="; + hash = "sha256-fKh4UbTVj74YxH2vvL24DNmMxg10GSYAmduwuRneE+0="; }; + patches = [ + (fetchpatch2 { + # fix libheif 1.18 support in tests + url = "https://github.com/bigcat88/pillow_heif/commit/a59434e9ca1138e47e322ddef2adc79e684384f1.patch"; + hash = "sha256-yVT/pnO5KWMnsO95EPCZgyhx6FIJOhsna7t0zpTjWpE="; + }) + ]; + postPatch = '' sed -i '/addopts/d' pyproject.toml ''; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index f061a17048b83..e913a10b4fbfd 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -55,7 +55,7 @@ import ../pillow/generic.nix ( Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. ''; license = licenses.hpnd; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } // args diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 420ed7bf53a62..87e982491fe89 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -67,10 +67,7 @@ import ./generic.nix ( processing and graphics capabilities. ''; license = licenses.hpnd; - maintainers = with maintainers; [ - goibhniu - prikhi - ]; + maintainers = with maintainers; [ prikhi ]; }; } // args diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 83816d8958acd..36fe5b0421fed 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -1,7 +1,6 @@ { pname, version, - disabled, src, patches ? [ ], meta, diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index ca8a72fff516b..c016d45ffae58 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/pims"; changelog = "https://github.com/soft-matter/pims/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix index 52f780cfad934..548e38c388d55 100644 --- a/pkgs/development/python-modules/ping3/default.nix +++ b/pkgs/development/python-modules/ping3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index c6239ac4d1511..562f701dece7f 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.33"; + version = "0.0.34"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "di"; repo = "pip-api"; rev = "refs/tags/${version}"; - hash = "sha256-bDM31YpVB0pZMqeGTCbnINSmJc03N0HuU8hcc8nnHgw="; + hash = "sha256-nmCP4hp+BsD80OBjerOu+QTBBExGHvn/v19od4V3ncI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pip-chill/default.nix b/pkgs/development/python-modules/pip-chill/default.nix new file mode 100644 index 0000000000000..7a32efc1c0130 --- /dev/null +++ b/pkgs/development/python-modules/pip-chill/default.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pip, + pythonAtLeast, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pip-chill"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rbanffy"; + repo = "pip-chill"; + rev = "refs/tags/v${version}"; + hash = "sha256-oWq3UWBL5nsCBUkaElashZKvm7pN3StJNubgU++8YFs="; + }; + + build-system = [ setuptools ]; + + dependencies = lib.optionals (pythonAtLeast "3.12") [ setuptools ]; + + nativeCheckInputs = [ + pip + pytestCheckHook + ]; + + preCheck = '' + substituteInPlace tests/test_pip_chill.py \ + --replace-fail "pip_chill/cli.py" "${placeholder "out"}/bin/pip-chill" + ''; + + pythonImportsCheck = [ "pip_chill" ]; + + meta = { + description = "A more relaxed `pip freeze`"; + homepage = "https://github.com/rbanffy/pip-chill"; + changelog = "https://github.com/rbanffy/pip-chill/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "pip-chill"; + }; +} diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index da4cef42adf92..87d275cf7c0b8 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { mainProgram = "pipdate"; homepage = "https://github.com/nschloe/pipdate"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 7414085188995..2ba2d47cae9e2 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.23.0"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-Er47yUaRCtTYQOhttOMIaM2EFf0l5rMH5YV1kpMCDls="; + hash = "sha256-yEiehHcJcVC0hjb9NFgsrSxmAsxNki8HNGKk8dEk75s="; }; build-system = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 38f6af66ad9d2..38f54f0963995 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.7"; + version = "0.5.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-u58+NRSV+mN6Vd1zyR2UM1rEbjZY1pNnLKSRj/JNxhU="; + hash = "sha256-/wWAkO2WKn6o9JClkcxoGfHKZNI3GW9hSXmxmoUJpUM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index d3f8f3f43b14e..0fc5fe5648c02 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -41,7 +41,10 @@ buildPythonPackage rec { userpath ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + argcomplete + ]; nativeCheckInputs = [ pytestCheckHook @@ -95,9 +98,9 @@ buildPythonPackage rec { postInstall = '' installShellCompletion --cmd pipx \ - --bash <(${argcomplete}/bin/register-python-argcomplete pipx --shell bash) \ - --zsh <(${argcomplete}/bin/register-python-argcomplete pipx --shell zsh) \ - --fish <(${argcomplete}/bin/register-python-argcomplete pipx --shell fish) + --bash <(register-python-argcomplete pipx --shell bash) \ + --zsh <(register-python-argcomplete pipx --shell zsh) \ + --fish <(register-python-argcomplete pipx --shell fish) ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix index bda5d66cf4ca4..23d5f748d3355 100644 --- a/pkgs/development/python-modules/pixelmatch/default.nix +++ b/pkgs/development/python-modules/pixelmatch/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pixel-level image comparison library"; homepage = "https://github.com/whtsky/pixelmatch-py"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 589721c4106e0..069ffd31a4ab0 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { setup.py develop). ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix deleted file mode 100644 index 724e991ee143d..0000000000000 --- a/pkgs/development/python-modules/pkutils/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nose3, - pythonOlder, - semver, -}: - -buildPythonPackage rec { - pname = "pkutils"; - version = "3.0.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "reubano"; - repo = "pkutils"; - rev = "refs/tags/v${version}"; - hash = "sha256-AK+xX+LPz6IVLZedsqMUm7G28ue0s3pXgIzxS4EHHLE="; - }; - - pythonRelaxDeps = [ "semver" ]; - - - propagatedBuildInputs = [ semver ]; - - nativeCheckInputs = [ nose3 ]; - - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - - pythonImportsCheck = [ "pkutils" ]; - - meta = with lib; { - description = "Python packaging utility library"; - homepage = "https://github.com/reubano/pkutils/"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 66aaa4e9425ba..d234636bb2ce2 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { mainProgram = "plac_runner.py"; homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 5bd7bc2ada3e8..29a5c749ab983 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "23.0.0"; + version = "24.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-1/819y1zcjoVwv5ITdvhno/X7piWdO22vYMovupwKXo="; + hash = "sha256-0LtYs2S1fGunmmPFl3cGa/lMtE7Ng+Xb4FruowjdWGM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index c4e53362c78cd..88ef8975b7288 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.9.7"; + version = "3.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/lsu7kiUyQ6LUFINX+/aCFSKm1pGyIfUzSuUehwCz7I="; + hash = "sha256-DLpxT+t1EqF42SaVnhtjjONsXRsnTMAlx6YaTD8Zj7c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plasTeX/default.nix b/pkgs/development/python-modules/plasTeX/default.nix new file mode 100644 index 0000000000000..407918ec4042c --- /dev/null +++ b/pkgs/development/python-modules/plasTeX/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + typing-extensions, + pillow, + jinja2, + unidecode, +}: +buildPythonPackage { + pname = "plasTeX"; + version = "3.1"; + pyproject = true; + + src = fetchFromGitHub { + repo = "plastex"; + owner = "plastex"; + rev = "193747318f7ebadd19eaaa1e9996da42a31a2697"; # The same as what is published on PyPi for version 3.1. See <https://github.com/plastex/plastex/issues/386> + hash = "sha256-Muuin7n0aPOZwlUaB32pONy5eyIjtPNb4On5gC9wOcQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + typing-extensions + pillow + jinja2 + unidecode + ]; + + meta = { + description = "plasTeX is a Python package to convert LaTeX markup to DOM"; + homepage = "https://plastex.github.io/plastex/"; + maintainers = with lib.maintainers; [ niklashh ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 94ff14306b77c..0585d596e74ad 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "PasteDeploy binding to the plaster configuration loader"; homepage = "https://github.com/Pylons/plaster_pastedeploy"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/plastexdepgraph/default.nix b/pkgs/development/python-modules/plastexdepgraph/default.nix new file mode 100644 index 0000000000000..7fcc029ad97f4 --- /dev/null +++ b/pkgs/development/python-modules/plastexdepgraph/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + pygraphviz, + plasTeX, +}: +buildPythonPackage { + pname = "plastexdepgraph"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + repo = "plastexdepgraph"; + owner = "PatrickMassot"; + rev = "0.0.4"; + hash = "sha256-Q13uYYZe1QgZHS4Nj8ugr+Fmhva98ttJj3AlXTK6XDw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pygraphviz + plasTeX + ]; + + meta = { + description = "plasTeX plugin allowing to build dependency graphs"; + homepage = "https://github.com/PatrickMassot/plastexdepgraph"; + maintainers = with lib.maintainers; [ niklashh ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/plastexshowmore/default.nix b/pkgs/development/python-modules/plastexshowmore/default.nix new file mode 100644 index 0000000000000..907869829a03a --- /dev/null +++ b/pkgs/development/python-modules/plastexshowmore/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + plasTeX, +}: + +buildPythonPackage { + pname = "plastexshowmore"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + repo = "plastexshowmore"; + owner = "PatrickMassot"; + rev = "0.0.2"; + hash = "sha256-b45VHHEwFA41FaInDteix56O7KYDzyKiRRSl7heHqEA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ plasTeX ]; + + meta = { + description = "PlasTeX plugin for adding navigation buttons"; + homepage = "https://github.com/PatrickMassot/plastexshowmore"; + maintainers = with lib.maintainers; [ niklashh ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 07f6f6813f1cd..d56554e46fb80 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.0"; + version = "1.25.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,10 +31,12 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-Sm6FfwUxW3t7gLwWd+ZJPyp0VSMPgGpuT3lrMurWOa0="; + hash = "sha256-aBex+29NGPELQY+uaOXzGOWxt8injSk2hmOtVqzodmM="; }; pythonRelaxDeps = [ + "aiohttp" + "aiohttp-socks" "beautifulsoup4" "playwright" "setuptools" diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 15e281911325d..89474b2646db7 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.14"; + version = "4.15.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-fcKLsx+hCMcY+LE7tHW0oys89MnmnYZndnctGBCiFDk="; + hash = "sha256-8sn+ttW8JzxrjDYvtRcjlahE0PNufMXySDwFsbg5zqk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 044bf148a336b..daa68e31afa1d 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc="; + hash = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ploomber-core/default.nix b/pkgs/development/python-modules/ploomber-core/default.nix new file mode 100644 index 0000000000000..e5d8eb2e480ae --- /dev/null +++ b/pkgs/development/python-modules/ploomber-core/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + pyyaml, + posthog, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "ploomber-core"; + version = "0.2.25"; + + pyproject = true; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ploomber"; + repo = "core"; + rev = "refs/tags/${version}"; + hash = "sha256-QUEnWFhf42ppoXoz3H/2SHtoPZOi6lbopsrbmEAk+1U="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyyaml + posthog + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + "telemetry" # requires network + "exceptions" # requires stderr capture + ]; + + pythonImportsCheck = [ "ploomber_core" ]; + + meta = with lib; { + description = "Core module shared across Ploomber projects"; + homepage = "https://github.com/ploomber/core"; + changelog = "https://github.com/ploomber/core/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/pkgs/development/python-modules/ploomber-extension/default.nix b/pkgs/development/python-modules/ploomber-extension/default.nix new file mode 100644 index 0000000000000..9c020f25fa6fd --- /dev/null +++ b/pkgs/development/python-modules/ploomber-extension/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + hatchling, + hatch-jupyter-builder, + hatch-nodejs-version, + jupyterlab, + ploomber-core, + pytestCheckHook, + pytest-jupyter, +}: + +buildPythonPackage rec { + pname = "ploomber-extension"; + version = "0.1.1"; + + pyproject = true; + disabled = pythonOlder "3.6"; + + # using pypi archive which includes pre-built assets + src = fetchPypi { + pname = "ploomber_extension"; + inherit version; + hash = "sha256-wsldqLhJfOESH9aMMzz1Y/FXofHyfgrl81O95NePXSA="; + }; + + build-system = [ + hatchling + hatch-jupyter-builder + hatch-nodejs-version + jupyterlab + ]; + + dependencies = [ ploomber-core ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-jupyter + ]; + + pythonImportsCheck = [ "ploomber_extension" ]; + + meta = with lib; { + description = "Ploomber extension"; + homepage = "https://pypi.org/project/ploomber-extension"; + license = licenses.bsd3; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 98ade26c76949..6623b8ace1ee1 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -2,29 +2,37 @@ lib, buildPythonPackage, fetchPypi, - pytz, - requests, - six, + setuptools, + packaging, tenacity, }: buildPythonPackage rec { pname = "plotly"; - version = "5.22.0"; - format = "setuptools"; + version = "5.23.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hZ/a29hrV3CuJGblQrdhskfRxrSdrtdluVu4xwY+dGk="; + hash = "sha256-ieV9ADoRYwOjTeZwCGI5E2fdVkIiq3H4Ux33Ann8AZM="; }; - propagatedBuildInputs = [ - pytz - requests - six + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "\"jupyterlab~=3.0;python_version>='3.6'\"," "" + ''; + + env.SKIP_NPM = true; + + build-system = [ setuptools ]; + + dependencies = [ + packaging tenacity ]; + pythonImportsCheck = [ "plotly" ]; + # No tests in archive doCheck = false; @@ -33,6 +41,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/plotly/plotly.py"; homepage = "https://plot.ly/python/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 6368f8c667853..f94ac77898f3f 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; + pythonRelaxDeps = [ "mizani" ]; + dependencies = [ matplotlib mizani @@ -105,11 +107,11 @@ buildPythonPackage rec { "tests/test_lint_and_format.py" ]; - meta = with lib; { + meta = { description = "Grammar of graphics for Python"; homepage = "https://plotnine.readthedocs.io/"; changelog = "https://github.com/has2k1/plotnine/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onny ]; }; } diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index ff03c4a6a5336..f2951a245e319 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools-scm, pythonOlder, - importlib-metadata, callPackage, }: diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix index cd2c09467ffd3..6a79e5b30068b 100644 --- a/pkgs/development/python-modules/plugp100/default.nix +++ b/pkgs/development/python-modules/plugp100/default.nix @@ -1,6 +1,4 @@ { - stdenv, - pkgs, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 75c281ae22b9f..6b2b163df6d87 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.38.3"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-DFHKycFWtR8moLyGaiDVqnrlg+ydgR8/UVgkUpzqAuY="; + hash = "sha256-OEEk0rMhvk99EVouotcNQlSfx5Xv23WswCQ5ZN5M3A4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index b1722a47a516c..42a9234a08d00 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -64,9 +64,9 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}"; - description = " Plumbum: Shell Combinators "; + description = " Plumbum: Shell Combinators"; homepage = " https://github.com/tomerfiliba/plumbum "; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix index 537eebe52a503..3467d9b213148 100644 --- a/pkgs/development/python-modules/pluthon/default.nix +++ b/pkgs/development/python-modules/pluthon/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch2, buildPythonPackage, setuptools, pythonOlder, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "pluthon"; - version = "0.4.6"; + version = "0.5.3"; format = "pyproject"; @@ -20,9 +21,18 @@ buildPythonPackage rec { owner = "OpShin"; repo = "pluthon"; rev = version; - hash = "sha256-ZmBkbglSbBfVhA4yP0tJdwpJiFpJ7vX0A321ldQF0lA="; + hash = "sha256-pX/XPZJQZaSY06nLLEvhf+1LEqYG3CdgPV/3Q6XOzTs="; }; + patches = [ + (fetchpatch2 { + name = "pluthon-bump-uplc.patch"; + # https://github.com/OpShin/pluthon/pull/21 + url = "https://github.com/OpShin/pluthon/commit/4b0a40223f253643056cab12231264c5beffc666.patch?full_index=1"; + hash = "sha256-dO9JaIpkugZFKsr3Hd0cFCy7K+cmf77UfrdkZ+sGQtA="; + }) + ]; + propagatedBuildInputs = [ setuptools uplc diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 5fbc757db88b6..302b67eea7b22 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Dynamic code loading framework for building pluggable Python distributions"; homepage = "https://github.com/localstack/plux"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix index 839ed1f303323..81b37969126cb 100644 --- a/pkgs/development/python-modules/pmdsky-debug-py/default.nix +++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python"; homepage = "https://github.com/SkyTemple/pmdsky-debug-py"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 3ba10ffb06b61..11f3a62535b47 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -5,7 +5,6 @@ fixtures, pytestCheckHook, pythonOlder, - pyxdg, requests, requests-mock, rich, @@ -16,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "5.0.0"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,18 +24,19 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-3tbhTg060/K4ejT/xjItSu9zf05LR/d0vkg4XDsspEE="; + hash = "sha256-2NsF00jaW2wl99sTxTQ5xJkqNOYh9RaecmBMcWP3TI8="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ - pyxdg + dependencies = [ requests - rich - tomli urllib3 - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + passthru.optional-dependencies = { + progress_bar = [ rich ]; + }; nativeCheckInputs = [ fixtures @@ -54,6 +54,7 @@ buildPythonPackage rec { # Integration tests require a running container setup "AdapterIntegrationTest" "ContainersIntegrationTest" + "ContainersExecIntegrationTests" "ImagesIntegrationTest" "ManifestsIntegrationTest" "NetworksIntegrationTest" @@ -69,6 +70,5 @@ buildPythonPackage rec { changelog = "https://github.com/containers/podman-py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; - mainProgram = "podman"; }; } diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index cf51068bc90c5..fec055b429bda 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix index be7bea5a634a1..fc0afe375f460 100644 --- a/pkgs/development/python-modules/polarizationsolver/default.nix +++ b/pkgs/development/python-modules/polarizationsolver/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, lib, fetchFromGitLab, - python, numpy, scipy, periodictable, diff --git a/pkgs/development/python-modules/polling/default.nix b/pkgs/development/python-modules/polling/default.nix index edca7ccbd3ba1..bbf858356234b 100644 --- a/pkgs/development/python-modules/polling/default.nix +++ b/pkgs/development/python-modules/polling/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Powerful polling utility in Python"; homepage = "https://github.com/justiniso/polling"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index 6b45f328598f0..089505631840a 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.8.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY="; + hash = "sha256-RjzB7S3qTCl6fo+qZ+mVCsQg6CLUnSwutNse5QPQOHU="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 20d39a3592b2d..734da54c25452 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,8 +4,8 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - pythonAtLeast, setuptools, + fetchpatch, }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.7.17"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ponyorm"; @@ -22,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-wBqw+YHKlxYplgsYL1pbkusHyPfCaVPcH/Yku6WDYbE="; }; + patches = [ + # https://github.com/ponyorm/pony/pull/713 + (fetchpatch { + name = "py312-compat.patch"; + url = "https://github.com/ponyorm/pony/commit/5a37f6d59b6433d17d6d56b54f3726190e98c98f.patch"; + hash = "sha256-niOoANOYHqrcmEXRZEDew2BM8P/s7UFnn0qpgB8V0Mk="; + }) + ]; + nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index dd5434422144e..0ac8753d382dc 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; + hash = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; }; buildInputs = [ @@ -56,6 +56,6 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/frescobaldi/python-poppler-qt5"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 53de4065ff12a..be7697d0d6aba 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Library to provide an easy API to file locking"; homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 2b89a74928dbb..35bf5d1a8be5d 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; + hash = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index b19dd5b1bf107..61fd71319fad4 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { mainProgram = "portserver.py"; homepage = "https://github.com/google/python_portpicker"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/posix-ipc/default.nix b/pkgs/development/python-modules/posix-ipc/default.nix index d081801ce48a5..6c78fc34830db 100644 --- a/pkgs/development/python-modules/posix-ipc/default.nix +++ b/pkgs/development/python-modules/posix-ipc/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; homepage = "https://github.com/osvenskan/posix_ipc"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 381bd2bb2193c..9d361a3ff11c0 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -3,25 +3,25 @@ autograd, buildPythonPackage, fetchFromGitHub, - cupy, cvxopt, cython, - oldest-supported-numpy, + jax, + jaxlib, matplotlib, numpy, - tensorflow, pymanopt, pytestCheckHook, pythonOlder, scikit-learn, scipy, - enableDimensionalityReduction ? false, - enableGPU ? false, + setuptools, + tensorflow, + torch, }: buildPythonPackage rec { pname = "pot"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,33 +30,56 @@ buildPythonPackage rec { owner = "PythonOT"; repo = "POT"; rev = "refs/tags/${version}"; - hash = "sha256-fdqDM0V6zTFe1lcqi53ZZNHAfmuR2I7fdX4SN9qeNn8="; + hash = "sha256-Yx9hjniXebn7ZZeqou0JEsn2Yf9hyJSu/acDlM4kCCI="; }; - nativeBuildInputs = [ + build-system = [ + setuptools cython - oldest-supported-numpy + numpy ]; - propagatedBuildInputs = - [ - numpy - scipy - ] - ++ lib.optionals enableGPU [ cupy ] - ++ lib.optionals enableDimensionalityReduction [ - autograd + dependencies = [ + numpy + scipy + ]; + + optional-dependencies = { + backend-numpy = [ ]; + backend-jax = [ + jax + jaxlib + ]; + backend-cupy = [ ]; + backend-tf = [ tensorflow ]; + backend-torch = [ torch ]; + cvxopt = [ cvxopt ]; + dr = [ + scikit-learn pymanopt + autograd + ]; + gnn = [ + torch + # torch-geometric ]; + plot = [ matplotlib ]; + all = + with optional-dependencies; + ( + backend-numpy + ++ backend-jax + ++ backend-cupy + ++ backend-tf + ++ backend-torch + ++ optional-dependencies.cvxopt + ++ dr + ++ gnn + ++ plot + ); + }; - nativeCheckInputs = [ - cvxopt - matplotlib - numpy - tensorflow - scikit-learn - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ @@ -64,6 +87,9 @@ buildPythonPackage rec { --replace " --durations=20" "" \ --replace " --junit-xml=junit-results.xml" "" + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0" "numpy" + # we don't need setup.py to find the macos sdk for us sed -i '/sdk_path/d' setup.py ''; @@ -106,8 +132,6 @@ buildPythonPackage rec { "test_emd1d_device_tf" ]; - disabledTestPaths = lib.optionals (!enableDimensionalityReduction) [ "test/test_dr.py" ]; - pythonImportsCheck = [ "ot" "ot.lp" diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 02da784d426ab..5270503513a22 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -11,7 +11,6 @@ matplotlib, numpy, pandas, - pytestCheckHook, pythonOlder, requests, scipy, diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix index f6e6f72755f89..fcf1f4e0701d5 100644 --- a/pkgs/development/python-modules/potr/default.nix +++ b/pkgs/development/python-modules/potr/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Pure Python OTR implementation"; homepage = "http://python-otr.pentabarf.de/"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 2c82fc966e946..ffcf9616cb599 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { mainProgram = "pox"; homepage = "https://pox.readthedocs.io/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index ec61d57fc46c9..53eaa5657e7a3 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://ppft.readthedocs.io/"; changelog = "https://github.com/uqfoundation/ppft/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ppk2-api/default.nix b/pkgs/development/python-modules/ppk2-api/default.nix new file mode 100644 index 0000000000000..066cf56c557bd --- /dev/null +++ b/pkgs/development/python-modules/ppk2-api/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyserial, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "ppk2-api"; + version = "0.9.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "IRNAS"; + repo = "ppk2-api-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-fubDFtOXiv2YFYUCOUbuyXs1sHgs0/6ZVK9sAwxQ+Pk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pyserial ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "ppk2_api" ]; + + meta = with lib; { + description = "Power Profiling Kit 2 unofficial Python API"; + homepage = "https://github.com/IRNAS/ppk2-api-python"; + changelog = "https://github.com/IRNAS/ppk2-api-python/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 98f97f9466ae7..d9684090774a7 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1CohbIKRTc9NfAAN68mLsza4+D4Ca6XZUszNn4B07/0="; + hash = "sha256-1CohbIKRTc9NfAAN68mLsza4+D4Ca6XZUszNn4B07/0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index cd7e115d5aff2..d791e77972b9c 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -2,33 +2,27 @@ lib, buildPythonPackage, fetchpatch, - fetchPypi, - parameterized, + fetchFromGitHub, pytestCheckHook, - pynose, - python, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pprintpp"; - version = "0.4.0"; + version = "0.4.0-unstable-2022-05-31"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6oJhCOLH9J3G1mx1KXPD/JdJFCp5jWslTh4wHP28ZAM="; + src = fetchFromGitHub { + owner = "joaonc"; + repo = "pprintpp2"; + rev = "303f0652c9420f2cf0a0f4fe1907377508a17b3d"; # no tags + hash = "sha256-rjOf38m5mzIyJ3aVrD0+WQuzIyFjfa/4zmpFGGhF2hs="; }; patches = [ - # Replace nose-parameterized with parameterized, https://github.com/wolever/pprintpp/pull/21 - (fetchpatch { - url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; - hash = "sha256-Y+2yVUkDHkwo49ynNHYXVXJpX4DfVYJ0CWKgzFX/HWc="; - }) # Remove "U" move from open(), https://github.com/wolever/pprintpp/pull/31 (fetchpatch { name = "remove-u.patch"; @@ -39,22 +33,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ - parameterized - pynose - pytestCheckHook - ]; - pythonImportsCheck = [ "pprintpp" ]; - pytestFlagsArray = [ "test.py" ]; - - disabledTests = [ - # AttributeError: 'EncodedFile' object has no attribute 'getvalue' - "test_pp" - "test_pp_pprint" - "test_fmt" - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Drop-in replacement for pprint that's actually pretty"; diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 5c6a85b29c835..533382cdca269 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1krw77ij69EbLg5mKmQmxeHpn38uRG9EOboGmRk+StY="; + hash = "sha256-1krw77ij69EbLg5mKmQmxeHpn38uRG9EOboGmRk+StY="; }; # tests require running postgresql cluster diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index 5802f01cc0006..7067bd61213e4 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/byllyfish/precis_i18n"; changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index 5c4241a6477ee..4281e6de0edfd 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -4,8 +4,7 @@ fetchPypi, six, unidecode, - nose, - yanc, + pytestCheckHook, }: buildPythonPackage rec { @@ -17,20 +16,13 @@ buildPythonPackage rec { six unidecode ]; - nativeCheckInputs = [ - nose - yanc - ]; + nativeCheckInputs = [ pytestCheckHook ]; src = fetchPypi { inherit pname version; sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c"; }; - checkPhase = '' - nosetests . - ''; - meta = with lib; { description = "Assertion library for Python"; homepage = "http://heynemann.github.io/preggy/"; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 69e4a00c5955c..dd6eec493338a 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; meta = { - description = "Turns CSS blocks into style attributes "; + description = "Turns CSS blocks into style attributes"; homepage = "https://github.com/peterbe/premailer"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index e901288445585..1ca058038fbfa 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, cymem, cython, - python, fetchPypi, murmurhash, pytestCheckHook, @@ -43,6 +42,6 @@ buildPythonPackage rec { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index 3e4396a4043c9..f35fcb5e9c872 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Module for stubbing"; homepage = "https://github.com/alex/pretend"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index f7fd2f5bfca2f..53143aa47fbf6 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/prettytable"; changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/print-color/default.nix b/pkgs/development/python-modules/print-color/default.nix new file mode 100644 index 0000000000000..605f89e51bcd4 --- /dev/null +++ b/pkgs/development/python-modules/print-color/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "print-color"; + version = "0.4.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "xy3"; + repo = "print-color"; + rev = "refs/tags/v${version}"; + hash = "sha256-PHPbzzWG7smEsoTFYFT2tgXfCxUYjevpB9rxG2bZVy4="; + }; + + build-system = [ poetry-core ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "print_color" ]; + + meta = with lib; { + description = "Module to print color messages in the terminal"; + homepage = "https://github.com/xy3/print-color"; + changelog = "https://github.com/xy3/print-color/releases/tag/v${version}"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix index 23eb592a57069..1f9b8dff5eeb0 100644 --- a/pkgs/development/python-modules/prisma/default.nix +++ b/pkgs/development/python-modules/prisma/default.nix @@ -7,7 +7,6 @@ jinja2, nodeenv, pydantic, - pytestCheckHook, python-dotenv, pythonOlder, setuptools, @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "prisma"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +26,7 @@ buildPythonPackage rec { owner = "RobertCraigie"; repo = "prisma-client-py"; rev = "refs/tags/v${version}"; - hash = "sha256-7pibexiFsyrwC6rVv0CGHRbQU4G3rOXVhQW/7c/vKJA="; + hash = "sha256-PeKRH+6/D5/VxnhRFhpvtZ85OL8mJDhG7QLn4oRUvfE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix index 32d7a9ead8c6b..5abb41f269103 100644 --- a/pkgs/development/python-modules/prison/default.nix +++ b/pkgs/development/python-modules/prison/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, six, - nose, + pytestCheckHook, }: buildPythonPackage rec { pname = "prison"; version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "betodealmeida"; @@ -18,9 +19,11 @@ buildPythonPackage rec { hash = "sha256-qor40vUQeTdlO3vwug3GGNX5vkNaF0H7EWlRdsY4bvc="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ nose ]; + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Rison encoder/decoder"; diff --git a/pkgs/development/python-modules/private-gpt/default.nix b/pkgs/development/python-modules/private-gpt/default.nix index 765132c92ba52..8c4c1545c3504 100644 --- a/pkgs/development/python-modules/private-gpt/default.nix +++ b/pkgs/development/python-modules/private-gpt/default.nix @@ -93,6 +93,6 @@ buildPythonPackage rec { homepage = "https://github.com/zylon-ai/private-gpt"; license = lib.licenses.asl20; mainProgram = "private-gpt"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix new file mode 100644 index 0000000000000..95d2277697d6e --- /dev/null +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, flit-core + +, prometheus-client +, typing-extensions +, wrapt +, aiohttp +, twisted + +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "prometheus-async"; + version = "22.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hynek"; + repo = "prometheus-async"; + rev = version; + hash = "sha256-2C4qr0gLYHndd49UfjtuF/v05Hl2PuyegPUhCAmd5/E="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + prometheus-client + typing-extensions + wrapt + ]; + + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + ]; + consul = [ + aiohttp + ]; + twisted = [ + twisted + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ "prometheus_async" ]; + + meta = with lib; { + description = "Async helpers for prometheus_client"; + homepage = "https://github.com/hynek/prometheus-async"; + changelog = "https://github.com/hynek/prometheus-async/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index db541075d773d..9f0704d7a3d0b 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/prometheus/client_python"; changelog = "https://github.com/prometheus/client_python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix new file mode 100644 index 0000000000000..9ec29ff80bca1 --- /dev/null +++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, devtools +, fastapi +, httpx +, poetry-core +, prometheus-client +, requests +, starlette +}: + +buildPythonPackage rec { + pname = "prometheus-fastapi-instrumentator"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "trallnag"; + repo = "prometheus-fastapi-instrumentator"; + rev = "refs/tags/v${version}"; + hash = "sha256-yvKdhQdbY0+jEc8TEHNNgtdnqE0abnd4MN/JZFQwQ2E="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + prometheus-client + starlette + ]; + + nativeCheckInputs = [ + devtools + fastapi + httpx + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ "prometheus_fastapi_instrumentator" ]; + + meta = { + description = "Instrument FastAPI with Prometheus metrics"; + homepage = "https://github.com/trallnag/prometheus-fastapi-instrumentator"; + changelog = "https://github.com/trallnag/prometheus-fastapi-instrumentator/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ isc bsd3 ]; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.linux; # numerous test failures on Darwin + }; +} diff --git a/pkgs/development/python-modules/prompt-toolkit/1.nix b/pkgs/development/python-modules/prompt-toolkit/1.nix index 1a6dd3223df01..b50f5ef7cd4f4 100644 --- a/pkgs/development/python-modules/prompt-toolkit/1.nix +++ b/pkgs/development/python-modules/prompt-toolkit/1.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { with a nice interactive Python shell (called ptpython) built on top. ''; homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 0a415b1926fe4..c66dd4499ee41 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; changelog = "https://github.com/prompt-toolkit/python-prompt-toolkit/blob/${version}/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index bfd17d74dcbfa..bf2fb99c36afa 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/protego"; changelog = "https://github.com/scrapy/protego/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix new file mode 100644 index 0000000000000..9d10deca12a58 --- /dev/null +++ b/pkgs/development/python-modules/protobuf/4.nix @@ -0,0 +1,131 @@ +{ + buildPackages, + buildPythonPackage, + fetchpatch, + isPyPy, + lib, + numpy, + protobuf, + pytestCheckHook, + pythonAtLeast, + substituteAll, + tzdata, +}: + +assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required"; + +let + protobufVersionMajor = lib.versions.major protobuf.version; + protobufVersionMinor = lib.versions.minor protobuf.version; +in +buildPythonPackage { + inherit (protobuf) pname src; + + # protobuf 21 corresponds with its python library 4.21 + version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; + format = "setuptools"; + + sourceRoot = "${protobuf.src.name}/python"; + + patches = + lib.optionals (lib.versionAtLeast protobuf.version "22") [ + # Replace the vendored abseil-cpp with nixpkgs' + (substituteAll { + src = ./use-nixpkgs-abseil-cpp.patch; + abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; + }) + ] + ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [ + (fetchpatch { + name = "support-python311.patch"; + url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; + stripLen = 1; # because sourceRoot above + hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo="; + }) + ]; + + prePatch = '' + if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then + echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" + exit 1 + fi + ''; + + # Remove the line in setup.py that forces compiling with C++14. Upstream's + # CMake build has been updated to support compiling with other versions of + # C++, but the Python build has not. Without this, we observe compile-time + # errors using GCC. + # + # Fedora appears to do the same, per this comment: + # + # https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967 + # + postPatch = '' + sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + + # The former function has been renamed into the latter in Python 3.12. + # Does not apply to all protobuf versions, hence --replace-warn. + substituteInPlace google/protobuf/internal/json_format_test.py \ + --replace-warn assertRaisesRegexp assertRaisesRegex + ''; + + nativeBuildInputs = lib.optional isPyPy tzdata; + + buildInputs = [ protobuf ]; + + propagatedNativeBuildInputs = [ + # For protoc of the same version. + buildPackages."protobuf_${protobufVersionMajor}" + ]; + + setupPyGlobalFlags = [ "--cpp_implementation" ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + + disabledTestPaths = + lib.optionals (lib.versionAtLeast protobuf.version "23") [ + # The following commit (I think) added some internal test logic for Google + # that broke generator_test.py. There is a new proto file that setup.py is + # not generating into a .py file. However, adding this breaks a bunch of + # conflict detection in descriptor_test.py that I don't understand. So let's + # just disable generator_test.py for now. + # + # https://github.com/protocolbuffers/protobuf/commit/5abab0f47e81ac085f0b2d17ec3b3a3b252a11f1 + # + "google/protobuf/internal/generator_test.py" + ] + ++ lib.optionals (lib.versionAtLeast protobuf.version "25") [ + "minimal_test.py" # ModuleNotFoundError: No module named 'google3' + ]; + + pythonImportsCheck = [ + "google.protobuf" + "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + ]; + + passthru = { + inherit protobuf; + }; + + meta = with lib; { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp ]; + # Tests are currently failing because backend is unavailable and causes tests to fail + # Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902 + broken = lib.versionAtLeast protobuf.version "26"; + }; +} diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 9d10deca12a58..75dc81ccbad34 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -1,131 +1,39 @@ { - buildPackages, buildPythonPackage, - fetchpatch, - isPyPy, + fetchPypi, lib, - numpy, - protobuf, - pytestCheckHook, - pythonAtLeast, - substituteAll, - tzdata, + setuptools, }: -assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required"; +buildPythonPackage rec { + pname = "protobuf"; + version = "5.27.2"; + pyproject = true; -let - protobufVersionMajor = lib.versions.major protobuf.version; - protobufVersionMinor = lib.versions.minor protobuf.version; -in -buildPythonPackage { - inherit (protobuf) pname src; - - # protobuf 21 corresponds with its python library 4.21 - version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; - format = "setuptools"; - - sourceRoot = "${protobuf.src.name}/python"; - - patches = - lib.optionals (lib.versionAtLeast protobuf.version "22") [ - # Replace the vendored abseil-cpp with nixpkgs' - (substituteAll { - src = ./use-nixpkgs-abseil-cpp.patch; - abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; - }) - ] - ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [ - (fetchpatch { - name = "support-python311.patch"; - url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; - stripLen = 1; # because sourceRoot above - hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo="; - }) - ]; - - prePatch = '' - if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then - echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" - exit 1 - fi - ''; - - # Remove the line in setup.py that forces compiling with C++14. Upstream's - # CMake build has been updated to support compiling with other versions of - # C++, but the Python build has not. Without this, we observe compile-time - # errors using GCC. - # - # Fedora appears to do the same, per this comment: - # - # https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967 - # - postPatch = '' - sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py - - # The former function has been renamed into the latter in Python 3.12. - # Does not apply to all protobuf versions, hence --replace-warn. - substituteInPlace google/protobuf/internal/json_format_test.py \ - --replace-warn assertRaisesRegexp assertRaisesRegex - ''; - - nativeBuildInputs = lib.optional isPyPy tzdata; - - buildInputs = [ protobuf ]; - - propagatedNativeBuildInputs = [ - # For protoc of the same version. - buildPackages."protobuf_${protobufVersionMajor}" - ]; - - setupPyGlobalFlags = [ "--cpp_implementation" ]; - - nativeCheckInputs = [ - pytestCheckHook - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ]; + src = fetchPypi { + inherit pname version; + hash = "sha256-8+ze8ia5r4VgdfKCJ/8skM46WU0JLDm+5VE1c/JeJxQ="; + }; - disabledTests = lib.optionals isPyPy [ - # error message differs - "testInvalidTimestamp" - # requires tracemalloc which pypy does not implement - # https://foss.heptapod.net/pypy/pypy/-/issues/3048 - "testUnknownFieldsNoMemoryLeak" - # assertion is not raised for some reason - "testStrictUtf8Check" - ]; + build-system = [ setuptools ]; - disabledTestPaths = - lib.optionals (lib.versionAtLeast protobuf.version "23") [ - # The following commit (I think) added some internal test logic for Google - # that broke generator_test.py. There is a new proto file that setup.py is - # not generating into a .py file. However, adding this breaks a bunch of - # conflict detection in descriptor_test.py that I don't understand. So let's - # just disable generator_test.py for now. - # - # https://github.com/protocolbuffers/protobuf/commit/5abab0f47e81ac085f0b2d17ec3b3a3b252a11f1 - # - "google/protobuf/internal/generator_test.py" - ] - ++ lib.optionals (lib.versionAtLeast protobuf.version "25") [ - "minimal_test.py" # ModuleNotFoundError: No module named 'google3' - ]; + # the pypi source archive does not ship tests + doCheck = false; pythonImportsCheck = [ "google.protobuf" - "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + "google.protobuf.compiler" + "google.protobuf.internal" + "google.protobuf.pyext" + "google.protobuf.testdata" + "google.protobuf.util" + "google._upb._message" ]; - passthru = { - inherit protobuf; - }; - meta = with lib; { description = "Protocol Buffers are Google's data interchange format"; homepage = "https://developers.google.com/protocol-buffers/"; license = licenses.bsd3; - maintainers = with maintainers; [ knedlsepp ]; - # Tests are currently failing because backend is unavailable and causes tests to fail - # Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902 - broken = lib.versionAtLeast protobuf.version "26"; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index a5067b1525cf7..1f35c5aba5b6b 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -17,7 +17,6 @@ pkgs-systemd, python, xdg-utils, - makeWrapper, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 233f71b0a3d91..f4606cda7f48d 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; + hash = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index bd8219751872e..7502d2daf3cc5 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -5,7 +5,8 @@ buildPythonPackage, cffi, fetchFromGitHub, - nose, + setuptools, + pytestCheckHook, numpy, stdenv, }: @@ -13,7 +14,7 @@ buildPythonPackage { pname = "prox-tv"; version = "3.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "albarji"; @@ -22,27 +23,26 @@ buildPythonPackage { sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5"; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy cffi ]; - # this test is known to fail on darwin - checkPhase = '' - nosetests --exclude=test_tvp_1d ${lib.optionalString stdenv.isDarwin " --exclude=test_tv2_1d"} - ''; - - propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ blas lapack ]; + propagatedNativeBuildInputs = [ cffi ]; + enableParallelBuilding = true; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ "test_tvp_1d" ] ++ lib.optionals stdenv.isDarwin [ "test_tv2_1d" ]; + meta = with lib; { homepage = "https://github.com/albarji/proxTV"; description = "Toolbox for fast Total Variation proximity operators"; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index aa940d50ed011..886981ccabee5 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.4.4"; + version = "2.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "refs/tags/v${version}"; - hash = "sha256-QWwIbNt2MtRfQaX7uZJzYmS++2MH+gTjWO0aEKYSETI="; + hash = "sha256-pn4YYGntG9C8mhECb7PYgN5wwicdlPcZu6Xn2M3iIKA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 1f28bf2a244d9..f6ffef6ea7278 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.33"; + version = "1.9.34"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4Y4VLfGwopfeIppxwvGKSuelUDAXg67rM/ES9BrTP24="; + hash = "sha256-UFdprXoHFsbH3Tbui44n8FTdbkynnYVL1LHtFzFInio="; }; postPatch = '' diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 0b7a69a434fa9..4c0a93d2faa44 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/psutil"; changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/psychrolib/default.nix b/pkgs/development/python-modules/psychrolib/default.nix index 144d65b3f5785..ec8544ff2f6f4 100644 --- a/pkgs/development/python-modules/psychrolib/default.nix +++ b/pkgs/development/python-modules/psychrolib/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 471cff85da6ed..ec958d7525c94 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -72,6 +72,6 @@ buildPythonPackage rec { lgpl3Plus zpl20 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index 8847ef8a1bdc8..d88a7433f068e 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + setuptools, + pytestCheckHook, }: buildPythonPackage { pname = "ptable"; version = "unstable-2019-06-14"; - format = "setuptools"; + pyproject = true; # https://github.com/kxxoling/PTable/issues/27 src = fetchFromGitHub { @@ -18,11 +19,9 @@ buildPythonPackage { sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i"; }; - nativeCheckInputs = [ nose ]; + build-system = [ setuptools ]; - checkPhase = '' - nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75 - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/kxxoling/PTable"; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index bd920162aad42..9ddbd38d9339e 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.27"; + version = "3.0.28"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JLD9qUtz0cmaJ+b9DQi+by582nmi25lcfjx7ixJUutk="; + hash = "sha256-vFBvVNuvRHykdMhRytNx5J4rdg2JGcQidAMH+tIqUIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index 11f331cd67929..c0f0d87477ff5 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Allows to get the public suffix of a domain name"; homepage = "https://pypi.python.org/pypi/publicsuffix/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index 02a686c31025b..c11880a620c36 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -35,6 +35,6 @@ buildPythonPackage { description = "Get a public suffix for a domain name using the Public Suffix List"; homepage = "https://github.com/nexB/python-publicsuffix2"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 11d5d38fd10ad..4edaaaed333f5 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.1.20240629"; + version = "1.0.2.20240724"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WXyE+4SHMDoaG+g+GrDcfgYlQTdOv8IQkrmaxBWNjek="; + hash = "sha256-7pxRDUkWC1Umu5Eq6JiUnRadbMmjC96uMJynYPhSfUI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 868926ba95f13..3f027199af4a9 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -62,7 +62,9 @@ buildPythonPackage rec { description = "Python-based APIs for PubNub"; homepage = "https://github.com/pubnub/python"; changelog = "https://github.com/pubnub/python/releases/tag/v${version}"; - license = with licenses; [ mit ]; + # PubNub Software Development Kit License Agreement + # https://github.com/pubnub/python/blob/master/LICENSE + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix index 2bb9a0e75f73e..8938d9df1ce44 100644 --- a/pkgs/development/python-modules/pubnubsub-handler/default.nix +++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; + hash = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index cfafbc0fb7a67..08abae48d113c 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -2,7 +2,9 @@ lib, buildPythonPackage, fetchPypi, + setuptools, jedi, + packaging, pygments, urwid, urwid-readline, @@ -13,18 +15,21 @@ buildPythonPackage rec { pname = "pudb"; - version = "2024.1"; - format = "setuptools"; + version = "2024.1.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/J1ql2pZtZB2TIN57CAP7NR/qoQlm2Tv2M2GBmoK8zg="; + hash = "sha256-rcmwAEK6g2cRffCmwNxi+pYJq9IcO/jltz1iCQfFtD4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ jedi + packaging pygments urwid urwid-readline @@ -47,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/inducer/pudb"; changelog = "https://github.com/inducer/pudb/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 8d276960ac2ed..c8c0a42402604 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.41.0"; + version = "6.48.0"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-7l+m4ULDGa15QNu6l2kURQznKP2Ut9Y1P9njV7s9nzc="; + hash = "sha256-Q4peAFlwH1th/WZawg0QF5SdKHJkytJoy9aMw0b9Ak4="; }; sourceRoot = "${src.name}/sdk/python"; @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/pulumi/pulumi-aws"; changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix index 5851e3e274390..d037fc7af5b85 100644 --- a/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Reimplementation of pcapy"; homepage = "https://github.com/rcloran/pure-pcapy-3"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix index 283d59ef29030..5bbed7bb1b8dc 100644 --- a/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -8,13 +8,13 @@ typing-extensions, pytestCheckHook, pytest-benchmark, - pytest-cov, + pytest-cov-stub, pydantic, }: buildPythonPackage rec { pname = "pure-protobuf"; - version = "3.1.0"; + version = "3.1.1"; format = "pyproject"; # < 3.10 requires get-annotations which isn't packaged yet @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "eigenein"; repo = "protobuf"; rev = "refs/tags/${version}"; - hash = "sha256-JXC68iEX5VepIe4qpugvY0Qb3JlM5mPGHnUVWvb1TDA="; + hash = "sha256-xcW6ODL0UqwVesqIUxxzN5EuXK8hE4rY1inatuM1UpI="; }; build-system = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { pydantic pytestCheckHook pytest-benchmark - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "--benchmark-disable" ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 52e6abb8047cb..3012925d4103c 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.25"; + version = "1.27"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-l97ZK9VT+kU9Hos91C7Q9Zhv3Dge3kyF7N//j4sZ5Kc="; + hash = "sha256-93akHgfkNbYGDJxXXJTk9yobvpiycqdroVBEeOzDiFQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index d6e76fcc1ba78..493ac2fd2960e 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Immutable URL class for easy URL-building and manipulation"; homepage = "https://github.com/codeinthehole/purl"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index bd53166c58ff7..e0da6ed669604 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -6,7 +6,6 @@ requests, six, pytestCheckHook, - pythonOlder, requests-toolbelt, responses, }: diff --git a/pkgs/development/python-modules/pwinput/default.nix b/pkgs/development/python-modules/pwinput/default.nix new file mode 100644 index 0000000000000..66105db31a078 --- /dev/null +++ b/pkgs/development/python-modules/pwinput/default.nix @@ -0,0 +1,35 @@ +{ + buildPythonPackage, + fetchPypi, + setuptools, + lib, + pythonOlder, +}: +buildPythonPackage rec { + pname = "pwinput"; + version = "1.0.3"; + + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "pwinput"; + hash = "sha256-yhqL0G4ohy11Hb1BMthjcSfCW0COo6NJN3MUpUkUJvM="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "pwinput" ]; + + # Requires graphical environment to use pyautogui + doCheck = false; + + meta = { + description = "Python module that masks password input"; + homepage = "https://github.com/asweigart/pwinput"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bwkam ]; + }; +} diff --git a/pkgs/development/python-modules/pwndbg/default.nix b/pkgs/development/python-modules/pwndbg/default.nix index e4b77db14eab7..110fd273fbe1a 100644 --- a/pkgs/development/python-modules/pwndbg/default.nix +++ b/pkgs/development/python-modules/pwndbg/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, capstone, diff --git a/pkgs/development/python-modules/py-ccm15/default.nix b/pkgs/development/python-modules/py-ccm15/default.nix new file mode 100644 index 0000000000000..aa4ccf9928e2e --- /dev/null +++ b/pkgs/development/python-modules/py-ccm15/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + httpx, + xmltodict, + aiohttp, +}: + +buildPythonPackage { + pname = "py-ccm15"; + version = "0.0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ocalvo"; + repo = "py-ccm15"; + # Upstream does not have a tag for this release and this is the exact release commit + # Therefore it should not be marked unstable + # upstream issue: https://github.com/ocalvo/py-ccm15/issues/10 + rev = "3891d840e69d241c85bf9486e7fe0bb3c7443980"; + hash = "sha256-I2/AdG07PAvuC8rQKOIAUk7u3pJpANMaFpvEsejWeBU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + httpx + xmltodict + aiohttp + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "ccm15" ]; + + meta = { + description = "Python Library to access a Midea CCM15 data converter"; + homepage = "https://github.com/ocalvo/py-ccm15"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index 7c26fe29f2f2f..cf734872942d9 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/workhorsy/py-cpuinfo"; changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 2e2f1dd1bb16d..6ee5b05346739 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { description = "ECC pairing and bn_128 and bls12_381 curve operations"; homepage = "https://github.com/ethereum/py_ecc"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 6c009fd9c5922..bf95fb2da73f8 100644 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { description = "Collection of functions to generate hashes for signing on Ethereum"; homepage = "https://github.com/rmeissner/py-eth-sig-utils"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more. broken = true; }; diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 8aeae2b22b1fd..ab889f86ff2c2 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, + requests, setuptools, }: buildPythonPackage rec { pname = "py-nextbusnext"; - version = "1.0.2"; + version = "2.0.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ViViDboarder"; repo = "py_nextbus"; rev = "refs/tags/v${version}"; - hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM="; + hash = "sha256-dSBjOMqryEddWB54AddGDojRE8/STi3kxfjJsVFBuOw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = [ requests ]; pythonImportsCheck = [ "py_nextbus" ]; + # upstream has no tests + doCheck = false; + meta = with lib; { description = "Minimalistic Python client for the NextBus public API"; homepage = "https://github.com/ViViDboarder/py_nextbus"; diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix new file mode 100644 index 0000000000000..22f3ebe7ecc88 --- /dev/null +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, requests +}: + +buildPythonPackage rec { + pname = "py-opensonic"; + version = "5.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "khers"; + repo = "py-opensonic"; + rev = "v${version}"; + hash = "sha256-wXTXuX+iIMEoALxsciopucmvBxAyEeiOgjJPrbD63gM="; + }; + + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "libopensonic" + ]; + + meta = with lib; { + description = "Python library to wrap the Open Subsonic REST API"; + homepage = "https://github.com/khers/py-opensonic"; + changelog = "https://github.com/khers/py-opensonic/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/py-pdf-parser/default.nix b/pkgs/development/python-modules/py-pdf-parser/default.nix index 84d2e77d45af6..551eaea8cc62e 100644 --- a/pkgs/development/python-modules/py-pdf-parser/default.nix +++ b/pkgs/development/python-modules/py-pdf-parser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "py-pdf-parser"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nMEmzQVz1LR4omHyxhvrjBXDQQE23S62T0wxZeMnXhg="; + hash = "sha256-dssxWgbMrWFTK4b7oBezF77k9NmUTbdbQED9eyVQGlU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index b0e0f0284cb4e..d1908b79d3d0d 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.0.3"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-oVjb7/9RWvQd5L6xQBrspfblPzMaRvnZHDuojTuq+zE="; + hash = "sha256-8rGsFQzZbWJydzGhdobeN/L2LH2BEpC7O9D/h8zoXcM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/py-slvs/default.nix b/pkgs/development/python-modules/py-slvs/default.nix index 775de5a238bd1..1f434fe66970f 100644 --- a/pkgs/development/python-modules/py-slvs/default.nix +++ b/pkgs/development/python-modules/py-slvs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "py_slvs"; inherit version; - sha256 = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI="; + hash = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI="; }; pyproject = true; diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index 0d7f845b8a5b4..fd6a265b87e5e 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "py-stringmatching"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2XuhtWKtmO/8lGaHxdqwdMF6UVEUqw3PUCIC1c7J8rU="; + hash = "sha256-XdHLHwT/sgHM+uQ4lxw9c+AcAdJjL6OVgfwtJkYLoBs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index e81173c5cae00..143a3159b8fe7 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,10 +1,9 @@ { lib, aiohttp, - async-timeout, buildPythonPackage, fetchFromGitHub, - poetry-core, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -24,17 +23,14 @@ buildPythonPackage rec { hash = "sha256-46KoOKBiulTYH2x8ftFPVDF0oeBG1Pe9PkonxIV7528="; }; - nativeBuildInputs = [ - poetry-core - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - aiohttp - async-timeout - ]; + dependencies = [ aiohttp ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "synology_dsm" ]; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 5a546643e17e9..aed03b8408732 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { mainProgram = "vapid"; homepage = "https://github.com/mozilla-services/vapid"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d21e806016210..d762008e2ff24 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://github.com/ultrabug/py3status"; changelog = "https://github.com/ultrabug/py3status/blob/${version}/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e86332342bb9b..b131b1b11bb97 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.20.0"; + version = "4.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8="; + hash = "sha256-hP9MXv3/754ouvPgyOZKzBtEU2BugHUUE/e8biZPLFY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 3f8721e61e049..30211f9b6fd36 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; + hash = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; }; propagatedBuildInputs = [ @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Bindings for Chromaprint acoustic fingerprinting"; homepage = "https://github.com/sampsyo/pyacoustid"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyads/default.nix b/pkgs/development/python-modules/pyads/default.nix index 68dd02bb721db..1d6a7cb0387eb 100644 --- a/pkgs/development/python-modules/pyads/default.nix +++ b/pkgs/development/python-modules/pyads/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyads"; - version = "3.4.0"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "stlehmann"; repo = "pyads"; rev = "refs/tags/${version}"; - hash = "sha256-HJ/dlRuwFSY5j/mAp6rLMlTV59GFwrTV27n73TWlCUo="; + hash = "sha256-OvDh92fwHW+UzEO5iqVOY7d5H0Es6CJK/f/HCyLO9J4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyairports/default.nix b/pkgs/development/python-modules/pyairports/default.nix new file mode 100644 index 0000000000000..b6c8b2a8a4c41 --- /dev/null +++ b/pkgs/development/python-modules/pyairports/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyairports"; + version = "2.1.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PWCnJ/zk2oG5xjk+qK4LM9Z7N+zjRN/8hj90njrWK80="; + }; + + build-system = [ setuptools ]; + + doCheck = false; + + pythonImportChecks = [ "pyairports" ]; + + meta = with lib; { + description = "pyairports is a package which enables airport lookup by 3-letter IATA code."; + homepage = "https://github.com/ozeliger/pyairports"; + license = licenses.asl20; + maintainers = with maintainers; [ cfhammill ]; + }; +} diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index 2cbeb25693b95..9749114a4090f 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.6.6"; + version = "2.7.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-8i852bf0FRaorI3vJnuHTZSik6yoqtHr3wbafSvKmBM="; + hash = "sha256-6Bv0YE2zQv0mdXNzHkhq4sOJ18nmyxO884Smzwn2c8I="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; dependencies = [ attrs diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 1fdad3647bd0c..e0a983c6bbc55 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyamg/pyamg"; changelog = "https://github.com/pyamg/pyamg/blob/v${version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyaml-env/default.nix b/pkgs/development/python-modules/pyaml-env/default.nix new file mode 100644 index 0000000000000..dfbeb55112cda --- /dev/null +++ b/pkgs/development/python-modules/pyaml-env/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyyaml, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyaml-env"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mkaranasou"; + repo = "pyaml_env"; + rev = "refs/tags/v${version}"; + hash = "sha256-xSu+dksSVugShJwOqedXBrXIKaH0G5JAsynauOuP3OA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pyyaml ]; + + pythonImportsCheck = [ "pyaml_env" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Parse YAML configuration with environment variables in Python"; + homepage = "https://github.com/mkaranasou/pyaml_env"; + changelog = "https://github.com/mkaranasou/pyaml_env/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index cd640d600c57c..9b5b394893135 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyaml"; - version = "24.4.0"; + version = "24.7.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Dkg9kokBDnR6Ml3EMXG8w51lYt0d1HGejMfnyWyZ/OY="; + hash = "sha256-XQ/fnmgQNvsmOng9Apj8OvWApuKmzxozFP/EjcPZHMs="; }; nativeBuildInputs = [ setuptools ]; @@ -30,6 +30,6 @@ buildPythonPackage rec { mainProgram = "pyaml"; homepage = "https://github.com/mk-fg/pretty-yaml"; license = licenses.wtfpl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index ced51705b96a6..6c81a3f081b8f 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { mainProgram = "pyannotate"; homepage = "https://github.com/dropbox/pyannotate"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix index 9f4510785b0f8..7507b56528e0a 100644 --- a/pkgs/development/python-modules/pyannote-audio/default.nix +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -83,6 +83,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyannote/pyannote-audio"; changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix index 85c01bcee578f..d9ce9b18db99d 100644 --- a/pkgs/development/python-modules/pyannote-core/default.nix +++ b/pkgs/development/python-modules/pyannote-core/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyannote/pyannote-core"; changelog = "https://github.com/pyannote/pyannote-core/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index 314cc5110cf15..e8455f4d19b6c 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { homepage = "https://github.com/pyannote/pyannote-metrics"; changelog = "http://pyannote.github.io/pyannote-metrics/changelog.html"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "pyannote-metrics"; }; } diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix index 0b85c50474d58..a92c56758e2fb 100644 --- a/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { description = "Tunable pipelines"; homepage = "https://github.com/pyannote/pyannote-pipeline"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "pyannote-pipeline"; }; } diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix new file mode 100644 index 0000000000000..6c99394c31a39 --- /dev/null +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + crc, + setuptools, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "pyaprilaire"; + version = "0.7.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chamberlain2007"; + repo = "pyaprilaire"; + rev = "refs/tags/${version}"; + hash = "sha256-+/yQO0JF2nkxaM71iNj6ODB8raM9s4qiLLi6/borcr4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ crc ]; + + pythonImportsCheck = [ "pyaprilaire" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = { + changelog = "https://github.com/chamberlain2007/pyaprilaire/releases/tag/${version}"; + description = "Python library for interacting with Aprilaire thermostats."; + homepage = "https://github.com/chamberlain2007/pyaprilaire"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index d275e44f649dc..3c9b1d3bc211f 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - sourceRoot = "apache-arrow-${version}/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cmake diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index bbceb87e16f47..4c9f519fe28a7 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://pyasn1.readthedocs.io"; changelog = "https://github.com/etingof/pyasn1/blob/master/CHANGES.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyasuswrt/default.nix b/pkgs/development/python-modules/pyasuswrt/default.nix index 85449618a7e46..33bcc5ef39a10 100644 --- a/pkgs/development/python-modules/pyasuswrt/default.nix +++ b/pkgs/development/python-modules/pyasuswrt/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/ollo69/pyasuswrt"; changelog = "https://github.com/ollo69/pyasuswrt/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyasyncore/default.nix b/pkgs/development/python-modules/pyasyncore/default.nix index 22f1098ee4836..602b90ae41260 100644 --- a/pkgs/development/python-modules/pyasyncore/default.nix +++ b/pkgs/development/python-modules/pyasyncore/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Make asyncore available for Python 3.12 onwards"; homepage = "https://github.com/simonrob/pyasyncore"; license = licenses.psfl; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyatem/default.nix b/pkgs/development/python-modules/pyatem/default.nix index e9bf94be5dc1d..a605dd4b1a3d3 100644 --- a/pkgs/development/python-modules/pyatem/default.nix +++ b/pkgs/development/python-modules/pyatem/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromSourcehut, diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 8a81fa5b34f4c..0245c7b47ce85 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -9,6 +9,7 @@ hatchling, pandas, pyarrow, + python-dateutil, pythonOlder, sqlalchemy, tenacity, @@ -16,26 +17,27 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.8.3"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mcYIYOgww4UM0CAcdtOD12pp53clPdDqN85bLRHGDag="; + hash = "sha256-SxHUnfAyVcVW4R9j0ONGzCXqGWdaeseP/QU3vNhMtI8="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ boto3 botocore fsspec tenacity + python-dateutil ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas ]; sqlalchemy = [ sqlalchemy ]; arrow = [ pyarrow ]; @@ -54,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/laughingman7743/PyAthena/"; changelog = "https://github.com/laughingman7743/PyAthena/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ turion ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 77a4b8249d074..9d76a23bc780f 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/jabesq/pyatmo"; changelog = "https://github.com/jabesq/pyatmo/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 10667bc2f4f23..846c1d71a76a7 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner" "" + --replace-fail "pytest-runner" "" ''; pythonRelaxDeps = [ @@ -62,11 +62,9 @@ buildPythonPackage rec { "zeroconf" ]; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout chacha20poly1305-reuseable @@ -93,11 +91,7 @@ buildPythonPackage rec { ]; disabledTests = - [ - # https://github.com/postlund/pyatv/issues/2307 - "test_zeroconf_service_published" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ + lib.optionals (pythonAtLeast "3.12") [ # https://github.com/postlund/pyatv/issues/2365 "test_simple_dispatch" ] diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index cb2122eaaba32..6e4a7e846b3ec 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { mit asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pybars3/default.nix b/pkgs/development/python-modules/pybars3/default.nix index 8bd031801137e..937de513347e8 100644 --- a/pkgs/development/python-modules/pybars3/default.nix +++ b/pkgs/development/python-modules/pybars3/default.nix @@ -1,5 +1,5 @@ { - python3, + python, fetchPypi, lib, pymeta3, @@ -19,7 +19,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - ${python3.interpreter} tests.py + ${python.interpreter} tests.py runHook postCheck ''; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 50b7bcbd26441..6972373eea32b 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/mayeut/pybase64"; changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index cdb7753119bf6..3d150e82a501f 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { homepage = "https://github.com/bids-standard/pybids"; changelog = "https://github.com/bids-standard/pybids/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "pybids"; }; } diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index c53941e8b5dfe..b82126e5862e8 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pybigwig"; - version = "0.3.22"; + version = "0.3.23"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "deeptools"; repo = "pyBigWig"; rev = "refs/tags/${version}"; - hash = "sha256-wJC5eXIC9PNlbCtmq671WuoIJVkh3aX7K6WArJWjyFg="; + hash = "sha256-ch9nZrQAnzFQQ62/NF4J51pV4DQAbVq4/f/6LaXf5hM="; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index b0b7661607127..9ca1e37695664 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch2, cmake, ninja, setuptools, @@ -51,29 +50,16 @@ let in buildPythonPackage rec { pname = "pybind11"; - version = "2.12.0"; + version = "2.13.1"; pyproject = true; src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; rev = "v${version}"; - hash = "sha256-DVkI5NxM5uME9m3PFYVpJOOa2j+yjL6AJn76fCTv2nE="; + hash = "sha256-sQUq39CmgsDEMfluKMrrnC5fio//pgExcyqJAE00UjU="; }; - patches = [ - (fetchpatch2 { - # https://github.com/pybind/pybind11/pull/5127 - url = "https://github.com/pybind/pybind11/commit/540bef2d2c9fb54fa7c1474ee1af959ce90f2b32.patch"; - hash = "sha256-0ZWlH/5kQ3An/tu6ulOXO2k32asATrr1mlI4nGjIqaI="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "timeout=300" "" - ''; - build-system = [ cmake ninja diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index e6742c5e3654d..d5783fa023124 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index 8d34b1f39e3c7..5276e951b3c7c 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://capnproto.github.io/pycapnp/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd2; # No support for capnproto 1.0 yet # https://github.com/capnproto/pycapnp/issues/323 diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix index cc1f79c9b2c54..973b84f4c035f 100644 --- a/pkgs/development/python-modules/pycardano/default.nix +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -7,6 +7,7 @@ cachetools, cbor2, cose, + docker, ecpy, frozendict, frozenlist, @@ -33,7 +34,7 @@ let in buildPythonPackage rec { pname = "pycardano"; - version = "0.10.0"; + version = "0.11.1"; format = "pyproject"; @@ -41,15 +42,15 @@ buildPythonPackage rec { owner = "Python-Cardano"; repo = "pycardano"; rev = "v${version}"; - hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0="; + hash = "sha256-OWm6ztt3s3DUbxDZqpvwTO6XwdY/57AI6Bc6x6kxH7k="; }; - propagatedBuildInputs = [ blockfrost-python cachetools cbor2 cose_0_9_dev8 + docker ecpy frozendict frozenlist diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index b1ffac55aad64..e55a0dc4bf1a9 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycddl"; - version = "0.6.1"; - format = "pyproject"; + version = "0.6.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-63fe8UJXEH6t4l7ujV8JDvlGb7q3kL6fHHATFdklzFc="; + hash = "sha256-lVybSr+QvyepdTZfiTjqU0ENu6TT87ZZXIECBA8nMV4="; }; nativeBuildInputs = with rustPlatform; [ @@ -42,7 +42,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ssDEKRd3Y9/10oXBZHCxvlRkl9KMh3pGYbCkM4rXThQ="; + hash = "sha256-VpJ/PLAwwuakwsNAtLDdWGXCxl6jGMTvsEhzIHk6a0g="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index 78a620eb0dd76..2b2e635961963 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -1,54 +1,52 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - nose, - pkgs, + pkg-config, + swig, + libcdio, + libiconv, + pytestCheckHook, }: buildPythonPackage rec { pname = "pycdio"; - version = "2.1.1"; - format = "setuptools"; + version = "2.1.1-unstable-2024-02-26"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "61734db8c554b7b1a2cb2da2e2c15d3f9f5973a57cfb06f8854c38029004a9f8"; + src = fetchFromGitHub { + owner = "rocky"; + repo = "pycdio"; + rev = "806c6a2eeeeb546055ce2ac9a0ae6a14ea53ae35"; # no tag for this version (yet) + hash = "sha256-bOm82mBUIaw4BGHj3Y24Fv5+RfAew+Ma1u4QENXoRiU="; }; - prePatch = '' - substituteInPlace setup.py \ - --replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \ - --replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \ - --replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]' - ''; - preConfigure = '' patchShebangs . ''; + build-system = [ setuptools ]; + nativeBuildInputs = [ - nose - pkgs.pkg-config - pkgs.swig + pkg-config + swig ]; + buildInputs = [ - setuptools - pkgs.libcdio - ] ++ lib.optional stdenv.isDarwin pkgs.libiconv; - - # Run tests using nosetests but first need to install the binaries - # to the root source directory where they can be found. - checkPhase = '' - ./setup.py install_lib -d . - nosetests - ''; + libcdio + libiconv + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test/test-*.py" ]; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/libcdio/"; + changelog = "https://github.com/rocky/pycdio/blob/${src.rev}/ChangeLog"; description = "Wrapper around libcdio (CD Input and Control library)"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/pychm/default.nix b/pkgs/development/python-modules/pychm/default.nix index 6636f052b0a6c..8b7c443d66842 100644 --- a/pkgs/development/python-modules/pychm/default.nix +++ b/pkgs/development/python-modules/pychm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, chmlib, }: diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 8a27f29682b08..b2b4ef94b8d3e 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4="; + hash = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix deleted file mode 100644 index 7286de19ab78f..0000000000000 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - pyparsing, - decorator, - six, - future, -}: - -buildPythonPackage rec { - pname = "pycontracts"; - version = "1.8.14"; - - src = fetchPypi { - pname = "PyContracts"; - inherit version; - sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ - pyparsing - decorator - six - future - ]; - - meta = with lib; { - description = "Allows to declare constraints on function parameters and return values"; - homepage = "https://pypi.python.org/pypi/PyContracts"; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix index c90aee856a3c2..be5d6f82cba6b 100644 --- a/pkgs/development/python-modules/pycookiecheat/default.nix +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -69,6 +69,9 @@ buildPythonPackage rec { homepage = "https://github.com/n8henrie/pycookiecheat"; changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ + fab + n8henrie + ]; }; } diff --git a/pkgs/development/python-modules/pycoolmasternet-async/default.nix b/pkgs/development/python-modules/pycoolmasternet-async/default.nix index 2da04fea37a43..35e8547b337fd 100644 --- a/pkgs/development/python-modules/pycoolmasternet-async/default.nix +++ b/pkgs/development/python-modules/pycoolmasternet-async/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pycoolmasternet-async"; - version = "0.1.6"; - format = "setuptools"; + version = "0.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,11 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pycoolmasternet-async"; rev = "v${version}"; - hash = "sha256-7RYKZWs8SCXCBgjbiTLSRUPujeraxiOE6MHENPmhimg="; + hash = "sha256-uEZORtCZ5VOlTqonkgAtxhRIbhW+JTUMccuQ2zY7Jyo="; }; + build-system = [ setuptools ]; + # no tests implemented doCheck = false; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 5a4fd3fc1bb5d..2f5d52d9dacba 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -3,14 +3,13 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch2, poetry-core, pytestCheckHook, }: buildPythonPackage rec { pname = "pycountry"; - version = "23.12.11"; + version = "24.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,27 +18,15 @@ buildPythonPackage rec { owner = "pycountry"; repo = "pycountry"; rev = "refs/tags/${version}"; - hash = "sha256-B6kphZZZgK0YuPSmkiQNbEqEfqOQb+WZGnO2UeEqQN4="; + hash = "sha256-4YVPh6OGWguqO9Ortv+vAejxx7WLs4u0SVLv8JlKSWM="; }; - patches = [ - (fetchpatch2 { - name = "fix-usage-of-importlib_metadata.patch"; - url = "https://github.com/pycountry/pycountry/commit/824d2535833d061c04a1f1b6b964f42bb53bced2.patch"; - excludes = [ - "HISTORY.txt" - "poetry.lock" - "pyproject.toml" - ]; - hash = "sha256-U4fbZP++d6YfTJkVG3k2rBC8nOF9NflM6+ONlwBNu+g="; - }) - ]; - postPatch = '' - sed -i "/addopts/d" pytest.ini + sed -i "/addopts/d" pyproject.toml + sed -i "/pytest-cov/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index fbdb230e3a874..67bbfa1c3d97d 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; + hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 4e727cc583162..9f69727808a16 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.13.5"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "pycrdt-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-dzlmgxrdQ97+DO/vDtoX7PIOpngEE+FGUGq1vdVmhNw="; + hash = "sha256-lQ8ZYzFKdVvIEp38WztOWFpJhi4LtA8ODpAFgSZVpU8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index a0140aa4c2609..0da04d69be578 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -21,12 +21,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] name = "bumpalo" version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -62,9 +56,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indoc" @@ -89,25 +83,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memoffset" @@ -125,46 +109,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "parking_lot" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.8.24" +version = "0.9.6" dependencies = [ "pyo3", "yrs", @@ -172,15 +133,15 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", - "parking_lot", + "once_cell", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -190,9 +151,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" dependencies = [ "once_cell", "target-lexicon", @@ -200,9 +161,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" dependencies = [ "libc", "pyo3-build-config", @@ -210,9 +171,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -222,9 +183,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" dependencies = [ "heck", "proc-macro2", @@ -243,40 +204,25 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags", -] - -[[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] name = "serde" -version = "1.0.200" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -285,9 +231,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -311,9 +257,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.61" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -322,24 +268,24 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -419,74 +365,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] name = "yrs" -version = "0.18.7" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58fbc807677598fedfab76f99f6e1aa5c644411255002b5438ea0ab14672398" +checksum = "a8ca5126331b9a5ef5bb10f3f1c3d01b05f298d348c66f8fb15497d83ee73176" dependencies = [ "arc-swap", "atomic_refcell", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 85a994d9f201a..6ae1c9c5bd6c0 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -4,25 +4,25 @@ buildPythonPackage, fetchFromGitHub, libiconv, - cargo, rustPlatform, - rustc, + anyio, objsize, pydantic, pytestCheckHook, + trio, y-py, }: buildPythonPackage rec { pname = "pycrdt"; - version = "0.8.24"; + version = "0.9.6"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-3j5OhjeVE42n4EEOOMUGlQGdnQ/xia0KD543uCMFpCo="; + hash = "sha256-1BGJ6I8ODLyEv566w+vQOsPEqN8nQlZHXTWv0tH0cR0="; }; postPatch = '' @@ -32,10 +32,8 @@ buildPythonPackage rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; nativeBuildInputs = [ - cargo rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook - rustc ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -43,9 +41,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycrdt" ]; nativeCheckInputs = [ + anyio objsize pydantic pytestCheckHook + trio y-py ]; diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index c861dfaa4b37c..a5bd2ee074678 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -6,7 +6,6 @@ arrow, delorean, pendulum, - pynose, pytestCheckHook, pytz, udatetime, @@ -30,12 +29,16 @@ buildPythonPackage rec { arrow delorean pendulum - pynose pytestCheckHook pytz udatetime ]; + disabledTestPaths = [ + # depens on nose + "tests/test_has_been.py" + ]; + pythonImportsCheck = [ "pycron" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index 4bc528b64f95f..5509173bd985f 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyviz/pyct"; changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 145bdcaad36b8..04ea92be7fb21 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, - addOpenGLRunpath, + addDriverRunpath, fetchPypi, fetchFromGitHub, mako, @@ -23,12 +23,12 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2024.1"; + version = "2024.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-1Q0j/2NxSCz/fUuVPvQKuByd8DjsthRIT5/VNHMnMn4="; + hash = "sha256-0RC3J8vqhZ2ktj6Rtvoen8MsW63gLYn/RJl1mW6cz6s="; }; preConfigure = with lib.versions; '' @@ -46,7 +46,7 @@ buildPythonPackage rec { postFixup = '' find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do echo "setting opengl runpath for $lib..." - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" done ''; @@ -57,7 +57,7 @@ buildPythonPackage rec { py.test ''; - nativeBuildInputs = [ addOpenGLRunpath ]; + nativeBuildInputs = [ addDriverRunpath ]; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 38d46c58e7b13..689e23e3c1aef 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -89,6 +89,6 @@ buildPythonPackage rec { lgpl2Only mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pycxx/default.nix b/pkgs/development/python-modules/pycxx/default.nix index a99dd7445f2cb..a85a556c0bc79 100644 --- a/pkgs/development/python-modules/pycxx/default.nix +++ b/pkgs/development/python-modules/pycxx/default.nix @@ -2,17 +2,18 @@ lib, buildPythonPackage, fetchurl, + setuptools, python, }: buildPythonPackage rec { pname = "pycxx"; - version = "7.1.4"; - format = "setuptools"; + version = "7.1.8"; + pyproject = true; src = fetchurl { url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz"; - sha256 = "MUMU+/qsm92WENYFxfjQsSuR8/nE/asYG8HgIbaAaz0="; + hash = "sha256-S5Hh4RQcI/vVA532NcS7bnVjIWhUj1a4POF3GTwMmMY="; }; outputs = [ @@ -20,6 +21,8 @@ buildPythonPackage rec { "dev" ]; + build-system = [ setuptools ]; + postInstall = '' mkdir -p $dev/include mv $out/include/${python.libPrefix}*/CXX/ $dev/include/CXX/ @@ -27,10 +30,10 @@ buildPythonPackage rec { sed -i "s|Src|$dev/src|" $dev/src/cxxextensions.c $dev/src/cxxsupport.cxx ''; - meta = with lib; { - description = "set of classes to help create extensions of Python in the C++ language"; + meta = { + description = "Set of classes to help create extensions of Python in the C++ language"; homepage = "https://sourceforge.net/projects/cxx/"; - maintainers = with maintainers; [ freezeboy ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ freezeboy ]; }; } diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 36d138b188cd1..d1ccc9497678f 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -11,7 +11,6 @@ pyserial, pytestCheckHook, pytest-asyncio, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index c551f3db55886..4693e97e76271 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -2,33 +2,38 @@ lib, aiohttp, buildPythonPackage, - fetchFromBitbucket, + fetchFromGitHub, freezegun, netifaces, pytest-aiohttp, pytestCheckHook, pythonOlder, urllib3, + setuptools, + tenacity, }: buildPythonPackage rec { pname = "pydaikin"; - version = "2.11.1"; - format = "setuptools"; + version = "2.13.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; - src = fetchFromBitbucket { - owner = "mustang51"; - repo = pname; - rev = "v${version}"; - hash = "sha256-IBrd4PH8EzVVVFQtJdJ8bTMLEzfh7MYMe79yuCrhmww="; + src = fetchFromGitHub { + owner = "fredrike"; + repo = "pydaikin"; + rev = "refs/tags/v${version}"; + hash = "sha256-t4SyFAgrLpXlDx464OHBWT8b+vGfIGZH6lKjX0k6tNw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp netifaces urllib3 + tenacity ]; doCheck = false; # tests fail and upstream does not seem to run them either @@ -43,9 +48,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python Daikin HVAC appliances interface"; - mainProgram = "pydaikin"; - homepage = "https://bitbucket.org/mustang51/pydaikin"; + homepage = "https://github.com/fredrike/pydaikin"; + changelog = "https://github.com/fredrike/pydaikin/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pydaikin"; }; } diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index e425d21f52e0e..82ceccfc66994 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20240601.3"; + version = "20240713.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t7Sl81YpdQZk4Q2ERz6jiJsD3ERmC8QVlr0d/RrNmhU="; + hash = "sha256-KW44LUGgCE+KB3tE9ecYqOansjFN6F4A7TRCoKwOsRs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index 6a9cfaaeb29f5..39da53345e860 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Extra Pydantic types"; homepage = "https://github.com/pydantic/pydantic-extra-types"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 2d158699724a9..ed94f3da47803 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -62,7 +62,7 @@ let homepage = "https://github.com/pydantic/pydantic-settings"; license = licenses.mit; broken = lib.versionOlder pydantic.version "2.0.0"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/pydantic-yaml-0/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix index d225d0e07150f..50f14837476a4 100644 --- a/pkgs/development/python-modules/pydantic-yaml-0/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml/default.nix @@ -2,22 +2,18 @@ lib, buildPythonPackage, fetchFromGitHub, - deprecated, importlib-metadata, - pydantic_1, + pydantic, ruamel-yaml, - semver, - types-deprecated, - setuptools, + typing-extensions, setuptools-scm, pytest-mock, pytestCheckHook, }: buildPythonPackage rec { - pname = "pydantic_yaml-0"; - # nixpkgs-update: no auto update - version = "0.11.2"; + pname = "pydantic-yaml"; + version = "1.3.0"; pyproject = true; @@ -25,7 +21,7 @@ buildPythonPackage rec { owner = "NowanIlfideme"; repo = "pydantic-yaml"; rev = "refs/tags/v${version}"; - hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY="; + hash = "sha256-Kv1nLR91iwShmCgduXA07+a+2EP1nnvaC7fBAn/ufEM="; }; postPatch = '' @@ -33,18 +29,13 @@ buildPythonPackage rec { --replace-fail "0.0.0" "${version}" ''; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - deprecated + dependencies = [ importlib-metadata - pydantic_1 + pydantic ruamel-yaml - semver - types-deprecated + typing-extensions ]; pythonImportsCheck = [ "pydantic_yaml" ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index f47c028ac54c0..4644e7949062e 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, # build-system diff --git a/pkgs/development/python-modules/pydata-google-auth/default.nix b/pkgs/development/python-modules/pydata-google-auth/default.nix index da4d1ad65f3c5..727ac93f47b61 100644 --- a/pkgs/development/python-modules/pydata-google-auth/default.nix +++ b/pkgs/development/python-modules/pydata-google-auth/default.nix @@ -2,26 +2,38 @@ lib, buildPythonPackage, fetchFromGitHub, - google-auth, google-auth-oauthlib, + google-auth, + pythonOlder, setuptools, + versioneer, }: buildPythonPackage rec { pname = "pydata-google-auth"; version = "1.8.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - repo = pname; + repo = "pydata-google-auth"; owner = "pydata"; rev = "refs/tags/${version}"; hash = "sha256-Wo+tXbzOuz/cW8GuWoSxLA/Lr2S9NMdePa8tIV39mbY="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; - propagatedBuildInputs = [ + dependencies = [ google-auth google-auth-oauthlib ]; @@ -34,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helpers for authenticating to Google APIs"; homepage = "https://github.com/pydata/pydata-google-auth"; + changelog = "https://github.com/pydata/pydata-google-auth/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 081c08582b6e3..1cd06c0d2be61 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.15.3"; + version = "0.15.4"; format = "wheel"; @@ -24,7 +24,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-pI7gSdybD3Bk27j3Bksc865Iqhk/qv4Uq9QDobcQKBA="; + hash = "sha256-ITatDpUA0JSflhZ+Y/PimGIAQK6o+cdGIZWe2l1M+OY="; }; propagatedBuildInputs = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/pydata/pydata-sphinx-theme"; changelog = "https://github.com/pydata/pydata-sphinx-theme/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index aedc5d852ff04..780f01cec123c 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/LEW21/pydbus"; description = "Pythonic DBus library"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix index be679c748b31f..c64eef1c9a63d 100644 --- a/pkgs/development/python-modules/pydelijn/default.nix +++ b/pkgs/development/python-modules/pydelijn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; + hash = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 254b8a06a72f8..996fce70df664 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydexcom"; - version = "0.3.2"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gagebenne"; repo = "pydexcom"; rev = "refs/tags/${version}"; - hash = "sha256-46+Ml73F6EUbMwRJB93FD+No/g65RJwnCnFzH4Pb5ek="; + hash = "sha256-gMUdVdO2Yy41Nl+mn9dEegb6/IRBwoBviPhuz3CMfS8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydigiham/default.nix b/pkgs/development/python-modules/pydigiham/default.nix index bfa7ba32e07b4..1bc5fd33e59e6 100644 --- a/pkgs/development/python-modules/pydigiham/default.nix +++ b/pkgs/development/python-modules/pydigiham/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, python, digiham, - csdr, pycsdr, codecserver, }: diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 6139d6b897189..d074f0a5feaeb 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Azure Cosmos DB API"; homepage = "https://github.com/Azure/azure-cosmos-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 524010a89a49a..3cad1aafe06c3 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -4,7 +4,6 @@ fetchPypi, substituteAll, graphviz, - python, pytestCheckHook, chardet, pythonOlder, @@ -20,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; + hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; }; propagatedBuildInputs = [ pyparsing ]; @@ -60,6 +59,6 @@ buildPythonPackage rec { description = "Allows to create both directed and non directed graphs from Python"; homepage = "https://github.com/erocarrera/pydot"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 9648fd9d206fd..163e49e38f759 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.6.5"; + version = "2024.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-ug9gADM6ig6i2mu3GhQ+vsbNf3vEfR4L7OQ5Ixuh5so="; + hash = "sha256-svy2bYyXDmN4mZK3VqVjr7GLUgnin09aEoTMKKbPJxk="; }; build-system = [ diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index e9fa5c8f70632..2678412b23449 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "http://pydub.com"; changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index d6e0d6bf9775b..e9b916c888e22 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -6,7 +6,7 @@ scipy, sympy, setuptools, - pynose, + nose, cython, }: @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pynose + nose cython ]; diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index d39f36b39e9e3..6a93a446506e4 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NXGUWT769h17SKuXw9WXIhFJNJZ8PfPXh4ym3SWwTDA="; + hash = "sha256-OU3d9hnMqdDFVxXjxV6hIam/nLx4DNwSAaJCeRe4a2Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyebus/default.nix b/pkgs/development/python-modules/pyebus/default.nix index dd299aae5878a..5376a546c9b0b 100644 --- a/pkgs/development/python-modules/pyebus/default.nix +++ b/pkgs/development/python-modules/pyebus/default.nix @@ -3,7 +3,6 @@ anytree, buildPythonPackage, fetchPypi, - pytestCheckHook, poetry-core, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix new file mode 100644 index 0000000000000..23edfcbcc00aa --- /dev/null +++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + dataclasses-json, + requests, + pytestCheckHook, + pytest-xdist, + requests-mock, + syrupy, +}: + +buildPythonPackage rec { + pname = "pyecotrend-ista"; + version = "3.3.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "Ludy87"; + repo = "pyecotrend-ista"; + rev = "refs/tags/${version}"; + hash = "sha256-TZDHEaDc7UACIAHNX1fStJH74qLKf+krWbTDtemXahA="; + }; + + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ setuptools ]; + + dependencies = [ + dataclasses-json + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + requests-mock + syrupy + ]; + + pythonImportsCheck = [ "pyecotrend_ista" ]; + + meta = { + changelog = "https://github.com/Ludy87/pyecotrend-ista/releases/tag/${version}"; + description = "Unofficial python library for the pyecotrend-ista API"; + homepage = "https://github.com/Ludy87/pyecotrend-ista"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oynqr ]; + }; +} diff --git a/pkgs/development/python-modules/pyegps/default.nix b/pkgs/development/python-modules/pyegps/default.nix new file mode 100644 index 0000000000000..c89fd46ec23a1 --- /dev/null +++ b/pkgs/development/python-modules/pyegps/default.nix @@ -0,0 +1,41 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + pyusb, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "pyegps"; + version = "0.2.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "gnumpi"; + repo = "pyegps"; + rev = "refs/tags/v${version}"; + hash = "sha256-iixk2sFa4KAayKFmQKtPjvoIYgxCMXnfkliKhyO2ba4="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ pyusb ]; + + pythonImportsCheck = [ "pyegps" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + changelog = "https://github.com/gnumpi/pyEGPS/releases/tag/v${version}"; + description = "Controlling Energenie Power Strips with python"; + homepage = "https://github.com/gnumpi/pyegps"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyelectra/default.nix b/pkgs/development/python-modules/pyelectra/default.nix new file mode 100644 index 0000000000000..749556926b07c --- /dev/null +++ b/pkgs/development/python-modules/pyelectra/default.nix @@ -0,0 +1,37 @@ +{ + aiohttp, + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyelectra"; + version = "1.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jafar-atili"; + repo = "pyelectra"; + rev = "refs/tags/${version}"; + hash = "sha256-3g+6AXbHMStk77k+1Qh5kgDswUZ8I627YiA/PguUGBg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "electrasmart" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/jafar-atili/pyElectra/releases/tag/${version}"; + description = "Electra Smart Python Integration"; + homepage = "https://github.com/jafar-atili/pyelectra"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyemoncms/default.nix b/pkgs/development/python-modules/pyemoncms/default.nix new file mode 100644 index 0000000000000..651b31bd7a7f7 --- /dev/null +++ b/pkgs/development/python-modules/pyemoncms/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + pytest-aiohttp, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyemoncms"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Open-Building-Management"; + repo = "pyemoncms"; + rev = "refs/tags/v${version}"; + hash = "sha256-IBrYys0i9pTAw9ul8bqni0H3KNSvKQYNU6D4OSfR6ZE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "pyemoncms" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + disabledTests = [ + # requires networking + "test_timeout" + ]; + + meta = { + changelog = "https://github.com/Open-Building-Management/pyemoncms/releases/tag/v${version}"; + description = "Python library for emoncms API"; + homepage = "https://github.com/Open-Building-Management/pyemoncms"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index 641339d487a9d..c2b6ac4d22ce0 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.5"; + version = "0.18.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cgQARaGM6Jb2kEcG7HqPStRPkhHldJ7UbxQpxN6JbZE="; + hash = "sha256-FQ34pKRK1HDLoupMDfVaNxAhn1HbZHYi6se4ewlUWGA="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index be57e85fa5b7c..613fb911c85e0 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.5"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-eP+tKpcRHHeRQEXMSIItgsUkv5SjQXnMsQbQMm50cpM="; + hash = "sha256-letF0s/zJKdMT2nGnZpMFufja0bsL0zlwG+dCSK5BA4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyephember/default.nix b/pkgs/development/python-modules/pyephember/default.nix index 45d9227d7b9df..7efe8561c8834 100644 --- a/pkgs/development/python-modules/pyephember/default.nix +++ b/pkgs/development/python-modules/pyephember/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-j3SftxXKs9EZwdio26W5U0y5owH4yTteS4RUmzkZkoE="; + hash = "sha256-j3SftxXKs9EZwdio26W5U0y5owH4yTteS4RUmzkZkoE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix new file mode 100644 index 0000000000000..16081d1cc6138 --- /dev/null +++ b/pkgs/development/python-modules/pyevtk/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + pytestCheckHook, + pytest-cov, +}: + +buildPythonPackage rec { + pname = "pyevtk"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyscience-projects"; + repo = "pyevtk"; + rev = "refs/tags/v${version}"; + hash = "sha256-HrodoVxjREZiutgRJ3ZUrART29+gAZfpR9f4A4SRh4Q="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'setup_requires=["pytest-runner"],' 'setup_requires=[],' + ''; + + build-system = [ setuptools ]; + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "pyevtk" ]; + + meta = { + description = "Exports data to binary VTK files for visualization/analysis"; + homepage = "https://github.com/pyscience-projects/pyevtk"; + changelog = "https://github.com/pyscience-projects/pyevtk/blob/${src.rev}/CHANGES.txt"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 93244293adab6..0bd4fdc27b795 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases"; homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix index 646bd2e8adc7a..8d0196473c09c 100644 --- a/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -1,43 +1,58 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch2, pyexcel-io, odfpy, - nose, pyexcel, pyexcel-xls, psutil, + pytestCheckHook, + pytest-cov-stub, + setuptools, }: buildPythonPackage rec { pname = "pyexcel-ods"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "f61b56515fd4ccd4687f0a112422f74ce8535247ad2da49db90038d7e3ed397c"; + src = fetchFromGitHub { + owner = "pyexcel"; + repo = "pyexcel-ods"; + rev = "v${version}"; + hash = "sha256-wptjCSi56hotmiIE0TrLY7jsCHKwDR+a7d89sAQWBHg="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/pyexcel/pyexcel-ods/pull/45 + (fetchpatch2 { + name = "nose-to-pytest.patch"; + url = "https://github.com/pyexcel/pyexcel-ods/compare/661d4f0b484ed281128c72e1a2701e2d33fc1879...838b410e800a86c147644568aaa8b2c005d13491.patch"; + hash = "sha256-1a52VM8yGDEjSFXTq3Di74xwv10d/QskpctOnz9zW1w="; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ pyexcel-io odfpy ]; nativeCheckInputs = [ - nose + pytestCheckHook + pytest-cov-stub pyexcel pyexcel-xls psutil ]; - checkPhase = "nosetests"; - meta = { description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy"; homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 5ff87b2390eb7..c372ca08adf12 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -1,47 +1,61 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + fetchpatch2, pyexcel-io, xlrd, xlwt, - nose, pyexcel, - mock, + pytestCheckHook, + pytest-cov, + setuptools, }: buildPythonPackage rec { pname = "pyexcel-xls"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "5ec606ef8667aafbb0c3fbd8242a7c23bf175ee7c10b08f70799b84fb2db84cb"; + src = fetchFromGitHub { + owner = "pyexcel"; + repo = "pyexcel-xls"; + rev = "v${version}"; + hash = "sha256-wxsx/LfeBxi+NnHxfxk3svzsBcdwOiLQ1660eoHfmLg="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/pyexcel/pyexcel-xls/pull/54 + (fetchpatch2 { + name = "nose-to-pytest.patch"; + url = "https://github.com/pyexcel/pyexcel-xls/compare/d8953c8ff7dc9a4a3465f2cfc182acafa49f6ea2...9f0d48035114f73077dd0f109395af32b4d9d48b.patch"; + hash = "sha256-2kVdN+kEYaJjXGzv9eudfKjRweMG0grTd5wnZXIDzUU="; + excludes = [ ".github/*" ]; + }) + ]; + + build-system = [ setuptools ]; + + dependencies = [ pyexcel-io xlrd xlwt ]; nativeCheckInputs = [ - nose + pytestCheckHook pyexcel - mock + pytest-cov ]; postPatch = '' substituteInPlace setup.py --replace "xlrd<2" "xlrd<3" ''; - checkPhase = "nosetests --exclude test_issue_151"; - meta = { description = "Wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index 439164698590e..404f29068affa 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files"; homepage = "http://docs.pyexcel.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 012cf3f7f5c30..20af23be56012 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, gitpython, - pytestCheckHook, pythonOlder, requests, setuptools, @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.24"; + version = "0.2.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-YXqctVB4mphNzhc/u5e0yTNi2R6+ibBiFyPaqHvG7Bk="; + hash = "sha256-kS9VoEsXdXQOedbDkgAP2x+MuWG5kCAvpcquDQn7Jno="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 551814d9fe81e..b3cb0f886bd71 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.8.1.1"; + version = "0.8.1.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bwSCNSYZ8sxWADyiIyG9sNB2S2VnlbweQGKx+psIaGs="; + hash = "sha256-2EUkcEVbHnePk5aUR9uOok3rRiTHxAdpUWRZy2+HvDM="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 342b3b88976ac..c65ead3e790b3 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -2,26 +2,37 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, requests, + urllib3, + google-auth, }: buildPythonPackage rec { pname = "pyfcm"; - version = "1.4.8"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; - rev = version; - sha256 = "15q6p21wsjm75ccmzcsgad1w9fgk6189hbrp7pawpxl7l3qxn2p7"; + rev = "refs/tags/${version}"; + hash = "sha256-lpSbb0DDXLHne062s7g27zRpvTuOHiqQkqGOtWvuWdI="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ + requests + urllib3 + google-auth + ]; # pyfcm's unit testing suite requires network access doCheck = false; + pythonImportsCheck = [ "pyfcm" ]; + meta = with lib; { description = "Python client for FCM - Firebase Cloud Messaging (Android, iOS and Web)"; homepage = "https://github.com/olucurious/pyfcm"; diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 20c448b36c644..a236951c493c3 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; + hash = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index b661edcc895d7..ab6444efebaad 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Fused multiply-add for Python"; homepage = "https://github.com/nschloe/pyfma"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 81cc96051c257..efe1c179777b9 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/pyftpdlib/"; changelog = "https://github.com/giampaolo/pyftpdlib/blob/release-${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "ftpbench"; }; } diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix new file mode 100644 index 0000000000000..5203a2bcf98c7 --- /dev/null +++ b/pkgs/development/python-modules/pyfwup/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyusb, + tqdm, + libusb1, + setuptools, + setuptools-git-versioning, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pyfwup"; + version = "0.5.0"; + + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = "pyfwup"; + rev = "refs/tags/${version}"; + hash = "sha256-HZaR7X19kWb8w/VcnRHReGPkUBQ/u89BjmkTPpayoxE="; + }; + + dependencies = [ + pyusb + tqdm + libusb1 + ]; + + build-system = [ + setuptools + setuptools-git-versioning + ]; + + pythonImportsCheck = [ + "fwup" + "fwup_utils" + ]; + + meta = { + description = "Python FirmWare UPgrader"; + homepage = "https://github.com/greatscottgadgets/pyfwup"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.msanft ]; + }; +} diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 3332c711bfb3e..5f5ba161f5e78 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { mainProgram = "fxa-client"; homepage = "https://github.com/mozilla/PyFxA"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index bed6aabe4057c..c16eae5e8e513 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { mainProgram = "pygal_gen.py"; homepage = "http://www.pygal.org"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix index 588b87c166d11..fecd65e349913 100644 --- a/pkgs/development/python-modules/pygame-ce/default.nix +++ b/pkgs/development/python-modules/pygame-ce/default.nix @@ -9,6 +9,8 @@ pkg-config, setuptools, cython, + ninja, + meson-python, AppKit, fontconfig, @@ -21,20 +23,21 @@ SDL2_image, SDL2_mixer, SDL2_ttf, + numpy, }: buildPythonPackage rec { pname = "pygame-ce"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pygame-community"; repo = "pygame-ce"; rev = "refs/tags/${version}"; - hash = "sha256-4Ky+QEUsQ0odcwEETk0yGECs7CcJQthhavboOnMDvF8="; + hash = "sha256-LVwOAp7ss8TPxJhfqGwOfH9EXNoNBGFpU+4tv4ozpvo="; # Unicode file cause different checksums on HFS+ vs. other filesystems postFetch = "rm -rf $out/docs/reST"; }; @@ -62,6 +65,8 @@ buildPythonPackage rec { postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "sphinx<=7.2.6"' "" substituteInPlace buildconfig/config_{unix,darwin}.py \ --replace-fail 'from distutils' 'from setuptools._distutils' substituteInPlace src_py/sysfont.py \ @@ -77,6 +82,8 @@ buildPythonPackage rec { pkg-config cython setuptools + ninja + meson-python ]; buildInputs = [ @@ -91,6 +98,11 @@ buildPythonPackage rec { SDL2_ttf ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + nativeCheckInputs = [ + numpy + ]; + + preConfigure = '' ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; @@ -116,7 +128,22 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "pygame" ]; + pythonImportsCheck = [ + "pygame" + "pygame.camera" + "pygame.colordict" + "pygame.cursors" + "pygame.freetype" + "pygame.ftfont" + "pygame.locals" + "pygame.midi" + "pygame.pkgdata" + "pygame.sndarray" # requires numpy + "pygame.sprite" + "pygame.surfarray" + "pygame.sysfont" + "pygame.version" + ]; meta = with lib; { description = "Pygame Community Edition (CE) - library for multimedia application built on SDL"; diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index fd9b7521e25e5..f5f5f4e0831db 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, mock, - pynose, pexpect, pyserial, pytestCheckHook, @@ -13,45 +12,35 @@ buildPythonPackage rec { pname = "pygatt"; - version = "4.0.5"; + version = "5.0.0"; pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "peplin"; repo = "pygatt"; rev = "refs/tags/v${version}"; - hash = "sha256-DUZGsztZViVNZwmhXoRN5FOQ7BgUeI0SsYgCHlvsrv0="; + hash = "sha256-TMIqC+JvNOLU38a9jkacRAbdmAAd4UekFUDRoAWhHFo="; }; postPatch = '' - # Not support for Python < 3.4 substituteInPlace setup.py \ - --replace-fail "'enum-compat'" "" \ - --replace-fail "'coverage >= 3.7.1'," "" \ - --replace-fail "'nose >= 1.3.7'" "" - substituteInPlace tests/bgapi/test_bgapi.py \ - --replace-fail "assertEquals" "assertEqual" + --replace-fail "setup_requires" "test_requires" ''; + pythonRemoveDeps = [ "enum-compat" ]; + build-system = [ setuptools ]; dependencies = [ pyserial ]; - passthru.optional-dependencies.GATTTOOL = [ pexpect ]; - - nativeBuildInputs = [ - # For cross compilation the doCheck is false and therefor the - # nativeCheckInputs not included. We have to include nose here, since - # setup.py requires nose unconditionally. - pynose - ]; + optional-dependencies.GATTTOOL = [ pexpect ]; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.GATTTOOL; + ] ++ optional-dependencies.GATTTOOL; pythonImportsCheck = [ "pygatt" ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index c541fe5aac650..eeb799f32919d 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { homepage = "https://github.com/libgit2/pygit2"; changelog = "https://github.com/libgit2/pygit2/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 2f880a0ea8673..488126dbe18dc 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; + hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index ff8569b9b8ebf..007e36f172331 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -48,13 +48,13 @@ let }); }; - meta = with lib; { + meta = { changelog = "https://github.com/pygments/pygments/releases/tag/${version}"; homepage = "https://pygments.org/"; description = "Generic syntax highlighter"; mainProgram = "pygmentize"; - license = licenses.bsd2; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ sigmanificient ]; }; }; in diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index dc23c6379319a..4f75a53e0545f 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -20,13 +20,13 @@ toPythonModule ( stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.6"; + version = "2.19.7"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-umXK8LGJJ6Xj6UbJ5k/DM/nYayjl+jBXtjar5/dWqFM="; + hash = "sha256-279KNnP11f5ob2senIVmbnlmhRp2p3RoZLsQRE6yJ5Q="; }; cmakeFlags = [ "-DPYGMO_INSTALL_PATH=${placeholder "out"}/${python.sitePackages}" ]; diff --git a/pkgs/development/python-modules/pygnmi/default.nix b/pkgs/development/python-modules/pygnmi/default.nix index caef1f11eb354..117d6a7b03bb7 100644 --- a/pkgs/development/python-modules/pygnmi/default.nix +++ b/pkgs/development/python-modules/pygnmi/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/akarneliuk/pygnmi"; changelog = "https://github.com/akarneliuk/pygnmi/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index 38208b28ad301..d4a9b4f810360 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pygobject3, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/pygogo/default.nix b/pkgs/development/python-modules/pygogo/default.nix deleted file mode 100644 index 889e2c7b06c33..0000000000000 --- a/pkgs/development/python-modules/pygogo/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - pythonOlder, - buildPythonPackage, - fetchFromGitHub, - pkutils, - # Check Inputs - nose, -}: - -buildPythonPackage rec { - pname = "pygogo"; - version = "0.13.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "reubano"; - repo = "pygogo"; - rev = "v${version}"; - sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9"; - }; - - nativeBuildInputs = [ pkutils ]; - - nativeCheckInputs = [ nose ]; - - postPatch = '' - substituteInPlace dev-requirements.txt \ - --replace "pkutils>=1.0.0,<2.0.0" "pkutils>=1.0.0" - ''; - - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - - pythonImportsCheck = [ "pygogo" ]; - - meta = with lib; { - description = "Python logging library"; - homepage = "https://github.com/reubano/pygogo/"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index 76eb40701cee1..a39bc08458ab6 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://launchpad.net/pygpgme"; description = "Python wrapper for the GPGME library"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index 2549a2d7f4978..c8e247f7d2d95 100644 --- a/pkgs/development/python-modules/pygsl/default.nix +++ b/pkgs/development/python-modules/pygsl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pygsl"; - version = "2.3.4"; + version = "2.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pygsl"; repo = "pygsl"; - rev = "refs/tags/v.${version}"; - hash = "sha256-2TalLKDDoJdKGZHr7eNNvVW8fL7wQJjnZv34LJokfow="; + rev = "refs/tags/v${version}"; + hash = "sha256-7agGgfDUgY6mRry7d38vGGNLJC4dFUniy2M/cnejDDs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix index c38fed72fd974..b4a404dc209f8 100644 --- a/pkgs/development/python-modules/pygtfs/default.nix +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -3,42 +3,38 @@ buildPythonPackage, docopt, fetchPypi, - nose, pytz, - pythonOlder, + setuptools, setuptools-scm, six, sqlalchemy, + pytestCheckHook, }: buildPythonPackage rec { pname = "pygtfs"; version = "0.1.9"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-J5vu51OOMabWd8h60PpvvBiCnwQlhEnBywNXxy9hOuA="; }; - postPatch = '' - # https://github.com/jarondl/pygtfs/pull/72 - substituteInPlace setup.py \ - --replace "pytz>=2012d" "pytz" - ''; - - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ docopt pytz six sqlalchemy ]; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "pygtfs/test/test.py" ]; pythonImportsCheck = [ "pygtfs" ]; diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index eb7f5491496d5..f392f53a8c1a5 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/koehlma/pygtkspellcheck"; description = "Python spell-checking library for GtkTextViews based on Enchant"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 8b18971d4af3a..947f3911ce3d5 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -19,7 +19,6 @@ python-pae, python-pkcs11, pythonOlder, - pytz, pyyaml, qrcode, requests, @@ -27,13 +26,12 @@ setuptools, tzlocal, uharfbuzz, - wheel, xsdata, }: buildPythonPackage rec { pname = "pyhanko"; - version = "0.21.0"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,25 +40,16 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "pyHanko"; rev = "refs/tags/v${version}"; - hash = "sha256-+RlrXuKMY89mO4iuFw7RLQABy+wLrAeHlEvTDCpBSqU="; + hash = "sha256-keWAiqwaMZYh92B0mlR4+jjxBKLOAJ9Kgc0l0GiIQbc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace ' "pytest-runner",' "" - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ - setuptools - wheel - ]; - - propagatedBuildInputs = [ + dependencies = [ asn1crypto click cryptography pyhanko-certvalidator - pytz pyyaml qrcode requests diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix index 2a1cad706bbe4..dc6b6e1ea5aff 100644 --- a/pkgs/development/python-modules/pyheif/default.nix +++ b/pkgs/development/python-modules/pyheif/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { homepage = "https://github.com/carsales/pyheif"; description = "Python interface to libheif library"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index db5fe0b0be02d..15f1f30a1fa37 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -2,42 +2,39 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, + setuptools, pytest-asyncio, pytestCheckHook, }: buildPythonPackage rec { pname = "pyheos"; - version = "0.7.2"; - format = "setuptools"; + version = "0.7.4"; + pyproject = true; src = fetchFromGitHub { owner = "andrewsayre"; repo = "pyheos"; - rev = version; - sha256 = "0rgzg7lnqzzqrjp73c1hj1hq8p0j0msyih3yr4wa2rj81s8ihmby"; + rev = "refs/tags/${version}"; + hash = "sha256-vz81FepXWcCdlY1v7ozp+/l+XpYb91mNmRiLKwjrC4A="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - disabledTests = - [ - # accesses network - "test_connect_timeout" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # stuck in epoll - "test_disconnect" - "test_commands_fail_when_disconnected" - ]; + disabledTests = [ + # accesses network + "test_connect_timeout" + ]; pythonImportsCheck = [ "pyheos" ]; meta = with lib; { + changelog = "https://github.com/andrewsayre/pyheos/releases/tag/${version}"; description = "Async python library for controlling HEOS devices through the HEOS CLI Protocol"; homepage = "https://github.com/andrewsayre/pyheos"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index b79cbc812bda6..8b6b6e68627c7 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; + hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix index 030066cff5cb2..13aad86b21212 100644 --- a/pkgs/development/python-modules/pyhomeworks/default.nix +++ b/pkgs/development/python-modules/pyhomeworks/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyindego/default.nix b/pkgs/development/python-modules/pyindego/default.nix index 98e5e3ba6ee6d..606ced6751213 100644 --- a/pkgs/development/python-modules/pyindego/default.nix +++ b/pkgs/development/python-modules/pyindego/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -20,15 +20,20 @@ buildPythonPackage rec { pname = "pyindego"; - version = "3.1.1"; + version = "3.2.2"; pyproject = true; - src = fetchPypi { - pname = "pyIndego"; - inherit version; - hash = "sha256-lRDi6qYMaPI8SiSNe0vzlKb92axujt44aei8opNPDug="; + src = fetchFromGitHub { + owner = "sander1988"; + repo = "pyIndego"; + rev = "refs/tags/${version}"; + hash = "sha256-x8/MSbn+urmArQCyxZU1JEUyATJsPzp7bflymE+1rkk="; }; + postPatch = '' + sed -i "/addopts/d" pytest.ini + ''; + build-system = [ setuptools ]; dependencies = [ @@ -55,8 +60,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for Bosch API for lawnmowers"; - homepage = "https://github.com/jm-73/pyIndego"; - changelog = "https://github.com/jm-73/pyIndego/blob/${version}/CHANGELOG.md"; + homepage = "https://github.com/sander1988/pyIndego"; + changelog = "https://github.com/sander1988/pyIndego/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 80b1d43ef6ed7..518c186e174de 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -8,6 +8,7 @@ fetchFromGitHub, gevent, jinja2, + packaging, paramiko, pytestCheckHook, python-dateutil, @@ -15,35 +16,41 @@ pywinrm, pyyaml, setuptools, + typeguard, + typing-extensions, }: buildPythonPackage rec { pname = "pyinfra"; - version = "2.9.2"; - format = "setuptools"; + version = "3.0.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Fizzadar"; - repo = pname; + repo = "pyinfra"; rev = "refs/tags/v${version}"; - hash = "sha256-lzbFwAg1aLCfBnSnqq4oVteArpkRBa7hU8V3vB5ODa8="; + hash = "sha256-Pjmh/aPsMIwGv5Agf+UGm1T3jv8i9jJQ7SEGc3vDxZg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click colorama configparser distro gevent jinja2 + packaging paramiko python-dateutil pywinrm pyyaml setuptools - ]; + typeguard + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -56,7 +63,6 @@ buildPythonPackage rec { meta = with lib; { description = "Python-based infrastructure automation"; - mainProgram = "pyinfra"; longDescription = '' pyinfra automates/provisions/manages/deploys infrastructure. It can be used for ad-hoc command execution, service deployment, configuration management and more. @@ -64,7 +70,8 @@ buildPythonPackage rec { homepage = "https://pyinfra.com"; downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases"; changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ totoroot ]; license = licenses.mit; + maintainers = with maintainers; [ totoroot ]; + mainProgram = "pyinfra"; }; } diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 4fbb435db53b2..8232ab456719f 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -14,9 +14,13 @@ buildPythonPackage rec { sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"; }; + patches = [ ./skip-asyncore-python-3.12.patch ]; + # No tests distributed doCheck = false; + pythonImportsCheck = [ "pyinotify" ]; + meta = with lib; { homepage = "https://github.com/seb-m/pyinotify/wiki"; description = "Monitor filesystems events on Linux platforms with inotify"; diff --git a/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch b/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch new file mode 100644 index 0000000000000..6f8f65545b8c3 --- /dev/null +++ b/pkgs/development/python-modules/pyinotify/skip-asyncore-python-3.12.patch @@ -0,0 +1,84 @@ +From 478d595a7d086423733e9f5da5edfe9f1df48682 Mon Sep 17 00:00:00 2001 +From: Troy Curtis Jr <troy@troycurtisjr.com> +Date: Thu, 10 Aug 2023 21:51:15 -0400 +Subject: [PATCH] Make asyncore support optional for Python 3. + +Fixes #204. +--- + python3/pyinotify.py | 50 +++++++++++++++++++++++++------------------- + 1 file changed, 28 insertions(+), 22 deletions(-) + +diff --git a/python3/pyinotify.py b/python3/pyinotify.py +index bc24313..f4a5a90 100755 +--- a/python3/pyinotify.py ++++ b/python3/pyinotify.py +@@ -68,7 +68,6 @@ def __init__(self, version): + from datetime import datetime, timedelta + import time + import re +-import asyncore + import glob + import locale + import subprocess +@@ -1494,33 +1493,40 @@ def run(self): + self.loop() + + +-class AsyncNotifier(asyncore.file_dispatcher, Notifier): +- """ +- This notifier inherits from asyncore.file_dispatcher in order to be able to +- use pyinotify along with the asyncore framework. ++try: ++ import asyncore + +- """ +- def __init__(self, watch_manager, default_proc_fun=None, read_freq=0, +- threshold=0, timeout=None, channel_map=None): ++ class AsyncNotifier(asyncore.file_dispatcher, Notifier): + """ +- Initializes the async notifier. The only additional parameter is +- 'channel_map' which is the optional asyncore private map. See +- Notifier class for the meaning of the others parameters. ++ This notifier inherits from asyncore.file_dispatcher in order to be able to ++ use pyinotify along with the asyncore framework. + + """ +- Notifier.__init__(self, watch_manager, default_proc_fun, read_freq, +- threshold, timeout) +- asyncore.file_dispatcher.__init__(self, self._fd, channel_map) ++ def __init__(self, watch_manager, default_proc_fun=None, read_freq=0, ++ threshold=0, timeout=None, channel_map=None): ++ """ ++ Initializes the async notifier. The only additional parameter is ++ 'channel_map' which is the optional asyncore private map. See ++ Notifier class for the meaning of the others parameters. + +- def handle_read(self): +- """ +- When asyncore tells us we can read from the fd, we proceed processing +- events. This method can be overridden for handling a notification +- differently. ++ """ ++ Notifier.__init__(self, watch_manager, default_proc_fun, read_freq, ++ threshold, timeout) ++ asyncore.file_dispatcher.__init__(self, self._fd, channel_map) + +- """ +- self.read_events() +- self.process_events() ++ def handle_read(self): ++ """ ++ When asyncore tells us we can read from the fd, we proceed processing ++ events. This method can be overridden for handling a notification ++ differently. ++ ++ """ ++ self.read_events() ++ self.process_events() ++except ImportError: ++ # asyncore was removed in Python 3.12, but try the import instead of a ++ # version check in case the compatibility package is installed. ++ pass + + + class TornadoAsyncNotifier(Notifier): diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix new file mode 100644 index 0000000000000..c3bfee6476174 --- /dev/null +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -0,0 +1,45 @@ +{ + lib +, buildPythonPackage +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "pyinstaller-hooks-contrib"; + version = "2024.8"; + + pyproject = true; + + src = fetchPypi { + pname = "pyinstaller_hooks_contrib"; + inherit version; + hash = "sha256-KbaNh4q3OelnBVtWqT65tY5SnVsFT7q3ovK6z4DO8+I="; + }; + + build-system = [ setuptools ]; + + # There are tests for every hook, which means that + # new updates are going to require changes to test inputs + # and building tests creates a very big closure. + doCheck = false; + + meta = { + description = "Community maintained hooks for PyInstaller"; + longDescription = '' + A "hook" file extends PyInstaller to adapt it to the special needs and methods used by a Python package. + The word "hook" is used for two kinds of files. A runtime hook helps the bootloader to launch an app, + setting up the environment. A package hook (there are several types of those) tells PyInstaller + what to include in the final app - such as the data files and (hidden) imports mentioned above. + This repository is a collection of hooks for many packages, and allows PyInstaller to work with these packages seamlessly. + ''; + homepage = "https://github.com/pyinstaller/pyinstaller-hooks-contrib"; + # See https://github.com/pyinstaller/pyinstaller-hooks-contrib/issues/761 + changelog = "https://github.com/pyinstaller/pyinstaller-hooks-contrib/blob/master/CHANGELOG.rst"; + license = with lib.licenses; [ + gpl2Plus + asl20 + ]; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix index 8a0c51eef3dc4..f941b8dc67c16 100644 --- a/pkgs/development/python-modules/pyinstaller-versionfile/default.nix +++ b/pkgs/development/python-modules/pyinstaller-versionfile/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { mainProgram = "create-version-file"; homepage = "https://pypi.org/project/pyinstaller-versionfile/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix new file mode 100644 index 0000000000000..c8b4d4697202e --- /dev/null +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -0,0 +1,67 @@ +{ + lib +, buildPythonPackage +, fetchPypi +, setuptools +, zlib +, altgraph +, packaging +, pyinstaller-hooks-contrib +, testers +, pyinstaller +, glibc +, binutils +, installShellFiles +}: + +buildPythonPackage rec { + pname = "pyinstaller"; + version = "6.9.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-9KdcVS+swuKjcPHkIrlxteXNtAWP84zqAjWqIfwLN48="; + }; + + + build-system = [ setuptools ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ zlib.dev ]; + + dependencies = [ + altgraph + packaging + pyinstaller-hooks-contrib + ]; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ glibc binutils ]) + ]; + + postInstall = '' + installManPage doc/pyinstaller.1 doc/pyi-makespec.1 + ''; + + pythonImportsCheck = [ "PyInstaller" ]; + + passthru.tests.version = testers.testVersion { + package = pyinstaller; + }; + + meta = { + description = "A tool to bundle a python application with dependencies into a single package"; + homepage = "https://pyinstaller.org/"; + changelog = "https://pyinstaller.org/en/v${version}/CHANGES.html"; + downloadPage = "https://pypi.org/project/pyinstaller/"; + license = with lib.licenses; [ + mit + asl20 + gpl2Plus + ]; + maintainers = with lib.maintainers; [ h7x4 ]; + mainProgram = "pyinstaller"; + }; +} diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index bfeaab0146cb0..03beb0e878e1e 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.6.0"; + version = "4.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +18,7 @@ buildPythonPackage rec { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NSE2mZPbKmvlQbBPx0MoqYfAOjmsf9CllX7dxygZfc4="; + hash = "sha256-XB4ebWxTIX7WP2iLhhV2bHqoAau+mHnNnCSjEIQF/rM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix index 31eb43a15bd49..ce4e509174c81 100644 --- a/pkgs/development/python-modules/pykalman/default.nix +++ b/pkgs/development/python-modules/pykalman/default.nix @@ -1,39 +1,33 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, numpy, scipy, pytestCheckHook, - nose, + setuptools, }: buildPythonPackage rec { pname = "pykalman"; version = "0.9.7"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-E1d5IAOTxrNwIhmQ9zFnQEcvVBNG6SEdEWMOLC2PuKA="; + src = fetchFromGitHub { + owner = "pykalman"; + repo = "pykalman"; + rev = "aaf8c8574b0474b6f41b7b135a9a7f2dfbd0e86c"; # no tags + hash = "sha256-++YqxGMsFGv5OxicDFO9Xz89e62NG8X+6oR6M9ePUcg="; }; - patches = [ - # https://github.com/pykalman/pykalman/issues/83 - ./fix-masked-arrays-not-supported.patch - # python 3.11 issues fix: https://github.com/pykalman/pykalman/pull/101 - ./fix-p311-issues.patch - ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ numpy scipy ]; - nativeCheckInputs = [ - pytestCheckHook - nose - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pykalman" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch b/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch deleted file mode 100644 index f6dc6679cc54a..0000000000000 --- a/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/pykalman/utils.py -+++ b/pykalman/utils.py -@@ -70,7 +70,10 @@ - cv_chol = linalg.cholesky(cv + min_covar * np.eye(n_dim), - lower=True) - cv_log_det = 2 * np.sum(np.log(np.diagonal(cv_chol))) -- cv_sol = solve_triangular(cv_chol, (X - mu).T, lower=True).T -+ try: -+ cv_sol = solve_triangular(cv_chol, (X - mu).T, lower=True).T -+ except ValueError: -+ cv_sol = np.linalg.solve(cv_chol, (X - mu).T).T - log_prob[:, c] = - .5 * (np.sum(cv_sol ** 2, axis=1) + \ - n_dim * np.log(2 * np.pi) + cv_log_det) - diff --git a/pkgs/development/python-modules/pykalman/fix-p311-issues.patch b/pkgs/development/python-modules/pykalman/fix-p311-issues.patch deleted file mode 100644 index 002c8b893aad2..0000000000000 --- a/pkgs/development/python-modules/pykalman/fix-p311-issues.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pykalman/utils.py -+++ b/pykalman/utils_copy.py -@@ -40,6 +40,10 @@ - from scipy import linalg - - -+# monkey patch -+if not hasattr(inspect, 'getargspec'): -+ inspect.getargspec = inspect.getfullargspec -+ - def array1d(X, dtype=None, order=None): - """Returns at least 1-d array with data from X""" - return np.asarray(np.atleast_1d(X), dtype=dtype, order=order) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 73530902ee899..b6bac1517114e 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -13,30 +13,23 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.7"; + version = "4.1.0.post1"; pyproject = true; src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; - rev = "v${version}"; - hash = "sha256-qUNMjnIhQpUSQY0kN9bA4IxQx8fiFIA6p8rPqNqdjNo="; + rev = "refs/tags/v${version}"; + hash = "sha256-64is/XoRF/kojqd4jQIAQi1od8TRhiv9uR+WNIGvP2A="; }; - postPatch = '' - # https://github.com/libkeepass/pykeepass/pull/378 - substituteInPlace pyproject.toml \ - --replace-fail 'packages = ["pykeepass"]' 'packages = ["pykeepass", "pykeepass.kdbx_parsing"]' - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ argon2-cffi construct lxml pycryptodomex - setuptools ]; propagatedNativeBuildInputs = [ argon2-cffi ]; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 19cc38aba586c..1768d04891513 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { homepage = "https://www.pykka.org/"; description = "Python implementation of the actor model"; changelog = "https://github.com/jodal/pykka/releases/tag/v${version}"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/pykostalpiko/default.nix b/pkgs/development/python-modules/pykostalpiko/default.nix index 71c9416ae6499..c9c1838198181 100644 --- a/pkgs/development/python-modules/pykostalpiko/default.nix +++ b/pkgs/development/python-modules/pykostalpiko/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, click, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index a151a64d59d5e..0bd6c7f0b977f 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, mock, - pynose, pyserial, pytestCheckHook, pythonOlder, @@ -23,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw="; }; + patches = [ + # Migrate to pytest, https://github.com/hthiery/python-lacrosse/pull/17 + (fetchpatch2 { + url = "https://github.com/hthiery/python-lacrosse/commit/cc2623c667bc252360a9b5ccb4fc05296cf23d9c.patch?full_index=1"; + hash = "sha256-LKryLnXMKj1lVClneyHNVOWM5KPPhOGy0/FX/7Qy/jU="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "version = version," "version = '${version}'," @@ -32,7 +40,6 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pynose pytestCheckHook ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/pkgs/development/python-modules/pylance/Cargo.lock index 4ccab5df7b797..5f1aa29628fe8 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/pkgs/development/python-modules/pylance/Cargo.lock @@ -3,19 +3,10 @@ version = 3 [[package]] -name = "addr" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93b8a41dbe230ad5087cc721f8d41611de654542180586b315d9f4cf6b72bef" -dependencies = [ - "psl-types", -] - -[[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -28,22 +19,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom", "once_cell", "version_check", @@ -60,6 +41,21 @@ dependencies = [ ] [[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] name = "allocator-api2" version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -81,138 +77,465 @@ dependencies = [ ] [[package]] -name = "anstream" -version = "0.6.13" +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "arrayref" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "arrow" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "219d05930b81663fd3b32e3bde8ce5bff3c4d23052a99f11a8fa50a3b47b2658" dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", + "arrow-arith 51.0.0", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-csv 51.0.0", + "arrow-data 51.0.0", + "arrow-ipc 51.0.0", + "arrow-json 51.0.0", + "arrow-ord 51.0.0", + "arrow-row 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "arrow-string 51.0.0", ] [[package]] -name = "anstyle" -version = "1.0.6" +name = "arrow" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" +dependencies = [ + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-csv 52.2.0", + "arrow-data 52.2.0", + "arrow-ipc 52.2.0", + "arrow-json 52.2.0", + "arrow-ord 52.2.0", + "arrow-row 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "arrow-string 52.2.0", + "pyo3", +] [[package]] -name = "anstyle-parse" -version = "0.2.3" +name = "arrow-arith" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "0272150200c07a86a390be651abdd320a2d12e84535f0837566ca87ecd8f95e0" dependencies = [ - "utf8parse", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "half", + "num", ] [[package]] -name = "anstyle-query" -version = "1.0.2" +name = "arrow-arith" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" dependencies = [ - "windows-sys 0.52.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "num", ] [[package]] -name = "anstyle-wincon" -version = "3.0.2" +name = "arrow-array" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "8010572cf8c745e242d1b632bd97bd6d4f40fefed5ed1290a8f433abaa686fea" dependencies = [ - "anstyle", - "windows-sys 0.52.0", + "ahash", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "half", + "hashbrown", + "num", ] [[package]] -name = "any_ascii" -version = "0.3.2" +name = "arrow-array" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" +dependencies = [ + "ahash", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "chrono-tz", + "half", + "hashbrown", + "num", +] [[package]] -name = "approx" -version = "0.4.0" +name = "arrow-buffer" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +checksum = "0d0a2432f0cba5692bf4cb757469c66791394bac9ec7ce63c1afe74744c37b27" dependencies = [ - "num-traits", + "bytes", + "half", + "num", ] [[package]] -name = "approx" -version = "0.5.1" +name = "arrow-buffer" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" dependencies = [ - "num-traits", + "bytes", + "half", + "num", ] [[package]] -name = "arbitrary" -version = "1.3.2" +name = "arrow-cast" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "9abc10cd7995e83505cc290df9384d6e5412b207b79ce6bdff89a10505ed2cba" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "atoi", + "base64 0.22.1", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] [[package]] -name = "argon2" -version = "0.5.3" +name = "arrow-cast" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" +checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" dependencies = [ - "base64ct", - "blake2", - "cpufeatures", - "password-hash", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "atoi", + "base64 0.22.1", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", ] [[package]] -name = "arrayvec" -version = "0.7.4" +name = "arrow-csv" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "95cbcba196b862270bf2a5edb75927380a7f3a163622c61d40cbba416a6305f2" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] [[package]] -name = "ascii-canvas" -version = "3.0.0" +name = "arrow-csv" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +checksum = "c13c36dc5ddf8c128df19bab27898eea64bf9da2b555ec1cd17a8ff57fba9ec2" dependencies = [ - "term", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", ] [[package]] -name = "assert_cmd" -version = "2.0.14" +name = "arrow-data" +version = "51.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +checksum = "2742ac1f6650696ab08c88f6dd3f0eb68ce10f8c253958a18c943a68cd04aec5" dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", + "arrow-buffer 51.0.0", + "arrow-schema 51.0.0", + "half", + "num", ] [[package]] -name = "assert_fs" -version = "1.1.1" +name = "arrow-data" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" dependencies = [ - "anstyle", - "doc-comment", - "globwalk", - "predicates", - "predicates-core", - "predicates-tree", - "tempfile", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42ea853130f7e78b9b9d178cb4cd01dee0f78e64d96c2949dc0a915d6d9e19d" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "flatbuffers 23.5.26", +] + +[[package]] +name = "arrow-ipc" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e786e1cdd952205d9a8afc69397b317cfbb6e0095e445c69cda7e8da5c1eeb0f" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "flatbuffers 24.3.25", + "lz4_flex", + "zstd", +] + +[[package]] +name = "arrow-json" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaafb5714d4e59feae964714d724f880511500e3569cc2a94d02456b403a2a49" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-cast 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "chrono", + "half", + "indexmap", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-json" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb22284c5a2a01d73cebfd88a33511a3234ab45d66086b2ca2d1228c3498e445" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "indexmap", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e6b61e3dc468f503181dccc2fc705bdcc5f2f146755fa5b56d0a6c5943f412" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "half", + "num", +] + +[[package]] +name = "arrow-ord" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848ee52bb92eb459b811fb471175ea3afcf620157674c8794f539838920f9228" +dependencies = [ + "ahash", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "half", + "hashbrown", +] + +[[package]] +name = "arrow-row" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" +dependencies = [ + "ahash", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "half", +] + +[[package]] +name = "arrow-schema" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d9483aaabe910c4781153ae1b6ae0393f72d9ef757d38d09d450070cf2e528" + +[[package]] +name = "arrow-schema" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "arrow-select" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849524fa70e0e3c5ab58394c770cb8f514d0122d20de08475f7b472ed8075830" +dependencies = [ + "ahash", + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "num", +] + +[[package]] +name = "arrow-select" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" +dependencies = [ + "ahash", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "num", +] + +[[package]] +name = "arrow-string" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9373cb5a021aee58863498c37eb484998ef13377f69989c6c5ccfbd258236cdb" +dependencies = [ + "arrow-array 51.0.0", + "arrow-buffer 51.0.0", + "arrow-data 51.0.0", + "arrow-schema 51.0.0", + "arrow-select 51.0.0", + "memchr", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "arrow-string" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "memchr", + "num", + "regex", + "regex-syntax", ] [[package]] @@ -227,563 +550,841 @@ dependencies = [ ] [[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", + "xz2", + "zstd", + "zstd-safe", +] + +[[package]] name = "async-executor" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] [[package]] -name = "async-lock" -version = "3.3.0" +name = "async-global-executor" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy", - "pin-project-lite", + "async-channel 2.3.1", + "async-executor", + "async-io 2.3.3", + "async-lock 3.4.0", + "blocking", + "futures-lite 2.3.0", + "once_cell", ] [[package]] -name = "async-recursion" -version = "1.1.0" +name = "async-io" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", ] [[package]] -name = "async-stream" -version = "0.3.5" +name = "async-io" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", ] [[package]] -name = "async-stream-impl" -version = "0.3.5" +name = "async-lock" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", + "event-listener 2.5.3", ] [[package]] -name = "async-task" -version = "4.7.0" +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] [[package]] -name = "async-trait" -version = "0.1.80" +name = "async-priority-channel" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acde96f444d31031f760c5c43dc786b97d3e1cb2ee49dd06898383fe9a999758" +dependencies = [ + "event-listener 4.0.3", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] -name = "async_io_stream" -version = "0.3.3" +name = "async-std" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "futures", - "pharos", - "rustc_version", + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", ] [[package]] -name = "atomic" -version = "0.5.3" +name = "async-task" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] -name = "atomic-polyfill" -version = "1.0.3" +name = "async-trait" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ - "critical-section", + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] -name = "autocfg" -version = "1.2.0" +name = "async_cell" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "834eee9ce518130a3b4d5af09ecc43e9d6b57ee76613f227a1ddd6b77c7a62bc" [[package]] -name = "backtrace" -version = "0.3.71" +name = "atoi" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", + "num-traits", ] [[package]] -name = "base64" -version = "0.21.7" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "base64" -version = "0.22.0" +name = "autocfg" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] -name = "base64ct" -version = "1.6.0" +name = "aws-config" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "caf6cfe2881cb1fcbba9ae946fb9a6480d3b7a714ca84c74925014a89ef3387a" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.1.0", + "hex", + "http 0.2.12", + "hyper 0.14.30", + "ring", + "time", + "tokio", + "tracing", + "url", + "zeroize", +] [[package]] -name = "bcrypt" -version = "0.15.1" +name = "aws-credential-types" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" dependencies = [ - "base64 0.22.0", - "blowfish", - "getrandom", - "subtle", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", "zeroize", ] [[package]] -name = "bincode" -version = "1.3.3" +name = "aws-runtime" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "87c5f920ffd1e0526ec9e70e50bf444db50b204395a0fa7016bbf9e31ea1698f" dependencies = [ - "serde", + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.1.0", + "http 0.2.12", + "http-body 0.4.6", + "percent-encoding", + "pin-project-lite", + "tracing", + "uuid", ] [[package]] -name = "bit-set" -version = "0.5.3" +name = "aws-sdk-dynamodb" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "e2fdd26fcd839ffa0df7a589a34f5e1a2d4c4c6d8127fe18100bf8b4d57f5d4c" dependencies = [ - "bit-vec", + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.1.0", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", ] [[package]] -name = "bit-vec" -version = "0.6.3" +name = "aws-sdk-sso" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "6acca681c53374bf1d9af0e317a41d12a44902ca0f2d1e10e5cb5bb98ed74f35" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] [[package]] -name = "bitflags" -version = "1.3.2" +name = "aws-sdk-ssooidc" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b79c6bdfe612503a526059c05c9ccccbf6bd9530b003673cb863e547fd7c0c9a" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] [[package]] -name = "bitflags" -version = "2.5.0" +name = "aws-sdk-sts" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "32e6ecdb2bd756f3b2383e6f0588dc10a4e65f5d551e70a56e0bfe0c884673ce" +dependencies = [ + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", +] [[package]] -name = "bitvec" -version = "1.0.1" +name = "aws-sigv4" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" dependencies = [ - "funty", - "radium", - "tap", - "wyz", + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http 0.2.12", + "http 1.1.0", + "once_cell", + "percent-encoding", + "sha2", + "time", + "tracing", ] [[package]] -name = "blake2" -version = "0.10.6" +name = "aws-smithy-async" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ - "digest", + "futures-util", + "pin-project-lite", + "tokio", ] [[package]] -name = "block-buffer" -version = "0.10.4" +name = "aws-smithy-http" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" dependencies = [ - "generic-array", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", ] [[package]] -name = "blowfish" -version = "0.9.1" +name = "aws-smithy-json" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ - "byteorder", - "cipher", + "aws-smithy-types", ] [[package]] -name = "borsh" -version = "1.4.0" +name = "aws-smithy-query" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ - "borsh-derive", - "cfg_aliases", + "aws-smithy-types", + "urlencoding", ] [[package]] -name = "borsh-derive" -version = "1.4.0" +name = "aws-smithy-runtime" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" +checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.1.0", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.1", + "httparse", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.58", - "syn_derive", + "pin-project-lite", + "pin-utils", + "rustls 0.21.12", + "tokio", + "tracing", ] [[package]] -name = "bstr" -version = "1.9.1" +name = "aws-smithy-runtime-api" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f" dependencies = [ - "memchr", - "regex-automata", + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.1", + "http-body-util", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", "serde", + "time", + "tokio", + "tokio-util", ] [[package]] -name = "bumpalo" -version = "3.16.0" +name = "aws-smithy-xml" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +dependencies = [ + "xmlparser", +] [[package]] -name = "bytecheck" -version = "0.6.12" +name = "aws-types" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef" dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "rustc_version", + "tracing", ] [[package]] -name = "bytecheck_derive" -version = "0.6.12" +name = "backtrace" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", ] [[package]] -name = "bytemuck" -version = "1.15.0" +name = "base64" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "byteorder" -version = "1.5.0" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "bytes" -version = "1.6.0" +name = "base64-simd" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] [[package]] -name = "cc" -version = "1.0.92" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "cedar-policy" -version = "2.4.2" +name = "bitflags" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d91e3b10a0f7f2911774d5e49713c4d25753466f9e11d1cd2ec627f8a2dc857" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitpacking" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92" dependencies = [ - "cedar-policy-core", - "cedar-policy-validator", - "itertools 0.10.5", - "lalrpop-util", - "ref-cast", - "serde", - "serde_json", - "smol_str", - "thiserror", + "crunchy", ] [[package]] -name = "cedar-policy-core" -version = "2.4.2" +name = "bitvec" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd2315591c6b7e18f8038f0a0529f254235fd902b6c217aabc04f2459b0d9995" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "either", - "ipnet", - "itertools 0.10.5", - "lalrpop", - "lalrpop-util", - "lazy_static", - "miette", - "regex", - "rustc_lexer", - "serde", - "serde_json", - "serde_with", - "smol_str", - "stacker", - "thiserror", + "funty", + "radium", + "tap", + "wyz", ] [[package]] -name = "cedar-policy-validator" -version = "2.4.2" +name = "blake2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e756e1b2a5da742ed97e65199ad6d0893e9aa4bd6b34be1de9e70bd1e6adc7df" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "cedar-policy-core", - "itertools 0.10.5", - "serde", - "serde_json", - "serde_with", - "smol_str", - "stacker", - "thiserror", - "unicode-security", + "digest", ] [[package]] -name = "cfg-if" -version = "1.0.0" +name = "blake3" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] [[package]] -name = "cfg_aliases" -version = "0.1.1" +name = "block-buffer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] [[package]] -name = "chrono" -version = "0.4.38" +name = "blocking" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.4", + "async-channel 2.3.1", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", ] [[package]] -name = "chrono-human-duration" -version = "0.1.1" +name = "brotli" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19283df3a144dfdeee6568e42ad7f0939d3c261bcdfe954b1a1098f6f7c1b908" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ - "chrono", + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", ] [[package]] -name = "ciborium" -version = "0.2.2" +name = "brotli-decompressor" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", + "alloc-no-stdlib", + "alloc-stdlib", ] [[package]] -name = "ciborium-io" -version = "0.2.2" +name = "bumpalo" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] -name = "ciborium-ll" -version = "0.2.2" +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "bytemuck" +version = "1.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ - "ciborium-io", - "half", + "bytes", + "either", ] [[package]] -name = "cipher" +name = "bzip2" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ - "crypto-common", - "inout", + "bzip2-sys", + "libc", ] [[package]] -name = "clap" -version = "4.5.4" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" dependencies = [ - "clap_builder", - "clap_derive", + "cc", + "libc", + "pkg-config", ] [[package]] -name = "clap_builder" -version = "4.5.2" +name = "camino" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", + "serde", ] [[package]] -name = "clap_derive" -version = "4.5.4" +name = "cargo-platform" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.58", + "serde", ] [[package]] -name = "clap_lex" -version = "0.7.0" +name = "cargo_metadata" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", +] [[package]] -name = "cli-table" -version = "0.4.7" +name = "cc" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" dependencies = [ - "cli-table-derive", - "csv", - "termcolor", - "unicode-width", + "jobserver", + "libc", ] [[package]] -name = "cli-table-derive" -version = "0.4.5" +name = "census" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" +checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", ] [[package]] -name = "color-eyre" -version = "0.6.3" +name = "chrono-tz" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", + "chrono", + "chrono-tz-build", + "phf", ] [[package]] -name = "color-spantrace" -version = "0.2.1" +name = "chrono-tz-build" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", + "parse-zoneinfo", + "phf", + "phf_codegen", ] [[package]] -name = "colorchoice" -version = "1.0.0" +name = "comfy-table" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +dependencies = [ + "strum", + "strum_macros", + "unicode-width", +] [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] name = "const-random" version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -804,13 +1405,10 @@ dependencies = [ ] [[package]] -name = "convert_case" -version = "0.6.0" +name = "constant_time_eq" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -838,10 +1436,37 @@ dependencies = [ ] [[package]] -name = "critical-section" -version = "1.1.2" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] [[package]] name = "crossbeam-deque" @@ -863,10 +1488,19 @@ dependencies = [ ] [[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -906,212 +1540,439 @@ dependencies = [ ] [[package]] -name = "darling" -version = "0.20.8" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core", - "darling_macro", + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] -name = "darling_core" -version = "0.20.8" +name = "datafusion" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.58", + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "async-compression", + "async-trait", + "bytes", + "bzip2", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "datafusion-functions-array", + "datafusion-optimizer", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "datafusion-physical-plan", + "datafusion-sql", + "flate2", + "futures", + "glob", + "half", + "hashbrown", + "indexmap", + "itertools 0.12.1", + "log", + "num_cpus", + "object_store", + "parking_lot", + "parquet", + "paste", + "pin-project-lite", + "rand", + "sqlparser", + "tempfile", + "tokio", + "tokio-util", + "url", + "uuid", + "xz2", + "zstd", ] [[package]] -name = "darling_macro" -version = "0.20.8" +name = "datafusion-common" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" dependencies = [ - "darling_core", - "quote", - "syn 2.0.58", + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "half", + "hashbrown", + "instant", + "libc", + "num_cpus", + "object_store", + "parquet", + "sqlparser", ] [[package]] -name = "dashmap" -version = "5.5.3" +name = "datafusion-common-runtime" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", + "tokio", ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "datafusion-execution" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", + "arrow 52.2.0", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-expr", + "futures", + "hashbrown", + "log", + "object_store", + "parking_lot", + "rand", + "tempfile", + "url", ] [[package]] -name = "deranged" -version = "0.3.11" +name = "datafusion-expr" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" dependencies = [ - "powerfmt", - "serde", + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "chrono", + "datafusion-common", + "paste", + "serde_json", + "sqlparser", + "strum", + "strum_macros", ] [[package]] -name = "deunicode" -version = "1.4.3" +name = "datafusion-functions" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" +checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +dependencies = [ + "arrow 52.2.0", + "base64 0.22.1", + "blake2", + "blake3", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "hashbrown", + "hex", + "itertools 0.12.1", + "log", + "md-5", + "rand", + "regex", + "sha2", + "unicode-segmentation", + "uuid", +] [[package]] -name = "diff" -version = "0.1.13" +name = "datafusion-functions-aggregate" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +dependencies = [ + "ahash", + "arrow 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "log", + "paste", + "sqlparser", +] [[package]] -name = "difflib" -version = "0.4.0" +name = "datafusion-functions-array" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions", + "datafusion-functions-aggregate", + "itertools 0.12.1", + "log", + "paste", +] [[package]] -name = "diffy" -version = "0.3.0" +name = "datafusion-optimizer" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e616e59155c92257e84970156f506287853355f58cd4a6eb167385722c32b790" +checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" dependencies = [ - "nu-ansi-term", + "arrow 52.2.0", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "hashbrown", + "indexmap", + "itertools 0.12.1", + "log", + "paste", + "regex-syntax", ] [[package]] -name = "digest" -version = "0.10.7" +name = "datafusion-physical-expr" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-string 52.2.0", + "base64 0.22.1", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr-common", + "half", + "hashbrown", + "hex", + "indexmap", + "itertools 0.12.1", + "log", + "paste", + "petgraph", + "regex", ] [[package]] -name = "dir-diff" -version = "0.3.3" +name = "datafusion-physical-expr-common" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" +checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" dependencies = [ - "walkdir", + "ahash", + "arrow 52.2.0", + "datafusion-common", + "datafusion-expr", + "hashbrown", + "rand", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "datafusion-physical-plan" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" dependencies = [ - "cfg-if", - "dirs-sys-next", + "ahash", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-common-runtime", + "datafusion-execution", + "datafusion-expr", + "datafusion-functions-aggregate", + "datafusion-physical-expr", + "datafusion-physical-expr-common", + "futures", + "half", + "hashbrown", + "indexmap", + "itertools 0.12.1", + "log", + "once_cell", + "parking_lot", + "pin-project-lite", + "rand", + "tokio", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "datafusion-sql" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" dependencies = [ - "libc", - "redox_users", - "winapi", + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-schema 52.2.0", + "datafusion-common", + "datafusion-expr", + "log", + "regex", + "sqlparser", + "strum", ] [[package]] -name = "dlv-list" -version = "0.5.2" +name = "datafusion-substrait" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +checksum = "434e52fbff22e6e04e6c787f603a6aba4961a7e249a29c743c5d4f609ec2dcef" dependencies = [ - "const-random", + "arrow-buffer 52.2.0", + "async-recursion", + "chrono", + "datafusion", + "itertools 0.12.1", + "object_store", + "pbjson-types", + "prost 0.12.6", + "substrait", + "url", ] [[package]] -name = "dmp" +name = "deepsize" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaa1135a34d26e5cc5b4927a8935af887d4f30a5653a797c33b9a4222beb6d9" +checksum = "1cdb987ec36f6bf7bfbea3f928b75590b736fc42af8e54d97592481351b2b96c" dependencies = [ - "urlencoding", + "deepsize_derive", ] [[package]] -name = "doc-comment" -version = "0.3.3" +name = "deepsize_derive" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "990101d41f3bc8c1a45641024377ee284ecc338e5ecf3ea0f0e236d897c72796" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] -name = "earcutr" -version = "0.4.3" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "itertools 0.11.0", - "num-traits", + "powerfmt", + "serde", ] [[package]] -name = "either" -version = "1.10.0" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] [[package]] -name = "ena" -version = "0.14.2" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "log", + "dirs-sys", ] [[package]] -name = "encoding_rs" -version = "0.8.34" +name = "dirs-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ - "cfg-if", + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", ] [[package]] -name = "endian-type" -version = "0.1.2" +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dyn-clone" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] [[package]] name = "equivalent" @@ -1121,15 +1982,24 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "version_check", +] + +[[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1147,30 +2017,58 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", + "event-listener 5.3.1", "pin-project-lite", ] [[package]] -name = "eyre" -version = "0.6.12" +name = "fastdivide" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +checksum = "59668941c55e5c186b8b58c391629af56774ec768f73c08bbcd56f09348eb00b" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ - "indenter", - "once_cell", + "instant", ] [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] [[package]] name = "fixedbitset" @@ -1179,30 +2077,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "float-cmp" -version = "0.9.0" +name = "flatbuffers" +version = "23.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" dependencies = [ - "num-traits", + "bitflags 1.3.2", + "rustc_version", ] [[package]] -name = "float_next_after" -version = "1.0.0" +name = "flatbuffers" +version = "24.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" +checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f" +dependencies = [ + "bitflags 1.3.2", + "rustc_version", +] [[package]] -name = "flume" -version = "0.11.0" +name = "flate2" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin 0.9.8", + "crc32fast", + "miniz_oxide", ] [[package]] @@ -1221,16 +2122,22 @@ dependencies = [ ] [[package]] -name = "fs_extra" -version = "1.3.0" +name = "fs4" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +dependencies = [ + "rustix 0.38.34", + "windows-sys 0.52.0", +] [[package]] -name = "fst" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" +name = "fsst" +version = "0.1.0" +dependencies = [ + "arrow 51.0.0", + "rand", +] [[package]] name = "funty" @@ -1264,19 +2171,6 @@ dependencies = [ ] [[package]] -name = "futures-concurrency" -version = "7.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b590a729e1cbaf9ae3ec294143ea034d93cbb1de01c884d04bcd0af8b613d02" -dependencies = [ - "bitvec", - "futures-core", - "pin-project", - "slab", - "smallvec", -] - -[[package]] name = "futures-core" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1301,11 +2195,26 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -1320,7 +2229,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -1354,15 +2263,6 @@ dependencies = [ ] [[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1373,67 +2273,10 @@ dependencies = [ ] [[package]] -name = "geo" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" -dependencies = [ - "earcutr", - "float_next_after", - "geo-types", - "geographiclib-rs", - "log", - "num-traits", - "robust", - "rstar", - "serde", -] - -[[package]] -name = "geo" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" -dependencies = [ - "earcutr", - "float_next_after", - "geo-types", - "geographiclib-rs", - "log", - "num-traits", - "robust", - "rstar", - "serde", - "spade", -] - -[[package]] -name = "geo-types" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61" -dependencies = [ - "approx 0.5.1", - "arbitrary", - "num-traits", - "rstar", - "serde", -] - -[[package]] -name = "geographiclib-rs" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960" -dependencies = [ - "libm", -] - -[[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1444,32 +2287,26 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] -name = "globset" -version = "0.4.14" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globwalk" -version = "0.9.1" +name = "gloo-timers" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ - "bitflags 2.5.0", - "ignore", - "walkdir", + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -1483,8 +2320,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.2.6", + "http 0.2.12", + "indexmap", "slab", "tokio", "tokio-util", @@ -1492,31 +2329,33 @@ dependencies = [ ] [[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hash32" -version = "0.2.1" +name = "h2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ - "byteorder", + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "hashbrown" -version = "0.12.3" +name = "half" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ - "ahash 0.7.8", + "cfg-if", + "crunchy", + "num-traits", ] [[package]] @@ -1525,22 +2364,8 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", - "serde", -] - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin 0.9.8", - "stable_deref_trait", ] [[package]] @@ -1562,6 +2387,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1577,6 +2408,32 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] name = "http" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1588,21 +2445,55 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1618,22 +2509,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -1641,17 +2532,86 @@ dependencies = [ ] [[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] name = "hyper-rustls" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", - "rustls", + "http 0.2.12", + "hyper 0.14.30", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs 0.7.1", + "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperloglogplus" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3" +dependencies = [ + "serde", ] [[package]] @@ -1678,12 +2638,6 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] name = "idna" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1694,75 +2648,54 @@ dependencies = [ ] [[package]] -name = "ignore" -version = "0.4.22" +name = "indexmap" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata", - "same-file", - "walkdir", - "winapi-util", + "equivalent", + "hashbrown", ] [[package]] -name = "include_dir" -version = "0.7.3" +name = "indoc" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] -name = "include_dir_macros" -version = "0.7.3" +name = "instant" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ - "proc-macro2", - "quote", + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "indenter" -version = "0.3.3" +name = "integer-encoding" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] -name = "indexmap" -version = "1.9.3" +name = "integer-encoding" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] +checksum = "0d762194228a2f1c11063e46e32e5acb96e66e906382b9eb5441f2e0504bbd5a" [[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "inout" -version = "0.1.3" +name = "io-lifetimes" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "generic-array", + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", ] [[package]] @@ -1772,6 +2705,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1799,12 +2743,30 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] name = "js-sys" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1814,59 +2776,484 @@ dependencies = [ ] [[package]] -name = "lalrpop" -version = "0.20.2" +name = "kv-log-macro" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" dependencies = [ - "ascii-canvas", - "bit-set", - "ena", - "itertools 0.11.0", - "lalrpop-util", - "petgraph", - "pico-args", - "regex", - "regex-syntax", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", - "walkdir", + "log", ] [[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" +name = "lance" +version = "0.15.0" dependencies = [ - "regex-automata", + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-row 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-recursion", + "async-trait", + "async_cell", + "aws-credential-types", + "aws-sdk-dynamodb", + "byteorder", + "bytes", + "chrono", + "dashmap", + "datafusion", + "datafusion-functions", + "datafusion-physical-expr", + "deepsize", + "futures", + "half", + "itertools 0.12.1", + "lance-arrow", + "lance-core", + "lance-datafusion", + "lance-datagen", + "lance-encoding", + "lance-file", + "lance-index", + "lance-io", + "lance-linalg", + "lance-table", + "lazy_static", + "log", + "lru_time_cache", + "moka", + "num_cpus", + "object_store", + "ordered-float 3.9.2", + "pin-project", + "prost 0.12.6", + "prost-build 0.12.6", + "rand", + "roaring", + "serde", + "serde_json", + "snafu", + "tantivy", + "tempfile", + "tfrecord", + "tokio", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "lance-arrow" +version = "0.15.0" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "getrandom", + "half", + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "lance-core" +version = "0.15.0" +dependencies = [ + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "byteorder", + "bytes", + "chrono", + "datafusion-common", + "datafusion-sql", + "deepsize", + "futures", + "lance-arrow", + "lazy_static", + "libc", + "log", + "mock_instant", + "moka", + "num_cpus", + "object_store", + "pin-project", + "prost 0.12.6", + "rand", + "roaring", + "serde_json", + "snafu", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "lance-datafusion" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-trait", + "datafusion", + "datafusion-common", + "datafusion-functions", + "datafusion-physical-expr", + "datafusion-substrait", + "futures", + "lance-arrow", + "lance-core", + "log", + "prost 0.12.6", + "snafu", + "tokio", +] + +[[package]] +name = "lance-datagen" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-cast 52.2.0", + "arrow-schema 52.2.0", + "chrono", + "futures", + "hex", + "rand", + "rand_xoshiro", +] + +[[package]] +name = "lance-encoding" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "bytes", + "fsst", + "futures", + "hyperloglogplus", + "lance-arrow", + "lance-core", + "lance-datagen", + "log", + "num-traits", + "num_cpus", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", + "rand", + "rand_xoshiro", + "snafu", + "tokio", + "tracing", + "zstd", +] + +[[package]] +name = "lance-file" +version = "0.15.0" +dependencies = [ + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-recursion", + "async-trait", + "byteorder", + "bytes", + "datafusion-common", + "deepsize", + "futures", + "lance-arrow", + "lance-core", + "lance-datagen", + "lance-encoding", + "lance-io", + "lance-testing", + "log", + "num-traits", + "num_cpus", + "object_store", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", + "roaring", + "snafu", + "tempfile", + "tokio", + "tracing", +] + +[[package]] +name = "lance-index" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-recursion", + "async-trait", + "bitvec", + "bytes", + "crossbeam-queue", + "datafusion", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "datafusion-sql", + "deepsize", + "futures", + "half", + "itertools 0.12.1", + "lance-arrow", + "lance-core", + "lance-datafusion", + "lance-encoding", + "lance-file", + "lance-io", + "lance-linalg", + "lance-table", + "lazy_static", + "log", + "num-traits", + "num_cpus", + "object_store", + "prost 0.12.6", + "prost-build 0.12.6", + "rand", + "rayon", + "roaring", + "rustc_version", + "serde", + "serde_json", + "snafu", + "tantivy", + "tempfile", + "tokio", + "tracing", +] + +[[package]] +name = "lance-io" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-arith 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "async-priority-channel", + "async-recursion", + "async-trait", + "aws-config", + "aws-credential-types", + "byteorder", + "bytes", + "chrono", + "deepsize", + "futures", + "lance-arrow", + "lance-core", + "lazy_static", + "num_cpus", + "object_store", + "path_abs", + "pin-project", + "prost 0.12.6", + "prost-build 0.12.6", + "rand", + "shellexpand", + "snafu", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "lance-linalg" +version = "0.15.0" +dependencies = [ + "arrow-array 52.2.0", + "arrow-ord 52.2.0", + "arrow-schema 52.2.0", + "bitvec", + "cc", + "deepsize", + "futures", + "half", + "lance-arrow", + "lance-core", + "lazy_static", + "log", + "num-traits", + "num_cpus", + "rand", + "rayon", + "tokio", + "tracing", +] + +[[package]] +name = "lance-table" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "aws-credential-types", + "aws-sdk-dynamodb", + "byteorder", + "bytes", + "chrono", + "deepsize", + "futures", + "lance-arrow", + "lance-core", + "lance-datagen", + "lance-file", + "lance-io", + "lazy_static", + "log", + "object_store", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", + "rand", + "rangemap", + "roaring", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "lance-testing" +version = "0.15.0" +dependencies = [ + "arrow-array 52.2.0", + "arrow-schema 52.2.0", + "lance-arrow", + "num-traits", + "rand", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "levenshtein_automata" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" + +[[package]] +name = "lexical-core" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" dependencies = [ - "spin 0.5.2", + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", ] [[package]] -name = "lexicmp" -version = "0.1.0" +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7378d131ddf24063b32cbd7e91668d183140c4b3906270635a4d633d1068ea5d" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" dependencies = [ - "any_ascii", + "lexical-util", + "static_assertions", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -1880,33 +3267,27 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] [[package]] -name = "linfa-linalg" -version = "0.1.0" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e7562b41c8876d3367897067013bb2884cc78e6893f092ecd26b305176ac82" -dependencies = [ - "ndarray", - "num-traits", - "rand", - "thiserror", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1914,21 +3295,64 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] [[package]] -name = "matrixmultiply" -version = "0.3.8" +name = "lru" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "autocfg", - "rawpointer", + "hashbrown", +] + +[[package]] +name = "lru_time_cache" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" + +[[package]] +name = "lz4_flex" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", ] [[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] name = "md-5" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1939,32 +3363,37 @@ dependencies = [ ] [[package]] +name = "measure_time" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" +dependencies = [ + "instant", + "log", +] + +[[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "miette" -version = "5.10.0" +name = "memmap2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ - "miette-derive", - "once_cell", - "thiserror", - "unicode-width", + "libc", ] [[package]] -name = "miette-derive" -version = "5.10.0" +name = "memoffset" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", + "autocfg", ] [[package]] @@ -1974,16 +3403,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1991,94 +3410,73 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "names" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" -dependencies = [ - "rand", -] - -[[package]] -name = "nanoid" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" -dependencies = [ - "rand", + "windows-sys 0.52.0", ] [[package]] -name = "nanorand" -version = "0.7.0" +name = "mock_instant" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" dependencies = [ - "getrandom", + "once_cell", ] [[package]] -name = "ndarray" -version = "0.15.6" +name = "moka" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +checksum = "fa6e72583bf6830c956235bff0d5afec8cf2952f579ebad18ae7821a917d950f" dependencies = [ - "approx 0.4.0", - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "once_cell", + "parking_lot", + "quanta", + "rustc_version", + "scheduled-thread-pool", + "skeptic", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", ] [[package]] -name = "ndarray-stats" -version = "0.5.1" +name = "multimap" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5a8477ac96877b5bd1fd67e0c28736c12943aba24eda92b127e036b0c8f400" -dependencies = [ - "indexmap 1.9.3", - "itertools 0.10.5", - "ndarray", - "noisy_float", - "num-integer", - "num-traits", - "rand", -] +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] -name = "new_debug_unreachable" -version = "1.0.6" +name = "multimap" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] -name = "nibble_vec" -version = "0.1.0" +name = "murmurhash32" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] +checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "noisy_float" @@ -2100,12 +3498,6 @@ dependencies = [ ] [[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2116,31 +3508,27 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.4" +name = "num" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ - "autocfg", + "num-bigint", + "num-complex", "num-integer", + "num-iter", + "num-rational", "num-traits", ] [[package]] -name = "num-bigint-dig" -version = "0.8.4" +name = "num-bigint" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "byteorder", - "lazy_static", - "libm", "num-integer", - "num-iter", "num-traits", - "rand", - "smallvec", - "zeroize", ] [[package]] @@ -2169,9 +3557,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2179,10 +3567,21 @@ dependencies = [ ] [[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -2194,33 +3593,43 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.8.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "itertools 0.11.0", + "hyper 1.4.1", + "itertools 0.13.0", + "md-5", "parking_lot", "percent-encoding", + "quick-xml", + "rand", + "reqwest", + "ring", + "rustls-pemfile 2.1.3", + "serde", + "serde_json", "snafu", "tokio", "tracing", @@ -2235,26 +3644,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "ordered-multimap" -version = "0.7.3" +name = "oneshot" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" +checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ - "dlv-list", - "hashbrown 0.14.5", + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", ] [[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "owo-colors" -version = "3.5.0" +name = "ownedbytes" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" +dependencies = [ + "stable_deref_trait", +] [[package]] name = "parking" @@ -2264,9 +3708,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2274,69 +3718,115 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] -name = "password-hash" -version = "0.5.0" +name = "parquet" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +checksum = "e977b9066b4d3b03555c22bdc442f3fadebd96a39111249113087d0edb2691cd" dependencies = [ - "base64ct", - "rand_core", - "subtle", + "ahash", + "arrow-array 52.2.0", + "arrow-buffer 52.2.0", + "arrow-cast 52.2.0", + "arrow-data 52.2.0", + "arrow-ipc 52.2.0", + "arrow-schema 52.2.0", + "arrow-select 52.2.0", + "base64 0.22.1", + "brotli", + "bytes", + "chrono", + "flate2", + "futures", + "half", + "hashbrown", + "lz4_flex", + "num", + "num-bigint", + "object_store", + "paste", + "seq-macro", + "snap", + "thrift", + "tokio", + "twox-hash", + "zstd", + "zstd-sys", ] [[package]] -name = "paste" -version = "1.0.14" +name = "parse-zoneinfo" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] [[package]] -name = "path-clean" -version = "1.0.1" +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "pbkdf2" -version = "0.12.2" +name = "path_abs" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3" dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", + "serde", + "serde_derive", + "std_prelude", + "stfu8", ] [[package]] -name = "pem" -version = "2.0.1" +name = "pbjson" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" +checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90" dependencies = [ "base64 0.21.7", "serde", ] [[package]] -name = "pem-rfc7468" -version = "0.7.0" +name = "pbjson-build" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735" dependencies = [ - "base64ct", + "heck 0.4.1", + "itertools 0.11.0", + "prost 0.12.6", + "prost-types 0.12.6", +] + +[[package]] +name = "pbjson-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost 0.12.6", + "prost-build 0.12.6", + "serde", ] [[package]] @@ -2347,38 +3837,51 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap", ] [[package]] -name = "pharos" -version = "0.5.3" +name = "phf" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "futures", - "rustc_version", + "phf_shared", ] [[package]] -name = "phf_shared" -version = "0.10.0" +name = "phf_codegen" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ - "siphasher", + "phf_generator", + "phf_shared", ] [[package]] -name = "pico-args" -version = "0.5.0" +name = "phf_generator" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] [[package]] name = "pin-project" @@ -2397,7 +3900,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -2413,27 +3916,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkcs1" -version = "0.7.5" +name = "piper" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ - "der", - "pkcs8", - "spki", + "atomic-waker", + "fastrand 2.1.0", + "futures-io", ] [[package]] -name = "pkcs8" -version = "0.10.2" +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ - "der", - "spki", + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", ] [[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2441,143 +3977,337 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] -name = "precomputed-hash" -version = "0.1.1" +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] [[package]] -name = "predicates" -version = "3.1.0" +name = "prettyplease" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "normalize-line-endings", - "predicates-core", - "regex", + "proc-macro2", + "syn 2.0.72", ] [[package]] -name = "predicates-core" -version = "1.0.6" +name = "proc-macro2" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] [[package]] -name = "predicates-tree" -version = "1.0.9" +name = "prost" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "predicates-core", - "termtree", + "bytes", + "prost-derive 0.11.9", ] [[package]] -name = "pretty_assertions" -version = "1.4.0" +name = "prost" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "diff", - "yansi", + "bytes", + "prost-derive 0.12.6", ] [[package]] -name = "proc-macro-crate" -version = "3.1.0" +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck 0.4.1", + "itertools 0.10.5", + "lazy_static", + "log", + "multimap 0.8.3", + "petgraph", + "prettyplease 0.1.25", + "prost 0.11.9", + "prost-types 0.11.9", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ - "toml_edit", + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap 0.10.0", + "once_cell", + "petgraph", + "prettyplease 0.2.20", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn 2.0.72", + "tempfile", ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "prost-derive" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ - "proc-macro-error-attr", + "anyhow", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "prost-derive" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ + "anyhow", + "itertools 0.12.1", "proc-macro2", "quote", - "version_check", + "syn 2.0.72", ] [[package]] -name = "proc-macro2" -version = "1.0.79" +name = "prost-types" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "unicode-ident", + "prost 0.11.9", ] [[package]] -name = "psl-types" -version = "2.0.11" +name = "prost-types" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost 0.12.6", +] [[package]] -name = "psm" -version = "0.1.21" +name = "pulldown-cmark" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "cc", + "bitflags 2.6.0", + "memchr", + "unicase", ] [[package]] -name = "ptr_meta" -version = "0.1.4" +name = "pylance" +version = "0.15.0" +dependencies = [ + "arrow 52.2.0", + "arrow-array 52.2.0", + "arrow-data 52.2.0", + "arrow-schema 52.2.0", + "async-trait", + "chrono", + "env_logger", + "futures", + "half", + "lance", + "lance-arrow", + "lance-core", + "lance-datagen", + "lance-encoding", + "lance-file", + "lance-index", + "lance-io", + "lance-linalg", + "lance-table", + "lazy_static", + "log", + "num_cpus", + "object_store", + "prost 0.12.6", + "prost-build 0.11.9", + "pyo3", + "serde", + "serde_json", + "serde_yaml", + "snafu", + "tokio", + "tracing", + "tracing-chrome", + "tracing-subscriber", + "url", + "uuid", +] + +[[package]] +name = "pyo3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" dependencies = [ - "ptr_meta_derive", + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", ] [[package]] -name = "ptr_meta_derive" -version = "0.1.4" +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" dependencies = [ "proc-macro2", + "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] -name = "quick_cache" -version = "0.4.2" +name = "pyo3-macros-backend" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1380629287ed1247c1e0fcc6d43efdcec508b65382c9ab775cc8f3df7ca07b0" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" dependencies = [ - "ahash 0.8.11", - "equivalent", - "hashbrown 0.14.5", - "parking_lot", + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quick-xml" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -2596,17 +4326,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", - "serde", -] - -[[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2637,62 +4356,93 @@ dependencies = [ ] [[package]] -name = "rawpointer" -version = "0.2.1" +name = "rand_distr" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] [[package]] -name = "reblessive" -version = "0.3.5" +name = "rand_xoshiro" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4149deda5bd21e0f6ccaa2f907cd542541521dead5861bc51bebdf2af4acaf2a" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] [[package]] -name = "redox_syscall" -version = "0.4.1" +name = "rangemap" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.5" +name = "rayon" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "getrandom", - "libredox", - "thiserror", + "either", + "rayon-core", ] [[package]] -name = "ref-cast" -version = "1.0.22" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "ref-cast-impl", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] -name = "ref-cast-impl" -version = "1.0.22" +name = "redox_syscall" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2702,9 +4452,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2712,53 +4462,62 @@ dependencies = [ ] [[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] -name = "rend" -version = "0.4.2" +name = "regress" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" dependencies = [ - "bytecheck", + "hashbrown", + "memchr", ] [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-util", "ipnet", "js-sys", "log", "mime", - "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "quinn", + "rustls 0.23.12", + "rustls-native-certs 0.7.1", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tokio-util", "tower-service", "url", @@ -2766,302 +4525,257 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", "winreg", ] [[package]] -name = "revision" -version = "0.7.0" +name = "ring" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588784c1d9453cfd2ce1b7aff06c903513677cf0e63779a0a3085ee8a44f5b17" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ - "bincode", - "chrono", - "geo 0.26.0", - "regex", - "revision-derive", - "roaring", - "rust_decimal", - "serde", - "thiserror", - "uuid", + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", ] [[package]] -name = "revision-derive" -version = "0.7.0" +name = "roaring" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854ff0b6794d4e0aab5e4486870941caefe9f258e63cad2f21b49a6302377c85" +checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" dependencies = [ - "darling", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.58", + "bytemuck", + "byteorder", ] [[package]] -name = "ring" -version = "0.16.20" +name = "rust-stemmers" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", + "serde", + "serde_derive", ] [[package]] -name = "ring" -version = "0.17.8" +name = "rustc-demangle" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.52.0", -] +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] -name = "rkyv" -version = "0.7.44" +name = "rustc-hash" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rkyv_derive" -version = "0.7.44" +name = "rustc-hash" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] -name = "rmp" -version = "0.8.14" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "byteorder", - "num-traits", - "paste", + "semver", ] [[package]] -name = "rmpv" -version = "1.0.2" +name = "rustix" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e540282f11751956c82bc5529a7fb71b871b998fbf9cf06c2419b22e1b4350df" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "num-traits", - "rmp", + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", ] [[package]] -name = "roaring" -version = "0.10.3" +name = "rustix" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bytemuck", - "byteorder", - "serde", + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", ] [[package]] -name = "robust" -version = "1.1.0" +name = "rustls" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] [[package]] -name = "rsa" -version = "0.9.6" +name = "rustls" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.6", "subtle", "zeroize", ] [[package]] -name = "rstar" -version = "0.11.0" +name = "rustls-native-certs" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ - "heapless", - "num-traits", - "smallvec", + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", ] [[package]] -name = "rust-ini" -version = "0.21.0" +name = "rustls-native-certs" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "schannel", + "security-framework", ] [[package]] -name = "rust-stemmers" -version = "1.2.0" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "serde", - "serde_derive", + "base64 0.21.7", ] [[package]] -name = "rust_decimal" -version = "1.35.0" +name = "rustls-pemfile" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "arrayvec", - "borsh", - "bytes", - "num-traits", - "rand", - "rkyv", - "serde", - "serde_json", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] -name = "rustc-demangle" -version = "0.1.23" +name = "rustls-pki-types" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] -name = "rustc_lexer" -version = "0.1.0" +name = "rustls-webpki" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "unicode-xid", + "ring", + "untrusted", ] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustls-webpki" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ - "semver", + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] -name = "rustix" -version = "0.38.32" +name = "rustversion" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] -name = "rustls" -version = "0.21.11" +name = "ryu" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki", - "sct", -] +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "base64 0.21.7", + "winapi-util", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "schannel" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "windows-sys 0.52.0", ] [[package]] -name = "rustversion" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" - -[[package]] -name = "ryu" -version = "1.0.17" +name = "scheduled-thread-pool" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot", +] [[package]] -name = "salsa20" -version = "0.10.2" +name = "schemars" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ - "cipher", + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", ] [[package]] -name = "same-file" -version = "1.0.6" +name = "schemars_derive" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ - "winapi-util", + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.72", ] [[package]] @@ -3071,156 +4785,131 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scrypt" -version = "0.11.0" +name = "sct" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "password-hash", - "pbkdf2", - "salsa20", - "sha2", + "ring", + "untrusted", ] [[package]] -name = "sct" -version = "0.7.1" +name = "security-framework" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] -name = "seahash" -version = "4.1.0" +name = "security-framework-sys" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] -name = "send_wrapper" -version = "0.6.0" +name = "seq-macro" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] -name = "serde_json" -version = "1.0.116" +name = "serde_derive_internals" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ - "indexmap 2.2.6", - "itoa", - "ryu", - "serde", + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] -name = "serde_urlencoded" -version = "0.7.1" +name = "serde_json" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ - "form_urlencoded", "itoa", + "memchr", "ryu", "serde", ] [[package]] -name = "serde_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.7.0" +name = "serde_tokenstream" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "8790a7c3fe883e443eaa2af6f705952bc5d6e8671a220b9335c8cae92c037e74" dependencies = [ - "darling", "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "serial_test" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", + "serde", + "syn 2.0.72", ] [[package]] -name = "serial_test_derive" -version = "3.0.0" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", + "form_urlencoded", + "itoa", + "ryu", + "serde", ] [[package]] -name = "sha1" -version = "0.10.6" +name = "serde_yaml" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "cfg-if", - "cpufeatures", - "digest", + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", ] [[package]] @@ -3244,31 +4933,21 @@ dependencies = [ ] [[package]] -name = "signature" -version = "2.2.0" +name = "shellexpand" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ - "digest", - "rand_core", + "dirs", ] [[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "simple_asn1" -version = "0.6.2" +name = "signal-hook-registry" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", + "libc", ] [[package]] @@ -3278,6 +4957,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "skeptic" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" +dependencies = [ + "bytecount", + "cargo_metadata", + "error-chain", + "glob", + "pulldown-cmark", + "tempfile", + "walkdir", +] + +[[package]] +name = "sketches-ddsketch" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" +dependencies = [ + "serde", +] + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3293,15 +4996,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] -name = "smol_str" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" -dependencies = [ - "serde", -] - -[[package]] name = "snafu" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3331,58 +5025,49 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.6" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", - "windows-sys 0.52.0", + "winapi", ] [[package]] -name = "spade" -version = "2.6.0" +name = "socket2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ - "hashbrown 0.14.5", - "num-traits", - "robust", - "smallvec", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] -name = "spki" -version = "0.7.3" +name = "sqlparser" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" dependencies = [ - "base64ct", - "der", + "log", + "sqlparser_derive", ] [[package]] -name = "sqlparser" -version = "0.45.0" +name = "sqlparser_derive" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bbffee862a796d67959a89859d6b1046bb5016d63e23835ad0da182777bbe0" +checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ - "log", + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -3392,368 +5077,248 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "stacker" -version = "0.1.15" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "storekey" -version = "0.5.0" +name = "std_prelude" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c42833834a5d23b344f71d87114e0cc9994766a5c42938f4b50e7b2aef85b2" -dependencies = [ - "byteorder", - "memchr", - "serde", - "thiserror", -] +checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe" [[package]] -name = "string_cache" -version = "0.8.7" +name = "stfu8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "e51f1e89f093f99e7432c491c382b88a6860a5adbe6bf02574bf0a08efff1978" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", + "strum_macros", ] [[package]] -name = "strsim" -version = "0.10.0" +name = "strum_macros" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.72", +] [[package]] -name = "strsim" -version = "0.11.1" +name = "substrait" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "b1ee6e584c8bf37104b7eb51c25eae07a9321b0e01379bec3b7c462d2f42afbf" +dependencies = [ + "heck 0.5.0", + "pbjson", + "pbjson-build", + "pbjson-types", + "prettyplease 0.2.20", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", + "schemars", + "semver", + "serde", + "serde_json", + "serde_yaml", + "syn 2.0.72", + "typify", + "walkdir", +] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] -name = "surrealdb" -version = "1.5.0" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8bb7301422b4b0945aef848285073fa95c1e1412a0952dbdc50917104c26d2" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "async-channel", - "bincode", - "chrono", - "dmp", - "flume", - "futures", - "futures-concurrency", - "geo 0.27.0", - "indexmap 2.2.6", - "once_cell", - "path-clean", - "pharos", - "reqwest", - "revision", - "ring 0.17.8", - "rust_decimal", - "rustls", - "semver", - "serde", - "serde_json", - "surrealdb-core 1.4.2", - "surrealdb-core 2.0.0-1.5.0", - "thiserror", - "tokio", - "tokio-tungstenite", - "tokio-util", - "tracing", - "trice", - "url", - "uuid", - "wasm-bindgen-futures", - "wasmtimer", - "ws_stream_wasm", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "surrealdb-core" -version = "1.4.2" +name = "syn" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2f403dba761e0e3404f90334f8ff1454f1f308e88c84dd5dbcee52866ff30e" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ - "addr", - "any_ascii", - "argon2", - "async-channel", - "async-executor", - "async-recursion", - "base64 0.21.7", - "bcrypt", - "bincode", - "bytes", - "cedar-policy", - "chrono", - "deunicode", - "dmp", - "fst", - "futures", - "fuzzy-matcher", - "geo 0.27.0", - "geo-types", - "hex", - "ipnet", - "lexicmp", - "md-5", - "nanoid", - "nom", - "num_cpus", - "object_store", - "once_cell", - "pbkdf2", - "pharos", - "pin-project-lite", - "quick_cache", - "radix_trie", - "rand", - "regex", - "revision", - "ring 0.17.8", - "roaring", - "rust-stemmers", - "rust_decimal", - "scrypt", - "semver", - "serde", - "serde_json", - "sha1", - "sha2", - "snap", - "storekey", - "surrealdb-derive", - "surrealdb-jsonwebtoken", - "thiserror", - "tokio", - "tracing", - "trice", - "ulid", - "url", - "uuid", - "wasm-bindgen-futures", - "wasmtimer", - "ws_stream_wasm", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "surrealdb-core" -version = "2.0.0-1.5.0" +name = "sync_wrapper" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7c90233b21c23c669d462c1305693a4cdd6a5c7424654fbd9564564a6b8bf8" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] +name = "tantivy" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" dependencies = [ - "addr", - "ahash 0.8.11", - "any_ascii", - "argon2", - "async-channel", - "async-executor", - "async-recursion", - "base64 0.21.7", - "bcrypt", - "bincode", - "bytes", - "cedar-policy", - "chrono", - "ciborium", - "dashmap", - "deunicode", - "dmp", - "fst", - "futures", - "fuzzy-matcher", - "geo 0.27.0", - "geo-types", - "hashbrown 0.14.5", - "hex", - "ipnet", - "lexicmp", - "linfa-linalg", - "md-5", - "nanoid", - "ndarray", - "ndarray-stats", - "nom", - "num-traits", + "aho-corasick", + "arc-swap", + "base64 0.22.1", + "bitpacking", + "byteorder", + "census", + "crc32fast", + "crossbeam-channel", + "downcast-rs", + "fastdivide", + "fnv", + "fs4", + "htmlescape", + "itertools 0.12.1", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", "num_cpus", - "object_store", "once_cell", - "pbkdf2", - "pharos", - "pin-project-lite", - "quick_cache", - "radix_trie", - "rand", - "reblessive", + "oneshot", + "rayon", "regex", - "reqwest", - "revision", - "ring 0.17.8", - "rmpv", - "roaring", "rust-stemmers", - "rust_decimal", - "scrypt", - "semver", + "rustc-hash 1.1.0", "serde", "serde_json", - "sha1", - "sha2", - "snap", - "storekey", - "surrealdb-derive", - "surrealdb-jsonwebtoken", + "sketches-ddsketch", + "smallvec", + "tantivy-bitpacker", + "tantivy-columnar", + "tantivy-common", + "tantivy-fst", + "tantivy-query-grammar", + "tantivy-stacker", + "tantivy-tokenizer-api", + "tempfile", "thiserror", - "tokio", - "tracing", - "trice", - "ulid", - "url", + "time", "uuid", - "wasm-bindgen-futures", - "wasmtimer", - "ws_stream_wasm", + "winapi", ] [[package]] -name = "surrealdb-derive" -version = "0.12.0" +name = "tantivy-bitpacker" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aacdb4c58b9ebef0291310afcd63af0012d85610d361f3785952c61b6f1dddf4" +checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" dependencies = [ - "quote", - "syn 1.0.109", + "bitpacking", ] [[package]] -name = "surrealdb-jsonwebtoken" -version = "8.3.0-surreal.1" +name = "tantivy-columnar" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b" +checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" dependencies = [ - "base64 0.21.7", - "getrandom", - "hmac", - "pem", - "rand", - "ring 0.16.20", - "rsa", + "downcast-rs", + "fastdivide", + "itertools 0.12.1", "serde", - "serde_json", - "sha2", - "simple_asn1", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-sstable", + "tantivy-stacker", ] [[package]] -name = "surrealdb-migrations" -version = "1.5.0" +name = "tantivy-common" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" dependencies = [ - "assert_cmd", - "assert_fs", - "chrono", - "chrono-human-duration", - "clap", - "cli-table", - "color-eyre", - "convert_case", - "diffy", - "dir-diff", - "fs_extra", - "include_dir", - "itertools 0.12.1", - "names", - "predicates", - "pretty_assertions", - "regex", - "rust-ini", + "async-trait", + "byteorder", + "ownedbytes", "serde", - "serde_json", - "serial_test", - "sqlparser", - "surrealdb", - "tokio", - "tokio-test", + "time", ] [[package]] -name = "syn" -version = "1.0.109" +name = "tantivy-fst" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "byteorder", + "regex-syntax", + "utf8-ranges", ] [[package]] -name = "syn" -version = "2.0.58" +name = "tantivy-query-grammar" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "nom", ] [[package]] -name = "syn_derive" -version = "0.1.8" +name = "tantivy-sstable" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.58", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-fst", + "zstd", ] [[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-configuration" -version = "0.5.1" +name = "tantivy-stacker" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", + "murmurhash32", + "rand_distr", + "tantivy-common", ] [[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "tantivy-tokenizer-api" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" dependencies = [ - "core-foundation-sys", - "libc", + "serde", ] [[package]] @@ -3763,26 +5328,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "tempfile" -version = "3.10.1" +name = "tar" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", + "filetime", + "libc", + "xattr", ] [[package]] -name = "term" -version = "0.7.0" +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ - "dirs-next", - "rustversion", - "winapi", + "cfg-if", + "fastrand 2.1.0", + "once_cell", + "rustix 0.38.34", + "windows-sys 0.52.0", ] [[package]] @@ -3795,29 +5367,52 @@ dependencies = [ ] [[package]] -name = "termtree" -version = "0.4.1" +name = "tfrecord" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +checksum = "7036e822a1d906b8a49620e524a6fe21ab956583ac77f1427e908c61499a1f78" +dependencies = [ + "anyhow", + "async-std", + "bytemuck", + "crc", + "flate2", + "futures", + "glob", + "hex", + "hostname", + "integer-encoding 4.0.2", + "itertools 0.11.0", + "noisy_float", + "num", + "num-traits", + "once_cell", + "pin-project", + "prost 0.12.6", + "prost-build 0.12.6", + "tar", + "thiserror", + "ureq", +] [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -3831,6 +5426,17 @@ dependencies = [ ] [[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding 3.0.4", + "ordered-float 2.10.1", +] + +[[package]] name = "time" version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3872,9 +5478,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -3887,30 +5493,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", - "socket2", + "signal-hook-registry", + "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -3919,80 +5525,65 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", "tokio", ] [[package]] -name = "tokio-stream" -version = "0.1.15" +name = "tokio-rustls" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "futures-core", - "pin-project-lite", + "rustls 0.23.12", + "rustls-pki-types", "tokio", ] [[package]] -name = "tokio-test" -version = "0.4.4" +name = "tokio-stream" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ - "async-stream", - "bytes", "futures-core", + "pin-project-lite", "tokio", - "tokio-stream", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] -name = "toml_datetime" -version = "0.6.5" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] [[package]] -name = "toml_edit" -version = "0.21.1" +name = "tower-layer" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow", -] +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" @@ -4019,7 +5610,18 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", +] + +[[package]] +name = "tracing-chrome" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724" +dependencies = [ + "serde_json", + "tracing-core", + "tracing-subscriber", ] [[package]] @@ -4033,13 +5635,14 @@ dependencies = [ ] [[package]] -name = "tracing-error" +name = "tracing-log" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "tracing", - "tracing-subscriber", + "log", + "once_cell", + "tracing-core", ] [[package]] @@ -4048,27 +5651,19 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ + "nu-ansi-term", "sharded-slab", + "smallvec", "thread_local", "tracing-core", + "tracing-log", ] [[package]] -name = "trice" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3aaab10ae9fac0b10f392752bf56f0fd20845f39037fec931e8537b105b515a" -dependencies = [ - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" +name = "triomphe" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" [[package]] name = "try-lock" @@ -4077,23 +5672,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "tungstenite" -version = "0.20.1" +name = "twox-hash" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "sha1", - "thiserror", - "url", - "utf-8", + "cfg-if", + "static_assertions", ] [[package]] @@ -4103,15 +5688,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "ulid" -version = "1.1.2" +name = "typify" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +checksum = "adb6beec125971dda80a086f90b4a70f60f222990ce4d63ad0fc140492f53444" dependencies = [ - "getrandom", - "rand", + "typify-impl", + "typify-macro", +] + +[[package]] +name = "typify-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93bbb24e990654aff858d80fee8114f4322f7d7a1b1ecb45129e2fcb0d0ad5ae" +dependencies = [ + "heck 0.5.0", + "log", + "proc-macro2", + "quote", + "regress", + "schemars", + "semver", "serde", - "web-time", + "serde_json", + "syn 2.0.72", + "thiserror", + "unicode-ident", +] + +[[package]] +name = "typify-macro" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8e6491896e955692d68361c68db2b263e3bec317ec0b684e0e2fa882fb6e31e" +dependencies = [ + "proc-macro2", + "quote", + "schemars", + "semver", + "serde", + "serde_json", + "serde_tokenstream", + "syn 2.0.72", + "typify-impl", ] [[package]] @@ -4145,22 +5765,6 @@ dependencies = [ ] [[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-security" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9e13753df674873f3c4693b240ae5c03245ddc157dfccf7c26db9329af3a11" -dependencies = [ - "unicode-normalization", - "unicode-script", -] - -[[package]] name = "unicode-segmentation" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4168,21 +5772,21 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] -name = "unicode-xid" -version = "0.2.4" +name = "unindent" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] -name = "untrusted" -version = "0.7.1" +name = "unsafe-libyaml" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -4191,10 +5795,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] +name = "ureq" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "once_cell", + "rustls 0.23.12", + "rustls-pki-types", + "url", + "webpki-roots", +] + +[[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4208,27 +5828,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf8-ranges" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "atomic", "getrandom", "serde", - "wasm-bindgen", ] [[package]] @@ -4238,19 +5850,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + +[[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] -name = "wait-timeout" -version = "0.2.0" +name = "vsimd" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -4298,7 +5919,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -4332,7 +5953,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4357,19 +5978,6 @@ dependencies = [ ] [[package]] -name = "wasmtimer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf" -dependencies = [ - "futures", - "js-sys", - "parking_lot", - "pin-utils", - "wasm-bindgen", -] - -[[package]] name = "web-sys" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4380,20 +5988,25 @@ dependencies = [ ] [[package]] -name = "web-time" -version = "1.1.0" +name = "webpki-roots" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ - "js-sys", - "wasm-bindgen", + "rustls-pki-types", ] [[package]] -name = "webpki-roots" -version = "0.25.4" +name = "which" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.34", +] [[package]] name = "winapi" @@ -4413,11 +6026,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4432,7 +6045,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -4450,7 +6063,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4470,17 +6092,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4491,9 +6114,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4503,9 +6126,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4515,9 +6138,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4527,9 +6156,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4539,9 +6168,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4551,9 +6180,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4563,85 +6192,106 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "ws_stream_wasm" -version = "0.7.4" +name = "wyz" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ - "async_io_stream", - "futures", - "js-sys", - "log", - "pharos", - "rustc_version", - "send_wrapper", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "tap", ] [[package]] -name = "wyz" -version = "0.5.1" +name = "xattr" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ - "tap", + "libc", + "linux-raw-sys 0.4.14", + "rustix 0.38.34", ] [[package]] -name = "yansi" -version = "0.5.1" +name = "xmlparser" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix new file mode 100644 index 0000000000000..d0ef5931a2bb0 --- /dev/null +++ b/pkgs/development/python-modules/pylance/default.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + buildPythonPackage, + rustPlatform, + fetchFromGitHub, + darwin, + libiconv, + pkg-config, + protobuf, + numpy, + pyarrow, + ml-dtypes, + pandas, + pillow, + polars, + pytestCheckHook, + tqdm, +}: + +buildPythonPackage rec { + pname = "pylance"; + version = "0.15.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lancedb"; + repo = "lance"; + rev = "refs/tags/v${version}"; + hash = "sha256-zJ6zyS9DNhlJ1wbXHZRtNMDytF/Beh9DDHKB8S9HFwk="; + }; + + sourceRoot = "${src.name}/python"; + + cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + rustPlatform.cargoSetupHook + ]; + + build-system = [ rustPlatform.maturinBuildHook ]; + + buildInputs = + [ + libiconv + protobuf + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + SystemConfiguration + ] + ); + + pythonRelaxDeps = [ "pyarrow" ]; + + dependencies = [ + numpy + pyarrow + ]; + + pythonImportsCheck = [ "lance" ]; + + nativeCheckInputs = [ + ml-dtypes + pandas + pillow + polars + pytestCheckHook + tqdm + ]; + + preCheck = '' + cd python/tests + ''; + + disabledTests = [ + # Error during planning: Invalid function 'invert'. + "test_polar_scan" + "test_simple_predicates" + ]; + + meta = { + description = "Python wrapper for Lance columnar format"; + homepage = "https://github.com/lancedb/lance"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index e2f2efdef7a25..9438cb9102b9d 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; + hash = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; }; # ERROR: testExtended (tests.test_acls.AclExtensions) diff --git a/pkgs/development/python-modules/pylibjpeg-data/default.nix b/pkgs/development/python-modules/pylibjpeg-data/default.nix new file mode 100644 index 0000000000000..dcc14a7fd912d --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg-data/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + flit-core, +}: + +buildPythonPackage rec { + pname = "pylibjpeg-data"; + version = "unstable-2024-03-28"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-data"; + rev = "8253566715800a7fc3d4d949abab102c8172bca0"; + hash = "sha256-TzhiZ4LCFZX75h3YRrEFO5kRVc5VwTOJd+1VFW3LsaQ="; + }; + + build-system = [ flit-core ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "ljdata" + "ljdata.ds" + "ljdata.jpg" + ]; + + meta = { + description = "JPEG and DICOM data used for testing pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-data"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix new file mode 100644 index 0000000000000..33f1b807ac50f --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -0,0 +1,76 @@ +{ + stdenv, + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + cmake, + cython, + poetry-core, + setuptools, + numpy, + openjpeg, + pytestCheckHook, + pydicom, + pylibjpeg, + pylibjpeg-data, +}: + +buildPythonPackage rec { + pname = "pylibjpeg-openjpeg"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-openjpeg"; + rev = "refs/tags/v${version}"; + hash = "sha256-cCDnARElNn+uY+HQ39OnGJRz2vTz0I8s0Oe+qGvqM1o="; + }; + + # don't use vendored openjpeg submodule: + # (note build writes into openjpeg source dir, so we have to make it writable) + postPatch = '' + rmdir lib/openjpeg + cp -r ${openjpeg.src} lib/openjpeg + chmod +rwX -R lib/openjpeg + ''; + + dontUseCmakeConfigure = true; + + build-system = [ + cmake + cython + poetry-core + setuptools + ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + pydicom + pylibjpeg-data + pylibjpeg + ]; + disabledTestPaths = [ + # ignore a few Python test files (e.g. performance tests) in openjpeg itself: + "lib/openjpeg" + ]; + + pytestFlagsArray = [ "openjpeg/tests" ]; + + pythonImportsCheck = [ "openjpeg" ]; + + meta = { + description = "A J2K and JP2 plugin for pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-openjpeg"; + license = [ lib.licenses.mit ]; + maintainers = with lib.maintainers; [ bcdarwin ]; + # x86-linux: test_encode.py::TestEncodeBuffer failures + # darwin: numerous test failures, seemingly due to issues setting up test data + broken = (stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix index 468a00d8ef72f..155b3f1fe8c09 100644 --- a/pkgs/development/python-modules/pylibjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -5,34 +5,15 @@ pythonOlder, pytestCheckHook, flit-core, - setuptools, numpy, pydicom, + pylibjpeg-data, pylibjpeg-libjpeg, }: -let - pylibjpeg-data = buildPythonPackage { - pname = "pylibjpeg-data"; - version = "1.0.0dev0"; - pyproject = true; - - nativeBuildInputs = [ setuptools ]; - - src = fetchFromGitHub { - owner = "pydicom"; - repo = "pylibjpeg-data"; - rev = "2ab4b8a65b070656eca2582bd23197a3d01cdccd"; - hash = "sha256-cFE1XjrqyGqwHCYGRucXK+q4k7ftUIbYwBw4WwIFtEc="; - }; - - doCheck = false; - }; -in - buildPythonPackage rec { pname = "pylibjpeg"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,12 +22,12 @@ buildPythonPackage rec { owner = "pydicom"; repo = "pylibjpeg"; rev = "refs/tags/v${version}"; - hash = "sha256-qGtrphsBBVieGS/8rdymbsjLMU/QEd7zFNAANN8bD+k="; + hash = "sha256-MA1A/hTIx95MYZ2LGOifnHn77wbv0ydAgQSzNZRykVg="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 9a6a3680d2bb6..7caead892995a 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchurl, isPyPy, - pythonAtLeast, liblo, cython_0, }: diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index cb3d7d5902d22..e5730dfeb6144 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Quick and small memcached client for Python"; homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index 2e8121e0932f6..4e95fc4475308 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, mock, psutil, pytestCheckHook, @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "1.2.0"; - format = "setuptools"; + version = "1.2.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,10 +21,12 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-rcM7gvUUfXN5pL9uIihzmOCXA7NKjiMt2GaQaGJxD9M="; + hash = "sha256-WMpb/b9kF1rFlegDYxNGJbZ2Nz8nuG21tyjgUFLs5mg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ psutil six ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 01491a2a619ae..eb96516e84e47 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { "test_py3k_jobs_option" ]; - meta = with lib; { + meta = { description = "Bug and style checker for Python"; homepage = "https://pylint.readthedocs.io/en/stable/"; changelog = "https://github.com/pylint-dev/pylint/releases/tag/v${version}"; @@ -119,7 +119,8 @@ buildPythonPackage rec { - symilar: an independent similarities checker - epylint: Emacs and Flymake compatible Pylint ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + mainProgram = "pylint"; }; } diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index dcd863d08bfcd..ecd60bb6907f9 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -3,29 +3,30 @@ aiohttp, aioresponses, buildPythonPackage, + deepdiff, fetchFromGitHub, poetry-core, poetry-dynamic-versioning, + pycognito, pyjwt, pytest-aiohttp, pytest-freezegun, pytestCheckHook, pythonOlder, - deepdiff, }: buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.5.0"; + version = "2023.5.1"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "natekspencer"; repo = "pylitterbot"; rev = "refs/tags/v${version}"; - hash = "sha256-MSQdX2PKQohmPGqtRZnUmCCVgKgaf4+cHAUItiPv7pY="; + hash = "sha256-Mpqa7pMxnFdSL1KGTUbgjh1zd8bAcoyzgxRZZ4SGfYc="; }; pythonRelaxDeps = [ "deepdiff" ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { dependencies = [ aiohttp deepdiff + pycognito pyjwt ]; diff --git a/pkgs/development/python-modules/pylnk3/default.nix b/pkgs/development/python-modules/pylnk3/default.nix index 4bcb8547bd0d0..d6617e81798fc 100644 --- a/pkgs/development/python-modules/pylnk3/default.nix +++ b/pkgs/development/python-modules/pylnk3/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pytest, - twine, invoke, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix index aec92117415c9..cb2e77d5d2238 100644 --- a/pkgs/development/python-modules/pyloadapi/default.nix +++ b/pkgs/development/python-modules/pyloadapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyloadapi"; - version = "1.2.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "pyloadapi"; rev = "refs/tags/v${version}"; - hash = "sha256-uOgqc1RqmEk0Lqz/ixlChKTZva7+0v4V8KutLSgPKEE="; + hash = "sha256-USSTXHHhtUc8QF9U3t3rARXn5Iqo6KOGBa3VAfRMbiQ="; }; postPatch = '' @@ -47,6 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyloadapi" ]; + disabledTestPaths = [ + # Tests require network access + "tests/test_cli.py" + ]; + meta = with lib; { description = "Simple wrapper for pyLoad's API"; homepage = "https://github.com/tr4nt0r/pyloadapi"; diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index d97af412e9390..27dd4c93d6fc8 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 795d094cbac73..cc2048cc0450f 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, python-lsp-server, isort, }: @@ -9,12 +10,12 @@ buildPythonPackage rec { pname = "pyls-isort"; version = "0.2.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "pyls-isort"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "0xba0aiyjfdi9swjzxk26l94dwlwvn17kkfjfscxl8gvspzsn057"; }; @@ -23,15 +24,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyls_isort" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isort python-lsp-server ]; - meta = with lib; { + meta = { homepage = "https://github.com/paradoxxxzero/pyls-isort"; description = "Isort plugin for python-lsp-server"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/python-modules/pyls-memestra/default.nix b/pkgs/development/python-modules/pyls-memestra/default.nix index 2ad742ac9f78e..6a61f39ca4d66 100644 --- a/pkgs/development/python-modules/pyls-memestra/default.nix +++ b/pkgs/development/python-modules/pyls-memestra/default.nix @@ -1,7 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # dependencies deprecated, memestra, python-lsp-server, @@ -10,14 +12,16 @@ buildPythonPackage rec { pname = "pyls-memestra"; version = "0.0.16"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-zMVDd2uB4znw38z3yb0Nt7qQH5dGHTbQBIZO/qo1/t8="; + src = fetchFromGitHub { + owner = "QuantStack"; + repo = "pyls-memestra"; + rev = "refs/tags/${version}"; + hash = "sha256-C1d2BibjpoZCPSy39PkdcLiLIwZZG+XTDWXVjTT1Bws="; }; - propagatedBuildInputs = [ + dependencies = [ deprecated memestra python-lsp-server @@ -28,10 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyls_memestra" ]; - meta = with lib; { + meta = { description = "Memestra plugin for the Python Language Server"; homepage = "https://github.com/QuantStack/pyls-memestra"; - license = licenses.bsd3; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index e86ddcc60338d..de2cbdae88b8d 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Spyder extensions for the python-language-server"; homepage = "https://github.com/spyder-ide/pyls-spyder"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 3f787714bb33d..17f9c244e7020 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -1,21 +1,25 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies mypy, pytestCheckHook, python-lsp-server, - pythonOlder, tomli, }: buildPythonPackage rec { pname = "pylsp-mypy"; version = "0.6.8"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-lsp"; @@ -24,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ mypy python-lsp-server tomli @@ -41,10 +45,11 @@ buildPythonPackage rec { "test_option_overrides_dmypy" ]; - meta = with lib; { + meta = { description = "Mypy plugin for the Python LSP Server"; homepage = "https://github.com/python-lsp/pylsp-mypy"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; + changelog = "https://github.com/python-lsp/pylsp-mypy/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/python-modules/pylsp-rope/default.nix b/pkgs/development/python-modules/pylsp-rope/default.nix index 9556670a85c11..e7af3803e4808 100644 --- a/pkgs/development/python-modules/pylsp-rope/default.nix +++ b/pkgs/development/python-modules/pylsp-rope/default.nix @@ -1,38 +1,52 @@ { lib, buildPythonPackage, - fetchPypi, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies rope, - pytestCheckHook, python-lsp-server, - pythonOlder, + + # checks + pytestCheckHook, }: buildPythonPackage rec { pname = "pylsp-rope"; version = "0.1.16"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-1oC2iMYKQCV6iELsgIpuDeFZakelMA8irs/caVVQIKc="; + src = fetchFromGitHub { + owner = "python-rope"; + repo = "pylsp-rope"; + rev = "refs/tags/${version}"; + hash = "sha256-Mr+mWRvOXoy7+SosMae80o0V1jBMn1dEoGmaR/BGHrc="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ rope python-lsp-server ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "pylsp_rope" ]; - meta = with lib; { + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Extended refactoring capabilities for Python LSP Server using Rope"; homepage = "https://github.com/python-rope/pylsp-rope"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/python-rope/pylsp-rope/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 6dd8695330c70..7d5ef3a92258c 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; rev = "refs/tags/v${version}"; - hash = "sha256-7uUNLlVrMEgah2YvTECC4S2WArAQjeAyfgDd62sQsYA="; + hash = "sha256-rmf1ydPfA6rCpWB4TZXAK9MDpsPpahsT7xm/dUrMW+0="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index f486b45c6798f..5bbc8577b89aa 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.13"; + version = "0.2.15"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s5qprIVPlq495XWKjgIuohDzPV0EfU43zkfQ2DvH04Y="; + hash = "sha256-1UUW3Ym11jR4dxSS1OOVPl6h69I6H782Q4ZeVitty0c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 048822ad976e1..78c3cba291c48 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://pylxd.readthedocs.io/"; changelog = "https://github.com/canonical/pylxd/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pylyrics/default.nix b/pkgs/development/python-modules/pylyrics/default.nix index 00b9776380bba..189b9d184db0b 100644 --- a/pkgs/development/python-modules/pylyrics/default.nix +++ b/pkgs/development/python-modules/pylyrics/default.nix @@ -29,9 +29,9 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs "; + description = "Pythonic Implementation of lyrics.wikia.com for getting lyrics of songs"; homepage = "https://github.com/geekpradd/PyLyrics"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index b9ec633afb10d..63022ed6c41a1 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, bson, pytestCheckHook, + pytest-cov-stub, pyyaml, setuptools, }: @@ -23,8 +24,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" - substituteInPlace setup.cfg \ - --replace "--cov=pymarshal --cov-report=html --cov-report=term" "" ''; nativeBuildInputs = [ setuptools ]; @@ -33,6 +32,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub bson pyyaml ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index a56164dee5b98..005a65b63169f 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, ase, buildPythonPackage, cython, @@ -32,7 +31,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2024.6.10"; + version = "2024.7.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +40,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; rev = "refs/tags/v${version}"; - hash = "sha256-BV3zwb74ZnwTWUgKt5K6lZLASdO6/UQ8Ke3gBsLhy2M="; + hash = "sha256-LL3cZO3LkmBuGGcO7dhO2Wtgqx9nxLureFpC8EqvS3M"; }; build-system = [ setuptools ]; @@ -82,8 +81,6 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' - # hide from tests - mv pymatgen _pymatgen # ensure tests can find these export PMG_TEST_FILES_DIR="$(realpath ./tests/files)" # some tests cover the command-line scripts @@ -112,6 +109,6 @@ buildPythonPackage rec { changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; - broken = stdenv.isDarwin; # tests segfault. that's bad. + broken = true; # tests segfault. that's bad. }; } diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index 357c1f96f3188..c390123e4c5ae 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; + hash = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index a5d2063c2b6b2..bc5292e6d15e3 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Package for symbolic computation"; homepage = "https://documen.tician.de/pymbolic/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index d1cced8ea5072..30161191dd59d 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.16.1"; + version = "5.16.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-C3D07uouV8QZLplIonmViZoCXb4AAEN+uGvNly2hcMc="; + hash = "sha256-vOU5P45AJPULGWj9lscZKP3JqfSpkPDnq1Fyq9lIawc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index f60c8ed5fcfd0..016b5ee6bf242 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/sbraz/pymediainfo"; changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymee/default.nix b/pkgs/development/python-modules/pymee/default.nix new file mode 100644 index 0000000000000..7c07ff13e5fc3 --- /dev/null +++ b/pkgs/development/python-modules/pymee/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + websockets, +}: + +buildPythonPackage rec { + pname = "pymee"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "FreshlyBrewedCode"; + repo = "pymee"; + rev = "refs/tags/v${version}"; + hash = "sha256-4XKd0lZ6RAsG2zXjKMUeST6cNcg+SjT371gxLIhxkAA="; + }; + + build-system = [ setuptools ]; + dependencies = [ + aiohttp + websockets + ]; + + pythonImportsCheck = [ "pymee" ]; + + # no tests + doCheck = false; + + meta = { + description = "Python library to interact with homee"; + homepage = "https://github.com/FreshlyBrewedCode/pymee"; + changelog = "https://github.com/FreshlyBrewedCode/pymee/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 0b33812e6518c..38411beca94b3 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { prompt-toolkit pygments click - ] ++ typer.optional-dependencies.all; + ]; serial = [ pyserial ]; }; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 0f504b00cd75d..d7e1b35ed742c 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Python driver for MongoDB"; homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index eaaec885e53fb..b6476c9fe45e6 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -15,7 +15,6 @@ notebook, numba, numpy, - pandas, scipy, }: diff --git a/pkgs/development/python-modules/pymorphy2/default.nix b/pkgs/development/python-modules/pymorphy2/default.nix index ee9e7daa80c3d..748f7d8d24a39 100644 --- a/pkgs/development/python-modules/pymorphy2/default.nix +++ b/pkgs/development/python-modules/pymorphy2/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { mainProgram = "pymorphy"; homepage = "https://github.com/kmike/pymorphy2"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/pkgs/development/python-modules/pymorphy2/dicts-ru.nix index fd9f2c5e7e878..4385990518762 100644 --- a/pkgs/development/python-modules/pymorphy2/dicts-ru.nix +++ b/pkgs/development/python-modules/pymorphy2/dicts-ru.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { description = "Russian dictionaries for pymorphy2"; homepage = "https://github.com/kmike/pymorphy2-dicts/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index a09350f05eb17..1616ccd8574bb 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pymorphy3"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = "no-plagiarism"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AIAccIxv3lCZcTKHfE/s2n3A5fUWqon+dk0SvczritY="; + hash = "sha256-qYZm88wNOyZBb2Qhdpw83Oh679/dkWmrL/hQYsgEsaM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymsteams/default.nix b/pkgs/development/python-modules/pymsteams/default.nix index d4b9156a66b61..6708d5bed7071 100644 --- a/pkgs/development/python-modules/pymsteams/default.nix +++ b/pkgs/development/python-modules/pymsteams/default.nix @@ -4,23 +4,26 @@ fetchFromGitHub, pythonOlder, requests, + setuptools, }: buildPythonPackage rec { pname = "pymsteams"; - version = "0.2.2"; - format = "setuptools"; + version = "0.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rveachkc"; - repo = pname; - rev = version; - hash = "sha256-H1AEjUnEK+seKsnFnHpn1/aHxXcbyz67NbzhlGDtbk4="; + repo ="pymsteams"; + rev = "refs/tags/${version}"; + hash = "sha256-suPCAzjQp46+kKFiCtm65lxBbsn78Owq4dVmWCdhIpA="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; # Tests require network access doCheck = false; @@ -30,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Microsoft Teams"; homepage = "https://github.com/rveachkc/pymsteams"; + changelog = "https://github.com/rveachkc/pymsteams/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 5db76ccd3d97d..cc610d62e388f 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, @@ -49,6 +48,6 @@ buildPythonPackage rec { description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index e7d6803b288e8..cd556861748c1 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "http://jlafon.io/pynamodb.html"; changelog = "https://github.com/pynamodb/PynamoDB/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 0254369801bc4..e58ae0afdf451 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.3.3"; + version = "7.3.4"; format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QIvh24ZqnF8uF9HOuY0yt3QT/jHgJ2C916d+rBqezWQ="; + hash = "sha256-Ie309I19BhzASrmc3Ws1zV/BySc49AhFPNrNKQhTD0U="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 3339b77b98802..efcad7461e99f 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = "pynetdicom"; rev = "refs/tags/v${version}"; - hash = "sha256-gAgNSvNn5VsctqhbT/CzFVhwCEpZwGb1pOh0JwkuAW8="; + hash = "sha256-cEe0/mzmMnPoLQMx5AsJocGxCUVE512k9KlEmjzjzn4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index 0f6c85d993c84..23f0a904d4ac4 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyngo"; - version = "2.0.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yezz123"; repo = "pyngo"; rev = "refs/tags/${version}"; - hash = "sha256-wvy1L21AnQ4JP5seAh6DWksQU2OcbYTXKcixpFryH4w="; + hash = "sha256-vzqm+g/jYkxue5DiUe+iYA5x0zMKLKQtAatOSKCUWzs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 345f3cec33533..7082611f6716c 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.6"; + version = "7.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BcD8pjQJE2WKvdxiOgpTknrO2T4n/++AHSSBS8sYDqo="; + hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 2e40250adb4b9..a144da1003693 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.4.47"; + version = "0.4.50"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-WOHDskGAZGhiU48JGV0yDhWIpFELFLHhn9g5sbchKKg="; + hash = "sha256-BIBwIYxoUcK7E69REcu/qmrpNlyYwnA7Im3iRSsWlnA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynose/default.nix b/pkgs/development/python-modules/pynose/default.nix deleted file mode 100644 index c86f814aac7bf..0000000000000 --- a/pkgs/development/python-modules/pynose/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools, -}: - -buildPythonPackage rec { - pname = "pynose"; - version = "1.5.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "mdmintz"; - repo = "pynose"; - rev = "refs/tags/v${version}"; - hash = "sha256-Oi+vwInqgsdZfr5abJUa4zkTktpEuG0m89d1O8Oot0Q="; - }; - - nativeBuildInputs = [ setuptools ]; - - # has no tests - doCheck = false; - - meta = with lib; { - description = "pynose fixes nose to extend unittest and make testing easier"; - homepage = "https://github.com/mdmintz/pynose"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/development/python-modules/pynvim-pp/default.nix b/pkgs/development/python-modules/pynvim-pp/default.nix index b22e0d372981d..feb57706f7a52 100644 --- a/pkgs/development/python-modules/pynvim-pp/default.nix +++ b/pkgs/development/python-modules/pynvim-pp/default.nix @@ -8,24 +8,24 @@ buildPythonPackage { pname = "pynvim-pp"; - version = "unstable-2024-03-11"; + version = "unstable-2024-07-31"; pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "pynvim_pp"; - rev = "34e3a027c595981886d7efd1c91071f3eaa4715d"; - hash = "sha256-2+jDRJXlg9q4MN9vOhmeq4cWVJ0wp5r5xAh3G8lqgOg="; + rev = "6d3c298b7eb9543bce7ab515b0a39f256c1d37ca"; + hash = "sha256-W6YaxI/fa2HL6+FIBTTA+7K2Be02iuIfFFVO/hhYnpo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pynvim ]; + dependencies = [ pynvim ]; - meta = with lib; { + meta = { homepage = "https://github.com/ms-jpq/pynvim_pp"; description = "Dependency to chadtree and coq_nvim plugins"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 762771c66a2bb..936a4f5ce8476 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, substituteAll, pythonOlder, - addOpenGLRunpath, + addDriverRunpath, setuptools, pytestCheckHook, versioneer, @@ -28,7 +28,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; - inherit (addOpenGLRunpath) driverLink; + inherit (addDriverRunpath) driverLink; }) ]; diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index a9e5e959e53d4..a923be9c4a33b 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -7,7 +7,7 @@ metar, pytest-aiohttp, pytest-asyncio, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pynws"; - version = "1.8.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pynws"; rev = "refs/tags/v${version}"; - hash = "sha256-3QKdZ7hg7HfQ56xHbkhXCtlBq4JCwfXdZiTctI3OVl0="; + hash = "sha256-eAXIlX/K7Cpq+aiPHiRGqhtSHQDtbHONYP0AjRW8JjY="; }; build-system = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { freezegun pytest-aiohttp pytest-asyncio - pytest-cov + pytest-cov-stub pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index 7f7f8d2465a37..15a0a2dbdbfaf 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -17,7 +17,6 @@ pylink-square, pyusb, pyyaml, - setuptools, setuptools-scm, typing-extensions, stdenv, @@ -44,17 +43,11 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "libusb-package>=1.0,<2.0" "" - ''; + pythonRemoveDeps = [ "libusb-package" ]; - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ capstone_4 cmsis-pack-manager colorama @@ -74,6 +67,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyocd" ]; + disabledTests = [ + # AttributeError: 'not_called' is not a valid assertion + # Upstream fix at https://github.com/pyocd/pyOCD/pull/1710 + "test_transfer_err_not_flushed" + ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index ba6d5dbb0c588..62e5509d2e445 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -9,7 +9,6 @@ libopus, opusfile, substituteAll, - python, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index f91ae1753966a..f21872914ba66 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { homepage = "http://www.pyomo.org/"; changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "pyomo"; }; } diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index d452ff22af1ec..f32d555d7589e 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonAtLeast, fetchPypi, cython, numpy, diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index fc7dbfd515f34..b9691b2a2827d 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -100,6 +100,6 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; changelog = "https://github.com/pyca/pyopenssl/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 0283116b2160c..03a07846b89b9 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pyserial-asyncio, pyserial-asyncio-fast, pytest-asyncio, pytestCheckHook, diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index f8e09d76c0e95..bca06fd41de6a 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -7,6 +7,7 @@ boto3, buildPythonPackage, fetchFromGitHub, + fetchpatch2, poetry-core, pyhumps, pytest-asyncio, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.12"; + version = "1.13.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,13 +27,17 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-zcFcF0a3gyY3WmRiRlQntO8hjbkUm2Cxumn2aKHchvY="; + hash = "sha256-HlDydPreHe/O+fqVwjkwQlQx0o9UxI/fwA+idB02Gng="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"' - ''; + patches = [ + # https://github.com/iMicknl/python-overkiz-api/pull/1309 + (fetchpatch2 { + url = "https://github.com/iMicknl/python-overkiz-api/commit/9e5bbec3fc88faac9dae0c0c001ed7582c4933e2.patch"; + excludes = [ "poetry.lock" ]; + hash = "sha256-KzagDvljkKoUJT+41o7Jv5OPLpPXQDeGmz3O/HOk1YQ="; + }) + ]; build-system = [ poetry-core ]; @@ -40,11 +45,10 @@ buildPythonPackage rec { aiohttp attrs backoff - backports-strenum boto3 pyhumps warrant-lite - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ backports-strenum ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 9c02f6eb31797..ebdd762b6d067 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, isPyPy, pkgs, - python, six, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index f5113813a1ae2..784a5e213c3ba 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -8,10 +8,11 @@ git, gnugrep, gnupg, - nose, pbr, pexpect, pythonAtLeast, + pytestCheckHook, + setuptools, substituteAll, tree, xclip, @@ -22,11 +23,11 @@ buildPythonPackage rec { pname = "pypass"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r"; + hash = "sha256-+dAQiufpULdU26or4EKDqazQbOZjGRbhI/+ddo+spNo="; }; # Set absolute nix store paths to the executables that pypass uses @@ -46,40 +47,39 @@ buildPythonPackage rec { substituteInPlace requirements.txt --replace "enum34" "" ''; + build-system = [ setuptools ]; + nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ + dependencies = [ click colorama pexpect ]; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytestCheckHook ]; # Configuration so that the tests work preCheck = '' - HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org" - HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder" - HOME=$TEMP ${git}/bin/git config --global pull.ff only - HOME=$TEMP make setup_gpg + export HOME=$(mktemp -d) + export GNUPGHOME=pypass/tests/gnupg + ${git}/bin/git config --global user.email "nix-builder@nixos.org" + ${git}/bin/git config --global user.name "Nix Builder" + ${git}/bin/git config --global pull.ff only + make setup_gpg ''; - # Run tests but exclude the test that uses clipboard as I wasn't able to make - # it work - probably the X clipboard just doesn't work in the build - # environment.. - checkPhase = '' - runHook preCheck - HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip . - runHook postCheck - ''; + # Presumably this test needs the X clipboard, which we don't have + # as the test environment is non-graphical. + disabledTests = [ "test_show_clip" ]; - meta = with lib; { + meta = { broken = stdenv.isDarwin; description = "Password manager pass in Python"; mainProgram = "pypass"; homepage = "https://github.com/aviau/python-pass"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ jluttine ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 3ecbde22d6900..23c90f841ac55 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { pname = "pypdf"; - version = "4.2.0"; - format = "pyproject"; + version = "4.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "py-pdf"; @@ -36,7 +36,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-ksLpxfRxrNVXezF0VjbAqadpF6bv/SAOOnCKabhugo0="; + hash = "sha256-wSF20I5WaxRoN0n0jxB5O3mAAIOxP/TclYBTRAUwYHo="; }; outputs = [ @@ -55,12 +55,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--disable-socket" "" + --replace-fail "--disable-socket" "" ''; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { full = crypto ++ image; crypto = [ cryptography ]; image = [ pillow ]; @@ -72,7 +72,7 @@ buildPythonPackage rec { (fpdf2.overridePythonAttrs { doCheck = false; }) # avoid reference loop pytestCheckHook pytest-timeout - ] ++ passthru.optional-dependencies.full; + ] ++ optional-dependencies.full; pytestFlagsArray = [ # don't access the network diff --git a/pkgs/development/python-modules/pypdf2/default.nix b/pkgs/development/python-modules/pypdf2/default.nix index d40c07114504f..d8bea0dbf51de 100644 --- a/pkgs/development/python-modules/pypdf2/default.nix +++ b/pkgs/development/python-modules/pypdf2/default.nix @@ -35,7 +35,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ desiderius - vrthra ]; }; } diff --git a/pkgs/development/python-modules/pypemicro/default.nix b/pkgs/development/python-modules/pypemicro/default.nix index 7f51691529e94..42c783a6e4c2e 100644 --- a/pkgs/development/python-modules/pypemicro/default.nix +++ b/pkgs/development/python-modules/pypemicro/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - autoPatchelfHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 5eab5062ac882..5c752a0834d17 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://pyperf.readthedocs.io/"; changelog = "https://github.com/psf/pyperf/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index d75608465fe30..b8464e1852bbe 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyphen"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pDBiPeysU9w2kSQSUyY8uja53XpE/9JoC3Bq82jNovI="; + hash = "sha256-LABrPd8HLJVxq5dgbZqzwmqS6s7UwNWf0dJpiPMI9BM="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index 601db553cf5eb..8c001b7ebf82c 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -2,44 +2,39 @@ lib, buildPythonPackage, fetchFromGitLab, - nose, pillow, - isPy3k, - isPyPy, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pypillowfight"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.0-unstable-2024-07-07"; + pyproject = true; src = fetchFromGitLab { domain = "gitlab.gnome.org"; group = "World"; owner = "OpenPaperwork"; repo = "libpillowfight"; - rev = version; - sha256 = "096242v425mlqqj5g1giy59p7grxp05g78w6bk37vzph98jrgv3w"; + # Currently no tagged release past 0.3.0 and we need these patches to fix Python 3.12 compat + rev = "4d5f739b725530cd61e709071d31e9f707c64bd6"; + hash = "sha256-o5FzUSDq0lwkXGXRMsS5NB/Mp4Ie833wkxKPziR23f4="; }; prePatch = '' echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h ''; - # Disable tests because they're designed to only work on Debian: - # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 - doCheck = false; + build-system = [ setuptools ]; - # Python 2.x is not supported, see: - # https://github.com/jflesch/libpillowfight/issues/1 - disabled = !isPy3k && !isPyPy; + dependencies = [ pillow ]; - # This is needed by setup.py regardless of whether tests are enabled. - buildInputs = [ nose ]; - propagatedBuildInputs = [ pillow ]; + nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Library containing various image processing algorithms"; inherit (src.meta) homepage; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 001474532af23..e51909faab5b9 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.51.0"; + version = "0.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-kbUVif3a3L7BHj1b37FME5wicalK/iild0pvwPawr6Q="; + hash = "sha256-XoRH9vBO0vJl7DqgGrFLfxGFtiQTpXdZoM4FO3TFWeY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index b61fb265dcf79..486b980bd4cbb 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, }: diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix index 472d16ede4862..f9ddc503ede65 100644 --- a/pkgs/development/python-modules/pypoolstation/default.nix +++ b/pkgs/development/python-modules/pypoolstation/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypoolstation"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hszGCA2DDGQSh37lxp8G0bqHliH/+i2so5imDyzyOJw="; + hash = "sha256-SA5Eqz0WoisVVAjeKQymVh17+fHa7SuiYXgOL2BiJcc="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index c0885c1f0f30e..0013a3dbe7260 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -1,6 +1,8 @@ { lib, buildPythonPackage, + setuptools, + pip, cython, fetchFromGitHub, mpi4py, @@ -12,8 +14,8 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "3.1.0"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,10 +23,12 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-5K6oVBhR6mBdkyOb/Ec0qg9x63tkoTnLIrE8dz8oCtc="; + hash = "sha256-qeDWj03Uo0Kf75MN0eI+DBwa94v7GRe6+FKYtVOM6vs="; }; nativeBuildInputs = [ + setuptools + pip cython pkgconfig ]; diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 96aec1c90dc77..b01f7573511f1 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; + hash = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; }; doCheck = false; # tests require internet connection @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://qwertyquerty.github.io/pypresence/html/index.html"; description = "Discord RPC client written in Python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index ec8367aee0f49..9506f4c242187 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python Progress Bar and Percent Indicator Utility"; homepage = "https://github.com/rasbt/pyprind"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 09eb72384c1ab..913328722947d 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -10,7 +10,6 @@ # runtime packaging, - toml, tomli, # docs @@ -77,6 +76,6 @@ buildPythonPackage rec { description = "API to interact with the python pyproject.toml based projects"; homepage = "https://github.com/tox-dev/pyproject-api"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix index cc47f9d2a840e..28db88a18cf81 100644 --- a/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyproject_hooks" ]; meta = with lib; { - description = "Low-level library for calling build-backends in `pyproject.toml`-based project "; + description = "Low-level library for calling build-backends in `pyproject.toml`-based project"; homepage = "https://github.com/pypa/pyproject-hooks"; changelog = "https://github.com/pypa/pyproject-hooks/blob/v${version}/docs/changelog.rst"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix index 33adc83c67b83..1a51a0b8f8cdb 100644 --- a/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -6,9 +6,7 @@ packaging, pytestCheckHook, pythonOlder, - setuptools, tomli, - wheel, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix index 88c7eb338ed72..61b482ee5846a 100644 --- a/pkgs/development/python-modules/pyprusalink/default.nix +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyprusalink" ]; meta = with lib; { - description = "Library to communicate with PrusaLink "; + description = "Library to communicate with PrusaLink"; homepage = "https://github.com/home-assistant-libs/pyprusalink"; changelog = "https://github.com/home-assistant-libs/pyprusalink/releases/tag/${version}"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 32a93e89c57a1..0ad48f55d9315 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, jinja2, mako, - nose, pyramid, pyramid-mako, pytestCheckHook, @@ -35,7 +34,6 @@ buildPythonPackage rec { django jinja2 mako - nose tornado pyramid pyramid-mako diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix index 9c01099f5621a..3dfe0131ebf2e 100644 --- a/pkgs/development/python-modules/pypykatz/default.nix +++ b/pkgs/development/python-modules/pypykatz/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xni2cYI+ByTFSDvuWHDU97KljwMe3aT7P+VIir6ktks="; + hash = "sha256-M0LjYIa8leoMs/hDWM2nLqH8R00ZAL6uOCyXHA/0AJY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ed0264c816dd6..e947ad34b134b 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -22,13 +22,12 @@ withSerialPort ? false, withTools ? false, pkgsBuildTarget, - buildPackages, dbusSupport ? !stdenv.isDarwin, }: buildPythonPackage rec { pname = "pyqt5"; - version = "5.15.9"; + version = "5.15.10"; format = "pyproject"; disabled = isPy27; @@ -36,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt5"; inherit version; - hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA="; + hash = "sha256-1Gt4BLGxCk/5F1P4ET5bVYDStEYvMiYoji2ESXM0iYo="; }; patches = [ diff --git a/pkgs/development/python-modules/pyqt3d/default.nix b/pkgs/development/python-modules/pyqt3d/default.nix index 5c26e705bea6f..abf60dcad115e 100644 --- a/pkgs/development/python-modules/pyqt3d/default.nix +++ b/pkgs/development/python-modules/pyqt3d/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyqt5, diff --git a/pkgs/development/python-modules/pyqt5-stubs/default.nix b/pkgs/development/python-modules/pyqt5-stubs/default.nix index 008313ebb7fdf..a891942d1d457 100644 --- a/pkgs/development/python-modules/pyqt5-stubs/default.nix +++ b/pkgs/development/python-modules/pyqt5-stubs/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Stubs for PyQt5 "; + description = "Stubs for PyQt5"; homepage = "https://github.com/python-qt-tools/PyQt5-stubs"; license = licenses.gpl3; maintainers = with maintainers; [ _999eagle ]; diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index 60bc08b315d7a..f802db34771c9 100644 --- a/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_Charts"; inherit version; - sha256 = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; + hash = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqtchart/default.nix b/pkgs/development/python-modules/pyqtchart/default.nix index db7e24eabcb65..1a6675b9ad80d 100644 --- a/pkgs/development/python-modules/pyqtchart/default.nix +++ b/pkgs/development/python-modules/pyqtchart/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyqt5, diff --git a/pkgs/development/python-modules/pyqtdatavisualization/default.nix b/pkgs/development/python-modules/pyqtdatavisualization/default.nix index 09d1ad6c752e4..d0c1ba5b8d051 100644 --- a/pkgs/development/python-modules/pyqtdatavisualization/default.nix +++ b/pkgs/development/python-modules/pyqtdatavisualization/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyqt5, diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index b72fde6277f7b..4428779f0b952 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,29 +1,20 @@ { lib, + setuptools, stdenv, - pythonPackages, fetchPypi, pkg-config, - qmake, - qtbase, - qtsvg, - qtwebengine, - qtwebchannel, - qtdeclarative, - wrapQtAppsHook, + libsForQt5, darwin, - buildPackages, + buildPythonPackage, + python, + isPy27, + pyqt5, + sip, + pyqt-builder, }: let - inherit (pythonPackages) - buildPythonPackage - python - isPy27 - pyqt5 - sip - pyqt-builder - ; inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage ( @@ -37,7 +28,7 @@ buildPythonPackage ( src = fetchPypi { pname = "PyQtWebEngine"; inherit version; - sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; + hash = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; }; postPatch = '' @@ -53,32 +44,33 @@ buildPythonPackage ( nativeBuildInputs = [ pkg-config - qmake + libsForQt5.qmake + libsForQt5.wrapQtAppsHook ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ sip ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ python.pythonOnBuildForHost.pkgs.sip ] ++ [ - qtbase - qtsvg - qtwebengine + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qtwebengine pyqt-builder - pythonPackages.setuptools + setuptools ] - ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ qtdeclarative ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; buildInputs = [ sip - qtbase - qtsvg - qtwebengine + libsForQt5.qtbase + libsForQt5.qtsvg + libsForQt5.qtwebengine ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - qtwebchannel - qtdeclarative + libsForQt5.qtwebchannel + libsForQt5.qtdeclarative ]; propagatedBuildInputs = [ pyqt5 ]; @@ -99,21 +91,21 @@ buildPythonPackage ( enableParallelBuilding = true; passthru = { - inherit wrapQtAppsHook; + inherit (libsForQt5) wrapQtAppsHook; }; - meta = with lib; { + meta = { description = "Python bindings for Qt5"; homepage = "http://www.riverbankcomputing.co.uk"; - license = licenses.gpl3; - hydraPlatforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms; + license = lib.licenses.gpl3; + hydraPlatforms = lib.lists.intersectLists libsForQt5.qtwebengine.meta.platforms lib.platforms.mesaPlatforms; }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { # TODO: figure out why the env hooks aren't adding these inclusions automatically env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I${lib.getDev qtbase}/include/QtPrintSupport/" - "-I${lib.getDev qtwebchannel}/include/QtWebChannel/" + "-I${lib.getDev libsForQt5.qtbase}/include/QtPrintSupport/" + "-I${lib.getDev libsForQt5.qtwebchannel}/include/QtWebChannel/" ]; } ) diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix index ac374c9572bb4..fab1e6c4f8cc6 100644 --- a/pkgs/development/python-modules/pyquaternion/default.nix +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -1,19 +1,22 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, numpy, - nose, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyquaternion"; version = "0.9.9"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-sfYa8hnLL+lmtft5oZISTy5jo/end6w8rfKVexqBvqg="; + src = fetchFromGitHub { + owner = "KieranWynn"; + repo = "pyquaternion"; + rev = "v${version}"; + hash = "sha256-L0wT9DFUDRcmmN7OpmIDNvtQWQrM7iFnZt6R2xrJ+3A="; }; # The VERSION.txt file is required for setup.py @@ -22,9 +25,14 @@ buildPythonPackage rec { echo "${version}" > VERSION.txt ''; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "pyquaternion/test/" ]; - nativeCheckInputs = [ nose ]; pythonImportsCheck = [ "pyquaternion" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 3c3fc7253c8dc..657215e62ed2c 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -4,7 +4,6 @@ deprecated, fetchFromGitHub, ipython, - lark, matplotlib-inline, nest-asyncio, networkx, @@ -20,25 +19,22 @@ rpcq, scipy, syrupy, - tenacity, types-deprecated, - types-python-dateutil, - types-retry, typing-extensions, }: buildPythonPackage rec { pname = "pyquil"; - version = "4.10.1"; + version = "4.13.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "rigetti"; repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-mXcuvZauldoKmTZzFJ6TGgETxpqhXsXYBTCZpwc1I7Q="; + hash = "sha256-tfneoRtBOHPHWqeajpr+m0jDhtcl6+ReQNl2kt3ymUc="; }; pythonRelaxDeps = [ @@ -46,6 +42,7 @@ buildPythonPackage rec { "networkx" "packaging" "qcs-sdk-python" + "rpcq" ]; build-system = [ poetry-core ]; @@ -53,7 +50,6 @@ buildPythonPackage rec { dependencies = [ deprecated - lark matplotlib-inline networkx numpy @@ -61,10 +57,7 @@ buildPythonPackage rec { qcs-sdk-python rpcq scipy - tenacity types-deprecated - types-python-dateutil - types-retry typing-extensions ]; diff --git a/pkgs/development/python-modules/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix index fd6daf7d38e18..5ccd23833092e 100644 --- a/pkgs/development/python-modules/pyqwikswitch/default.nix +++ b/pkgs/development/python-modules/pyqwikswitch/default.nix @@ -4,7 +4,6 @@ fetchPypi, attrs, requests, - python, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix index 8faae270960d1..87e9a30932cb3 100644 --- a/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyramid_beaker"; inherit version; - sha256 = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; + hash = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyramid-chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix index 67ea57509b8b5..dadd0e534a3ff 100644 --- a/pkgs/development/python-modules/pyramid-chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid-chameleon/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, chameleon, diff --git a/pkgs/development/python-modules/pyramid-mako/default.nix b/pkgs/development/python-modules/pyramid-mako/default.nix index 2b4483d04f1d6..f362fae175173 100644 --- a/pkgs/development/python-modules/pyramid-mako/default.nix +++ b/pkgs/development/python-modules/pyramid-mako/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/Pylons/pyramid_mako"; description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyramid-multiauth/default.nix b/pkgs/development/python-modules/pyramid-multiauth/default.nix index 6454fa6c33c27..2bf668f94e357 100644 --- a/pkgs/development/python-modules/pyramid-multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid-multiauth/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 465615b99ed8a..1dc215bf0ee8f 100644 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { env.BORING_BSSL_PATH = boringssl-wrapper; - optional-dependencies = { + passthru.optional-dependencies = { dev = [ pytest ]; }; diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index ccfca503e786f..bf2abeb811d6f 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -2,16 +2,12 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build-system setuptools, # dependencies pytz, - - # tests - nose, }: buildPythonPackage rec { @@ -29,9 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; - doCheck = pythonOlder "3.12"; - - nativeCheckInputs = [ nose ]; + doCheck = false; # tests are not including in PyPI tarball meta = with lib; { description = "Generate and parse RFC 3339 timestamps"; diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index d939061018ba8..a4f709f2dfb29 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, multipledispatch, numpy, }: diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 957394ad5fa3c..51ed8f0cc31f9 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -96,6 +96,6 @@ buildPythonPackage rec { homepage = "https://github.com/IdentityPython/pysaml2"; changelog = "https://github.com/IdentityPython/pysaml2/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 3ee18d12e4de7..667ba03903230 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -59,6 +59,6 @@ buildPythonPackage { homepage = "https://github.com/deepmind/pysc2"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index a724b105ed2b6..c85e01e099252 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { description = "Integration of django builtin scaffold cli (django-admin) into PyScaffold"; homepage = "https://pypi.org/project/pyscaffoldext-django/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index c00f5398595ab..5866abddf4cfc 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -86,6 +86,7 @@ buildPythonPackage rec { "test_veff" "test_collinear_kgks_gga" "test_libxc_gga_deriv4" + "test_sacasscf_grad" ]; pytestFlagsArray = [ @@ -94,6 +95,8 @@ buildPythonPackage rec { "--ignore-glob=*_slow.*py" "--ignore-glob=*_kproxy_.*py" "--ignore-glob=test_proxy.py" + "--ignore-glob=pyscf/nac/test/test_sacasscf.py" + "--ignore-glob=pyscf/grad/test/test_casscf.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 4cf66570a74f3..6112062c91e9b 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; + hash = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; }; propagatedBuildInputs = @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "python screenshot"; homepage = "https://github.com/ponty/pyscreenshot"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 46261614492b5..af8307218eaf6 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Scss compiler for Python"; homepage = "https://pyscss.readthedocs.org/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysecuritas/default.nix b/pkgs/development/python-modules/pysecuritas/default.nix index c5ba481bab550..118518859d0b1 100644 --- a/pkgs/development/python-modules/pysecuritas/default.nix +++ b/pkgs/development/python-modules/pysecuritas/default.nix @@ -4,22 +4,25 @@ fetchPypi, pythonOlder, requests, + setuptools, xmltodict, }: buildPythonPackage rec { pname = "pysecuritas"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "W3DLZCXUH9y5NPipFEu6URmKN+oVXMgeDF1rfKtxRng="; + hash = "sha256-W3DLZCXUH9y5NPipFEu6URmKN+oVXMgeDF1rfKtxRng="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ xmltodict requests ]; @@ -32,9 +35,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to access Securitas Direct Mobile API"; - mainProgram = "pysecuritas"; homepage = "https://github.com/Cebeerre/pysecuritas"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pysecuritas"; }; } diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index 236d040cb9459..48cc85cf27b03 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/giampaolo/pysendfile"; changelog = "https://github.com/giampaolo/pysendfile/blob/release-${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix index 882c761d191e6..17951563bed7b 100644 --- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -5,7 +5,6 @@ # build-system setuptools, - wheel, # dependencies pyserial, @@ -17,22 +16,19 @@ buildPythonPackage rec { pname = "pyserial-asyncio-fast"; - version = "0.12"; + version = "0.14"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "pyserial-asyncio-fast"; rev = version; - hash = "sha256-37dbJq+9Ex+/uiRR2esgOP15CjySA0MLvxnjiPDTF08="; + hash = "sha256-ZnXuwHvYq/BrEW6YV6T0sQ03u2rpwNBnpF+dXAmvxKQ="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pyserial ]; + dependencies = [ pyserial ]; pythonImportsCheck = [ "serial_asyncio_fast" ]; @@ -42,6 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/home-assistant-libs/pyserial-asyncio-fast/releases/tag/${version}"; description = "Fast asyncio extension package for pyserial that implements eager writes"; homepage = "https://github.com/bdraco/pyserial-asyncio-fast"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index 68c318a9d975c..bd48ff1b4527e 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Asyncio extension package for pyserial"; homepage = "https://github.com/pyserial/pyserial-asyncio"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index 3999af3f3e63a..ba92fdaebd281 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { homepage = "https://github.com/KimiNewt/pyshark/"; changelog = "https://github.com/KimiNewt/pyshark/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 34866cdf85a29..176e04eed522d 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Python read/write support for ESRI Shapefile format"; homepage = "https://github.com/GeospatialPython/pyshp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyside2/Final-details-to-enable-3.12-wheel-compatibility.patch b/pkgs/development/python-modules/pyside2/Final-details-to-enable-3.12-wheel-compatibility.patch new file mode 100644 index 0000000000000..beab48c54ad1c --- /dev/null +++ b/pkgs/development/python-modules/pyside2/Final-details-to-enable-3.12-wheel-compatibility.patch @@ -0,0 +1,28 @@ +From: =?utf-8?q?Cristi=C3=A1n_Maureira-Fredes?= + <Cristian.Maureira-Fredes@qt.io> +Date: Tue, 10 Oct 2023 15:52:09 +0200 +Subject: Final details to enable 3.12 wheel compatibility + +Change-Id: I0252c4e73e8c214ef8aa418ddf88bc452c0fdf53 +Pick-to: 6.6 +Task-number: PYSIDE-2230 +Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> +(cherry picked from commit 6c7bb7b6e1008909e49bc04d2a48024309a784cc) +--- + build_scripts/config.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build_scripts/config.py b/build_scripts/config.py +index 5fc23d4..fb27394 100644 +--- a/build_scripts/config.py ++++ b/build_scripts/config.py +@@ -138,7 +138,7 @@ class Config(object): + setup_kwargs['zip_safe'] = False + setup_kwargs['cmdclass'] = cmd_class_dict + setup_kwargs['version'] = package_version +- setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.12" ++ setup_kwargs['python_requires'] = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <3.13" + + if quiet: + # Tells distutils / setuptools to be quiet, and only print warnings or errors. + diff --git a/pkgs/development/python-modules/pyside2/Modify-sendCommand-signatures.patch b/pkgs/development/python-modules/pyside2/Modify-sendCommand-signatures.patch new file mode 100644 index 0000000000000..7465b109f8a42 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/Modify-sendCommand-signatures.patch @@ -0,0 +1,41 @@ +From: Dmitry Shachnev <mitya57@debian.org> +Date: Sun, 4 Feb 2024 00:29:00 +0300 +Subject: Modify sendCommand signatures to use 0 as default value + +The original default value was QNodeCommand::CommandId(), and shiboken +copies it verbatim from the header file, however it does not work because +we do not generate "using namespace Qt3DCore;". + +0 is the same as QNodeCommand::CommandId(). +--- + sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml +index 8696a12..310595f 100644 +--- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml ++++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml +@@ -58,6 +58,11 @@ + <object-type name="QAspectJob"/> + <object-type name="QBackendNode"> + <enum-type name="Mode"/> ++ <modify-function signature="sendCommand(const QString&,const QVariant&,unsigned long long)"> ++ <modify-argument index="3"> ++ <replace-default-expression with="0"/> ++ </modify-argument> ++ </modify-function> + </object-type> + <!-- TODO: Solve issues related to windows and a unresolved + external symbol +@@ -82,6 +87,11 @@ + </object-type> + <object-type name="QNode"> + <enum-type name="PropertyTrackingMode"/> ++ <modify-function signature="sendCommand(const QString&,const QVariant&,unsigned long long)"> ++ <modify-argument index="3"> ++ <replace-default-expression with="0"/> ++ </modify-argument> ++ </modify-function> + </object-type> + <object-type name="QNodeCommand" since="5.10"/> + <object-type name="QNodeCreatedChangeBase"/> diff --git a/pkgs/development/python-modules/pyside2/Python-3.12-Fix-the-structure-of-class-property.patch b/pkgs/development/python-modules/pyside2/Python-3.12-Fix-the-structure-of-class-property.patch new file mode 100644 index 0000000000000..11c738512e387 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/Python-3.12-Fix-the-structure-of-class-property.patch @@ -0,0 +1,37 @@ +From: Christian Tismer <tismer@stackless.com> +Date: Tue, 14 Feb 2023 14:46:22 +0100 +Subject: Python 3.12: Fix the structure of class property + +There is a PySide bug in Python 3.10 already: The structure for +classproperty derives from the property structure. This was extended +in Python 3.10, already, but the type generation check was made more +exhaustive in Python 3.12 and recognized that. + +This change is only for making the compiler/C API happy. +In order to use the extension field, it is necessary to do a runtime +check because of the Limited API. + +Task-number: PYSIDE-2230 +Change-Id: I88dcaa11589ff41852f08fa2defa5200a0dd4eb6 +Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> +Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> +(cherry picked from commit edfd9a5ad174a48f8d7da511dc6a1c69e931a418) +--- + sources/pyside2/libpyside/feature_select.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sources/pyside2/libpyside/feature_select.cpp b/sources/pyside2/libpyside/feature_select.cpp +index 3011b35..b9e1470 100644 +--- a/sources/pyside2/libpyside/feature_select.cpp ++++ b/sources/pyside2/libpyside/feature_select.cpp +@@ -671,6 +671,11 @@ typedef struct { + PyObject *prop_set; + PyObject *prop_del; + PyObject *prop_doc; ++#if PY_VERSION_HEX >= 0x030A0000 ++ // Note: This is a problem with Limited API: We have no direct access. ++ // You need to pick it from runtime info. ++ PyObject *prop_name; ++#endif + int getter_doc; + } propertyobject; diff --git a/pkgs/development/python-modules/pyside2/Support-running-PySide-on-Python-3.12.patch b/pkgs/development/python-modules/pyside2/Support-running-PySide-on-Python-3.12.patch new file mode 100644 index 0000000000000..3291705b20017 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/Support-running-PySide-on-Python-3.12.patch @@ -0,0 +1,298 @@ +From: Christian Tismer <tismer@stackless.com> +Date: Tue, 14 Feb 2023 14:46:22 +0100 +Subject: Support running PySide on Python 3.12 + +Builtin types no longer have tp_dict set. We need to +use PyType_GetDict, instead. This works without Limited API +at the moment. + +With some great cheating, this works with Limited API, too. +We emulate PyType_GetDict by tp_dict if that is not 0. +Otherwise we create an empty dict. + +Some small changes to Exception handling and longer +warm-up in leaking tests were found, too. + +Pick-to: 6.6 6.5 6.2 +Task-number: PYSIDE-2230 +Change-Id: I8a56de6208ec00979255b39b5784dfc9b4b92def +Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> +(cherry picked from commit 441ffbd4fc622e67acd81e9c1c6d3a0b0fbcacf0) +--- + build_scripts/config.py | 3 +- + sources/pyside2/PySide2/support/generate_pyi.py | 8 ++++-- + sources/pyside2/libpyside/feature_select.cpp | 10 ++++--- + sources/pyside2/libpyside/pysideproperty.cpp | 4 +-- + sources/pyside2/libpyside/pysidesignal.cpp | 4 +-- + sources/pyside2/tests/QtWidgets/bug_662.py | 3 +- + sources/pyside2/tests/signals/bug_79.py | 5 ++++ + sources/shiboken2/libshiboken/pep384impl.cpp | 33 ++++++++++++++++++++++ + sources/shiboken2/libshiboken/pep384impl.h | 8 ++++++ + .../shiboken2/libshiboken/signature/signature.cpp | 2 +- + .../libshiboken/signature/signature_helper.cpp | 6 ++-- + .../shibokensupport/signature/errorhandler.py | 6 ++++ + sources/shiboken2/tests/samplebinding/enum_test.py | 2 +- + 13 files changed, 78 insertions(+), 16 deletions(-) + +diff --git a/build_scripts/config.py b/build_scripts/config.py +index f2b4c40..5fc23d4 100644 +--- a/build_scripts/config.py ++++ b/build_scripts/config.py +@@ -94,7 +94,8 @@ class Config(object): + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', +- 'Programming Language :: Python :: 3.11' ++ 'Programming Language :: Python :: 3.11', ++ 'Programming Language :: Python :: 3.12', + ] + + self.setup_script_dir = None +diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py +index 1956533..fd05b1f 100644 +--- a/sources/pyside2/PySide2/support/generate_pyi.py ++++ b/sources/pyside2/PySide2/support/generate_pyi.py +@@ -116,8 +116,12 @@ class Formatter(Writer): + """ + def _typevar__repr__(self): + return "typing." + self.__name__ +- typing.TypeVar.__repr__ = _typevar__repr__ +- ++ # This is no longer necessary for modern typing versions. ++ # Ignore therefore if the repr is read-only and cannot be changed. ++ try: ++ typing.TypeVar.__repr__ = _typevar__repr__ ++ except TypeError: ++ pass + # Adding a pattern to substitute "Union[T, NoneType]" by "Optional[T]" + # I tried hard to replace typing.Optional by a simple override, but + # this became _way_ too much. +diff --git a/sources/pyside2/libpyside/feature_select.cpp b/sources/pyside2/libpyside/feature_select.cpp +index b9e1470..533c09d 100644 +--- a/sources/pyside2/libpyside/feature_select.cpp ++++ b/sources/pyside2/libpyside/feature_select.cpp +@@ -358,7 +358,8 @@ static bool SelectFeatureSetSubtype(PyTypeObject *type, PyObject *select_id) + * This is the selector for one sublass. We need to call this for + * every subclass until no more subclasses or reaching the wanted id. + */ +- if (Py_TYPE(type->tp_dict) == Py_TYPE(PyType_Type.tp_dict)) { ++ static const auto *pyTypeType_tp_dict = PepType_GetDict(&PyType_Type); ++ if (Py_TYPE(type->tp_dict) == Py_TYPE(pyTypeType_tp_dict)) { + // On first touch, we initialize the dynamic naming. + // The dict type will be replaced after the first call. + if (!replaceClassDict(type)) { +@@ -385,7 +386,8 @@ static inline PyObject *SelectFeatureSet(PyTypeObject *type) + * Generated functions call this directly. + * Shiboken will assign it via a public hook of `basewrapper.cpp`. + */ +- if (Py_TYPE(type->tp_dict) == Py_TYPE(PyType_Type.tp_dict)) { ++ static const auto *pyTypeType_tp_dict = PepType_GetDict(&PyType_Type); ++ if (Py_TYPE(type->tp_dict) == Py_TYPE(pyTypeType_tp_dict)) { + // We initialize the dynamic features by using our own dict type. + if (!replaceClassDict(type)) + return nullptr; +@@ -721,11 +723,11 @@ static bool patch_property_impl() + // Turn `__doc__` into a computed attribute without changing writability. + auto gsp = property_getset; + auto type = &PyProperty_Type; +- auto dict = type->tp_dict; ++ AutoDecRef dict(PepType_GetDict(type)); + AutoDecRef descr(PyDescr_NewGetSet(type, gsp)); + if (descr.isNull()) + return false; +- if (PyDict_SetItemString(dict, gsp->name, descr) < 0) ++ if (PyDict_SetItemString(dict.object(), gsp->name, descr) < 0) + return false; + // Replace property_descr_get/set by slightly changed versions + return true; +diff --git a/sources/pyside2/libpyside/pysideproperty.cpp b/sources/pyside2/libpyside/pysideproperty.cpp +index 86909d3..d2e2c68 100644 +--- a/sources/pyside2/libpyside/pysideproperty.cpp ++++ b/sources/pyside2/libpyside/pysideproperty.cpp +@@ -445,8 +445,8 @@ namespace { + + static PyObject *getFromType(PyTypeObject *type, PyObject *name) + { +- PyObject *attr = nullptr; +- attr = PyDict_GetItem(type->tp_dict, name); ++ AutoDecRef tpDict(PepType_GetDict(type)); ++ auto *attr = PyDict_GetItem(tpDict.object(), name); + if (!attr) { + PyObject *bases = type->tp_bases; + int size = PyTuple_GET_SIZE(bases); +diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp +index 6824a71..f15d7aa 100644 +--- a/sources/pyside2/libpyside/pysidesignal.cpp ++++ b/sources/pyside2/libpyside/pysidesignal.cpp +@@ -670,8 +670,8 @@ void updateSourceObject(PyObject *source) + Py_ssize_t pos = 0; + PyObject *value; + PyObject *key; +- +- while (PyDict_Next(objType->tp_dict, &pos, &key, &value)) { ++ Shiboken::AutoDecRef tpDict(PepType_GetDict(objType)); ++ while (PyDict_Next(tpDict, &pos, &key, &value)) { + if (PyObject_TypeCheck(value, PySideSignalTypeF())) { + Shiboken::AutoDecRef signalInstance(reinterpret_cast<PyObject *>(PyObject_New(PySideSignalInstance, PySideSignalInstanceTypeF()))); + instanceInitialize(signalInstance.cast<PySideSignalInstance *>(), key, reinterpret_cast<PySideSignal *>(value), source, 0); +diff --git a/sources/pyside2/tests/QtWidgets/bug_662.py b/sources/pyside2/tests/QtWidgets/bug_662.py +index 7fb97de..ec0e6f9 100644 +--- a/sources/pyside2/tests/QtWidgets/bug_662.py ++++ b/sources/pyside2/tests/QtWidgets/bug_662.py +@@ -40,7 +40,8 @@ from PySide2.QtWidgets import QTextEdit, QApplication + import sys + + class testQTextBlock(unittest.TestCase): +- def tesIterator(self): ++ ++ def testIterator(self): + edit = QTextEdit() + cursor = edit.textCursor() + fmt = QTextCharFormat() +diff --git a/sources/pyside2/tests/signals/bug_79.py b/sources/pyside2/tests/signals/bug_79.py +index ca25fb3..b70c8c5 100644 +--- a/sources/pyside2/tests/signals/bug_79.py ++++ b/sources/pyside2/tests/signals/bug_79.py +@@ -60,6 +60,11 @@ class ConnectTest(unittest.TestCase): + gc.collect() + # if this is no debug build, then we check at least that + # we do not crash any longer. ++ for idx in range(200): ++ # PYSIDE-2230: Warm-up is necessary before measuring, because ++ # the code changes the constant parts after some time. ++ o.selectionModel().destroyed.connect(self.callback) ++ o.selectionModel().destroyed.disconnect(self.callback) + if not skiptest: + total = gettotalrefcount() + for idx in range(1000): +diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp +index d12dae3..fed2716 100644 +--- a/sources/shiboken2/libshiboken/pep384impl.cpp ++++ b/sources/shiboken2/libshiboken/pep384impl.cpp +@@ -810,6 +810,39 @@ init_PepRuntime() + PepRuntime_38_flag = 1; + } + ++#ifdef Py_LIMITED_API ++static PyObject *emulatePyType_GetDict(PyTypeObject *type) ++{ ++ if (_PepRuntimeVersion() < 0x030C00 || type->tp_dict) { ++ auto *res = type->tp_dict; ++ Py_XINCREF(res); ++ return res; ++ } ++ // PYSIDE-2230: Here we are really cheating. We don't know how to ++ // access an internal dict, and so we simply pretend ++ // it were an empty dict. This works great for our types. ++ // This was an unexpectedly simple solution :D ++ return PyDict_New(); ++} ++#endif ++ ++// PyType_GetDict: replacement for <static type>.tp_dict, which is ++// zero for builtin types since 3.12. ++PyObject *PepType_GetDict(PyTypeObject *type) ++{ ++#if !defined(Py_LIMITED_API) ++# if PY_VERSION_HEX >= 0x030C0000 ++ return PyType_GetDict(type); ++# else ++ // pre 3.12 fallback code, mimicking the addref-behavior. ++ Py_XINCREF(type->tp_dict); ++ return type->tp_dict; ++# endif ++#else ++ return emulatePyType_GetDict(type); ++#endif // Py_LIMITED_API ++} ++ + /***************************************************************************** + * + * Module Initialization +diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h +index a870d6b..440784e 100644 +--- a/sources/shiboken2/libshiboken/pep384impl.h ++++ b/sources/shiboken2/libshiboken/pep384impl.h +@@ -567,6 +567,14 @@ extern LIBSHIBOKEN_API PyObject *PepMapping_Items(PyObject *o); + + extern LIBSHIBOKEN_API int PepRuntime_38_flag; + ++/***************************************************************************** ++ * ++ * Runtime support for Python 3.12 incompatibility ++ * ++ */ ++ ++LIBSHIBOKEN_API PyObject *PepType_GetDict(PyTypeObject *type); ++ + /***************************************************************************** + * + * Module Initialization +diff --git a/sources/shiboken2/libshiboken/signature/signature.cpp b/sources/shiboken2/libshiboken/signature/signature.cpp +index 191af3d..f817e47 100644 +--- a/sources/shiboken2/libshiboken/signature/signature.cpp ++++ b/sources/shiboken2/libshiboken/signature/signature.cpp +@@ -482,7 +482,7 @@ static PyObject *adjustFuncName(const char *func_name) + + // Find the feature flags + auto type = reinterpret_cast<PyTypeObject *>(obtype.object()); +- auto dict = type->tp_dict; ++ AutoDecRef dict(PepType_GetDict(type)); + int id = SbkObjectType_GetReserved(type); + id = id < 0 ? 0 : id; // if undefined, set to zero + auto lower = id & 0x01; +diff --git a/sources/shiboken2/libshiboken/signature/signature_helper.cpp b/sources/shiboken2/libshiboken/signature/signature_helper.cpp +index 0246ec6..05eaa14 100644 +--- a/sources/shiboken2/libshiboken/signature/signature_helper.cpp ++++ b/sources/shiboken2/libshiboken/signature/signature_helper.cpp +@@ -105,7 +105,8 @@ int add_more_getsets(PyTypeObject *type, PyGetSetDef *gsp, PyObject **doc_descr) + */ + assert(PyType_Check(type)); + PyType_Ready(type); +- PyObject *dict = type->tp_dict; ++ AutoDecRef tpDict(PepType_GetDict(type)); ++ auto *dict = tpDict.object(); + for (; gsp->name != nullptr; gsp++) { + PyObject *have_descr = PyDict_GetItemString(dict, gsp->name); + if (have_descr != nullptr) { +@@ -346,7 +347,8 @@ static int _build_func_to_type(PyObject *obtype) + * We also check for hidden methods, see below. + */ + auto *type = reinterpret_cast<PyTypeObject *>(obtype); +- PyObject *dict = type->tp_dict; ++ AutoDecRef tpDict(PepType_GetDict(type)); ++ auto *dict = tpDict.object(); + PyMethodDef *meth = type->tp_methods; + + if (meth == nullptr) +diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py +index 47ab89a..3e1266c 100644 +--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py ++++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/errorhandler.py +@@ -113,6 +113,12 @@ def seterror_argument(args, func_name, info): + msg = "{func_name}(): {info}".format(**locals()) + err = AttributeError + return err, msg ++ if isinstance(info, Exception): ++ # PYSIDE-2230: Python 3.12 seems to always do normalization. ++ err = type(info) ++ info = info.args[0] ++ msg = f"{func_name}(): {info}" ++ return err, msg + if info and type(info) is dict: + keyword = tuple(info)[0] + msg = "{func_name}(): unsupported keyword '{keyword}'".format(**locals()) +diff --git a/sources/shiboken2/tests/samplebinding/enum_test.py b/sources/shiboken2/tests/samplebinding/enum_test.py +index 0beb720..f2606a4 100644 +--- a/sources/shiboken2/tests/samplebinding/enum_test.py ++++ b/sources/shiboken2/tests/samplebinding/enum_test.py +@@ -95,7 +95,7 @@ class EnumTest(unittest.TestCase): + + def testEnumConstructorWithTooManyParameters(self): + '''Calling the constructor of non-extensible enum with the wrong number of parameters.''' +- self.assertRaises(TypeError, SampleNamespace.InValue, 13, 14) ++ self.assertRaises((TypeError, ValueError), SampleNamespace.InValue, 13, 14) + + def testEnumConstructorWithNonNumberParameter(self): + '''Calling the constructor of non-extensible enum with a string.''' + diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index aa92b81e2dde7..d66ef9a52257b 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -1,7 +1,6 @@ { python, pythonAtLeast, - disabledIf, fetchurl, lib, stdenv, @@ -13,18 +12,51 @@ }: stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.11"; + version = "5.15.14"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "sha256-2lZ807eFTSegtK/j6J3osvmLem1XOTvlbx/BP3cPryk="; + hash = "sha256-MmURlPamt7zkLwTmixQBrSCH5HiaTI8/uGSehhicY3I="; }; - patches = [ ./dont_ignore_optional_modules.patch ]; + patches = [ + ./nix_compile_cflags.patch + ./Final-details-to-enable-3.12-wheel-compatibility.patch + ./Python-3.12-Fix-the-structure-of-class-property.patch + ./Support-running-PySide-on-Python-3.12.patch + ./shiboken2-clang-Fix-and-simplify-resolveType-helper.patch + ./shiboken2-clang-Fix-build-with-clang-16.patch + ./shiboken2-clang-Fix-clashes-between-type-name-and-enumera.patch + ./shiboken2-clang-Record-scope-resolution-of-arguments-func.patch + ./shiboken2-clang-Remove-typedef-expansion.patch + ./shiboken2-clang-Suppress-class-scope-look-up-for-paramete.patch + ./shiboken2-clang-Write-scope-resolution-for-all-parameters.patch + ./dont_ignore_optional_modules.patch + ./Modify-sendCommand-signatures.patch + ]; - postPatch = '' - cd sources/pyside2 - ''; + postPatch = + (lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace \ + ez_setup.py \ + build_scripts/main.py \ + build_scripts/options.py \ + build_scripts/utils.py \ + build_scripts/wheel_override.py \ + build_scripts/wheel_utils.py \ + sources/pyside2/CMakeLists.txt \ + --replace-fail "from distutils" "import setuptools; from distutils" + substituteInPlace \ + build_scripts/config.py \ + build_scripts/main.py \ + build_scripts/options.py \ + build_scripts/setup_runner.py \ + build_scripts/utils.py \ + --replace-fail "import distutils" "import setuptools; import distutils" + '') + + '' + cd sources/pyside2 + ''; cmakeFlags = [ "-DBUILD_TESTS=OFF" @@ -38,6 +70,7 @@ stdenv.mkDerivation rec { ninja qt5.qmake python + python.pkgs.setuptools ]; buildInputs = @@ -79,5 +112,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyside2/nix_compile_cflags.patch b/pkgs/development/python-modules/pyside2/nix_compile_cflags.patch new file mode 100644 index 0000000000000..02f17c09a8883 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/nix_compile_cflags.patch @@ -0,0 +1,23 @@ +diff --git a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +index add278a..2626eb6 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +@@ -349,11 +349,15 @@ QByteArrayList emulatedCompilerOptions() + + // Append the c++ include paths since Clang is unable to find + // <type_traits> etc (g++ 11.3). +- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); ++ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); + for (const HeaderPath &h : gppPaths) { +- if (h.path.contains("c++") +- || h.path.contains("sysroot")) { // centOS ++ // PySide2 requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ if (!h.path.contains("-qt")) { ++ // add using -isystem + headerPaths.append(h); ++ } else { ++ headerPaths.append({h.path, HeaderType::Standard}); + } + } + #else diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-and-simplify-resolveType-helper.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-and-simplify-resolveType-helper.patch new file mode 100644 index 0000000000000..304cff91a86d8 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-and-simplify-resolveType-helper.patch @@ -0,0 +1,88 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Tue, 25 Apr 2023 10:00:39 +0200 +Subject: shiboken2/clang: Fix and simplify resolveType() helper + +The function had a bug which only manifested with clang 16: +"type" should have been assigned the type of the cursor +obtained from clang_getTypeDeclaration(). With this, the complicated +lookup code in getBaseClass() can be removed. + +Task-number: PYSIDE-2288 +Pick-to: 6.5 +Change-Id: I861e30451b3f4af2ec0c2e4ffa4179a429854533 +Reviewed-by: Christian Tismer <tismer@stackless.com> +Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> +--- + .../ApiExtractor/clangparser/clangbuilder.cpp | 39 ++++++++++------------ + 1 file changed, 18 insertions(+), 21 deletions(-) + +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +index e8e5bcf..1b4c81c 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +@@ -627,6 +627,9 @@ long clang_EnumDecl_isScoped4(BaseVisitor *bv, const CXCursor &cursor) + #endif // CLANG_NO_ENUMDECL_ISSCOPED + + // Resolve declaration and type of a base class ++// Note: TypeAliasTemplateDecl ("using QVector<T>=QList<T>") is automatically ++// resolved by clang_getTypeDeclaration(), but it stops at ++// TypeAliasDecl / TypedefDecl. + + struct TypeDeclaration + { +@@ -634,19 +637,23 @@ struct TypeDeclaration + CXCursor declaration; + }; + ++static inline bool isTypeAliasDecl(const CXCursor &cursor) ++{ ++ const auto kind = clang_getCursorKind(cursor); ++ return kind == CXCursor_TypeAliasDecl || kind == CXCursor_TypedefDecl; ++} ++ + static TypeDeclaration resolveBaseSpecifier(const CXCursor &cursor) + { + Q_ASSERT(clang_getCursorKind(cursor) == CXCursor_CXXBaseSpecifier); + CXType inheritedType = clang_getCursorType(cursor); + CXCursor decl = clang_getTypeDeclaration(inheritedType); +- if (inheritedType.kind != CXType_Unexposed) { +- while (true) { +- auto kind = clang_getCursorKind(decl); +- if (kind != CXCursor_TypeAliasDecl && kind != CXCursor_TypedefDecl) +- break; +- inheritedType = clang_getTypedefDeclUnderlyingType(decl); +- decl = clang_getTypeDeclaration(inheritedType); +- } ++ auto resolvedType = clang_getCursorType(decl); ++ if (resolvedType.kind != CXType_Invalid && resolvedType.kind != inheritedType.kind) ++ inheritedType = resolvedType; ++ while (isTypeAliasDecl(decl)) { ++ inheritedType = clang_getTypedefDeclUnderlyingType(decl); ++ decl = clang_getTypeDeclaration(inheritedType); + } + return {inheritedType, decl}; + } +@@ -656,20 +663,10 @@ void BuilderPrivate::addBaseClass(const CXCursor &cursor) + { + Q_ASSERT(clang_getCursorKind(cursor) == CXCursor_CXXBaseSpecifier); + // Note: spelling has "struct baseClass", use type +- QString baseClassName; + const auto decl = resolveBaseSpecifier(cursor); +- if (decl.type.kind == CXType_Unexposed) { +- // The type is unexposed when the base class is a template type alias: +- // "class QItemSelection : public QList<X>" where QList is aliased to QVector. +- // Try to resolve via code model. +- TypeInfo info = createTypeInfo(decl.type); +- auto parentScope = m_scopeStack.at(m_scopeStack.size() - 2); // Current is class. +- auto resolved = TypeInfo::resolveType(info, parentScope); +- if (resolved != info) +- baseClassName = resolved.toString(); +- } +- if (baseClassName.isEmpty()) +- baseClassName = getTypeName(decl.type); ++ QString baseClassName = getTypeName(decl.type); ++ if (baseClassName.startsWith(u"std::")) // Simplify "std::" types ++ baseClassName = createTypeInfo(decl.type).toString(); + + auto it = m_cursorClassHash.constFind(decl.declaration); + const CodeModel::AccessPolicy access = accessPolicy(clang_getCXXAccessSpecifier(cursor)); diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-build-with-clang-16.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-build-with-clang-16.patch new file mode 100644 index 0000000000000..b07cc33526f76 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-build-with-clang-16.patch @@ -0,0 +1,108 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Tue, 25 Apr 2023 14:01:45 +0200 +Subject: shiboken2/clang: Fix build with clang 16 + +clang 16 returns more elaborated types instead of fully qualified type +names. Qualify elaborated types when retrieving the type name. + +[ChangeLog][shiboken6] Support for libclang version 16 has been added. + +Task-number: PYSIDE-2288 +Pick-to: 6.5 5.15 +Change-Id: Ibd428280180967f11d82a72159e744c016afc927 +Reviewed-by: Christian Tismer <tismer@stackless.com> +(cherry picked from commit 44ef1859214c66861a251d4a0faf5c38dc050850) +--- + .../ApiExtractor/clangparser/clangbuilder.cpp | 2 +- + .../ApiExtractor/clangparser/clangutils.cpp | 23 ++++++++++++++++++++++ + .../ApiExtractor/clangparser/clangutils.h | 1 + + .../shiboken2/ApiExtractor/tests/testtemplates.cpp | 3 +-- + 4 files changed, 26 insertions(+), 3 deletions(-) + +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +index 332f1da..ed1e15d 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +@@ -524,7 +524,7 @@ TypeInfo BuilderPrivate::createTypeInfoHelper(const CXType &type) const + typeInfo.setConstant(clang_isConstQualifiedType(nestedType) != 0); + typeInfo.setVolatile(clang_isVolatileQualifiedType(nestedType) != 0); + +- QString typeName = getTypeName(nestedType); ++ QString typeName = getResolvedTypeName(nestedType); + while (TypeInfo::stripLeadingConst(&typeName) + || TypeInfo::stripLeadingVolatile(&typeName)) { + } +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp +index 57271ef..295ede3 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp +@@ -130,6 +130,23 @@ QString getCursorDisplayName(const CXCursor &cursor) + return result; + } + ++static inline bool isBuiltinType(CXTypeKind kind) ++{ ++ return kind >= CXType_FirstBuiltin && kind <= CXType_LastBuiltin; ++} ++ ++// Resolve elaborated types occurring with clang 16 ++static CXType resolveType(const CXType &type) ++{ ++ if (!isBuiltinType(type.kind)) { ++ CXCursor decl = clang_getTypeDeclaration(type); ++ auto resolvedType = clang_getCursorType(decl); ++ if (resolvedType.kind != CXType_Invalid && resolvedType.kind != type.kind) ++ return resolvedType; ++ } ++ return type; ++} ++ + QString getTypeName(const CXType &type) + { + CXString typeSpelling = clang_getTypeSpelling(type); +@@ -138,6 +155,12 @@ QString getTypeName(const CXType &type) + return result; + } + ++// Resolve elaborated types occurring with clang 16 ++QString getResolvedTypeName(const CXType &type) ++{ ++ return getTypeName(resolveType(type)); ++} ++ + Diagnostic::Diagnostic(const QString &m, const CXCursor &c, CXDiagnosticSeverity s) + : message(m), source(Other), severity(s) + { +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h b/sources/shiboken2/ApiExtractor/clangparser/clangutils.h +index f7c230a..aacaf63 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangutils.h +@@ -52,6 +52,7 @@ QString getCursorKindName(CXCursorKind cursorKind); + QString getCursorSpelling(const CXCursor &cursor); + QString getCursorDisplayName(const CXCursor &cursor); + QString getTypeName(const CXType &type); ++QString getResolvedTypeName(const CXType &type); + inline QString getCursorTypeName(const CXCursor &cursor) + { return getTypeName(clang_getCursorType(cursor)); } + inline QString getCursorResultTypeName(const CXCursor &cursor) +diff --git a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp +index 9f929c4..fbc5c4c 100644 +--- a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp ++++ b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp +@@ -236,7 +236,6 @@ struct List { + const AbstractMetaFunction *erase = list->findFunction(QStringLiteral("erase")); + QVERIFY(erase); + QCOMPARE(erase->arguments().size(), 1); +- QEXPECT_FAIL("", "Clang: Some other code changes the parameter type", Abort); + QCOMPARE(erase->arguments().at(0)->type()->cppSignature(), QLatin1String("List::Iterator")); + } + +@@ -389,7 +388,7 @@ typedef BaseTemplateClass<TypeOne> TypeOneClass; + const ComplexTypeEntry* oneType = one->typeEntry(); + const ComplexTypeEntry* baseType = base->typeEntry(); + QCOMPARE(oneType->baseContainerType(), baseType); +- QCOMPARE(one->baseClassNames(), QStringList(QLatin1String("BaseTemplateClass<TypeOne>"))); ++ QCOMPARE(one->baseClassNames(), QStringList(QLatin1String("NSpace::BaseTemplateClass<NSpace::TypeOne>"))); + + QVERIFY(one->hasTemplateBaseClassInstantiations()); + AbstractMetaTypeList instantiations = one->templateBaseClassInstantiations(); diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-clashes-between-type-name-and-enumera.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-clashes-between-type-name-and-enumera.patch new file mode 100644 index 0000000000000..62de5a1531ee0 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Fix-clashes-between-type-name-and-enumera.patch @@ -0,0 +1,92 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Tue, 25 Apr 2023 15:30:30 +0200 +Subject: shiboken2/clang: Fix clashes between type name and enumeration + values + +Remove all constant and enum value type entries found in the type lookup +unless it is looking for template arguments; where it may be a +non-type template argument. + +Task-number: PYSIDE-2288 +Pick-to: 6.5 5.15 +Change-Id: If0609ce0d0223f551ed6dee1d1e0ea3ef49d6917 +Reviewed-by: Christian Tismer <tismer@stackless.com> +(cherry picked from commit e22f717153a5e9855531f45c0bf82ff2461a3f7e) +--- + .../shiboken2/ApiExtractor/abstractmetabuilder.cpp | 21 +++++++++++++++++++-- + .../shiboken2/ApiExtractor/abstractmetabuilder.h | 3 ++- + .../shiboken2/ApiExtractor/typesystem_typedefs.h | 1 + + 3 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +index 5a413ec..2f34e16 100644 +--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp ++++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +@@ -2144,6 +2144,13 @@ static bool isNumber(const QString &s) + [](QChar c) { return c.isDigit(); }); + } + ++// A type entry relevant only for non type template "X<5>" ++static bool isNonTypeTemplateArgument(const TypeEntryCPtr &te) ++{ ++ const auto type = te->type(); ++ return type == TypeEntry::EnumValue || type == TypeEntry::ConstantValueType; ++} ++ + AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo &_typei, + AbstractMetaClass *currentClass, + AbstractMetaBuilderPrivate *d, +@@ -2271,7 +2278,15 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo + typeInfo.clearInstantiations(); + } + +- const TypeEntries types = findTypeEntries(qualifiedName, name, currentClass, d); ++ TypeEntries types = findTypeEntries(qualifiedName, name, currentClass, d); ++ if (!flags.testFlag(AbstractMetaBuilder::TemplateArgument)) { ++ // Avoid clashes between QByteArray and enum value QMetaType::QByteArray ++ // unless we are looking for template arguments. ++ auto end = std::remove_if(types.begin(), types.end(), ++ isNonTypeTemplateArgument); ++ types.erase(end, types.end()); ++ } ++ + if (types.isEmpty()) { + if (errorMessageIn) { + *errorMessageIn = +@@ -2293,7 +2308,9 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo + const auto &templateArguments = typeInfo.instantiations(); + for (int t = 0, size = templateArguments.size(); t < size; ++t) { + const TypeInfo &ti = templateArguments.at(t); +- AbstractMetaType *targType = translateTypeStatic(ti, currentClass, d, flags, &errorMessage); ++ AbstractMetaType *targType = translateTypeStatic(ti, currentClass, d, ++ flags | AbstractMetaBuilder::TemplateArgument, ++ &errorMessage); + // For non-type template parameters, create a dummy type entry on the fly + // as is done for classes. + if (!targType) { +diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h +index d2dc080..8916eaf 100644 +--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h ++++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h +@@ -93,7 +93,8 @@ public: + void setSkipDeprecated(bool value); + + enum TranslateTypeFlag { +- DontResolveType = 0x1 ++ DontResolveType = 0x1, ++ TemplateArgument = 0x2 + }; + Q_DECLARE_FLAGS(TranslateTypeFlags, TranslateTypeFlag); + +diff --git a/sources/shiboken2/ApiExtractor/typesystem_typedefs.h b/sources/shiboken2/ApiExtractor/typesystem_typedefs.h +index 73f92b2..5dcc65c 100644 +--- a/sources/shiboken2/ApiExtractor/typesystem_typedefs.h ++++ b/sources/shiboken2/ApiExtractor/typesystem_typedefs.h +@@ -48,6 +48,7 @@ using CodeSnipList = QVector<CodeSnip>; + using DocModificationList = QVector<DocModification>; + using FieldModificationList = QVector<FieldModification>; + using FunctionModificationList = QVector<FunctionModification>; ++using TypeEntryCPtr = const TypeEntry *; + using TypeEntries = QVector<const TypeEntry *>; + + #endif // TYPESYSTEM_TYPEDEFS_H diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch new file mode 100644 index 0000000000000..f5b1fc0da31c5 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Record-scope-resolution-of-arguments-func.patch @@ -0,0 +1,178 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Thu, 27 Apr 2023 12:44:10 +0200 +Subject: shiboken2/clang: Record scope resolution of arguments/function + return + +Add a flag indicating whether a type was specified with a leading "::" +(scope resolution). Such parameters previously caused the function to +rejected due to the "::TypeName" not being found. The type resolution +added for clang 16 strips these qualifiers though, so, the information +needs to be stored. + +Task-number: PYSIDE-2288 +Pick-to: 6.5 5.15 +Change-Id: I27d27c94ec43bcc4cb3b79e6e9ce6706c749a1e9 +Reviewed-by: Christian Tismer <tismer@stackless.com> +(cherry picked from commit 075d8ad4660f05e6d2583ff1c05e9987ad624bfe) +--- + .../ApiExtractor/clangparser/clangbuilder.cpp | 8 ++++++-- + .../ApiExtractor/clangparser/clangutils.cpp | 11 ++++++++++ + .../ApiExtractor/clangparser/clangutils.h | 1 + + .../shiboken2/ApiExtractor/parser/codemodel.cpp | 24 ++++++++++++++++++++++ + sources/shiboken2/ApiExtractor/parser/codemodel.h | 8 ++++++++ + 5 files changed, 50 insertions(+), 2 deletions(-) + +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +index ed1e15d..1b5cc5c 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +@@ -294,7 +294,9 @@ FunctionModelItem BuilderPrivate::createFunction(const CXCursor &cursor, + name = fixTypeName(name); + FunctionModelItem result(new _FunctionModelItem(m_model, name)); + setFileName(cursor, result.data()); +- result->setType(createTypeInfoHelper(clang_getCursorResultType(cursor))); ++ const auto type = clang_getCursorResultType(cursor); ++ result->setType(createTypeInfoHelper(type)); ++ result->setScopeResolution(hasScopeResolution(type)); + result->setFunctionType(t); + result->setScope(m_scope); + result->setStatic(clang_Cursor_getStorageClass(cursor) == CX_SC_Static); +@@ -1031,7 +1033,9 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor) + if (d->m_currentArgument.isNull() && !d->m_currentFunction.isNull()) { + const QString name = getCursorSpelling(cursor); + d->m_currentArgument.reset(new _ArgumentModelItem(d->m_model, name)); +- d->m_currentArgument->setType(d->createTypeInfo(cursor)); ++ const auto type = clang_getCursorType(cursor); ++ d->m_currentArgument->setScopeResolution(hasScopeResolution(type)); ++ d->m_currentArgument->setType(d->createTypeInfo(type)); + d->m_currentFunction->addArgument(d->m_currentArgument); + QString defaultValueExpression = d->cursorValueExpression(this, cursor); + if (!defaultValueExpression.isEmpty()) { +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp +index 295ede3..ec6d228 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangutils.cpp +@@ -155,6 +155,17 @@ QString getTypeName(const CXType &type) + return result; + } + ++// Quick check for "::Type" ++bool hasScopeResolution(const CXType &type) ++{ ++ CXString typeSpelling = clang_getTypeSpelling(type); ++ const QString spelling = QString::fromUtf8(clang_getCString(typeSpelling)); ++ const bool result = spelling.startsWith(QLatin1String("::")) ++ || spelling.contains(QLatin1String(" ::")); ++ clang_disposeString(typeSpelling); ++ return result; ++} ++ + // Resolve elaborated types occurring with clang 16 + QString getResolvedTypeName(const CXType &type) + { +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h b/sources/shiboken2/ApiExtractor/clangparser/clangutils.h +index aacaf63..33f362c 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangutils.h ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangutils.h +@@ -52,6 +52,7 @@ QString getCursorKindName(CXCursorKind cursorKind); + QString getCursorSpelling(const CXCursor &cursor); + QString getCursorDisplayName(const CXCursor &cursor); + QString getTypeName(const CXType &type); ++bool hasScopeResolution(const CXType &type); + QString getResolvedTypeName(const CXType &type); + inline QString getCursorTypeName(const CXCursor &cursor) + { return getTypeName(clang_getCursorType(cursor)); } +diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp +index dea0812..ba07a01 100644 +--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp ++++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp +@@ -1121,11 +1121,23 @@ void _ArgumentModelItem::setDefaultValue(bool defaultValue) + m_defaultValue = defaultValue; + } + ++bool _ArgumentModelItem::scopeResolution() const ++{ ++ return m_scopeResolution; ++} ++ ++void _ArgumentModelItem::setScopeResolution(bool v) ++{ ++ m_scopeResolution = v; ++} ++ + #ifndef QT_NO_DEBUG_STREAM + void _ArgumentModelItem::formatDebug(QDebug &d) const + { + _CodeModelItem::formatDebug(d); + d << ", type=" << m_type; ++ if (m_scopeResolution) ++ d << ", [m_scope resolution]"; + if (m_defaultValue) + d << ", defaultValue=\"" << m_defaultValueExpression << '"'; + } +@@ -1200,6 +1212,16 @@ void _FunctionModelItem::setVariadics(bool isVariadics) + m_isVariadics = isVariadics; + } + ++bool _FunctionModelItem::scopeResolution() const ++{ ++ return m_scopeResolution; ++} ++ ++void _FunctionModelItem::setScopeResolution(bool v) ++{ ++ m_scopeResolution = v; ++} ++ + bool _FunctionModelItem::isNoExcept() const + { + return m_exceptionSpecification == ExceptionSpecification::NoExcept; +@@ -1343,6 +1365,8 @@ void _FunctionModelItem::formatDebug(QDebug &d) const + d << " [explicit]"; + if (m_isInvokable) + d << " [invokable]"; ++ if (m_scopeResolution) ++ d << " [scope resolution]"; + formatModelItemList(d, ", arguments=", m_arguments); + if (m_isVariadics) + d << ",..."; +diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h +index b990ad9..85f298c 100644 +--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h ++++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h +@@ -499,6 +499,10 @@ public: + QString defaultValueExpression() const { return m_defaultValueExpression; } + void setDefaultValueExpression(const QString &expr) { m_defaultValueExpression = expr; } + ++ // Argument type has scope resolution "::ArgumentType" ++ bool scopeResolution() const; ++ void setScopeResolution(bool v); ++ + #ifndef QT_NO_DEBUG_STREAM + void formatDebug(QDebug &d) const override; + #endif +@@ -507,6 +511,7 @@ private: + TypeInfo m_type; + QString m_defaultValueExpression; + bool m_defaultValue = false; ++ bool m_scopeResolution = false; + }; + + class _MemberModelItem: public _CodeModelItem +@@ -623,6 +628,8 @@ public: + bool isVariadics() const; + void setVariadics(bool isVariadics); + ++ bool scopeResolution() const; // Return type has scope resolution "::ReturnType" ++ void setScopeResolution(bool v); + + bool isSimilar(const FunctionModelItem &other) const; + +@@ -652,6 +659,7 @@ private: + uint m_isExplicit: 1; + uint m_isVariadics: 1; + uint m_isInvokable : 1; // Qt ++ uint m_scopeResolution: 1; + }; + uint m_flags; + }; diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Remove-typedef-expansion.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Remove-typedef-expansion.patch new file mode 100644 index 0000000000000..142641173639a --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Remove-typedef-expansion.patch @@ -0,0 +1,101 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Thu, 20 Apr 2023 11:16:15 +0200 +Subject: shiboken2/clang: Remove typedef expansion + +The functionality will be re-added by a subsequent change +expanding elaborated types. + +Task-number: PYSIDE-2288 +Pick-to: 6.5 5.15 +Change-Id: I3245c6dccba7de0ed1ce0e7820e1edb4567ca3c2 +Reviewed-by: Christian Tismer <tismer@stackless.com> +(cherry picked from commit 24742dca014109bd3c2a9775fc15ca306ab22c9c) +--- + .../ApiExtractor/clangparser/clangbuilder.cpp | 39 ---------------------- + 1 file changed, 39 deletions(-) + +diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +index 1b4c81c..332f1da 100644 +--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +@@ -140,7 +140,6 @@ static bool isSigned(CXTypeKind kind) + class BuilderPrivate { + public: + using CursorClassHash = QHash<CXCursor, ClassModelItem>; +- using CursorTypedefHash = QHash<CXCursor, TypeDefModelItem>; + using TypeInfoHash = QHash<CXType, TypeInfo>; + + explicit BuilderPrivate(BaseVisitor *bv) : m_baseVisitor(bv), m_model(new CodeModel) +@@ -197,9 +196,6 @@ public: + QString cursorValueExpression(BaseVisitor *bv, const CXCursor &cursor) const; + void addBaseClass(const CXCursor &cursor); + +- template <class Item> +- void qualifyTypeDef(const CXCursor &typeRefCursor, const QSharedPointer<Item> &item) const; +- + bool visitHeader(const char *cFileName) const; + + void setFileName(const CXCursor &cursor, _CodeModelItem *item); +@@ -213,7 +209,6 @@ public: + // classes can be correctly parented in case of forward-declared inner classes + // (QMetaObject::Connection) + CursorClassHash m_cursorClassHash; +- CursorTypedefHash m_cursorTypedefHash; + + mutable TypeInfoHash m_typeInfoHash; // Cache type information + mutable QHash<QString, TemplateTypeAliasModelItem> m_templateTypeAliases; +@@ -561,7 +556,6 @@ void BuilderPrivate::addTypeDef(const CXCursor &cursor, const CXType &cxType) + item->setType(createTypeInfo(cxType)); + item->setScope(m_scope); + m_scopeStack.back()->addTypeDef(item); +- m_cursorTypedefHash.insert(cursor, item); + } + + void BuilderPrivate::startTemplateTypeAlias(const CXCursor &cursor) +@@ -703,31 +697,6 @@ static inline CXCursor definitionFromTypeRef(const CXCursor &typeRefCursor) + return clang_getTypeDeclaration(clang_getCursorType(typeRefCursor)); + } + +-// Qualify function arguments or fields that are typedef'ed from another scope: +-// enum ConversionFlag {}; +-// typedef QFlags<ConversionFlag> ConversionFlags; +-// class QTextCodec { +-// enum ConversionFlag {}; +-// typedef QFlags<ConversionFlag> ConversionFlags; +-// struct ConverterState { +-// explicit ConverterState(ConversionFlags); +-// ^^ qualify to QTextCodec::ConversionFlags +-// ConversionFlags m_flags; +-// ^^ ditto +- +-template <class Item> // ArgumentModelItem, VariableModelItem +-void BuilderPrivate::qualifyTypeDef(const CXCursor &typeRefCursor, const QSharedPointer<Item> &item) const +-{ +- TypeInfo type = item->type(); +- if (type.qualifiedName().size() == 1) { // item's type is unqualified. +- const auto it = m_cursorTypedefHash.constFind(definitionFromTypeRef(typeRefCursor)); +- if (it != m_cursorTypedefHash.constEnd() && !it.value()->scope().isEmpty()) { +- type.setQualifiedName(it.value()->scope() + type.qualifiedName()); +- item->setType(type); +- } +- } +-} +- + void BuilderPrivate::setFileName(const CXCursor &cursor, _CodeModelItem *item) + { + const SourceRange range = getCursorRange(cursor); +@@ -1120,14 +1089,6 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor) + } + break; + case CXCursor_TypeRef: +- if (!d->m_currentFunction.isNull()) { +- if (d->m_currentArgument.isNull()) +- d->qualifyTypeDef(cursor, d->m_currentFunction); // return type +- else +- d->qualifyTypeDef(cursor, d->m_currentArgument); +- } else if (!d->m_currentField.isNull()) { +- d->qualifyTypeDef(cursor, d->m_currentField); +- } + break; + case CXCursor_CXXFinalAttr: + if (!d->m_currentFunction.isNull()) diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Suppress-class-scope-look-up-for-paramete.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Suppress-class-scope-look-up-for-paramete.patch new file mode 100644 index 0000000000000..db9791a981594 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Suppress-class-scope-look-up-for-paramete.patch @@ -0,0 +1,96 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Thu, 27 Apr 2023 13:00:37 +0200 +Subject: shiboken2/clang: Suppress class scope look up for parameters with + scope resolution + +Add a flag to AbstractMetaBuilderPrivate::findTypeEntriesHelper() +to suppress the class scope look in case scope resolution. + +Task-number: PYSIDE-2288 +Pick-to: 6.5 5.15 +Change-Id: I04a4810d03845fb48393c5efed3641220bd12d87 +Reviewed-by: Christian Tismer <tismer@stackless.com> +--- + sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 16 ++++++++++++---- + sources/shiboken2/ApiExtractor/abstractmetabuilder.h | 3 ++- + sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h | 1 + + 3 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +index 2f34e16..4bf4ab4 100644 +--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp ++++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +@@ -1845,7 +1845,10 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio + return nullptr; + } + +- AbstractMetaType *type = translateType(returnType, currentClass, {}, &errorMessage); ++ TranslateTypeFlags flags; ++ if (functionItem->scopeResolution()) ++ flags.setFlag(AbstractMetaBuilder::NoClassScopeLookup); ++ AbstractMetaType *type = translateType(returnType, currentClass, flags, &errorMessage); + if (!type) { + const QString reason = msgUnmatchedReturnType(functionItem, errorMessage); + qCWarning(lcShiboken, "%s", +@@ -1880,7 +1883,10 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio + return nullptr; + } + +- AbstractMetaType *metaType = translateType(arg->type(), currentClass, {}, &errorMessage); ++ TranslateTypeFlags flags; ++ if (arg->scopeResolution()) ++ flags.setFlag(AbstractMetaBuilder::NoClassScopeLookup); ++ AbstractMetaType *metaType = translateType(arg->type(), currentClass, flags, &errorMessage); + if (!metaType) { + // If an invalid argument has a default value, simply remove it + // unless the function is virtual (since the override in the +@@ -2073,11 +2079,13 @@ static const TypeEntry* findTypeEntryUsingContext(const AbstractMetaClass* metaC + // Helper for translateTypeStatic() + TypeEntries AbstractMetaBuilderPrivate::findTypeEntries(const QString &qualifiedName, + const QString &name, ++ TranslateTypeFlags flags, + AbstractMetaClass *currentClass, + AbstractMetaBuilderPrivate *d) + { + // 5.1 - Try first using the current scope +- if (currentClass) { ++ if (currentClass != nullptr ++ && !flags.testFlag(AbstractMetaBuilder::NoClassScopeLookup)) { + if (auto type = findTypeEntryUsingContext(currentClass, qualifiedName)) + return {type}; + +@@ -2278,7 +2286,7 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo + typeInfo.clearInstantiations(); + } + +- TypeEntries types = findTypeEntries(qualifiedName, name, currentClass, d); ++ TypeEntries types = findTypeEntries(qualifiedName, name, flags, currentClass, d); + if (!flags.testFlag(AbstractMetaBuilder::TemplateArgument)) { + // Avoid clashes between QByteArray and enum value QMetaType::QByteArray + // unless we are looking for template arguments. +diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h +index 8916eaf..f333ad5 100644 +--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h ++++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h +@@ -94,7 +94,8 @@ public: + + enum TranslateTypeFlag { + DontResolveType = 0x1, +- TemplateArgument = 0x2 ++ TemplateArgument = 0x2, ++ NoClassScopeLookup = 0x4 + }; + Q_DECLARE_FLAGS(TranslateTypeFlags, TranslateTypeFlag); + +diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h +index 8468950..8ddd369 100644 +--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h ++++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h +@@ -154,6 +154,7 @@ public: + TranslateTypeFlags flags = {}, + QString *errorMessageIn = nullptr); + static TypeEntries findTypeEntries(const QString &qualifiedName, const QString &name, ++ TranslateTypeFlags flags = {}, + AbstractMetaClass *currentClass = nullptr, + AbstractMetaBuilderPrivate *d = nullptr); + diff --git a/pkgs/development/python-modules/pyside2/shiboken2-clang-Write-scope-resolution-for-all-parameters.patch b/pkgs/development/python-modules/pyside2/shiboken2-clang-Write-scope-resolution-for-all-parameters.patch new file mode 100644 index 0000000000000..b0be6fa263178 --- /dev/null +++ b/pkgs/development/python-modules/pyside2/shiboken2-clang-Write-scope-resolution-for-all-parameters.patch @@ -0,0 +1,62 @@ +From: Friedemann Kleint <Friedemann.Kleint@qt.io> +Date: Thu, 27 Apr 2023 12:18:39 +0200 +Subject: shiboken2/clang: Write scope resolution for all parameters of native + wrappers + +Make sure types are correct for cases like: + +- QtDBusHelper::QDBusReply::QDBusReply(::QDBusReply<void>) +- Qt3DInput*Event constructors taking the equivalent QtGui classes + (Qt3DInput::QMouseEvent(::QMouseEvent *); + +[ChangeLog][shiboken6] Support for parameters/function return +types with scope resolution has been improved. + +Fixes: PYSIDE-2288 +Pick-to: 6.5 5.15 +Change-Id: Id29758fceb88188f4cd834fbd5a7cc0ab511fb1a +Reviewed-by: Christian Tismer <tismer@stackless.com> +(cherry picked from commit dd863857436bbeeba4c0a1077f5ad16653296277) +--- + sources/shiboken2/generator/generator.cpp | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp +index 6028282..6147b8a 100644 +--- a/sources/shiboken2/generator/generator.cpp ++++ b/sources/shiboken2/generator/generator.cpp +@@ -899,21 +899,23 @@ QString Generator::translateType(const AbstractMetaType *cType, + if (index >= (s.size() - (constLen + 1))) // (VarType const) or (VarType const[*|&]) + s = s.remove(index, constLen); + } +- } else if (options & Generator::ExcludeConst || options & Generator::ExcludeReference) { ++ } else { + AbstractMetaType *copyType = cType->copy(); ++ if (options & Generator::ExcludeConst || options & Generator::ExcludeReference) { ++ if (options & Generator::ExcludeConst) ++ copyType->setConstant(false); + +- if (options & Generator::ExcludeConst) +- copyType->setConstant(false); +- +- if (options & Generator::ExcludeReference) +- copyType->setReferenceType(NoReference); +- ++ if (options & Generator::ExcludeReference) ++ copyType->setReferenceType(NoReference); ++ } + s = copyType->cppSignature(); +- if (!copyType->typeEntry()->isVoid() && !copyType->typeEntry()->isCppPrimitive()) +- s.prepend(QLatin1String("::")); ++ const auto te = copyType->typeEntry(); ++ if (!te->isVoid() && !te->isCppPrimitive()) { // Add scope resolution ++ const auto pos = s.indexOf(te->qualifiedCppName()); // Skip const/volatile ++ Q_ASSERT(pos >= 0); ++ s.insert(pos, QLatin1String("::")); ++ } + delete copyType; +- } else { +- s = cType->cppSignature(); + } + } + diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 79c691980ffbf..2dc0078c369a0 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -2,11 +2,55 @@ lib, stdenv, cmake, + cups, ninja, python, + pythonImportsCheckHook, moveBuildTree, shiboken6, + llvmPackages, + symlinkJoin, + libGL, + darwin, }: +let + packages = with python.pkgs.qt6; [ + # required + python.pkgs.ninja + python.pkgs.packaging + python.pkgs.setuptools + qtbase + + # optional + qt3d + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qthttpserver + qtmultimedia + qtnetworkauth + qtquick3d + qtremoteobjects + qtscxml + qtsensors + qtspeech + qtsvg + qtwebchannel + qtwebsockets + qtpositioning + qtlocation + qtshadertools + qtserialport + qtserialbus + qtgraphs + qttools + ]; + qt_linked = symlinkJoin { + name = "qt_linked"; + paths = packages; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "pyside6"; @@ -15,52 +59,55 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6"; - # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS + # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. - postPatch = lib.optionalString stdenv.isLinux '' - # Don't ignore optional Qt modules - substituteInPlace cmake/PySideHelpers.cmake \ - --replace-fail \ - 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ - 'set (found_basepath 0)' - ''; + # We therefore symLink all required and optional Qt modules in one directory tree ("qt_linked"). + # Also we remove "Designer" from darwin build, due to linking failure + postPatch = + '' + # Don't ignore optional Qt modules + substituteInPlace cmake/PySideHelpers.cmake \ + --replace-fail \ + 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ + 'set (found_basepath 0)' + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/PySideHelpers.cmake \ + --replace-fail \ + "Designer" "" + ''; + + # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds." + env = lib.optionalAttrs stdenv.isDarwin { LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; }; nativeBuildInputs = [ cmake ninja python + pythonImportsCheckHook ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; buildInputs = - with python.pkgs.qt6; - [ - # required - qtbase - python.pkgs.ninja - python.pkgs.packaging - python.pkgs.setuptools - ] - ++ lib.optionals stdenv.isLinux [ - # optional - qt3d - qtcharts - qtconnectivity - qtdatavis3d - qtdeclarative - qthttpserver - qtmultimedia - qtnetworkauth - qtquick3d - qtremoteobjects - qtscxml - qtsensors - qtspeech - qtsvg - qttools - qtwebchannel - qtwebengine - qtwebsockets - ]; + if stdenv.isLinux then + # qtwebengine fails under darwin + # see https://github.com/NixOS/nixpkgs/pull/312987 + packages ++ [ python.pkgs.qt6.qtwebengine ] + else + with darwin.apple_sdk_11_0.frameworks; + [ + qt_linked + libGL + cups + # frameworks + IOKit + DiskArbitration + CoreBluetooth + EventKit + AVFoundation + Contacts + AGL + AppKit + ]; propagatedBuildInputs = [ shiboken6 ]; @@ -74,6 +121,8 @@ stdenv.mkDerivation (finalAttrs: { cp -r PySide6.egg-info $out/${python.sitePackages}/ ''; + pythonImportsCheck = [ "PySide6" ]; + meta = { description = "Python bindings for Qt"; license = with lib.licenses; [ @@ -83,10 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - gebner - Enzime - ]; + maintainers = with lib.maintainers; [ gebner ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix index d0ec8be3b48ea..c88fb3e2befd1 100644 --- a/pkgs/development/python-modules/pysigma-backend-qradar/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -7,7 +7,6 @@ pysigma-pipeline-sysmon, pytestCheckHook, pythonOlder, - requests, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index 7d2b44a61ec28..bee85a4b2bc36 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -17,23 +17,21 @@ buildPythonPackage rec { pname = "pysilero-vad"; - version = "1.0.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pysilero-vad"; - rev = "fc1e3f74e6282249c1fd67ab0f65832ad1ce9cc5"; - hash = "sha256-5jS2xZEtvzXO/ffZzseTTUHfE528W9FvKB0AKG6T62k="; + rev = "refs/tags/v${version}"; + hash = "sha256-p0pPhQo/raZhlHettmoc7FwnlZH9n2NI4tYHvikJ8i4="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "numpy" ]; - propagatedBuildInputs = [ + dependencies = [ numpy onnxruntime ]; diff --git a/pkgs/development/python-modules/pysim/default.nix b/pkgs/development/python-modules/pysim/default.nix index ee828c0f71181..99563f726096f 100644 --- a/pkgs/development/python-modules/pysim/default.nix +++ b/pkgs/development/python-modules/pysim/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, pytestCheckHook, - pytest-asyncio, colorlog, smpp-pdu, pyscard, diff --git a/pkgs/development/python-modules/pysmartdl/default.nix b/pkgs/development/python-modules/pysmartdl/default.nix index d8920c500f93e..b131b2e3e1965 100644 --- a/pkgs/development/python-modules/pysmartdl/default.nix +++ b/pkgs/development/python-modules/pysmartdl/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Smart Download Manager for Python"; changelog = "https://github.com/iTaybb/pySmartDL/blob/${src.rev}/ChangeLog.txt"; license = licenses.unlicense; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysnmpcrypto/default.nix b/pkgs/development/python-modules/pysnmpcrypto/default.nix index 4261815d5741b..73e3ed2e17b35 100644 --- a/pkgs/development/python-modules/pysnmpcrypto/default.nix +++ b/pkgs/development/python-modules/pysnmpcrypto/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "https://github.com/etingof/pysnmpcrypto"; changelog = "https://github.com/etingof/pysnmpcrypto/blob/${version}/CHANGES.txt"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 395130f016361..db2df1ad97cbd 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -4,17 +4,18 @@ buildPythonPackage, fetchFromGitHub, isodate, + poetry-core, + poetry-dynamic-versioning, pytestCheckHook, pythonOlder, pyyaml, requests, responses, - poetry-core, }: buildPythonPackage rec { pname = "pysolcast"; - version = "2.0.3"; + version = "2.0.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,12 +24,15 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-BMM6eDloyLee7mkwUE9HpWcRUE62y43YivRjDbwAqIk="; + hash = "sha256-x91QVCDPjfC8rCVam/mrc8HP84ONa2/mJtSV64hrilc="; }; pythonRelaxDeps = [ "responses" ]; - build-system = [ poetry-core ]; + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; dependencies = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index a5e35e698c99f..7ffcf52bea8a3 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -29,6 +29,17 @@ buildPythonPackage rec { --replace py4j== 'py4j>=' ''; + postFixup = '' + # find_python_home.py has been wrapped as a shell script + substituteInPlace $out/bin/find-spark-home \ + --replace 'export SPARK_HOME=$($PYSPARK_DRIVER_PYTHON "$FIND_SPARK_HOME_PYTHON_SCRIPT")' \ + 'export SPARK_HOME=$("$FIND_SPARK_HOME_PYTHON_SCRIPT")' + # patch PYTHONPATH in pyspark so that it properly looks at SPARK_HOME + substituteInPlace $out/bin/pyspark \ + --replace 'export PYTHONPATH="''${SPARK_HOME}/python/:$PYTHONPATH"' \ + 'export PYTHONPATH="''${SPARK_HOME}/..:''${SPARK_HOME}/python/:$PYTHONPATH"' + ''; + propagatedBuildInputs = [ py4j ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 4a8582409ced7..8e69a942665f9 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -1,6 +1,5 @@ { lib, - python, buildPythonPackage, fetchFromGitHub, pydns, diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index ffd7caf99da4c..f6f0de014d36d 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -6,7 +6,6 @@ decorator, fetchPypi, numpy, - pytestCheckHook, pythonOlder, scipy, six, @@ -14,14 +13,14 @@ buildPythonPackage rec { pname = "pysptk"; - version = "0.2.2"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QUgBA/bchWTaJ54u/ubcRfoVcDeV77wSnHOjkgfVauE="; + hash = "sha256-eLHJM4v3laQc3D/wP81GmcQBwyP1RjC7caGXEAeNCz8="; }; PYSPTK_BUILD_VERSION = 0; diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index a1201c22c21fe..3b371ba727cff 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Python 3 bindings for SQLCipher"; homepage = "https://github.com/rigglemania/pysqlcipher3/"; license = licenses.zlib; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index 8541a95c8c6f8..f9f4e9c59def1 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Srim Automation of Tasks via Python"; homepage = "https://gitlab.com/costrouc/pysrim"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index d94e1fec3a74f..9be5028a87879 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, chardet, - nose, + pytestCheckHook, + fetchpatch2, }: buildPythonPackage rec { pname = "pysrt"; version = "1.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "byroot"; @@ -18,16 +20,22 @@ buildPythonPackage rec { sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg"; }; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests -v - ''; + patches = [ + (fetchpatch2 { + url = "https://github.com/byroot/pysrt/commit/93f52f6d4f70f4e18dc71deeaae0ec1e9100a50f.patch?full_index=1"; + hash = "sha256-nikMPwj3OHvl6LunAfRk6ZbFUvVgPwF696Dt8R7BY4U="; + }) + ]; + + build-system = [ setuptools ]; propagatedBuildInputs = [ chardet ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = with lib; { homepage = "https://github.com/byroot/pysrt"; - license = licenses.gpl3; + license = licenses.gpl3Only; description = "Python library used to edit or create SubRip files"; mainProgram = "srt"; }; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 9088f2c503aff..f82f6c8e4ac2f 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Framework-agnostic, logic-free templating system inspired by ctemplate and et"; homepage = "https://github.com/defunkt/pystache"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 847679f2e996b..86be5f000ed51 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,5 +1,4 @@ { - stdenv, buildPythonPackage, lib, fetchPypi, diff --git a/pkgs/development/python-modules/pysubs2/default.nix b/pkgs/development/python-modules/pysubs2/default.nix index c833f155c9342..e03a87fffda02 100644 --- a/pkgs/development/python-modules/pysubs2/default.nix +++ b/pkgs/development/python-modules/pysubs2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pysubs2"; - version = "1.6.1"; + version = "1.7.3"; format = "pyproject"; src = fetchFromGitHub { owner = "tkarabela"; repo = pname; rev = version; - hash = "sha256-0bW9aB6ERRQK3psqeU0Siyi/8drEGisAp8UtTfOKlp0="; + hash = "sha256-PrpN+w/gCi7S9OmD6kbbvL9VlZEfy1DbehFTwjxsibA="; }; nativeBuildInputs = [ setuptools ]; @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python library for editing subtitle files"; mainProgram = "pysubs2"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index e34c07ba0e94c..3df9edb39f9c7 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchurl, - isPy3k, python, apr, aprutil, @@ -11,8 +10,8 @@ e2fsprogs, expat, gcc, - glibcLocales, neon, + glibcLocales, openssl, pycxx, subversion, @@ -20,12 +19,12 @@ buildPythonPackage rec { pname = "pysvn"; - version = "1.9.20"; + version = "1.9.22"; format = "other"; src = fetchurl { url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; - hash = "sha256-LbAz+KjEY3nkSJAzJNwlnSRYoWr4i1ITRUPV3ZBH7cc="; + hash = "sha256-KfLg9tuuKpXxJoniD002kDXGCTwOZ9jurCoPrWMRo7g="; }; patches = [ ./replace-python-first.patch ]; @@ -61,7 +60,7 @@ buildPythonPackage rec { # It is not only shebangs, some tests also write scripts dynamically # so it is easier to simply search and replace - sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh + sed -i "s|/bin/bash|${lib.getExe bash}|" ../Tests/test-*.sh make -C ../Tests runHook postCheck diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 715d084ad9c14..3d81a5b01ce60 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.8.0"; + version = "1.8.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-bMxWrapFX689yvC6+9NUunEtTe79+QNauFa1ZjG9ON4="; + hash = "sha256-at/HCY6htUz1ej09XPrb2QEyoiOWhIEpgSwJange1cU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 2a3ed39294165..90c45ad4ebfc4 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.48.0"; + version = "0.48.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-UVLB1SdtYiMsXR3od2gIxNxiQ6wyW2ItAJQrxv0w1tk="; + hash = "sha256-zJzNVwrG5R2cLN7mJY9kjji2p1jP/b3b0qU7CMOPXCE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index e82ff9c57e4e2..13e41ed77a5e0 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/wmalgadey/PyTado"; changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 60972f086b548..1cc1d8f5d180e 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.23"; + version = "3.3.30"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fjZ3DK95d0keYaMbBaRJTncnaxpWea+kIGzhh/fYDxw="; + hash = "sha256-zSeDeGD/78bIoKm6B8BN4qWQE1ivNgyvnrGtgsekM3M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index 181da2761baba..ccf6fd94f7db6 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.17"; + version = "0.2.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-5mCHCzoDJ6+ao2guhAtVjvPaAS6Hutn+NwaQIjWDlgo="; + hash = "sha256-mBE5h6oGEJ2Wzb/PCD4vwFs52tWy+YmQVA06BPVW1Kg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index bad53e61dfa53..8bdbd027a7c88 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -15,7 +15,6 @@ minikanren, numpy, scipy, - typing-extensions, # checks jax, @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.23.0"; + version = "2.25.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -38,13 +37,12 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-r7ooPwZSEsypYAf+oWu7leuoIK39gFfHZACrxsbcIV0="; + hash = "sha256-+82zQtC20Q2u3/ujnt8UfmK4oYCpH6Eo2TTlk2g3z+s="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "versioneer[toml]==0.28" "versioneer[toml]" - ''; + pythonRelaxDeps = [ + "scipy" + ]; build-system = [ cython @@ -59,7 +57,6 @@ buildPythonPackage rec { minikanren numpy scipy - typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index ac5a88e436912..23a26fd52a1b9 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { license = licenses.asl20; description = "Python wrapper for Google Tesseract"; mainProgram = "pytesseract"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-aio/default.nix b/pkgs/development/python-modules/pytest-aio/default.nix index ef643d765a7a9..5706ffce5ce9d 100644 --- a/pkgs/development/python-modules/pytest-aio/default.nix +++ b/pkgs/development/python-modules/pytest-aio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-aio"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "klen"; repo = "pytest-aio"; rev = "refs/tags/${version}"; - hash = "sha256-MexIL9yFTzhkJ/61GgYoT54MWV8B0c1/CWkN5FVTvnw="; + hash = "sha256-6RxYn8/HAvXv1AEgSIEOLiaBkGgTcqQhWK+xbtxgj/o="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 0064ba62fc712..31ed87e032138 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Generate PyAnnotate annotations from your pytest tests"; homepage = "https://github.com/kensho-technologies/pytest-annotate"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index a95648618f38f..5832ff98e668d 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.1.3"; + version = "24.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-pQNm7Q9NAc/jLlR6f0132tpXyBoQaKpm7JoEgqOJL8U="; + hash = "sha256-yrdfVWXcTB6WKDUnm4wDdKZGWq9F7oOT0RP42xyASRw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index 9f98f85052f3d..4a1912e958782 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; + hash = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Pytest plugin to help with comparing array output from tests"; homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index b2771d70c495b..f620e14a51b6c 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Meta-package containing dependencies for testing"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index ef428705d7583..78baca8da38ad 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.23.6"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.23.8"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-+kyKcVzW05kqtLeC81rk3fJpOtyW3xSYshgl5gqIddE="; + hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY="; }; outputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { "testout" ]; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 5e07b68d989cd..f46abe031c3f3 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Pytest plugin to enable format checking with black"; homepage = "https://github.com/shopkeep/pytest-black"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index 8c12563a5be26..2a970b16e7e02 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/Stranger6667/pytest-click"; changelog = "https://github.com/Stranger6667/pytest-click/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 0d41302276321..e3f63c4686f04 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/kvas-it/pytest-console-scripts"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-cov-stub/default.nix b/pkgs/development/python-modules/pytest-cov-stub/default.nix new file mode 100644 index 0000000000000..1a177559f3190 --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov-stub/default.nix @@ -0,0 +1,22 @@ +{ + lib, + buildPythonPackage, + hatchling, +}: + +buildPythonPackage rec { + pname = "pytest-cov-stub"; + # please use pythonRemoveDeps rather than change this version + version = (lib.importTOML ./src/pyproject.toml).project.version; + pyproject = true; + + src = ./src; + + build-system = [ hatchling ]; + + meta = with lib; { + description = "Nixpkgs checkPhase stub for pytest-cov"; + license = licenses.mit; + maintainers = [ lib.maintainers.pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-cov-stub/src/pyproject.toml b/pkgs/development/python-modules/pytest-cov-stub/src/pyproject.toml new file mode 100644 index 0000000000000..1f356aa7f9963 --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov-stub/src/pyproject.toml @@ -0,0 +1,13 @@ +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[project] +name = "pytest-cov-nixpkgs-stub" +version = "1.0.0" + +[tool.hatch.build.targets.wheel] +packages = ["pytest_cov"] + +[project.entry-points.pytest11] +pytest_cov = "pytest_cov.plugin" diff --git a/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/__init__.py b/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/__init__.py diff --git a/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/plugin.py b/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/plugin.py new file mode 100644 index 0000000000000..d03f4d1f7a882 --- /dev/null +++ b/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/plugin.py @@ -0,0 +1,93 @@ +import argparse +import pytest + +class CoverageError(Exception): + pass + +class PytestCovWarning(pytest.PytestWarning): + pass + +class CovDisabledWarning(PytestCovWarning): + pass + +class CovReportWarning(PytestCovWarning): + pass + +class StoreReport(argparse.Action): + def __call__(self, parser, namespace, values, option_string=None): + report_type, file = values + namespace.cov_report[report_type] = file + +def pytest_addoption(parser): + group = parser.getgroup('cov', 'coverage reporting') + group.addoption( + '--cov', + action='append', + default=[], + metavar='SOURCE', + nargs='?', + const=True, + dest='cov_source', + ) + group.addoption( + '--cov-reset', + action='store_const', + const=[], + dest='cov_source', + ) + group.addoption( + '--cov-report', + action=StoreReport, + default={}, + metavar='TYPE', + type=lambda x: x.split(":", 1) if ":" in x else (x, None), + ) + group.addoption( + '--cov-config', + action='store', + default='.coveragerc', + metavar='PATH', + ) + group.addoption( + '--no-cov-on-fail', + action='store_true', + default=False, + ) + group.addoption( + '--no-cov', + action='store_true', + default=False, + ) + group.addoption( + '--cov-fail-under', + action='store', + metavar='MIN', + type=str, + ) + group.addoption( + '--cov-append', + action='store_true', + default=False, + ) + group.addoption( + '--cov-branch', + action='store_true', + default=None, + ) + group.addoption( + '--cov-context', + action='store', + metavar='CONTEXT', + type=str, + ) + +def pytest_configure(config): + config.addinivalue_line('markers', 'no_cover: disable coverage for this test.') + +@pytest.fixture +def no_cover(): + pass + +@pytest.fixture +def cov(): + pass diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index d60948e7d924e..2d98d9cfb2806 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Pytest plugin to create a tmpdir containing predefined files/directories"; homepage = "https://github.com/omarkohl/pytest-datafiles"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 3a57ab7db41c3..64aae4d60ad20 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 5196a6e8f1086..9908c3b2b4ff5 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-filter-subpackage"; changelog = "https://github.com/astropy/pytest-filter-subpackage/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index f836e9cc78a70..f45abf0941fa7 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,44 +1,40 @@ { lib, - fetchpatch, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, + setuptools-scm, flake8, pytestCheckHook, }: buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.1.1"; + version = "1.2.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e"; + src = fetchFromGitHub { + owner = "coherent-oss"; + repo = "pytest-flake8"; + rev = "refs/tags/v${version}"; + hash = "sha256-FsJysBj5S5HHGay+YZKMgb9RdUN637J+FfNl+m9l6ik="; }; - patches = [ - # https://github.com/tholo/pytest-flake8/issues/87 - # https://github.com/tholo/pytest-flake8/pull/88 - (fetchpatch { - url = "https://github.com/tholo/pytest-flake8/commit/976e6180201f7808a3007c8c5903a1637b18c0c8.patch"; - hash = "sha256-Hbcpz4fTXtXRnIWuKuDhOVpGx9H1sdQRKqxadk2s+uE="; - }) - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ flake8 ]; + dependencies = [ flake8 ]; nativeCheckInputs = [ pytestCheckHook ]; meta = { + # https://github.com/coherent-oss/pytest-flake8/issues/3 + broken = lib.versionAtLeast flake8.version "6"; + changelog = "https://github.com/coherent-oss/pytest-flake8/blob/${src.rev}/NEWS.rst"; description = "py.test plugin for efficiently checking PEP8 compliance"; - homepage = "https://github.com/tholo/pytest-flake8"; + homepage = "https://github.com/coherent-oss/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; - broken = lib.versionAtLeast flake8.version "6.0.0"; }; } diff --git a/pkgs/development/python-modules/pytest-grpc/default.nix b/pkgs/development/python-modules/pytest-grpc/default.nix index f3002d2c57da1..18fa92f9279d2 100644 --- a/pkgs/development/python-modules/pytest-grpc/default.nix +++ b/pkgs/development/python-modules/pytest-grpc/default.nix @@ -4,7 +4,6 @@ fetchPypi, grpcio, pytest, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 8d7f98c78ffe8..891b8ed2cb751 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/kevin1024/pytest-httpbin"; changelog = "https://github.com/kevin1024/pytest-httpbin/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-image-diff/default.nix b/pkgs/development/python-modules/pytest-image-diff/default.nix index 4a8b94a0c73b3..59b32c8f11729 100644 --- a/pkgs/development/python-modules/pytest-image-diff/default.nix +++ b/pkgs/development/python-modules/pytest-image-diff/default.nix @@ -1,6 +1,5 @@ { lib, - python3, buildPythonPackage, fetchFromGitHub, typing-extensions, diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix index 63357c1b48d75..9afcd14deb179 100644 --- a/pkgs/development/python-modules/pytest-instafail/default.nix +++ b/pkgs/development/python-modules/pytest-instafail/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; + hash = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 8462f1565ef97..e4d5d98c406e7 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/moccu/pytest-isort/"; changelog = "https://github.com/stephrdev/pytest-isort/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index c36bcf52e6e0f..36e45343a3082 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -72,7 +72,7 @@ let description = "pytest plugin for testing Jupyter core libraries and extensions"; homepage = "https://github.com/jupyter-server/pytest-jupyter"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix index 3205d9d0e82d3..236e6dad3bfe7 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Allows you to use fixtures in @pytest.mark.parametrize"; homepage = "https://github.com/dev-petrov/pytest-lazy-fixtures"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-mpi/default.nix b/pkgs/development/python-modules/pytest-mpi/default.nix new file mode 100644 index 0000000000000..7c375aa1087d2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-mpi/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, sybil +, pytest +, pytestCheckHook +, mpi +, mpi4py +}: + +buildPythonPackage rec { + pname = "pytest-mpi"; + version = "0.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "aragilar"; + repo = "pytest-mpi"; + rev = "v${version}"; + hash = "sha256-m3HTGLoPnYeg0oeIA1nzTzch7FtkuXTYpox4rRgo5MU="; + }; + + build-system = [ + setuptools + ]; + buildInputs = [ + # Don't propagate it to let a different pytest version be used if needed + pytest + ]; + dependencies = [ + sybil + ]; + + nativeCheckInputs = [ + pytestCheckHook + mpi + mpi4py + ]; + # Tests cause the Python interpreter to crash from some reason, a hard issue + # to debug. (TODO: discuss this with upstream) + doCheck = false; + pytestFlagsArray = [ + # https://github.com/aragilar/pytest-mpi/issues/4#issuecomment-634614337 + "-p" "pytester" + ]; + + pythonImportsCheck = [ "pytest_mpi" ]; + + meta = { + description = "Pytest plugin for working with MPI"; + homepage = "https://github.com/aragilar/pytest-mpi"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 9290fa528e986..fd26b16b65083 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -6,7 +6,6 @@ pytest, jinja2, matplotlib, - pynose, pillow, pytest7CheckHook, }: @@ -28,7 +27,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 matplotlib - pynose pillow ]; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 554034ad08b00..6b83a3854c747 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "pytest_mypy" ]; - meta = with lib; { + meta = { description = "Mypy static type checker plugin for Pytest"; homepage = "https://github.com/dbader/pytest-mypy"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; } diff --git a/pkgs/development/python-modules/pytest-parallel/default.nix b/pkgs/development/python-modules/pytest-parallel/default.nix index a2cbf09d3b557..e3324bd91d8ce 100644 --- a/pkgs/development/python-modules/pytest-parallel/default.nix +++ b/pkgs/development/python-modules/pytest-parallel/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index 3cb7de0da430a..5f7f559585950 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -6,11 +6,9 @@ playwright-driver, pytest, pytest-base-url, - pytestCheckHook, python-slugify, pythonOlder, setuptools-scm, - django, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix index 27f2d5bbd094a..811b3928b8948 100644 --- a/pkgs/development/python-modules/pytest-postgresql/default.nix +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pythonOlder, pytestCheckHook, + pytest-cov-stub, setuptools, mirakuru, port-for, @@ -28,7 +29,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov" "" \ --replace-fail "--max-worker-restart=0" "" sed -i 's#/usr/lib/postgresql/.*/bin/pg_ctl#${postgresql}/bin/pg_ctl#' pytest_postgresql/plugin.py ''; @@ -45,6 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ postgresql pytestCheckHook + pytest-cov-stub ]; pytestFlagsArray = [ "-p" diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 214863978df0c..7a9903def54cb 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Pytest plugin to check source code with pylint"; homepage = "https://github.com/carsongee/pytest-pylint"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index 6e468060c6b79..d418cfee9e1f3 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "pytest support for PyQt and PySide applications"; homepage = "https://github.com/pytest-dev/pytest-qt"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix index 1f8e84466847b..23471054526ca 100644 --- a/pkgs/development/python-modules/pytest-recording/default.nix +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pytest-recording"; - version = "0.13.1"; + version = "0.13.2"; format = "pyproject"; src = fetchFromGitHub { owner = "kiwicom"; repo = "pytest-recording"; rev = "refs/tags/v${version}"; - hash = "sha256-HyV1wWYS/8p45mZxgA1XSChLCTYq5iOzBRqKXyZpwgo="; + hash = "sha256-C6uNp3knKKY0AX7fQYU85N82L6kyyO4HcExTz1bBtpE="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 9c109021be28c..5e47e2e1c6d5c 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, pythonOlder, matplotlib, numpy, @@ -77,6 +76,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ESSS/pytest-regressions"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index a86aceae8ddc7..6eecdcbc958b2 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Relaxed test discovery/organization for pytest"; changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index 43778bfab64e1..25cf16b2a6e6a 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/astropy/pytest-remotedata"; changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 34c4ab2cce2c1..8df24c2be1f87 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/pytest-dev/pytest-repeat"; changelog = "https://github.com/pytest-dev/pytest-repeat/blob/v${version}/CHANGES.rst"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 11f67121f4f74..bc66d607c775c 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Extensible server fixures for py.test"; homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index d4ae297d0a1f3..969b33dafcdb0 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -9,7 +9,6 @@ pytestCheckHook, pythonOlder, requests, - setuptools, setuptools-scm, toml, mysqlclient, diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index aafe4b5b93ec8..8d1f70fc8070c 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Plugin to enable snapshot testing with pytest"; homepage = "https://github.com/joseph-roitman/pytest-snapshot/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index 7e34ef0a99b94..c4350d412a3b3 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -5,7 +5,6 @@ poetry-core, pytest, pythonOlder, - setuptoolsBuildHook, }: buildPythonPackage rec { @@ -36,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/miketheman/pytest-socket"; changelog = "https://github.com/miketheman/pytest-socket/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-spec/default.nix b/pkgs/development/python-modules/pytest-spec/default.nix index 1325f6f52d095..73aa1b558a1cd 100644 --- a/pkgs/development/python-modules/pytest-spec/default.nix +++ b/pkgs/development/python-modules/pytest-spec/default.nix @@ -1,34 +1,33 @@ { lib, buildPythonPackage, + pythonOlder, fetchFromGitHub, - poetry-core, + setuptools, + setuptools-scm, pytest, pytestCheckHook, pytest-describe, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pytest-spec"; - version = "3.2.0-unstable-2023-06-04"; + version = "4.0.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pchomik"; repo = "pytest-spec"; - rev = "e16e0550dd6bc557411e4312b7b42d53b26e69ef"; - hash = "sha256-dyDUdZJU4E4y1yCzunAX2c48Qv6ogu0b60U/5YbJvIU="; + rev = "refs/tags/${version}"; + hash = "sha256-SOu4ucRcLQSk1YOfNifFDezsB+ZeLXTwbJJ93/3EASk="; }; - postPatch = '' - sed -i '/addopts/d' setup.cfg - # TODO: upstream - substituteInPlace pyproject.toml \ - --replace-fail "poetry>=0.12" "poetry-core" \ - --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" - ''; - - nativeBuildInputs = [ poetry-core ]; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest ]; @@ -37,11 +36,10 @@ buildPythonPackage { pytest-describe ]; - pytestFlagsArray = [ "--spec" ]; - pythonImportsCheck = [ "pytest_spec" ]; meta = { + changelog = "https://github.com/pchomik/pytest-spec/blob/${src.rev}/CHANGES.txt"; description = "Pytest plugin to display test execution output like a SPECIFICATION"; homepage = "https://github.com/pchomik/pytest-spec"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index b90b2a30e5ca0..ac77a4ac27f14 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/Frozenball/pytest-sugar"; changelog = "https://github.com/Teemu/pytest-sugar/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 6080586d6ec41..7fdf801dd1107 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, coverage, fetchFromGitHub, - poetry-core, pytest, pythonOlder, setuptools, diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index b35b412c71cc5..43464e3ce149a 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "py.test plugin for testing Python 3.5+ Tornado code"; homepage = "https://github.com/eukaryote/pytest-tornasync"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index fa80566a13364..29ae8e4624982 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; + hash = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index efe696a270d83..a27712212d30f 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Pytest external process plugin"; homepage = "https://github.com/pytest-dev"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix index b011f081b984d..0923c9b98bcea 100644 --- a/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/The-Compiler/pytest-xvfb"; changelog = "https://github.com/The-Compiler/pytest-xvfb/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 558909a61d259..38675d502277d 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -4,7 +4,6 @@ callPackage, pythonOlder, fetchPypi, - fetchpatch2, writeText, # build-system @@ -23,7 +22,6 @@ argcomplete, hypothesis, mock, - nose, pygments, requests, xmlschema, @@ -72,7 +70,6 @@ buildPythonPackage rec { attrs hypothesis mock - nose pygments requests setuptools diff --git a/pkgs/development/python-modules/python-apt/default.nix b/pkgs/development/python-modules/python-apt/default.nix index 5d5a703a1afc4..fbb7933595ceb 100644 --- a/pkgs/development/python-modules/python-apt/default.nix +++ b/pkgs/development/python-modules/python-apt/default.nix @@ -2,33 +2,36 @@ lib, apt, buildPythonPackage, - fetchgit, + fetchFromGitLab, setuptools, }: buildPythonPackage rec { pname = "apt"; - version = "2.7.6"; + version = "2.8.0"; pyproject = true; - src = fetchgit { - url = "https://git.launchpad.net/python-apt"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "apt-team"; + repo = "python-apt"; rev = "refs/tags/${version}"; - hash = "sha256-1jTe8ncMKV78+cfSZ6p6qdjxs0plZLB4VwVtPLtDlAc="; + hash = "sha256-7l7rgyJ28iQuL6ShF/KYwL/kAXpLPTqnUIavVxNF+wU="; }; buildInputs = [ apt.dev ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Ensure the version is set properly without trying to invoke # dpkg-parsechangelog - env.DEBVER = "${version}"; + env.DEBVER = version; pythonImportsCheck = [ "apt_pkg" ]; meta = { + changelog = "https://salsa.debian.org/apt-team/python-apt/-/blob/${version}/debian/changelog"; description = "Python bindings for APT"; homepage = "https://launchpad.net/python-apt"; license = lib.licenses.gpl2; diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 9abc67d70294c..944c2f1c7959f 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,16 +33,16 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.9.1"; + version = "8.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "ArangoDB-Community"; + owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-N10ysJKk0jxFyjgR/MXKHVS2MxCQtfFFGEh1IZ2eJk0="; + hash = "sha256-bMCzuqKLOQYmBGhdfHaff+0ZIVmZ4iy5jFtmV7X0pIM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix new file mode 100644 index 0000000000000..7188c83816053 --- /dev/null +++ b/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -0,0 +1,85 @@ +{ + lib, + buildPythonPackage, + cliff, + fetchFromGitea, + keystoneauth1, + openstackdocstheme, + oslo-i18n, + oslo-serialization, + oslo-utils, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, + stestr, +}: + +buildPythonPackage rec { + pname = "python-barbicanclient"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-barbicanclient"; + rev = version; + hash = "sha256-odoYyBulOQkjUpymFyZgvI+DYmdHJY3PaG8hh2ms+/0="; + }; + + env.PBR_VERSION = version; + + postPatch = '' + # Disable rsvgconverter not needed to build manpage + substituteInPlace doc/source/conf.py \ + --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter'," + ''; + + build-system = [ + openstackdocstheme + pbr + setuptools + sphinxHook + sphinxcontrib-apidoc + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + cliff + keystoneauth1 + oslo-i18n + oslo-serialization + oslo-utils + requests + ]; + + doCheck = true; + + nativeCheckInputs = [ + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "barbicanclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-barbicanclient"; + description = "Client library for OpenStack Barbican API"; + license = lib.licenses.asl20; + mainProgram = "barbican"; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index c18f52714c3c8..0c35e6579696a 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -1,21 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, - six, + fetchFromGitHub, + rustPlatform, + pytestCheckHook, }: buildPythonPackage rec { pname = "python-bidi"; - version = "0.4.2"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "U0f3HoKz6Zdtxlfwne0r/jm6jWd3yoGlssVsMBIcSW4="; + src = fetchFromGitHub { + owner = "MeirKriheli"; + repo = "python-bidi"; + rev = "refs/tags/v${version}"; + hash = "sha256-LrXt9qaXfy8Rn9HjU4YSTFT4WsqzwCgh0flcxXOTF6E="; }; - propagatedBuildInputs = [ six ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws="; + }; + + build-system = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + preCheck = '' + rm -rf bidi + ''; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/MeirKriheli/python-bidi"; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 7d1e2c47c9018..97885c27a9522 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -4,7 +4,6 @@ cython, fetchFromGitHub, msgpack, - poetry-core, pytestCheckHook, pythonOlder, pyyaml, diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index 834bfa60a0f0f..5debefcbb3973 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonAtLeast, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index bb6cf5d94ea1f..2adf0060dfb69 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; + hash = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; }; nativeBuildInputs = [ twine ]; @@ -67,6 +67,6 @@ buildPythonPackage rec { gpl3Plus asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix new file mode 100644 index 0000000000000..fa2a61d85aa43 --- /dev/null +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -0,0 +1,82 @@ +{ + lib, + buildPythonPackage, + debtcollector, + fetchFromGitea, + jsonschema, + keystoneauth1, + openstackdocstheme, + osc-lib, + oslo-serialization, + oslo-utils, + oslotest, + pbr, + pythonOlder, + requests-mock, + requests, + setuptools, + sphinxHook, + sphinxcontrib-apidoc, + stestr, +}: + +buildPythonPackage rec { + pname = "python-designateclient"; + version = "6.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "python-designateclient"; + rev = version; + hash = "sha256-vuaouOA69REx+ZrzXjLGVz5Az1/d6x4WRT1h78xeebk="; + }; + + env.PBR_VERSION = version; + + build-system = [ + openstackdocstheme + pbr + setuptools + sphinxHook + sphinxcontrib-apidoc + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ + debtcollector + jsonschema + keystoneauth1 + osc-lib + oslo-serialization + oslo-utils + requests + ]; + + doCheck = true; + + nativeCheckInputs = [ + oslotest + requests-mock + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "designateclient" ]; + + meta = { + homepage = "https://opendev.org/openstack/python-designateclient"; + description = "Client library for OpenStack Designate API"; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/python-djvulibre/default.nix b/pkgs/development/python-modules/python-djvulibre/default.nix index de74e70eb79b7..ce454d057abcf 100644 --- a/pkgs/development/python-modules/python-djvulibre/default.nix +++ b/pkgs/development/python-modules/python-djvulibre/default.nix @@ -7,7 +7,6 @@ ghostscript_headless, packaging, pkg-config, - requests, setuptools, unittestCheckHook, wheel, diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 8ac3ce7967993..012157d46507b 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.4"; + version = "2024.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - hash = "sha256-x1r71/Urpqf0FtL2Bao5SgsRQfmwym34F7qYzxFkT5c="; + hash = "sha256-YKKF2e1La8jsCRS3M+LT+KmK0HxCRGQOof3MlVkMAuY="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index ad51ef12d5c9d..4a99321dc880c 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.18"; + version = "0.2.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nkgilley"; repo = "python-ecobee-api"; rev = "refs/tags/${version}"; - hash = "sha256-WBVHlA7cAQGCFRNSANX6PqPQYMRw74GEAlTFwSBxVQU="; + hash = "sha256-osEqDUVf7fU5DWRUQyFaM8jOi2OgSqbtMaLSWMKQMPw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-escpos/default.nix b/pkgs/development/python-modules/python-escpos/default.nix new file mode 100644 index 0000000000000..79db357347147 --- /dev/null +++ b/pkgs/development/python-modules/python-escpos/default.nix @@ -0,0 +1,101 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + setuptools-scm, + + pillow, + qrcode, + python-barcode, + six, + appdirs, + pyyaml, + argcomplete, + importlib-resources, + + pyusb, + pyserial, + pycups, + + jaconv, + pytestCheckHook, + pytest-mock, + scripttest, + mock, + hypothesis, +}: + +buildPythonPackage rec { + pname = "python-escpos"; + version = "3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "python-escpos"; + repo = "python-escpos"; + rev = "refs/tags/v${version}"; + hash = "sha256-f7qA1+8PwnXS526jjULEoyn0ejnvsneuWDt863p4J2g="; + fetchSubmodules = true; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + pillow + qrcode + python-barcode + six + appdirs + pyyaml + argcomplete + importlib-resources + ]; + + optional-dependencies = { + usb = [ pyusb ]; + serial = [ pyserial ]; + cups = [ pycups ]; + all = [ + pyusb + pyserial + pycups + ]; + }; + + preCheck = '' + # force the tests to use the module in $out + rm -r src + + # disable checking coverage + substituteInPlace pyproject.toml \ + --replace-fail "--cov escpos --cov-report=xml" "" + + # allow tests to find the cli executable + export PATH="$out/bin:$PATH" + ''; + + nativeCheckInputs = [ + jaconv + pytestCheckHook + pytest-mock + scripttest + mock + hypothesis + ] ++ optional-dependencies.all; + + pythonImportsCheck = [ "escpos" ]; + + meta = { + changelog = "https://github.com/python-escpos/python-escpos/blob/${src.rev}/CHANGELOG.rst"; + description = "Python library to manipulate ESC/POS printers"; + homepage = "https://python-escpos.readthedocs.io/"; + license = lib.licenses.mit; + mainProgram = "python-escpos"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index b9dcd8aaee394..27d768c4e96ee 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -1,41 +1,52 @@ { lib, buildPythonPackage, - fetchPypi, - nose, - mock, - pyopenssl, + fetchFromGitHub, + setuptools, urllib3, dnspython, + pytestCheckHook, + etcd_3_4, + mock, + pyopenssl, + stdenv, }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-etcd"; - version = "0.4.5"; - format = "setuptools"; + version = "0.5.0-unstable-2023-10-31"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "f1b5ebb825a3e8190494f5ce1509fde9069f2754838ed90402a8c11e1f52b8cb"; + src = fetchFromGitHub { + owner = "jplana"; + repo = "python-etcd"; + rev = "5aea0fd4461bd05dd96e4ad637f6be7bceb1cee5"; + hash = "sha256-eVirStLOPTbf860jfkNMWtGf+r0VygLZRjRDjBMCVKg="; }; - buildInputs = [ - nose - mock - pyopenssl - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ urllib3 dnspython ]; - postPatch = '' - sed -i '19s/dns/"dnspython"/' setup.py - ''; + nativeCheckInputs = [ + pytestCheckHook + etcd_3_4 + mock + pyopenssl + ]; + + # arm64 is an unsupported platform on etcd 3.4. should be able to be removed on >= etcd 3.5 + doCheck = !stdenv.isAarch64; - # Some issues with etcd not in path even though most tests passed - doCheck = false; + preCheck = '' + for file in "test_auth" "integration/test_simple"; do + substituteInPlace src/etcd/tests/$file.py \ + --replace-fail "assertEquals" "assertEqual" + done + ''; meta = with lib; { description = "Python client for Etcd"; diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix deleted file mode 100644 index b140db8c9f220..0000000000000 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pkg-config, - libnl, - nettools, -}: - -buildPythonPackage rec { - pname = "python-ethtool"; - version = "0.15"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "fedora-python"; - repo = pname; - rev = "v${version}"; - sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; - }; - - postPatch = '' - substituteInPlace tests/parse_ifconfig.py --replace "Popen('ifconfig'," "Popen('${nettools}/bin/ifconfig'," - ''; - - buildInputs = [ libnl ]; - nativeBuildInputs = [ pkg-config ]; - pythonImportsCheck = [ "ethtool" ]; - - meta = with lib; { - description = "Python bindings for the ethtool kernel interface"; - homepage = "https://github.com/fedora-python/python-ethtool"; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/development/python-modules/python-family-hub-local/default.nix b/pkgs/development/python-modules/python-family-hub-local/default.nix index 14a14e829ead7..81ea4bff27ca3 100644 --- a/pkgs/development/python-modules/python-family-hub-local/default.nix +++ b/pkgs/development/python-modules/python-family-hub-local/default.nix @@ -5,7 +5,6 @@ async-timeout, pillow, fetchPypi, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/python-fedora/default.nix b/pkgs/development/python-modules/python-fedora/default.nix index f424a3f01b977..4dda6c0bc84d8 100644 --- a/pkgs/development/python-modules/python-fedora/default.nix +++ b/pkgs/development/python-modules/python-fedora/default.nix @@ -6,7 +6,6 @@ kitchen, lockfile, munch, - nose, openidc-client, pytestCheckHook, pythonOlder, @@ -43,7 +42,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - nose ]; disabledTestPaths = [ @@ -58,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/fedora-infra/python-fedora"; changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/${version}"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-ffmpeg/default.nix b/pkgs/development/python-modules/python-ffmpeg/default.nix new file mode 100644 index 0000000000000..12b734c37700f --- /dev/null +++ b/pkgs/development/python-modules/python-ffmpeg/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPythonPackage, + pyee, + fetchPypi, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "python_ffmpeg"; + version = "2.0.12"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + sha256 = "GayAr1oGSi9TwkWvGpCbLXZI6gRVANltO81Qe4jUPcc="; + }; + + propagatedBuildInputs = [ pyee ]; + + nativeBuildInputs = [ setuptools-scm ]; + pythonImportCheck = [ "ffmpeg" ]; + + meta = { + homepage = "https://github.com/jonghwanhyeon/python-ffmpeg"; + description = "Python binding for FFmpeg which provides sync and async APIs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ roshaen ]; + }; +} diff --git a/pkgs/development/python-modules/python-fluent/fluent-pygments.nix b/pkgs/development/python-modules/python-fluent/fluent-pygments.nix new file mode 100644 index 0000000000000..141e13c1d5c41 --- /dev/null +++ b/pkgs/development/python-modules/python-fluent/fluent-pygments.nix @@ -0,0 +1,51 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, + + # dependencies + fluent-syntax, + pygments, + six, +}: + +let + version = "1.0"; + + src = fetchFromGitHub { + owner = "projectfluent"; + repo = "python-fluent"; + rev = "fluent.pygments@${version}"; + hash = "sha256-AR2uce3HS1ELzpoHmx7F/5/nrL+7KhYemw/00nmvLik="; + }; +in +buildPythonPackage { + pname = "fluent-pygments"; + inherit version; + pyproject = true; + + inherit src; + sourceRoot = "${src.name}/fluent.pygments"; + + build-system = [ setuptools ]; + + dependencies = [ + fluent-syntax + pygments + six + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "fluent.pygments" ]; + + meta = { + changelog = "https://github.com/projectfluent/python-fluent/blob/main/fluent.pygments/CHANGELOG.rst"; + description = "Plugin for pygments to add syntax highlighting of Fluent files in Sphinx"; + homepage = "https://projectfluent.org/python-fluent/fluent.pygments/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ getpsyched ]; + }; +} diff --git a/pkgs/development/python-modules/python-fluent/fluent-runtime.nix b/pkgs/development/python-modules/python-fluent/fluent-runtime.nix new file mode 100644 index 0000000000000..1a011956eccee --- /dev/null +++ b/pkgs/development/python-modules/python-fluent/fluent-runtime.nix @@ -0,0 +1,61 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, + + # dependencies + attrs, + babel, + fluent-syntax, + pytz, + typing-extensions, +}: + +let + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "projectfluent"; + repo = "python-fluent"; + rev = "fluent.runtime@${version}"; + hash = "sha256-Crg6ybweOZ4B3WfLMOcD7+TxGEZPTHJUxr8ItLB4G+Y="; + }; +in +buildPythonPackage { + pname = "fluent-runtime"; + inherit version; + pyproject = true; + + inherit src; + sourceRoot = "${src.name}/fluent.runtime"; + + build-system = [ setuptools ]; + + dependencies = [ + attrs + babel + fluent-syntax + pytz + typing-extensions + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # https://github.com/projectfluent/python-fluent/pull/203 + "test_timeZone" + ]; + + pythonImportsCheck = [ "fluent.runtime" ]; + + meta = { + changelog = "https://github.com/projectfluent/python-fluent/blob/${src.rev}/fluent.runtime/CHANGELOG.rst"; + description = "Localization library for expressive translations"; + downloadPage = "https://github.com/projectfluent/python-fluent/releases/tag/${src.rev}"; + homepage = "https://projectfluent.org/python-fluent/fluent.runtime/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ getpsyched ]; + }; +} diff --git a/pkgs/development/python-modules/python-fluent/fluent-syntax.nix b/pkgs/development/python-modules/python-fluent/fluent-syntax.nix new file mode 100644 index 0000000000000..ddaa43560f2a7 --- /dev/null +++ b/pkgs/development/python-modules/python-fluent/fluent-syntax.nix @@ -0,0 +1,44 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, + typing-extensions, +}: + +let + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "projectfluent"; + repo = "python-fluent"; + rev = "fluent.syntax@${version}"; + hash = "sha256-nULngwBG/ebICRDi6HMHBdT+r/oq6tbDL7C1iMZpMsA="; + }; +in +buildPythonPackage { + pname = "fluent-syntax"; + inherit version; + pyproject = true; + + inherit src; + sourceRoot = "${src.name}/fluent.syntax"; + + build-system = [ setuptools ]; + + dependencies = [ typing-extensions ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "fluent.syntax" ]; + + meta = { + changelog = "https://github.com/projectfluent/python-fluent/blob/${src.rev}/fluent.syntax/CHANGELOG.md"; + description = "Parse, analyze, process, and serialize Fluent files"; + downloadPage = "https://github.com/projectfluent/python-fluent/releases/tag/${src.rev}"; + homepage = "https://projectfluent.org/python-fluent/fluent.syntax/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ getpsyched ]; + }; +} diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 314f733ca1706..a22b41a3d11a2 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/Vayn/python-fontconfig"; description = "Python binding for Fontconfig"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 8d7d40c4a7349..18dbd68cc66f3 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "4.6.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_gitlab"; inherit version; - hash = "sha256-tWrjY4kDdMrt6FPvVS6SxBVR1gWADeHGS6YbzyXyN7A="; + hash = "sha256-30TbtunJQefr+5JE5+1KpNuQ9cFkmMstE1uObn8Imho="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index b2c59c10ecd9a..223f43fbd5ff7 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "24.6.0"; + version = "24.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; rev = "refs/tags/v${version}"; - hash = "sha256-4Wa8O6kt4FsQk6VvE1dCdl9hQReO3YCf/4hTGcGaQxE="; + hash = "sha256-WsZxISvPw4uvRKv5CYpcLunAxvoCvVWTSp+m2QTEe0g="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/python-hcl2/default.nix b/pkgs/development/python-modules/python-hcl2/default.nix index 07e9d2140fa17..36ac08291140a 100644 --- a/pkgs/development/python-modules/python-hcl2/default.nix +++ b/pkgs/development/python-modules/python-hcl2/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-hcl2"; - version = "4.3.4"; + version = "4.3.5"; pyproject = true; src = fetchFromGitHub { owner = "amplify-education"; repo = "python-hcl2"; - rev = "v${version}"; - hash = "sha256-P/EZG6LVW33X9IDE4TbQxakEfenkOqBJ1RM6BZE/7Kk="; + rev = "refs/tags/v${version}"; + hash = "sha256-Pz1FS1g0OYSThpxFcs6UCOAzGnF4kOuRwhx2KIl9sv4="; }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index d2cefc90b58da..b8d4563a4d333 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -5,6 +5,7 @@ fetchPypi, iso8601, keystoneauth1, + openstackdocstheme, osc-lib, oslo-i18n, oslo-serialization, @@ -16,6 +17,8 @@ pyyaml, requests, requests-mock, + setuptools, + sphinxHook, stestr, testscenarios, }: @@ -23,7 +26,7 @@ buildPythonPackage rec { pname = "python-heatclient"; version = "3.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +35,15 @@ buildPythonPackage rec { hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g="; }; - propagatedBuildInputs = [ + build-system = [ + openstackdocstheme + setuptools + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ cliff iso8601 keystoneauth1 @@ -54,10 +65,14 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck + stestr run -e <(echo " heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file heatclient.tests.unit.test_deployment_utils.TempURLSignalTest.test_create_temp_url ") + + runHook postCheck ''; pythonImportsCheck = [ "heatclient" ]; diff --git a/pkgs/development/python-modules/python-hglib/default.nix b/pkgs/development/python-modules/python-hglib/default.nix index 528316240c0a2..71e9bd7318ea4 100644 --- a/pkgs/development/python-modules/python-hglib/default.nix +++ b/pkgs/development/python-modules/python-hglib/default.nix @@ -1,24 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchzip, mercurial, - nose, + pytestCheckHook, + fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "python-hglib"; version = "2.6.2"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg="; + src = fetchzip { + url = "https://repo.mercurial-scm.org/python-hglib/archive/${version}.tar.gz"; + hash = "sha256-UXersegqJ9VAxy4Kvpb2IiOJfQbWryeeaGvwiR4ncW8="; }; + patches = [ + (fetchpatch2 { + name = "remove-nose.patch"; + excludes = [ "heptapod-ci.yml" ]; + url = "https://repo.mercurial-scm.org/python-hglib/raw-rev/8341f2494b3fc1c0d9ee55fa4487c0ac82f64d2a"; + hash = "sha256-4gicVCAH94itxHY0l8ek0L/RVhUrw2lMbbnENbWrV6U="; + }) + (fetchpatch2 { + name = "fix-tests.patch"; + url = "https://repo.mercurial-scm.org/python-hglib/raw-rev/a2afbf236ca86287e72f54e1248413625d1bc405"; + hash = "sha256-T/yKJ8cMMOBVk24SXwyPOoD321S1fZEIunaPJAxI0KI="; + }) + ]; + + build-system = [ setuptools ]; + nativeCheckInputs = [ mercurial - nose + pytestCheckHook ]; preCheck = '' @@ -28,10 +46,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "hglib" ]; - meta = with lib; { + meta = { description = "Library with a fast, convenient interface to Mercurial. It uses Mercurial’s command server for communication with hg"; homepage = "https://www.mercurial-scm.org/wiki/PythonHglibs"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index 4af23c95cc612..b4626a8d02dbe 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-homeassistant-analytics"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-homeassistant-analytics"; rev = "refs/tags/v${version}"; - hash = "sha256-uGi72UCIIvb5XZl7RkiAiR/TS+5VCpyvZfBsmlPzQEs="; + hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index e684cbbd34ce8..2936c3ec2f4cf 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -6,6 +6,7 @@ dogpile-cache, jsonschema, keystoneauth1, + openstackdocstheme, openstacksdk, osc-lib, oslo-utils, @@ -15,21 +16,33 @@ pyyaml, requests, requests-mock, + setuptools, + sphinxcontrib-apidoc, + sphinxHook, stestr, stevedore, }: buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.6.0"; - format = "setuptools"; + version = "5.7.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zWlfy+Pfu0l7vBQnLOIP9vaXzx+i35k4oQqPUtLg3cE="; + hash = "sha256-Blx0pr73uZA8eHd2iZ9WY+aozBFWsQhWpxoQKtjtJSk="; }; - propagatedBuildInputs = [ + build-system = [ + openstackdocstheme + setuptools + sphinxcontrib-apidoc + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + + dependencies = [ cliff dogpile-cache jsonschema @@ -51,7 +64,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "ironicclient" ]; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 56b56ebca1875..2a30bc9433a2b 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -9,27 +9,29 @@ kasa-crypt, orjson, poetry-core, + ptpython, pydantic, pytest-asyncio, pytest-freezer, pytest-mock, pytestCheckHook, pythonOlder, + rich, voluptuous, }: buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.0.3"; + version = "0.7.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-jbyc4YeUKjioUFXL5SVdgeUlSIiOCJ7D0cZRWPiKZII="; + hash = "sha256-ASS84thd54R1Z7+J7nMfUOPmQtJoybWis7C2US/mORs="; }; build-system = [ poetry-core ]; @@ -51,6 +53,10 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { + shell = [ + ptpython + rich + ]; speedups = [ kasa-crypt orjson @@ -68,10 +74,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; - mainProgram = "kasa"; homepage = "https://python-kasa.readthedocs.io/"; changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "kasa"; }; } diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 9150b1a240365..e4e964d52749f 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/marcospereirampj/python-keycloak"; changelog = "https://github.com/marcospereirampj/python-keycloak/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index c54395cabe7d5..4f1c9bd9636e9 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -3,10 +3,10 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, pythonOlder, # build-system + distutils, setuptools, # native dependencies @@ -26,7 +26,7 @@ buildPythonPackage rec { version = "3.4.4"; pyproject = true; - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; # requires distutils + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-ldap"; @@ -35,7 +35,10 @@ buildPythonPackage rec { hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; }; - build-system = [ setuptools ]; + build-system = [ + distutils + setuptools + ]; buildInputs = [ openldap diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix index 782b23be2538d..3e3937051aaf6 100644 --- a/pkgs/development/python-modules/python-libnmap/default.nix +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, defusedxml, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix index f4306acedf710..3a0ed111cb5cb 100644 --- a/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -1,21 +1,24 @@ { lib, buildPythonPackage, - fetchzip, + fetchurl, + setuptools, six, }: buildPythonPackage rec { pname = "python-linux-procfs"; - version = "0.6.3"; - format = "setuptools"; + version = "0.7.3"; + pyproject = true; - src = fetchzip { + src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/snapshot/python-linux-procfs-v${version}.tar.gz"; - hash = "sha256-iaKL7CWJbIvvcUCah7bKdwKZoZJehbQpZ7n0liO8N64="; + hash = "sha256-6js8+PBqMwNYSe74zqZP8CZ5nt1ByjCWnex+wBY/LZU="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; # contains no tests doCheck = false; diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 0747ee1dd7901..2d908d28c28f8 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Louvain Community Detection"; mainProgram = "community"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index efa83fe40d54c..6c3dcfbb6994f 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -1,20 +1,27 @@ { lib, - pythonOlder, buildPythonPackage, + pythonOlder, fetchFromGitHub, - pytestCheckHook, black, - python-lsp-server, + fetchpatch, + + # build-system setuptools, + + # dependencies + python-lsp-server, tomli, - fetchpatch, + + # checks + pytestCheckHook, }: buildPythonPackage rec { pname = "python-lsp-black"; version = "2.0.0"; pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -38,22 +45,22 @@ buildPythonPackage rec { hash = "sha256-4u0VIS7eidVEiKRW2wc8lJVkJwhzJD/M+uuqmTtiZ7E="; }); - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; - - propagatedBuildInputs = [ + dependencies = [ black python-lsp-server ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; pythonImportsCheck = [ "pylsp_black" ]; - meta = with lib; { + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { homepage = "https://github.com/python-lsp/python-lsp-black"; description = "Black plugin for the Python LSP Server"; - changelog = "https://github.com/python-lsp/python-lsp-black/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ cpcloud ]; + changelog = "https://github.com/python-lsp/python-lsp-black/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cpcloud ]; }; } diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index 9b10cc6eb8e6a..a23cf5c03130d 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -1,26 +1,32 @@ { lib, - pythonOlder, buildPythonPackage, - fetchPypi, + pythonOlder, + fetchFromGitHub, + ruff, + + # dependencies cattrs, lsprotocol, python-lsp-server, tomli, + + # checks pytestCheckHook, }: buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit version; - pname = "python_lsp_ruff"; - hash = "sha256-C7OiJ7wTboq4xm6Rcz8mc9wV329/yeuZ1CZ9CZGzJ6U="; + src = fetchFromGitHub { + owner = "python-lsp"; + repo = "python-lsp-ruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-czGA/gl7uoWG9UqYUaY9zER79IKfv7ClqgimgyNCAa4="; }; postPatch = '' @@ -32,7 +38,7 @@ buildPythonPackage rec { sed -i -e "s|workspace.root_path|'/tmp/'|g" tests/*.py ''; - propagatedBuildInputs = [ + dependencies = [ cattrs lsprotocol python-lsp-server @@ -40,11 +46,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { homepage = "https://github.com/python-lsp/python-lsp-ruff"; description = "Ruff linting plugin for pylsp"; changelog = "https://github.com/python-lsp/python-lsp-ruff/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ linsui ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ linsui ]; }; } diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index f2df743ee1c42..927f26b3201e7 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, autopep8, buildPythonPackage, docstring-to-markdown, @@ -18,7 +17,6 @@ pydocstyle, pyflakes, pylint, - pyqt5, pytestCheckHook, python-lsp-jsonrpc, pythonOlder, @@ -111,9 +109,7 @@ buildPythonPackage rec { pandas pytestCheckHook ] - ++ passthru.optional-dependencies.all - # pyqt5 is broken on aarch64-darwin - ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; + ++ passthru.optional-dependencies.all; disabledTests = [ @@ -123,9 +119,7 @@ buildPythonPackage rec { "test_numpy_completions" "test_workspace_loads_pycodestyle_config" "test_autoimport_code_actions_and_completions_for_notebook_document" - ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # pyqt5 is broken on aarch64-darwin + # avoid dependencies on many Qt things just to run one singular test "test_pyqt_completion" ]; diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index f30ac614d8ffb..1d7e39ccf446f 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { meta = with lib; { description = "Tool and library for manipulating LilyPond files"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 24c828a80eb03..942f4562d9dbb 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 1f11d62af8557..bb444dd15ab27 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - installShellFiles, pbr, openstackdocstheme, oslo-config, @@ -12,7 +11,8 @@ prettytable, requests, simplejson, - sphinx, + setuptools, + sphinxHook, sphinxcontrib-programoutput, babel, osc-lib, @@ -23,22 +23,24 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.9.0"; - format = "setuptools"; + version = "4.9.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Q7ADjuGQh5C88WqT5II+NMYLYFwTip/bzZinca/xqFY="; + hash = "sha256-TebykdG0fkeC+5Vs9eiwuJpXam41gg8gR4F2poYKDhI="; }; - nativeBuildInputs = [ - installShellFiles + build-system = [ openstackdocstheme - sphinx + setuptools + sphinxHook sphinxcontrib-programoutput ]; - propagatedBuildInputs = [ + sphinxBuilders = [ "man" ]; + + dependencies = [ pbr oslo-config oslo-log @@ -53,12 +55,6 @@ buildPythonPackage rec { debtcollector ]; - postInstall = '' - export PATH=$out/bin:$PATH - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man - installManPage doc/build/man/python-manilaclient.1 - ''; - # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index d2d0ae00f08cd..eed723f10d8e1 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -5,6 +5,7 @@ substituteAll, isPyPy, python, + setuptools, pillow, pycairo, pkg-config, @@ -21,7 +22,6 @@ zlib, libxml2, sqlite, - nose, pytestCheckHook, darwin, sparsehash, @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "python-mapnik"; version = "3.0.16-unstable-2024-02-22"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mapnik"; @@ -55,12 +55,14 @@ buildPythonPackage rec { stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + build-system = [ setuptools ]; + nativeBuildInputs = [ mapnik # for mapnik_config pkg-config ]; - buildInputs = [ + dependencies = [ mapnik boost cairo @@ -94,10 +96,7 @@ buildPythonPackage rec { export XMLPARSER=libxml2 ''; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' @@ -130,7 +129,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Mapnik"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; homepage = "https://mapnik.org"; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix index 4b7ef603297d3..5291c12e53a1e 100644 --- a/pkgs/development/python-modules/python-mimeparse/default.nix +++ b/pkgs/development/python-modules/python-mimeparse/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Module provides basic functions for parsing mime-type names and matching them against a list of media-ranges"; homepage = "https://github.com/dbtsai/python-mimeparse"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix index 673a9723397d6..72ba24cc0aeba 100644 --- a/pkgs/development/python-modules/python-musicpd/default.nix +++ b/pkgs/development/python-modules/python-musicpd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; + hash = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; }; pyproject = true; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 69fedb261ed16..2484537aabf91 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/named-data/python-ndn"; changelog = "https://github.com/named-data/python-ndn/blob/${src.rev}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-nvd3/default.nix b/pkgs/development/python-modules/python-nvd3/default.nix index a293ee90d1577..1ab84159b4374 100644 --- a/pkgs/development/python-modules/python-nvd3/default.nix +++ b/pkgs/development/python-modules/python-nvd3/default.nix @@ -5,13 +5,13 @@ python-slugify, jinja2, setuptools, - coverage, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-nvd3"; version = "0.15.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "areski"; @@ -20,22 +20,22 @@ buildPythonPackage rec { sha256 = "1vjnicszcc9j0rgb58104fk9sry5xad1xli64jana9bkx42c6x1v"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ python-slugify jinja2 - setuptools ]; - nativeCheckInputs = [ coverage ]; - checkPhase = '' - coverage run --source=nvd3 setup.py test - ''; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests.py" ]; - meta = with lib; { + meta = { homepage = "https://github.com/areski/python-nvd3"; description = "Python Wrapper for NVD3 - It's time for beautiful charts"; mainProgram = "nvd3"; - license = licenses.mit; - maintainers = [ maintainers.ivan-tkatchev ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ivan-tkatchev ]; }; } diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index 7af0f8fd7c63c..642af55ed7862 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, isPy3k, olm, diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index fc48197864abd..e3dd953e93b0b 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -3,37 +3,46 @@ buildPythonPackage, fetchPypi, ddt, - installShellFiles, openstackdocstheme, osc-lib, pbr, + python-barbicanclient, python-cinderclient, + python-designateclient, + python-heatclient, + python-ironicclient, python-keystoneclient, + python-manilaclient, python-novaclient, + python-openstackclient, requests-mock, - sphinx, + setuptools, + sphinxHook, sphinxcontrib-apidoc, stestr, + testers, }: buildPythonPackage rec { pname = "python-openstackclient"; version = "6.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-u+8e00gpxBBSsuyiZIDinKH3K+BY0UMNpTQexExPKVw="; }; - nativeBuildInputs = [ - installShellFiles + build-system = [ openstackdocstheme - sphinx + setuptools + sphinxHook sphinxcontrib-apidoc ]; - propagatedBuildInputs = [ + sphinxBuilders = [ "man" ]; + + dependencies = [ osc-lib pbr python-cinderclient @@ -41,23 +50,37 @@ buildPythonPackage rec { python-novaclient ]; - postInstall = '' - sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man - installManPage doc/build/man/openstack.1 - ''; - nativeCheckInputs = [ ddt - stestr requests-mock + stestr ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "openstackclient" ]; + passthru = { + optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-manilaclient + ]; + }; + tests.version = testers.testVersion { + package = python-openstackclient; + command = "openstack --version"; + }; + }; + meta = with lib; { description = "OpenStack Command-line Client"; mainProgram = "openstack"; diff --git a/pkgs/development/python-modules/python-openzwave/default.nix b/pkgs/development/python-modules/python-openzwave/default.nix index 179f3fd2b9bda..6b516823c5aba 100644 --- a/pkgs/development/python-modules/python-openzwave/default.nix +++ b/pkgs/development/python-modules/python-openzwave/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { description = "Python wrapper for the OpenZWave C++ library"; homepage = "https://github.com/OpenZWave/python-openzwave"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; inherit (openzwave.meta) platforms; }; } diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index ed97aef27a39a..95751831d2cc0 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; + hash = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index d6efce383b80a..6a631e49875e2 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, rapidjson, pytestCheckHook, @@ -11,26 +10,8 @@ substituteAll, }: -let - rapidjson' = rapidjson.overrideAttrs (old: { - version = "unstable-2023-03-06"; - src = fetchFromGitHub { - owner = "Tencent"; - repo = "rapidjson"; - rev = "5e17dbed34eef33af8f3e734820b5dc547a2a3aa"; - hash = "sha256-CTy42X6P6+Gz4WbJ3tCpAw3qqlJ+mU1PaWW9LGG+6nU="; - }; - patches = [ - (fetchpatch { - name = "do-not-include-gtest-src-dir.patch"; - url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; - hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; - }) - ]; - }); -in buildPythonPackage rec { - version = "1.16"; + version = "1.20"; pname = "python-rapidjson"; disabled = pythonOlder "3.8"; @@ -40,17 +21,17 @@ buildPythonPackage rec { owner = "python-rapidjson"; repo = "python-rapidjson"; rev = "refs/tags/v${version}"; - hash = "sha256-4Z8cNu6tK5/yAu6b9Vb/EdXQj+fQgeT0QIszTEUurVM="; + hash = "sha256-xIswmHQMl5pAqvcTNqeuO3P6MynKt3ahzUgGQroaqmw="; }; patches = [ (substituteAll { src = ./rapidjson-include-dir.patch; - rapidjson = lib.getDev rapidjson'; + rapidjson = lib.getDev rapidjson; }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index b89a7534a2ab4..bca7ec7225d31 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -12,7 +12,6 @@ pytestCheckHook, pythonOlder, redis, - withDjango ? false, django-redis, }: @@ -21,7 +20,6 @@ buildPythonPackage rec { version = "4.0.0"; pyproject = true; - build-system = [ setuptools ]; disabled = pythonOlder "3.7"; @@ -30,16 +28,26 @@ buildPythonPackage rec { hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; + # Fix django tests + postPatch = '' + substituteInPlace tests/test_project/settings.py \ + --replace "USE_L10N = True" "" + ''; + patches = [ + # https://github.com/ionelmc/python-redis-lock/pull/119 (fetchpatch { - url = "https://github.com/ionelmc/python-redis-lock/pull/119.diff"; + url = "https://github.com/ionelmc/python-redis-lock/commit/ae404b7834990b833c1f0f703ec8fbcfecd201c2.patch"; hash = "sha256-Fo43+pCtnrEMxMdEEdo0YfJGkBlhhH0GjYNgpZeHF3U="; }) - ./test_signal_expiration_increase_sleep.patch ]; - dependencies = [ redis ] ++ lib.optionals withDjango [ django-redis ]; + build-system = [ setuptools ]; + + dependencies = [ redis ]; + + optional-dependencies.django = [ django-redis ]; nativeCheckInputs = [ eventlet @@ -47,18 +55,16 @@ buildPythonPackage rec { pytestCheckHook process-tests pkgs.redis - ]; + ] ++ optional-dependencies.django; - disabledTests = - [ - # https://github.com/ionelmc/python-redis-lock/issues/86 - "test_no_overlap2" - ] - ++ lib.optionals stdenv.isDarwin [ - # fail on Darwin because it defaults to multiprocessing `spawn` - "test_reset_signalizes" - "test_reset_all_signalizes" - ]; + # For Django tests + preCheck = "export DJANGO_SETTINGS_MODULE=test_project.settings"; + + disabledTests = lib.optionals stdenv.isDarwin [ + # fail on Darwin because it defaults to multiprocessing `spawn` + "test_reset_signalizes" + "test_reset_all_signalizes" + ]; pythonImportsCheck = [ "redis_lock" ]; @@ -67,6 +73,6 @@ buildPythonPackage rec { description = "Lock context manager implemented via redis SETNX/BLPOP"; homepage = "https://github.com/ionelmc/python-redis-lock"; license = licenses.bsd2; - maintainers = with maintainers; [ vanschelven ]; + maintainers = with maintainers; [ erictapen ]; }; } diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 480c794039038..add99dfb341dd 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-W+xq6FwBZNjrqivAWv821h5Pak0wGaksQoYN5EULSnA="; + hash = "sha256-Mszy1p7TOEynCePCEiLhwdWiKXfFnlo3/a3vc9TxGeY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 95c047de31dbd..f29a3097c631c 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/SpotlightKid/python-rtmidi"; changelog = "https://github.com/SpotlightKid/python-rtmidi/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix index 1328dc98ae357..ca14b00ea5256 100644 --- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix +++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix @@ -1,11 +1,14 @@ { lib, fetchFromGitHub, - python3, + buildPythonPackage, pkg-config, + cffi, + secp256k1, + pytestCheckHook, }: -python3.pkgs.buildPythonPackage { +buildPythonPackage { pname = "python-secp256k1-cardano"; version = "0.2.3"; @@ -20,20 +23,20 @@ python3.pkgs.buildPythonPackage { nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ cffi secp256k1 ]; - nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests expect .so files and are failing doCheck = false; preConfigure = '' - cp -r ${python3.pkgs.secp256k1.src} libsecp256k1 - export INCLUDE_DIR=${python3.pkgs.secp256k1}/include - export LIB_DIR=${python3.pkgs.secp256k1}/lib + cp -r ${secp256k1.src} libsecp256k1 + export INCLUDE_DIR=${secp256k1}/include + export LIB_DIR=${secp256k1}/lib ''; meta = { diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index dcd0839cc097a..c640a72873259 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/un33k/python-slugify"; changelog = "https://github.com/un33k/python-slugify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index a16246c4331a3..928dd5f4a2a2c 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.36"; + version = "0.0.37"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cng19NW5Eq3arysl0B3dfK2Hy6lQFBFh7g2hxvxeklU="; + hash = "sha256-Dy7Nsq3qhVWb9W6ledD+Gq3fMQ/qLsxGmTBB+AQ5IZc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 88f4408dd59e0..806f067173df8 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Python library for the snappy compression library from Google"; homepage = "https://github.com/intake/python-snappy"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 208df3d95b109..0796ea2b3c96d 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 26df7c0567d91..354c97ffc4e47 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -5,14 +5,17 @@ beautifulsoup4, buildPythonPackage, cachetools, + cffi, cryptography, fetchFromGitHub, flaky, + hatchling, httpx, pytest-asyncio, pytest-timeout, pytest-xdist, pytestCheckHook, + pythonAtLeast, pythonOlder, pytz, setuptools, @@ -21,7 +24,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "21.3"; + version = "21.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,19 +33,26 @@ buildPythonPackage rec { owner = "python-telegram-bot"; repo = "python-telegram-bot"; rev = "refs/tags/v${version}"; - hash = "sha256-eyIRZkt1ea2L20ryogKrmSx/+xL2fhNXcf3vUnuS9vo="; + hash = "sha256-5raEejd8WH9JrFvMIy2AuMGK9O/FJ2rq9PeVqK+IMOU="; }; - build-system = [ setuptools ]; + build-system = [ setuptools hatchling ]; dependencies = [ - aiolimiter - apscheduler - cachetools - cryptography httpx - pytz - ] ++ httpx.optional-dependencies.socks ++ httpx.optional-dependencies.http2; + ]; + + optional-dependencies = rec { + all = ext ++ http2 ++ passport ++ socks; + callback-data = [ cachetools ]; + ext = callback-data ++ job-queue ++ rate-limiter ++ webhooks; + http2 = httpx.optional-dependencies.http2; + job-queue = [ apscheduler pytz ]; + passport = [ cryptography ] ++ lib.optionals (pythonAtLeast "3.13") [ cffi ]; + rate-limiter = [ aiolimiter ]; + socks = httpx.optional-dependencies.socks; + webhooks = [ tornado ]; + }; nativeCheckInputs = [ beautifulsoup4 @@ -51,8 +61,7 @@ buildPythonPackage rec { pytest-timeout pytest-xdist pytestCheckHook - tornado - ]; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "telegram" ]; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index ef5ecb4105bcb..01f1f2483282e 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hTaXNEtk31U31K4yum+88FFdUakBCRD11QGZWQOLbro="; + hash = "sha256-hTaXNEtk31U31K4yum+88FFdUakBCRD11QGZWQOLbro="; }; buildInputs = [ udev ]; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 8fc1bcc15bcfc..6fabd9a81763d 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/WoLpH/python-utils"; changelog = "https://github.com/wolph/python-utils/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index be1186c5ee9c5..82c4286626b40 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pynose, pytestCheckHook, python-dateutil, pythonOlder, @@ -28,7 +27,6 @@ buildPythonPackage rec { dependencies = [ python-dateutil ]; nativeCheckInputs = [ - pynose pytestCheckHook simplejson ]; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/python-xapp/default.nix index 631857b89d5b2..9abed704189a6 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/python-xapp/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - python, meson, ninja, psutil, @@ -15,7 +14,7 @@ }: buildPythonPackage rec { - pname = "xapp"; + pname = "python-xapp"; version = "2.4.2"; format = "other"; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 612194ae75360..edcb3e0047e71 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, exempi, fetchFromGitHub, - mock, pytz, lib, stdenv, diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix index ed676f9c3561d..64dba8c8d3502 100644 --- a/pkgs/development/python-modules/python-zbar/default.nix +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, setuptools, pillow, zbar, @@ -14,9 +13,6 @@ buildPythonPackage rec { version = "0.23.93"; pyproject = true; - # distutils usage in setup.py - disabled = pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "mchehab"; repo = "zbar"; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index d902444865167..969534e80cef7 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -37,6 +37,8 @@ buildPythonPackage { --replace 'dynamic = ["version"]' 'version = "${version}"' ''; + buildInputs = [ dotnet-build.nugetDeps ]; + nativeBuildInputs = [ setuptools dotnet-sdk @@ -62,7 +64,7 @@ buildPythonPackage { dotnet restore \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --source ${dotnet-build.nuget-source} + --source "$nugetSource" ''; # Rerun this when updating to refresh Nuget dependencies diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 44985f080a648..f7d3934384ce7 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pynose, + pytestCheckHook, pythonOlder, setuptools, }: @@ -21,7 +21,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ pynose ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "pytimeparse/tests/testtimeparse.py" ]; pythonImportsCheck = [ "pytimeparse" ]; @@ -30,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/wroberts/pytimeparse"; changelog = "https://github.com/wroberts/pytimeparse/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pytlv/default.nix b/pkgs/development/python-modules/pytlv/default.nix index 2960c12e95a8f..05e002a412c14 100644 --- a/pkgs/development/python-modules/pytlv/default.nix +++ b/pkgs/development/python-modules/pytlv/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, setuptools, }: diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index f755014155ddd..6f276f104f9e9 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytools"; - version = "2024.1.5"; + version = "2024.1.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jDd7sf/ctRAzAbjn6U8By+Nlc6AeAgQ0/qlikbHxrBk="; + hash = "sha256-u9t1BrCWakShd8XlVWdb7OHmXhW7sRFPNwsiPgaTIrk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 80462a073b477..bcea697b83251 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.2.5"; + version = "2.3.3"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-2O6Gr9BdjI/WTU0+KTfOQG31xzHyBeqxGv97f3WxUMs="; + hash = "sha256-JgT+OiBToBBa3h556gF+kmcqLKLaK17tlTPokvEDyUE="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e667590bf1b72..049064754937b 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, isPy27, + config, # build-system setuptools, @@ -19,7 +20,7 @@ tensorboard, # tests - cudaSupport, + cudaSupport ? config.cudaSupport, pytestCheckHook, torchvision }: diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 185d481f754dc..a42273fee7cc6 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -1,21 +1,37 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools-scm, + fetchFromGitHub, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pytubefix"; - version = "5.6.3"; - format = "pyproject"; + version = "6.4.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-qYNIQhwSZ3ZG3WMY6qCul1OEno1PWgMlfcFSxN3c6aw="; + src = fetchFromGitHub { + owner = "JuanBindez"; + repo = "pytubefix"; + rev = "refs/tags/v${version}"; + hash = "sha256-FbmVQ+nt/WEwE5vRMo2610TO463CT8nCseqB30uXjSM="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # require network access + "tests/test_captions.py" + "tests/test_cli.py" + "tests/test_exceptions.py" + "tests/test_extract.py" + "tests/test_main.py" + "tests/test_query.py" + "tests/test_streams.py" + ]; pythonImportsCheck = [ "pytubefix" ]; diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 42533a50005a2..21d08646ef84a 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, libjpeg_turbo, setuptools, numpy, @@ -12,13 +12,14 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.7.3"; + version = "1.7.5"; pyproject = true; - src = fetchPypi { - pname = "PyTurboJPEG"; - inherit version; - hash = "sha256-edSOOrU0YVKP+4AJxCCYnQh6iewxVFTM1QmU88mukis="; + src = fetchFromGitHub { + owner = "lilohuang"; + repo = "PyTurboJPEG"; + rev = "refs/tags/v${version}"; + hash = "sha256-HML56qnv//fSeXBcQC+nED/CNqUY9p8Hwrmd0EGCzx0="; }; patches = [ @@ -28,18 +29,23 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; # upstream has no tests, but we want to test whether the library is found checkPhase = '' + runHook preCheck + ${python.interpreter} -c 'from turbojpeg import TurboJPEG; TurboJPEG()' + + runHook postCheck ''; pythonImportsCheck = [ "turbojpeg" ]; meta = with lib; { + changelog = "https://github.com/lilohuang/PyTurboJPEG/releases/tag/v${version}"; description = "Python wrapper of libjpeg-turbo for decoding and encoding JPEG image"; homepage = "https://github.com/lilohuang/PyTurboJPEG"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index b33c6695bc0b9..bfbd39ce5cc40 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -15,7 +15,6 @@ packaging, pillow, platformdirs, - poetry-core, py, pydantic, pyjwt, @@ -71,7 +70,7 @@ buildPythonPackage rec { pyjwt pytz typer - ] ++ typer.optional-dependencies.all ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; passthru.optional-dependencies = { shell = [ diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix deleted file mode 100644 index eb2905444fe82..0000000000000 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - six, -}: - -buildPythonPackage rec { - pname = "pyutilib"; - version = "6.0.0"; - format = "setuptools"; - - src = fetchPypi { - pname = "PyUtilib"; - inherit version; - hash = "sha256-08FPjtkCioMbK/Ubird3brqH5mz8WKBrmcNZqqZA8EA="; - }; - - propagatedBuildInputs = [ - nose - six - ]; - - # tests require text files that are not included in the pypi package - doCheck = false; - - meta = with lib; { - description = "PyUtilib: A collection of Python utilities"; - homepage = "https://github.com/PyUtilib/pyutilib"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 1437a87ff6f5a..00073be609f00 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,17 +1,16 @@ { lib, buildPythonPackage, - pythonAtLeast, fetchFromGitHub, fetchpatch, + setuptools, libuv, }: buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; - format = "setuptools"; - disabled = pythonAtLeast "3.12"; + pyproject = true; src = fetchFromGitHub { owner = "saghul"; @@ -33,6 +32,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + setupPyBuildFlags = [ "--use-system-libuv" ]; buildInputs = [ libuv ]; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 3b4c2db066360..3904923d53b4e 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; + hash = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index 7fbc696ec598e..5a6c502e2eb00 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pytest-cov, + pytest-cov-stub, pytest-asyncio, pytest-timeout, responses, @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytest-timeout - pytest-cov + pytest-cov-stub pytestCheckHook responses ]; diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index ba591fa9f53bf..0868f7eadde55 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -5,7 +5,7 @@ pythonOlder, jinja2, ply, - verilog, + iverilog, pytestCheckHook, }: @@ -24,13 +24,13 @@ buildPythonPackage rec { patchPhase = '' # The path to Icarus can still be overridden via an environment variable at runtime. substituteInPlace pyverilog/vparser/preprocessor.py \ - --replace "iverilog = 'iverilog'" "iverilog = '${verilog}/bin/iverilog'" + --replace "iverilog = 'iverilog'" "iverilog = '${iverilog}/bin/iverilog'" ''; propagatedBuildInputs = [ jinja2 ply - verilog + iverilog ]; preCheck = '' diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 790c8fbabc2ca..ce5bd306ea0ca 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.109"; + version = "9.2.114"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GdKU+SbZbc81WSnqsxdiEuGUoBjmDPTrBfHs6zxehkg="; + hash = "sha256-zXPUuB/UyPabDZH370u0lf3LCf0oJNkrFtc08/O7RrI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index ee928182ccb45..19c5051f94936 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - imageio, matplotlib, numpy, pillow, @@ -10,32 +9,33 @@ pythonOlder, scooby, setuptools, + typing-extensions, vtk, }: buildPythonPackage rec { pname = "pyvista"; - version = "0.43.10"; + version = "0.44.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "pyvista"; + repo = "pyvista"; rev = "refs/tags/v${version}"; - hash = "sha256-WSxr6HA86zSbgwWn3KRIjcbNCe9SUjaOjBHywIdMbjw="; + hash = "sha256-P4kmsaeZqwEUdLJmfTRHkh8zdlOGLw+YLp9fa05xLXU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - imageio + dependencies = [ matplotlib numpy pillow pooch scooby + typing-extensions vtk ]; diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix index 72793ca72b92b..d981f8b142e4c 100644 --- a/pkgs/development/python-modules/pyvizio/default.nix +++ b/pkgs/development/python-modules/pyvizio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc="; + hash = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index c075df382106c..16260ed5de0a3 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.2.0.1"; + version = "8.0.3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Y7Zor70P4lhkAslckg/prfCmnszVMFPntWdJpfWnvIM="; + hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0="; }; propagatedBuildInputs = [ @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/vmware/pyvmomi"; changelog = "https://github.com/vmware/pyvmomi/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index d0311c4fdb393..f51d3c2dbce54 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; + hash = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 2efb46513e1cc..35e3fe6133e4d 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.17"; + version = "0.4.18"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9/0ZAmOML3oVrAfzGj72iV08FgyiYBSByoKyxhojxlc="; + hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix index ed985d23323de..081db245b8c22 100644 --- a/pkgs/development/python-modules/pywaze/default.nix +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pywaze"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "eifinger"; repo = "pywaze"; rev = "refs/tags/v${version}"; - hash = "sha256-fShfnfYhUtthwHSFYIFj2cWE9dZXakTrfqiR3AL2nb8="; + hash = "sha256-XE+VdxUjq8KBSIU6rUlBweKEkZD3gqJuy9J4u9JVy7Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index f61baecd5e850..9f5ed908aef8f 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://pywbem.github.io"; changelog = "https://github.com/pywbem/pywbem/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix new file mode 100644 index 0000000000000..e8d8cb61a3346 --- /dev/null +++ b/pkgs/development/python-modules/pywebcopy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pytestCheckHook, + setuptools, + cachecontrol, + lxml-html-clean, + requests, + six, +}: + +buildPythonPackage rec { + pname = "pywebcopy"; + version = "7.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rajatomar788"; + repo = "pywebcopy"; + rev = "v${version}"; + hash = "sha256-XTPk3doF9dqImsLtTB03YKMWLzQrJpJtjNXe+691rZo="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pywebcopy" ]; + + build-system = [ setuptools ]; + + dependencies = [ + cachecontrol + lxml-html-clean + requests + six + ]; + + meta = { + changelog = "https://github.com/rajatomar788/pywebcopy/blob/master/docs/changelog.md"; + description = "Python package for cloning complete webpages and websites to local storage"; + homepage = "https://github.com/rajatomar788/pywebcopy/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ d3vil0p3r ]; + }; +} diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index f35c2757e4e67..6350402a7739a 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -2,38 +2,46 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, mock, + pykerberos, pytestCheckHook, - requests, + pythonOlder, + requests-credssp, requests-ntlm, - six, + requests, + setuptools, xmltodict, }: buildPythonPackage rec { pname = "pywinrm"; - version = "0.4.3"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mVZ0v1rGSyViycVlQEcxCeUw02veEMJi1aUpYSGtVWU="; + hash = "sha256-VCjrHklK95VFRs1P8Vye8aMKdeBbJaOf1gbO8iIB6fE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests requests-ntlm - six xmltodict ]; + optional-dependencies = { + credssp = [ requests-credssp ]; + kerberos = [ pykerberos ]; + }; + nativeCheckInputs = [ mock pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "winrm" ]; @@ -42,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Windows Remote Management"; homepage = "https://github.com/diyan/pywinrm"; + changelog = "https://github.com/diyan/pywinrm/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ elasticdog diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix index 84cec559cc1af..5e14b6cd84827 100644 --- a/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Extending PyYAML with a custom constructor for including YAML files within YAML files"; homepage = "https://github.com/tanbro/pyyaml-include"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index f927515894c37..6c4b8076294fd 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -88,6 +88,6 @@ buildPythonPackage rec { bsd3 # or lgpl3Only ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 58043ccccd51b..920c3e08c4a70 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.5.63"; + version = "2024.7.64"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-zTAS8EL7lOnVIcQGttxSJgDv0YFNSy08kAxoEOn8viw="; + hash = "sha256-tHYoM4f6EfEX6LXhqHXPvYtiqd8WDFwwzkE0/A8CwmM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index e0bbde85f66ba..8d48679236925 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -36,7 +36,6 @@ websockets, wrapt, xarray, - importlib-metadata, # optional-dependencies jinja2, @@ -64,16 +63,16 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.46.0"; + version = "0.47.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-CeAX3sBE21v68KnCe8z28WTc7zMPA7usRRGh+dNijjo="; + hash = "sha256-Gp+HeYJGWyW49jisadnavjIpzu7C2uS2qWn7eC6okqg="; }; build-system = [ @@ -108,7 +107,7 @@ buildPythonPackage rec { websockets wrapt xarray - ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + ]; optional-dependencies = { docs = [ diff --git a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock index 58d71179d4cfb..3a32d7352daab 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock +++ b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "approx" @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "assert2" @@ -66,7 +66,7 @@ dependencies = [ "assert2-macros", "diff", "is-terminal", - "yansi", + "yansi 0.5.1", ] [[package]] @@ -111,18 +111,27 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] name = "async-trait" -version = "0.1.78" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", ] [[package]] @@ -138,9 +147,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -203,9 +212,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -229,6 +238,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "bindgen" version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -249,7 +264,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "which 3.1.1", + "which", ] [[package]] @@ -284,15 +299,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecount" -version = "0.6.7" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "bytemuck" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -302,9 +323,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cached" @@ -330,7 +351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082" dependencies = [ "cached_proc_macro_types", - "darling", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", @@ -356,12 +377,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -375,9 +397,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -397,9 +419,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "num-traits", ] @@ -488,9 +510,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -525,9 +547,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -554,8 +576,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -573,17 +605,42 @@ dependencies = [ ] [[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.66", +] + +[[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] [[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.66", +] + +[[package]] name = "deranged" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -598,7 +655,16 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.12.0", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro 0.20.0", ] [[package]] @@ -607,23 +673,45 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ - "darling", + "darling 0.14.4", "proc-macro2", "quote", "syn 1.0.109", ] [[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core", + "derive_builder_core 0.12.0", "syn 1.0.109", ] [[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core 0.20.0", + "syn 2.0.66", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -664,10 +752,41 @@ dependencies = [ ] [[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encode_unicode" @@ -677,9 +796,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -726,9 +845,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -736,9 +855,23 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "figment" +version = "0.10.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "pear", + "serde", + "toml 0.8.14", + "uncased", + "version_check", +] [[package]] name = "fixedbitset" @@ -826,7 +959,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -877,9 +1010,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -890,9 +1023,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -920,6 +1053,20 @@ dependencies = [ ] [[package]] +name = "handlebars" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -933,9 +1080,9 @@ checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "headers" @@ -1033,9 +1180,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" [[package]] name = "httpdate" @@ -1054,9 +1201,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -1121,7 +1268,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.11", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -1153,6 +1300,124 @@ dependencies = [ ] [[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1160,12 +1425,14 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] @@ -1185,33 +1452,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" [[package]] name = "insta" -version = "1.36.1" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", "linked-hash-map", "similar", - "yaml-rust", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -1259,15 +1531,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1283,13 +1555,14 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ "base64 0.21.7", + "js-sys", "pem", - "ring 0.16.20", + "ring 0.17.8", "serde", "serde_json", "simple_asn1", @@ -1392,9 +1665,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1413,7 +1686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1434,6 +1707,16 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1441,15 +1724,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1468,6 +1757,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] name = "matchit" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1485,15 +1783,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1522,9 +1820,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] @@ -1542,9 +1840,9 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "ndarray" @@ -1604,9 +1902,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -1618,11 +1916,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", "serde", @@ -1630,9 +1927,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", "serde", @@ -1655,9 +1952,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1666,11 +1963,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -1679,9 +1975,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1713,9 +2009,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -1739,7 +2035,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", +] + +[[package]] +name = "opentelemetry" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", ] [[package]] @@ -1755,6 +2065,53 @@ dependencies = [ ] [[package]] +name = "opentelemetry-otlp" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" +dependencies = [ + "async-trait", + "futures-core", + "http", + "opentelemetry 0.23.0", + "opentelemetry-proto", + "opentelemetry_sdk 0.23.0", + "prost", + "thiserror", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" +dependencies = [ + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "prost", + "tonic", +] + +[[package]] +name = "opentelemetry-stdout" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d080bf06af02b738feb2e6830cf72c30b76ca18b40f555cdf1b53e7b491bfe" +dependencies = [ + "async-trait", + "chrono", + "futures-util", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "ordered-float 4.2.0", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "opentelemetry_api" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1783,7 +2140,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float", + "ordered-float 3.9.2", "percent-encoding", "rand", "regex", @@ -1791,6 +2148,29 @@ dependencies = [ ] [[package]] +name = "opentelemetry_sdk" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "lazy_static", + "once_cell", + "opentelemetry 0.23.0", + "ordered-float 4.2.0", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] name = "ordered-float" version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1800,6 +2180,15 @@ dependencies = [ ] [[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", +] + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1807,9 +2196,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1817,22 +2206,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbjson" @@ -1872,6 +2261,29 @@ dependencies = [ ] [[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi 1.0.1", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.66", +] + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1879,11 +2291,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.1" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", + "serde", ] [[package]] @@ -1893,10 +2306,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "pest" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pest_meta" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap 2.2.6", @@ -1919,14 +2377,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1960,28 +2418,41 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "version_check", + "yansi 1.0.1", +] + +[[package]] name = "prost" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -1989,13 +2460,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.11.0", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", @@ -2004,29 +2475,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.53", + "syn 2.0.66", "tempfile", - "which 4.4.2", ] [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] @@ -2104,7 +2574,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -2117,18 +2587,64 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.53", + "syn 2.0.66", +] + +[[package]] +name = "pyo3-opentelemetry" +version = "0.3.2-dev.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f8d7f2bd9d6af9240258fce526857a85f03f89bd7f9cf18580ab0e80263ca4a" +dependencies = [ + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "pyo3", + "pyo3-opentelemetry-macros", +] + +[[package]] +name = "pyo3-opentelemetry-macros" +version = "0.3.2-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e7dacb594f115c33f49a0bbc15fdfe7b47ba58d1db03cbdd3e2809a2ff1182" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pyo3-tracing-subscriber" +version = "0.1.2-dev.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32dd810a19ef59f9ea7dfb3c84bbaa5cb577a15d92a56bd2e781b8c4e5cba8eb" +dependencies = [ + "handlebars", + "opentelemetry 0.23.0", + "opentelemetry-otlp", + "opentelemetry-proto", + "opentelemetry-stdout", + "opentelemetry_sdk 0.23.0", + "pyo3", + "pyo3-asyncio", + "serde", + "thiserror", + "tokio", + "tonic", + "tracing", + "tracing-opentelemetry 0.24.0", + "tracing-subscriber", ] [[package]] name = "qcs" -version = "0.21.10" +version = "0.23.0" dependencies = [ "assert2", "async-trait", "built", "cached", - "derive_builder", + "derive_builder 0.12.0", "enum-as-inner", "erased-serde", "float-cmp", @@ -2142,6 +2658,8 @@ dependencies = [ "maplit", "ndarray", "num", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "qcs-api", "qcs-api-client-common", "qcs-api-client-grpc", @@ -2182,22 +2700,25 @@ dependencies = [ [[package]] name = "qcs-api-client-common" -version = "0.7.14" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c56fa367070074f32143b4adef924af1441faa86e835f45371e14801884d14" +checksum = "040552f233992abe94376304cf17dab2d79ff62d4a9ee986d75efe3d19337f57" dependencies = [ "async-trait", "backoff", + "derive_builder 0.20.0", + "figment", "futures", "home", "http", "jsonwebtoken", "reqwest", "serde", + "shellexpand", "thiserror", "time", "tokio", - "toml 0.7.8", + "toml 0.8.14", "tracing", "url", "urlpattern", @@ -2205,9 +2726,9 @@ dependencies = [ [[package]] name = "qcs-api-client-grpc" -version = "0.7.16" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01247ae1b0523e058007edb0132cd40915452b8b4dc669d68156e187740ead70" +checksum = "eb755cd59b1b3ce99abe52ff6898ad74ca26463e94300c103cafaac4f345c4f3" dependencies = [ "backoff", "http", @@ -2215,7 +2736,7 @@ dependencies = [ "hyper", "hyper-proxy", "hyper-socks2", - "opentelemetry", + "opentelemetry 0.20.0", "opentelemetry-http", "opentelemetry_api", "pbjson", @@ -2238,9 +2759,9 @@ dependencies = [ [[package]] name = "qcs-api-client-openapi" -version = "0.8.15" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d7172e79b083a85c911917c03be58eda083b36ea7575db685d21aa2fa99b41" +checksum = "008d06c4051dd4b3e7d5b6c1f31457c68384f8f36b05b304de6059bbd81c6128" dependencies = [ "anyhow", "qcs-api-client-common", @@ -2258,16 +2779,20 @@ dependencies = [ [[package]] name = "qcs-sdk-python" -version = "0.17.10" +version = "0.19.0" dependencies = [ "async-trait", "numpy", "once_cell", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "paste", "pyo3", "pyo3-asyncio", "pyo3-build-config", "pyo3-log", + "pyo3-opentelemetry", + "pyo3-tracing-subscriber", "qcs", "qcs-api", "qcs-api-client-common", @@ -2278,6 +2803,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", + "tracing", ] [[package]] @@ -2309,9 +2835,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2354,9 +2880,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2374,41 +2900,67 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.4", ] [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -2434,7 +2986,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.11", + "rustls 0.21.12", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", "serde", @@ -2479,12 +3031,12 @@ dependencies = [ "async-trait", "getrandom", "matchit", - "opentelemetry", + "opentelemetry 0.20.0", "reqwest", "reqwest-middleware", "task-local-extensions", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.20.0", ] [[package]] @@ -2532,9 +3084,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -2543,9 +3095,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -2580,9 +3132,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -2601,9 +3153,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -2627,9 +3179,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.11" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", @@ -2646,7 +3198,7 @@ dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -2682,7 +3234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -2699,19 +3251,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -2725,9 +3277,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -2736,15 +3288,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2798,11 +3350,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -2811,9 +3363,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -2821,38 +3373,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2861,9 +3413,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2892,6 +3444,17 @@ dependencies = [ ] [[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] name = "sharded-slab" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2901,6 +3464,15 @@ dependencies = [ ] [[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs", +] + +[[package]] name = "shlex" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2908,9 +3480,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "similar" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simple_asn1" @@ -2945,15 +3517,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2972,6 +3544,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2990,6 +3568,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] name = "strum" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3000,15 +3584,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -3030,9 +3614,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.53" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -3046,6 +3630,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3075,7 +3670,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.12", + "toml 0.8.14", "version-compare", ] @@ -3133,7 +3728,7 @@ dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -3144,7 +3739,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", "test-case-core", ] @@ -3159,22 +3754,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -3189,9 +3784,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -3210,34 +3805,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] [[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] name = "tokio" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3263,13 +3853,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -3289,7 +3879,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.11", + "rustls 0.21.12", "tokio", ] @@ -3329,16 +3919,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -3355,21 +3944,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.8", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -3389,15 +3978,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.8" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -3420,7 +4009,7 @@ dependencies = [ "pin-project", "prost", "rustls-native-certs 0.7.0", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.2", "rustls-pki-types", "tokio", "tokio-rustls 0.25.0", @@ -3441,7 +4030,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -3534,7 +4123,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", ] [[package]] @@ -3576,7 +4165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" dependencies = [ "once_cell", - "opentelemetry", + "opentelemetry 0.20.0", "tracing", "tracing-core", "tracing-log 0.1.4", @@ -3584,17 +4173,52 @@ dependencies = [ ] [[package]] +name = "tracing-opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "smallvec", + "tracing", + "tracing-core", + "tracing-log 0.2.0", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ + "matchers", "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", + "tracing", "tracing-core", "tracing-log 0.2.0", + "tracing-serde", ] [[package]] @@ -3610,6 +4234,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] name = "unic-char-property" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3660,31 +4299,16 @@ dependencies = [ ] [[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unindent" @@ -3706,9 +4330,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", "idna", @@ -3735,6 +4359,18 @@ dependencies = [ ] [[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] name = "uuid" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3788,9 +4424,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ "bytes", "futures-channel", @@ -3803,13 +4439,11 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", - "rustls-pemfile 1.0.4", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-stream", "tokio-util", "tower-service", "tracing", @@ -3842,7 +4476,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3876,7 +4510,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.53", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3898,6 +4532,16 @@ dependencies = [ ] [[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] name = "webpki" version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3923,18 +4567,6 @@ dependencies = [ ] [[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3952,11 +4584,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3980,7 +4612,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4000,17 +4632,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4021,9 +4654,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4033,9 +4666,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4045,9 +4678,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4057,9 +4696,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4069,9 +4708,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4081,9 +4720,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4093,9 +4732,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -4108,9 +4747,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4126,13 +4765,16 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "yansi" @@ -4141,10 +4783,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + +[[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zeromq-src" @@ -4157,6 +4850,28 @@ dependencies = [ ] [[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "zmq" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 86421d7d84a32..72931012f6334 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -3,6 +3,8 @@ stdenv, buildPythonPackage, fetchFromGitHub, + opentelemetry-api, + opentelemetry-sdk, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.17.10"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-sdk-rust"; rev = "python/v${version}"; - hash = "sha256-pBh7g4MH5hL3k458q6UhkW/5/HdFm4ELnJHIl0wQFGE="; + hash = "sha256-M2JG4EOpvSNy7C7uFRMNl4fvkeCXm3B5LpL8fKKJ61M="; }; cargoDeps = rustPlatform.importCargoLock { @@ -43,6 +45,10 @@ buildPythonPackage rec { dependencies = [ quil ]; + optional-dependencies = { + tracing-opentelemetry = [ opentelemetry-api ]; + }; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration @@ -50,6 +56,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + opentelemetry-sdk pytest-asyncio pytestCheckHook syrupy diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index f90c52359634d..a04f4a4ec6ccd 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.9.2"; + version = "1.10.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-F7H06SGKq6jSasY0TQVBmn1TYONVEZn6ArJXlRR4lCc="; + hash = "sha256-moBu/VA/bRcpzgDH+CILiy+Xt7kb0e9ASlo+xOLrgTU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index e409345bcd7ad..a508d6351688d 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; + hash = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; }; patches = [ diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix index 3e19b7bce5f12..16fe955ef8389 100644 --- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix +++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { some non-UTF8 locale settings. ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 68e7c6a309d20..449ea678d83e5 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -2,11 +2,13 @@ lib, fetchFromGitHub, buildPythonPackage, - python3Packages, pythonOlder, + pyqt5, + poppler-qt5, + pycups, }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "qpageview"; version = "0.6.2"; format = "setuptools"; @@ -20,7 +22,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ pyqt5 poppler-qt5 pycups diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index d8c20804134d7..468099e7b59ee 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, unittestCheckHook, @@ -17,17 +16,18 @@ osqp, quadprog, scs, + highspy, }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.3.2"; + version = "4.3.3"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-EU7/OGLeOIHw7wyNTibMmHZLAiRTCUFwjEaVNsHg1vw="; + hash = "sha256-AQHd3tBfPzISQXsXHQQyh59nmym5gt8Jfogd6gRG3EM="; }; nativeBuildInputs = [ flit-core ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { daqp = [ daqp ]; ecos = [ ecos ]; gurobi = [ gurobipy ]; - # highs = [ highspy ]; + highs = [ highspy ]; # mosek = [ cvxopt mosek ]; osqp = [ osqp ]; # piqp = [ piqp ]; @@ -60,8 +60,9 @@ buildPythonPackage rec { clarabel cvxopt daqp - ecos # highs osqp # piqp proxqp qpalm + ecos + highs quadprog scs ]; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index c0ac1f4bff047..2c7df77b33a10 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/lincolnloop/python-qrcode"; changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 6cf875c9f1553..0b7c60d3f4148 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/qtawesome"; changelog = "https://github.com/spyder-ide/qtawesome/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; # fails on Darwin }; } diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 28da64efdc1d4..39da7959de592 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.26.0"; + version = "0.27.0.post1"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-ywqZggn1k7zezk5CS1y6EWZfLoIWMHmGO8mvqxBaB9g="; + hash = "sha256-c5MCcpU6g95DMycSgOaUdpvPUtgVV/zUSdKVDbZWZGM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index e65aad91904a7..72b6629a752d4 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-htgrfGBGRlJSm88mmwW92ikXR/M1lr0OTom16TIvdpo="; + hash = "sha256-FO83i6nnMGY4eGsPYFfLuQPbN9ngUWXQMguBYqGrehg="; }; patches = [ diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 74f28e526ff8d..17a7b28d05030 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://python-quantities.readthedocs.io/"; changelog = "https://github.com/python-quantities/python-quantities/blob/v${version}/CHANGES.txt"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/quantulum3/default.nix b/pkgs/development/python-modules/quantulum3/default.nix index 889b15a79c178..685145d941eaa 100644 --- a/pkgs/development/python-modules/quantulum3/default.nix +++ b/pkgs/development/python-modules/quantulum3/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonOlder, - pythonAtLeast, fetchFromGitHub, # build inputs inflect, diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix index 6b498ae2272dd..e39b66b42ae64 100644 --- a/pkgs/development/python-modules/quantum-gateway/default.nix +++ b/pkgs/development/python-modules/quantum-gateway/default.nix @@ -7,7 +7,6 @@ pythonOlder, requests, requests-mock, - setuptools-scm, urllib3, }: diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index fac428090a518..0a109427b8edd 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2023.0.3"; + version = "2023.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vSkFHYXcT14aW3OTfqYymVQbpWnKFEVkhh3IQTi5xS4="; + hash = "sha256-i+UPi+DrhItplfc6EvDhmr3CEH2/cHODoHVBElM7jY8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix index 0e104dd1fdded..61763323bc238 100644 --- a/pkgs/development/python-modules/querystring-parser/default.nix +++ b/pkgs/development/python-modules/querystring-parser/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python, pythonOlder, setuptools, six, diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 9274a8157d977..53105b8ef7495 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; + hash = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; }; buildInputs = [ pytest ]; @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Collection of persistent (disk-based) queues for Python"; homepage = "https://github.com/scrapy/queuelib"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 959c5e1d52236..b8970bc1ccd4b 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Module to generate SVG railroad syntax diagrams"; homepage = "https://github.com/tabatkins/railroad-diagrams"; license = licenses.cc0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 108ad1470c706..22fef92b576d2 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; + hash = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; }; meta = with lib; { @@ -32,7 +32,7 @@ buildPythonPackage rec { mainProgram = "ramlfications"; homepage = "https://ramlfications.readthedocs.org"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 1d406e5d3508b..4da9eb0bd17d4 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.4"; + version = "3.9.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,12 +28,13 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-Af5WTmvUVO91GfnnjVnShMB188XINBdmk2NWC80REdI="; + hash = "sha256-uoiXUE36FjIzYrcoqVnHF5RpNeYm8Nkied9UzaEGeSY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "Cython >=3.0.9, <3.1.0" "Cython" + --replace-fail "scikit-build~=0.18.0" "scikit-build" \ + --replace-fail "Cython >=3.0.10, <3.1.0" "Cython" ''; build-system = [ @@ -59,12 +60,6 @@ buildPythonPackage rec { export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ - "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 - ] - ); - passthru.optional-dependencies = { full = [ numpy ]; }; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 48209fc9efca3..eef3e3b975ce8 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -6,7 +6,6 @@ fetchzip, substitute, - pythonRelaxDepsHook, pytestCheckHook, setuptools, @@ -20,13 +19,13 @@ onnxruntime, }: let - version = "1.3.22"; + version = "1.3.24"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; - rev = "v${version}"; - hash = "sha256-8h4DFhnI9imr+bYQZdlrl8UKUdpwnGK+SGxLXSMmcag="; + rev = "refs/tags/v${version}"; + hash = "sha256-+iY+/IdOgsn+LPZQ4Kdzxuh31csQ7dyh5Zf552ne3N0="; }; models = fetchzip { @@ -73,8 +72,6 @@ buildPythonPackage { echo "from .rapidocr_onnxruntime.main import RapidOCR, VisRes" > __init__.py ''; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - # Upstream expects the source files to be under rapidocr_onnxruntime/rapidocr_onnxruntime # instead of rapidocr_onnxruntime for the wheel to build correctly. preBuild = '' diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index c0c462cb44784..ec0ebf0302caf 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/markokr/rarfile"; changelog = "https://github.com/markokr/rarfile/releases/tag/v${version}"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rauth/default.nix b/pkgs/development/python-modules/rauth/default.nix deleted file mode 100644 index 05580a029e321..0000000000000 --- a/pkgs/development/python-modules/rauth/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - fetchpatch, - requests, - pytestCheckHook, - mock, - nose, - pycrypto, -}: - -buildPythonPackage rec { - pname = "rauth"; - version = "0.7.2"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "litl"; - repo = "rauth"; - rev = version; - hash = "sha256-wRKZbxZCEfihOaJM8sk8438LE++KJWxdOGImpL1gHa4="; - }; - - patches = [ - (fetchpatch { - # https://github.com/litl/rauth/pull/211 - name = "fix-pycrypdodome-replacement-for-pycrypto.patch"; - url = "https://github.com/litl/rauth/commit/7fb3b7bf1a1869a52cf59ee3eb607d318e97265c.patch"; - hash = "sha256-jiAIw+VQ2d/bkm2brqfY1RUrNGf+lsMPnoI91gGUS6o="; - }) - ]; - - propagatedBuildInputs = [ requests ]; - - pythonImportsCheck = [ "rauth" ]; - - nativeCheckInputs = [ - pytestCheckHook - mock - nose - pycrypto - ]; - - meta = with lib; { - description = "Python library for OAuth 1.0/a, 2.0, and Ofly"; - homepage = "https://github.com/litl/rauth"; - changelog = "https://github.com/litl/rauth/blob/${src.rev}/CHANGELOG"; - license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; - }; -} diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index e4b50337f05a1..00f469329e660 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "CTypes based LibRaw bindings for Python"; homepage = "https://rawkit.readthedocs.org/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 802f7061a7c28..ca32a86cf85b4 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-iSKDUwJTakE1nStvaMvJ5RwS7+a9JiurOe8wcRjs7Ik="; + hash = "sha256-dnFaktwQ1/CQvftJD25tSXzI0hLaeBdNDeUWunAhzuQ="; }; cp311 = { - hash = "sha256-SQ7tIqb+XWqWqUYxAT8PTT9SBnl1us6soJiy9zLHJQI="; + hash = "sha256-tgjWhlYAy9NRaIKhm7O3E7bxYbFQzh7jHZIITQlAi5o="; }; cp312 = { - hash = "sha256-ri2m867sokJjB3wB7yOEEQczRzMglzbCJ0vOomJDhGI="; + hash = "sha256-rqrFzgZXKxWUfJlbbWWmyHBqGyM27r7VuY6Qc/6Uq+A="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index cad6772ed22a7..ba2d8afe9be97 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -1,58 +1,62 @@ { + lib, + buildPythonPackage, + pythonOlder, + pythonAtLeast, + python, + fetchPypi, + autoPatchelfHook, + + # dependencies aiohttp, aiohttp-cors, - aiorwlock, aiosignal, attrs, - autoPatchelfHook, - buildPythonPackage, - fetchPypi, click, cloudpickle, colorama, colorful, cython, - dm-tree, - fastapi, filelock, frozenlist, - fsspec, gpustat, grpcio, - gym, jsonschema, - lib, - lz4, - matplotlib, msgpack, numpy, opencensus, packaging, - pandas, - py-spy, prometheus-client, psutil, - pyarrow, pydantic, - python, - pythonAtLeast, - pythonOlder, + py-spy, pyyaml, requests, - scikit-image, - scipy, setproctitle, smart-open, + virtualenv, + + # optional-dependencies + fsspec, + pandas, + pyarrow, + dm-tree, + gym, + lz4, + matplotlib, + scikit-image, + scipy, + aiorwlock, + fastapi, starlette, + uvicorn, tabulate, tensorboardx, - uvicorn, - virtualenv, }: let pname = "ray"; - version = "2.31.0"; + version = "2.34.0"; in buildPythonPackage rec { inherit pname version; @@ -76,39 +80,6 @@ buildPythonPackage rec { // binary-hash ); - passthru.optional-dependencies = rec { - data-deps = [ - pandas - pyarrow - fsspec - ]; - - serve-deps = [ - aiorwlock - fastapi - pandas - starlette - uvicorn - ]; - - tune-deps = [ - tabulate - tensorboardx - ]; - - rllib-deps = tune-deps ++ [ - dm-tree - gym - lz4 - matplotlib - scikit-image - pyyaml - scipy - ]; - - air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps; - }; - nativeBuildInputs = [ autoPatchelfHook ]; @@ -121,10 +92,10 @@ buildPythonPackage rec { ]; dependencies = [ - attrs aiohttp aiohttp-cors aiosignal + attrs click cloudpickle colorama @@ -139,10 +110,10 @@ buildPythonPackage rec { numpy opencensus packaging - py-spy prometheus-client psutil pydantic + py-spy pyyaml requests setproctitle @@ -150,6 +121,35 @@ buildPythonPackage rec { virtualenv ]; + optional-dependencies = rec { + air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps; + data-deps = [ + fsspec + pandas + pyarrow + ]; + rllib-deps = tune-deps ++ [ + dm-tree + gym + lz4 + matplotlib + pyyaml + scikit-image + scipy + ]; + serve-deps = [ + aiorwlock + fastapi + pandas + starlette + uvicorn + ]; + tune-deps = [ + tabulate + tensorboardx + ]; + }; + postInstall = '' chmod +x $out/${python.sitePackages}/ray/core/src/ray/{gcs/gcs_server,raylet/raylet} ''; diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index ce3442245a580..7f32b5075d504 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "CSS minifier written in pure python"; homepage = "http://opensource.perlig.de/rcssmin/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 7c131ffe8bc2f..b0f2b4c7cd2a2 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -93,6 +93,6 @@ buildPythonPackage rec { description = "Python library for working with RDF"; homepage = "https://rdflib.readthedocs.io"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/readmdict/default.nix b/pkgs/development/python-modules/readmdict/default.nix index 74fec466ad927..9089bd1b44dd4 100644 --- a/pkgs/development/python-modules/readmdict/default.nix +++ b/pkgs/development/python-modules/readmdict/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { mainProgram = "readmdict"; homepage = "https://github.com/ffreemt/readmdict"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix index 2e927f5473dcf..2ffce823140c4 100644 --- a/pkgs/development/python-modules/readme-renderer/default.nix +++ b/pkgs/development/python-modules/readme-renderer/default.nix @@ -1,6 +1,5 @@ { lib, - bleach, buildPythonPackage, cmarkgfm, docutils, diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 2aebf689bbaa9..7bec155f52a1e 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/Toilal/rebulk/"; changelog = "https://github.com/Toilal/rebulk/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix index f80732ad7b3b0..b60e2b6ebc196 100644 --- a/pkgs/development/python-modules/recline/default.nix +++ b/pkgs/development/python-modules/recline/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "recline"; - version = "2024.6"; + version = "2024.7.1"; format = "pyproject"; src = fetchFromGitHub { owner = "NetApp"; repo = "recline"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wVUM5vkavdLDtwRlbtVlVaBOXX+7tcB+SxYe1jZdq9I="; + sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU="; }; nativeBuildInputs = [ setuptools ]; @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "This library helps you quickly implement an interactive command-based application"; homepage = "https://github.com/NetApp/recline"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/red-black-tree-mod/default.nix b/pkgs/development/python-modules/red-black-tree-mod/default.nix index 92eca8c4411f6..91de8a60cb74d 100644 --- a/pkgs/development/python-modules/red-black-tree-mod/default.nix +++ b/pkgs/development/python-modules/red-black-tree-mod/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pytestCheckHook, pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/redis-om/default.nix b/pkgs/development/python-modules/redis-om/default.nix index e4c545ad48fde..98cdc98457b88 100644 --- a/pkgs/development/python-modules/redis-om/default.nix +++ b/pkgs/development/python-modules/redis-om/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "redis-om"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "redis"; repo = "redis-om-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jwFtRnj/jhH+AKjExdOCgUfgEWweFCXVuz6F3qQRcs0="; + hash = "sha256-FN39Db94Z7z3luCDKi8b4Ku7bFwxEOXtBT5aXbDGVtw="; }; build-system = [ diff --git a/pkgs/development/python-modules/refoss-ha/default.nix b/pkgs/development/python-modules/refoss-ha/default.nix new file mode 100644 index 0000000000000..e8564038e94e9 --- /dev/null +++ b/pkgs/development/python-modules/refoss-ha/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "refoss-ha"; + version = "1.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ashionky"; + repo = "refoss_ha"; + rev = "refs/tags/v${version}"; + hash = "sha256-DFP2lEZkjW5L94CnhJS04ydM66gnKzvgpiXOAejs768="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "refoss_ha" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/ashionky/refoss_ha/releases/tag/v${version}"; + description = "Refoss support for Home Assistant"; + homepage = "https://github.com/ashionky/refoss_ha"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index e5dea4940b317..ea995ee27a7db 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Simple manipualtion and display of spatial regions"; homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 9595e8e176879..458633c1a36a2 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; + hash = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 413c2563ee024..909523d7ffc8e 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, @@ -17,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rawpython"; - repo = pname; + repo = "remi"; rev = version; hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA="; }; @@ -42,7 +41,11 @@ buildPythonPackage rec { "self.assertEqual(" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ + setuptools # pkg_resources is referenced at runtime + ]; nativeCheckInputs = [ pytestCheckHook @@ -57,10 +60,10 @@ buildPythonPackage rec { "editor.widgets" ]; - meta = with lib; { + meta = { description = "Pythonic, lightweight and websocket-based webui library"; homepage = "https://github.com/rawpython/remi"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ pbsds ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pbsds ]; }; } diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 473ea7762355a..a362f99324aac 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, requests, - tabulate, pytestCheckHook, requests-mock, }: diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 40939cd6f2951..2613136ddde53 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; rev = "refs/tags/v${version}"; - hash = "sha256-dr830PDGiTpiWCHsgxDspVyk6isOVsdGhB/jL96CDic="; + hash = "sha256-PBNiYfWcPx3AorpYmNiPGC8MAE8efQOwdtaY8dH1wTs="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index f9a0cf8164005..388e7ec9cd810 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/aresch/rencode"; description = "Fast (basic) object serialization similar to bencode"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 99e91d683cfbd..b5e378366bb67 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.4"; + version = "0.9.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-Iv9WDxtnSXZC++8m6+cr7jG6yNXkK0KR5tyUIzQ4Na0="; + hash = "sha256-EWNnaLXgJ4ieLFVBT651d50eZ/s/NfdRwRAVQy49kpc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 48e0065bc564a..186b02c60375c 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -18,7 +18,7 @@ let in buildPythonPackage rec { pname = "reportlab"; - version = "4.2.0"; + version = "4.2.2"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-R0+yjWNDGl1H11yQ1YA5MFDffUkaCceHffMpGi6fbQo="; + hash = "sha256-dl7svdaEkcVpR+KcOLi2m4NO5du90vt0CfCOvevwRCg="; }; postPatch = '' @@ -63,6 +63,6 @@ buildPythonPackage rec { description = "Open Source Python library for generating PDFs and graphics"; homepage = "https://www.reportlab.com/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/repoze-who/default.nix b/pkgs/development/python-modules/repoze-who/default.nix index abbc62a0aa83b..6616b1c1e027d 100644 --- a/pkgs/development/python-modules/repoze-who/default.nix +++ b/pkgs/development/python-modules/repoze-who/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { homepage = "http://www.repoze.org"; changelog = "https://github.com/repoze/repoze.who/blob/${version}/CHANGES.rst"; license = licenses.bsd0; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 7deb0b20614ea..48fec33e8cd13 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-Y+Ne7ZUgCieWcC4zqfrqPzmr/kGUdFroGfIPKWACaPY="; + hash = "sha256-3TxPd2CEmKWDlE1nC2GnXBUASe/DNgZnS1GJoRo5u8A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 2bd4a81122336..6b4fe60c12e58 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -13,11 +13,9 @@ markdown-it-py, mdurl, pygments, - pytest, pytestCheckHook, pythonOlder, pyyaml, - reptor, requests, rich, setuptools, @@ -32,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.20"; + version = "0.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-6DuIJScNiSaEez4vMRuA5Thr8zmvH0j3oiZmQhONSdY="; + hash = "sha256-XJCysRGCg5V3ftSsu611mS8btbdebs1EOPTp1Z/6PJ0="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 670c50c51a2a1..8e5218dc7dbdd 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -4,36 +4,34 @@ fetchFromGitHub, httpx, pytestCheckHook, - python, pythonOlder, requests, - six, + setuptools, }: buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.2.3"; - format = "setuptools"; + version = "1.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tedder"; - repo = pname; + repo = "requests-aws4auth"; rev = "refs/tags/v${version}"; - hash = "sha256-9ySuX7eKrSwgxgFoMdnVTsIfpnm9kVcI9AqSb+AsVaU="; + hash = "sha256-tRo38fdWqZmutGhWv8Hks+oFaLv770RlAHYgS3S6xJA="; }; - propagatedBuildInputs = [ - requests - six - ]; + build-system = [ setuptools ]; - passthru.optional-dependencies = { + dependencies = [ requests ]; + + optional-dependencies = { httpx = [ httpx ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.httpx; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.httpx; pythonImportsCheck = [ "requests_aws4auth" ]; diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index d76cdfbdaefb0..80c72a0b46141 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/dashea/requests-file"; changelog = "https://github.com/dashea/requests-file/blob/${version}/CHANGES.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix index d166a0fe0fde9..e370ec6f846fd 100644 --- a/pkgs/development/python-modules/requests-futures/default.nix +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; + hash = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 9f3fbb94670d8..24370891b5ddd 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python, mohawk, requests, }: @@ -14,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; + hash = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 50afeafe218eb..4ad604ea56f27 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "requirements-parser"; - version = "0.9.0"; + version = "0.10.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "requirements-parser"; rev = "refs/tags/v${version}"; - hash = "sha256-ZkyfK2s6wmKX/AJsOXlAHOpJ2/zZO0zipdM3j2BrrWo="; + hash = "sha256-/zV9PfG4mEE7VN0FIk3m4sUVhKIyuryI6znQNh+zjak="; }; build-system = [ poetry-core ]; @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/davidfischer/requirements-parser"; changelog = "https://github.com/madpah/requirements-parser/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 9250bf55931e6..eb93492e75947 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "Efficient signal resampling"; homepage = "https://github.com/bmcfee/resampy"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 3f17d6048a2de..849e5b1bee8fd 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resend"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Kk80+3oub32jIj2epTeunAfvYSSoP0GyZC4dhnYb8SM="; + hash = "sha256-cgeHkueH060vDvx3r6QP6e72l10zZ6mhUosWxIakG2g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 15c05ed6da6af..98e8e8d6487d7 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/sarugaku/resolvelib"; changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index f7d419b478e98..daba92a14a6c6 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "7.1"; + version = "7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,10 +19,10 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-h1rrUcE51440zvhgXcZTCbRJFoBg3QhVGh/p7bR8uaU="; + hash = "sha256-TR0w9wmmYhynxCNvCLZ7cyplHICZFF8TcHjH3UvtPSE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 320603a10b818..11eab85380a65 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "General-purpose retrying library"; homepage = "https://github.com/rholder/retrying"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index e4a67829e0bac..277933b3c358d 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -3,6 +3,11 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + sphinxHook, + furo, + myst-parser, + pbr, + sphinxcontrib-apidoc, # dependencies attrs, @@ -20,17 +25,30 @@ buildPythonPackage rec { pname = "reuse"; - version = "4.0.2"; + version = "4.0.3"; pyproject = true; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-ajvQbDHQDzmEAmODVEXKH+Nsbud6V3RX1DRQ6SDEtm8="; + hash = "sha256-oKtQBT8tuAk4S/Sygp4qxLk4ADWDTG0MbVaL5O2qsuA="; }; - build-system = [ poetry-core ]; + outputs = [ + "out" + "doc" + "man" + ]; + + build-system = [ + poetry-core + sphinxHook + furo + myst-parser + pbr + sphinxcontrib-apidoc + ]; dependencies = [ attrs @@ -42,13 +60,22 @@ buildPythonPackage rec { tomlkit ]; - nativeCheckInputs = [ pytestCheckHook freezegun ]; + nativeCheckInputs = [ + pytestCheckHook + freezegun + ]; disabledTestPaths = [ # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError() "src/reuse" ]; + sphinxBuilders = [ + "html" + "man" + ]; + sphinxRoot = "docs"; + pythonImportsCheck = [ "reuse" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix index 6fcc9297e6a31..d4f70dac0763c 100644 --- a/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "RFC 3339 validator for Python"; homepage = "https://github.com/naimetti/rfc3339-validator"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rfc3986-validator/default.nix b/pkgs/development/python-modules/rfc3986-validator/default.nix index 0f681dba2413d..bceb67a22594a 100644 --- a/pkgs/development/python-modules/rfc3986-validator/default.nix +++ b/pkgs/development/python-modules/rfc3986-validator/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Pure python rfc3986 validator"; homepage = "https://github.com/naimetti/rfc3986-validator"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 8fbf10e332a9a..863d4562056d6 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Validating URI References per RFC 3986"; homepage = "https://rfc3986.readthedocs.org"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rfc6555/default.nix b/pkgs/development/python-modules/rfc6555/default.nix index 063f6146a192d..596a2ca07290e 100644 --- a/pkgs/development/python-modules/rfc6555/default.nix +++ b/pkgs/development/python-modules/rfc6555/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Python implementation of the Happy Eyeballs Algorithm"; homepage = "https://github.com/sethmlarson/rfc6555"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 728be4b0ce0a6..0b6d57325b35b 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -6,7 +6,6 @@ pythonOlder, rich, setuptools, - typer, typing-extensions, }: diff --git a/pkgs/development/python-modules/rich-theme-manager/default.nix b/pkgs/development/python-modules/rich-theme-manager/default.nix new file mode 100644 index 0000000000000..f465b77b6ef6d --- /dev/null +++ b/pkgs/development/python-modules/rich-theme-manager/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + rich, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "rich-theme-manager"; + version = "0.11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "RhetTbull"; + repo = "rich_theme_manager"; + rev = "refs/tags/v${version}"; + hash = "sha256-nSNG+lWOPmh66I9EmPvWqbeceY/cu+zBpgVlDTNuHc0="; + }; + + build-system = [ poetry-core ]; + dependencies = [ rich ]; + + pythonImportsCheck = [ "rich_theme_manager" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Define custom styles and themes for use with rich"; + license = lib.licenses.mit; + homepage = "https://github.com/RhetTbull/rich_theme_manager"; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/riden/default.nix b/pkgs/development/python-modules/riden/default.nix new file mode 100644 index 0000000000000..30c89f4e68e4f --- /dev/null +++ b/pkgs/development/python-modules/riden/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + click, + fetchFromGitHub, + modbus-tk, + poetry-core, + pyserial, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "riden"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "geeksville"; + repo = "riden"; + rev = "refs/tags/${version}"; + hash = "sha256-uR1CsVsGn/QC4krHaxl6GqRnTPbFdRaqyMEl2RVMHPU="; + }; + + build-system = [ + poetry-core + setuptools + ]; + + dependencies = [ + click + modbus-tk + pyserial + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "riden" ]; + + meta = with lib; { + description = "Module for Riden RD power supplies"; + homepage = "https://github.com/geeksville/riden"; + changelog = "https://github.com/geeksville/Riden/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 757dd7c5e1745..008fb69e8aa76 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, @@ -33,6 +34,14 @@ buildPythonPackage rec { hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ="; }; + patches = [ + # fix xarray tests, remove on next release + (fetchpatch { + url = "https://github.com/cogeotiff/rio-tiler/commit/7a36ed58b649d2f4d644f280b54851ecb7ffa4e9.patch"; + hash = "sha256-QlX5ZKpjSpXevi76gx39dXok0aClApkLU0cAVpCuYYs="; + }) + ]; + build-system = [ hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index d270fb5049ec6..10a6c15d3cf19 100644 --- a/pkgs/development/python-modules/rioxarray/default.nix +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rioxarray"; - version = "0.15.7"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "corteva"; repo = "rioxarray"; rev = "refs/tags/${version}"; - hash = "sha256-x5+T1ITZ6t+08s+WpSiqbohiKVfigREn63+5pJYHkxc="; + hash = "sha256-mOXyfkreQ55vWmPCG2U/ijcKZqzHoQQLfKArSh2fDmA="; }; build-system = [ setuptools ]; @@ -49,11 +49,13 @@ buildPythonPackage rec { disabledTests = [ "test_clip_geojson__no_drop" ] - ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - # numerical errors - "test_clip_geojson" - "test_open_rasterio_mask_chunk_clip" - ]; + ++ lib.optionals + (stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin") + [ + # numerical errors + "test_clip_geojson" + "test_open_rasterio_mask_chunk_clip" + ]; pythonImportsCheck = [ "rioxarray" ]; diff --git a/pkgs/development/python-modules/riprova/default.nix b/pkgs/development/python-modules/riprova/default.nix index 98d70bcd939a9..737f941f8dbbb 100644 --- a/pkgs/development/python-modules/riprova/default.nix +++ b/pkgs/development/python-modules/riprova/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; + hash = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 75790f1e3cc50..318282f763a0a 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://ripser.scikit-tda.org"; changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/riscof/default.nix b/pkgs/development/python-modules/riscof/default.nix index af2879b0e2e5e..8debd6ea4657e 100644 --- a/pkgs/development/python-modules/riscof/default.nix +++ b/pkgs/development/python-modules/riscof/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - git, jinja2, pythonOlder, riscv-config, diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index cdfeebb491694..b3984446c404d 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Module to minify Javascript"; homepage = "http://opensource.perlig.de/rjsmin/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index f04ecac4c4b91..3c258f2b8feaf 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "RLP serialization library"; homepage = "https://github.com/ethereum/pyrlp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix index bc41471533563..7b691f638b44e 100644 --- a/pkgs/development/python-modules/rnc2rng/default.nix +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; + hash = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; }; propagatedBuildInputs = [ rply ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 69ca0941df4d0..00f5bce3267d3 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, allpairspy, buildPythonPackage, diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 559e769f37ff5..0a24bb1ca9dfd 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch2, setuptools, robotframework, approvaltests, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.4.0"; + version = "4.4.1"; disabled = pythonOlder "3.8"; @@ -24,16 +23,9 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "refs/tags/v${version}"; - hash = "sha256-282A4EW88z6ODSIEIIeBbN8YO491rwI4M7njI7kL3XQ="; + hash = "sha256-5RUi65+DljCqWoB8vZxc0hyIefEFOWuKluplXrD0SkI="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/robotframework/PythonLibCore/commit/8b756a4bd119d660109437023789bfada21bdc78.patch"; - hash = "sha256-4NtgkGbIj9gH9Det6VNh1MpGSGroESxQ8X2ZTeoX/zU="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ robotframework ]; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 542aea236da41..38080bd66615f 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; homepage = "https://github.com/bulkan/robotframework-requests"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index f535055d32013..cfd0c71d38d48 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + click, robotframework, robotframework-pythonlibcore, selenium, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "robotframework-seleniumlibrary"; - version = "6.4.0"; + version = "6.5.0"; pyproject = true; # no tests included in PyPI tarball @@ -22,12 +23,13 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Rjbdn1WXdXLn//HLtHwVrlLD+3vw9mgre/0wvMb+xbc="; + sha256 = "sha256-sB2lWFFpCGgF0XFes84fBBvR8GF+S8aWWJoih+xBmW8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + click robotframework robotframework-pythonlibcore selenium @@ -44,11 +46,11 @@ buildPythonPackage rec { mkdir utest/output_dir ''; - meta = with lib; { + meta = { changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix new file mode 100644 index 0000000000000..4593f30b8db2f --- /dev/null +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + packaging, + requests, +}: + +buildPythonPackage rec { + pname = "rocketchat-api"; + version = "1.32.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jadolg"; + repo = "rocketchat_API"; + rev = "refs/tags/${version}"; + hash = "sha256-mzcesoBU8sOznAgvi2u8NsUheyLXPZuyIkGghbc556c="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + packaging + requests + ]; + + pythonImportsCheck = [ + "rocketchat_API" + "rocketchat_API.APIExceptions" + "rocketchat_API.APISections" + ]; + + # requires running a Rocket.Chat server + doCheck = false; + + meta = { + description = "Python API wrapper for Rocket.Chat"; + homepage = "https://github.com/jadolg/rocketchat_API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index 40e97073c7bce..cd71a84d64132 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { mainProgram = "rollbar"; homepage = "https://github.com/rollbar/pyrollbar"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 9379f13f7ee33..d3a1408149f7c 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-rope/rope"; changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 3724cb4adedde..6608071f1dd88 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.6.2"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-AR/zQFH0uvPrCp61XLiRBiAO3ZnD4jVaDXN00hXDlnI="; + hash = "sha256-dP7QFUNIGFFQcR98po+LYg3MU7P+GUunO7zz/y8vZmY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rouge-score/default.nix b/pkgs/development/python-modules/rouge-score/default.nix index a3bd05b8a5c0d..a63d958bdafee 100644 --- a/pkgs/development/python-modules/rouge-score/default.nix +++ b/pkgs/development/python-modules/rouge-score/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, fetchFromGitHub, - python, buildPythonPackage, absl-py, nltk, diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 153aac57546ce..925653572f363 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Re-implementation of the Rails routes system for mapping URLs to application actions"; homepage = "https://github.com/bbangert/routes"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix index d69947e24575d..a127bfffaef43 100644 --- a/pkgs/development/python-modules/rova/default.nix +++ b/pkgs/development/python-modules/rova/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, requests, setuptools, diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index bec7009ae86f6..da05ba50a2717 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { pname = "rpmfile"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; + hash = "sha256-CsK7qJJ3xxhcuGHJxtfQyaJovlFpUW28amjxVWqeP5k="; }; # Tests access the internet diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c4e408cced64b..3136801492470 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, pythonOlder, diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 91f58f1347103..259b460e9e095 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { types-docutils pydantic typer - ] ++ typer.optional-dependencies.all; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/rtb-data/default.nix b/pkgs/development/python-modules/rtb-data/default.nix new file mode 100644 index 0000000000000..4202e2bb1af86 --- /dev/null +++ b/pkgs/development/python-modules/rtb-data/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "rtb-data"; + version = "1.0.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xRKS3c31li5ZRWw6WrYqTVQKXqW91ONbKWP57Dglzx0="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "rtbdata" ]; + + meta = with lib; { + description = "Data files for the Robotics Toolbox for Python"; + homepage = "https://pypi.org/project/rtb-data/"; + license = licenses.mit; + maintainers = with maintainers; [ + djacu + a-camarillo + ]; + }; +} diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index a700b4c411370..6d8bf78b6d3c5 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Python wrapper for RtMidi"; homepage = "https://github.com/superquadratic/rtmidi-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 0f8be5e13d201..994cd103c18ff 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "spatialaudio"; repo = "python-rtmixer"; rev = "refs/tags/${version}"; - sha256 = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; + hash = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/rtp/default.nix b/pkgs/development/python-modules/rtp/default.nix index dbafa102ea1d6..ad27d151776c5 100644 --- a/pkgs/development/python-modules/rtp/default.nix +++ b/pkgs/development/python-modules/rtp/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - python3, # nativeCheckInputs hypothesis, diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix index fee90dff358f1..3829984642858 100644 --- a/pkgs/development/python-modules/rtree/default.nix +++ b/pkgs/development/python-modules/rtree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rtree"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "rtree"; rev = "refs/tags/${version}"; - hash = "sha256-RmAiyYrkUMBN/ebmo27WvFcRmYlKkywuQHLLUbluTTw="; + hash = "sha256-yuSPRb8SRz+FRmwFCKDx+gtp9IWaneQ84jDuZP7TX0A="; }; postPatch = '' @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/Toblerity/rtree"; changelog = "https://github.com/Toblerity/rtree/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ bgamari ]; + maintainers = with maintainers; teams.geospatial.members ++ [ bgamari ]; }; } diff --git a/pkgs/development/python-modules/ruamel-base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix index 65e96e71faa8b..2d38ff808ddab 100644 --- a/pkgs/development/python-modules/ruamel-base/default.nix +++ b/pkgs/development/python-modules/ruamel-base/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index 1f898ed67073e..58a41a102246c 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index cfd009e7fd047..eeb77714fddc8 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/projects/ruamel-yaml/"; changelog = "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ruff-api/Cargo.lock b/pkgs/development/python-modules/ruff-api/Cargo.lock index 15e1d2e799389..5c1da84adff77 100644 --- a/pkgs/development/python-modules/ruff-api/Cargo.lock +++ b/pkgs/development/python-modules/ruff-api/Cargo.lock @@ -50,47 +50,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -98,15 +99,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "argfile" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1287c4f82a41c5085e65ee337c7934d71ab43d5187740a81fb69129013f6a5f6" +checksum = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8" dependencies = [ "fs-err", "os_str_bytes", @@ -114,9 +115,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bincode" @@ -135,18 +136,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "serde", ] @@ -157,6 +158,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] name = "cachedir" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -167,9 +174,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.96" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" [[package]] name = "cfg-if" @@ -201,14 +208,14 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -216,22 +223,22 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" dependencies = [ "clap", ] @@ -250,9 +257,9 @@ dependencies = [ [[package]] name = "clap_complete_fig" -version = "4.5.0" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110" +checksum = "d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b" dependencies = [ "clap", "clap_complete", @@ -270,21 +277,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clearscreen" @@ -301,9 +308,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" @@ -342,9 +349,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -379,21 +386,15 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crunchy" -version = "0.2.2" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -401,27 +402,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.60", + "strsim", + "syn 2.0.72", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -473,9 +474,9 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "equivalent" @@ -485,9 +486,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -564,9 +565,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -590,8 +591,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -602,29 +603,11 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] name = "home" version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -682,7 +665,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -690,9 +673,9 @@ dependencies = [ [[package]] name = "imperative" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" +checksum = "29a1f6526af721f9aec9ceed7ab8ebfca47f3399d08b80056c2acca3fcb694a9" dependencies = [ "phf", "rust-stemmers", @@ -700,9 +683,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", @@ -753,7 +736,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -767,10 +750,16 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -817,58 +806,22 @@ dependencies = [ ] [[package]] -name = "lalrpop-util" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" - -[[package]] name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcst" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1e25d1b119ab5c2f15a6e081bb94a8d547c5c2ad065f5fd0dbb683f31ced91" +checksum = "10293a04a48e8b0cb2cc825a93b83090e527bffd3c897a0255ad7bc96079e920" dependencies = [ "chic", "libcst_derive", @@ -881,19 +834,19 @@ dependencies = [ [[package]] name = "libcst_derive" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5011f2d59093de14a4a90e01b9d85dee9276e58a25f0107dcee167dd601be0" +checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "libmimalloc-sys" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -905,15 +858,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -927,9 +880,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" @@ -946,8 +899,7 @@ dependencies = [ [[package]] name = "lsp-types" version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365" +source = "git+https://github.com/astral-sh/lsp-types.git?rev=3512a9f#3512a9f33eadc5402cfab1b8f7340824c8ca1439" dependencies = [ "bitflags 1.3.2", "serde", @@ -972,10 +924,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + +[[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -988,9 +946,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -1020,12 +978,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" [[package]] +name = "newtype-uuid" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526cb7c660872e401beaf3297f95f548ce3b4b4bdd8121b7c0713771d7c4a6e" +dependencies = [ + "uuid", +] + +[[package]] name = "nix" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1047,7 +1014,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1071,34 +1038,15 @@ dependencies = [ ] [[package]] -name = "nu-ansi-term" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1112,9 +1060,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_str_bytes" -version = "6.6.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9" dependencies = [ "memchr", ] @@ -1127,9 +1075,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1143,16 +1091,16 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-absolutize" @@ -1173,6 +1121,12 @@ dependencies = [ ] [[package]] +name = "path-slash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" + +[[package]] name = "pathdiff" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1180,9 +1134,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "peg" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a625d12ad770914cbf7eff6f9314c3ef803bfe364a1b20bc36ddf56673e71e5" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" dependencies = [ "peg-macros", "peg-runtime", @@ -1190,9 +1144,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" dependencies = [ "peg-runtime", "proc-macro2", @@ -1219,9 +1173,9 @@ dependencies = [ [[package]] name = "pep440_rs" -version = "0.5.0" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efd4d885c29126cc93e12af3087896e2518bd5ca0fb328c19c4ef9cecfa8be" +checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385" dependencies = [ "once_cell", "serde", @@ -1296,27 +1250,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] -name = "pmutil" -version = "0.6.1" +name = "ppv-lite86" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", + "zerocopy", ] [[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1396,12 +1342,13 @@ dependencies = [ [[package]] name = "quick-junit" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a341ae463320e9f8f34adda49c8a85d81d4e8f34cce4397fb0350481552224" +checksum = "cfc1a6a5406a114913df2df8507998c755311b55b78584bed5f6e88f6417c4d4" dependencies = [ "chrono", "indexmap", + "newtype-uuid", "quick-xml", "strip-ansi-escapes", "thiserror", @@ -1487,11 +1434,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1507,14 +1454,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1528,13 +1475,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -1545,40 +1492,19 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "result-like" -version = "0.5.0" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf7172fef6a7d056b5c26bf6c826570267562d51697f4982ff3ba4aec68a9df" -dependencies = [ - "result-like-derive", -] - -[[package]] -name = "result-like-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d6574c02e894d66370cfc681e5d68fedbc9a548fb55b30a96b3f0ae22d0fe5" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "syn 2.0.60", -] +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ruff" -version = "0.3.7" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +version = "0.4.10" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "anyhow", "argfile", "bincode", - "bitflags 2.5.0", + "bitflags 2.6.0", "cachedir", "chrono", "clap", @@ -1592,7 +1518,6 @@ dependencies = [ "log", "mimalloc", "notify", - "num_cpus", "path-absolutize", "rayon", "regex", @@ -1617,15 +1542,13 @@ dependencies = [ "tikv-jemallocator", "toml", "tracing", - "tracing-subscriber", - "tracing-tree", "walkdir", "wild", ] [[package]] name = "ruff-api" -version = "0.0.6" +version = "0.0.7" dependencies = [ "glob", "pyo3", @@ -1641,7 +1564,7 @@ dependencies = [ [[package]] name = "ruff_cache" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "filetime", "glob", @@ -1654,7 +1577,7 @@ dependencies = [ [[package]] name = "ruff_diagnostics" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "anyhow", "is-macro", @@ -1666,7 +1589,7 @@ dependencies = [ [[package]] name = "ruff_formatter" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "drop_bomb", "ruff_cache", @@ -1682,20 +1605,20 @@ dependencies = [ [[package]] name = "ruff_index" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "ruff_macros", ] [[package]] name = "ruff_linter" -version = "0.3.7" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +version = "0.4.10" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "chrono", "clap", "colored", @@ -1713,11 +1636,10 @@ dependencies = [ "once_cell", "path-absolutize", "pathdiff", - "pep440_rs 0.5.0", + "pep440_rs 0.6.6", "pyproject-toml", "quick-junit", "regex", - "result-like", "ruff_cache", "ruff_diagnostics", "ruff_macros", @@ -1750,19 +1672,19 @@ dependencies = [ [[package]] name = "ruff_macros" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "itertools", "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "ruff_notebook" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "anyhow", "itertools", @@ -1781,10 +1703,10 @@ dependencies = [ [[package]] name = "ruff_python_ast" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "aho-corasick", - "bitflags 2.5.0", + "bitflags 2.6.0", "is-macro", "itertools", "once_cell", @@ -1798,19 +1720,20 @@ dependencies = [ [[package]] name = "ruff_python_codegen" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "once_cell", "ruff_python_ast", "ruff_python_literal", "ruff_python_parser", "ruff_source_file", + "ruff_text_size", ] [[package]] name = "ruff_python_formatter" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "anyhow", "clap", @@ -1823,7 +1746,6 @@ dependencies = [ "ruff_formatter", "ruff_macros", "ruff_python_ast", - "ruff_python_index", "ruff_python_parser", "ruff_python_trivia", "ruff_source_file", @@ -1834,13 +1756,12 @@ dependencies = [ "static_assertions", "thiserror", "tracing", - "unicode-width", ] [[package]] name = "ruff_python_index" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "ruff_python_ast", "ruff_python_parser", @@ -1852,12 +1773,10 @@ dependencies = [ [[package]] name = "ruff_python_literal" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ - "bitflags 2.5.0", - "hexf-parse", + "bitflags 2.6.0", "itertools", - "lexical-parse-float", "ruff_python_ast", "unic-ucd-category", ] @@ -1865,19 +1784,16 @@ dependencies = [ [[package]] name = "ruff_python_parser" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ - "anyhow", + "bitflags 2.6.0", "bstr", - "is-macro", - "itertools", - "lalrpop-util", "memchr", "ruff_python_ast", + "ruff_python_trivia", "ruff_text_size", "rustc-hash", "static_assertions", - "tiny-keccak", "unicode-ident", "unicode-normalization", "unicode_names2", @@ -1886,9 +1802,9 @@ dependencies = [ [[package]] name = "ruff_python_semantic" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "is-macro", "ruff_index", "ruff_python_ast", @@ -1901,7 +1817,7 @@ dependencies = [ [[package]] name = "ruff_python_stdlib" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "unicode-ident", ] @@ -1909,7 +1825,7 @@ dependencies = [ [[package]] name = "ruff_python_trivia" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "itertools", "ruff_source_file", @@ -1920,17 +1836,20 @@ dependencies = [ [[package]] name = "ruff_server" version = "0.2.2" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "anyhow", "crossbeam", + "globset", "jod-thread", "libc", "lsp-server", "lsp-types", + "regex", "ruff_diagnostics", "ruff_formatter", "ruff_linter", + "ruff_notebook", "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", @@ -1942,13 +1861,16 @@ dependencies = [ "rustc-hash", "serde", "serde_json", + "shellexpand", "tracing", + "tracing-subscriber", + "walkdir", ] [[package]] name = "ruff_source_file" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "memchr", "once_cell", @@ -1959,7 +1881,7 @@ dependencies = [ [[package]] name = "ruff_text_size" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "serde", ] @@ -1967,7 +1889,7 @@ dependencies = [ [[package]] name = "ruff_workspace" version = "0.0.0" -source = "git+https://github.com/astral-sh/ruff.git?tag=v0.3.7#2e37cf6b3b4b873ad9ffe9728bccdf134862b768" +source = "git+https://github.com/astral-sh/ruff.git?tag=v0.4.10#b54922fd7394c36cdc390fd21aaee99206ebc361" dependencies = [ "anyhow", "colored", @@ -1978,8 +1900,10 @@ dependencies = [ "is-macro", "itertools", "log", + "matchit", "path-absolutize", - "pep440_rs 0.5.0", + "path-slash", + "pep440_rs 0.6.6", "regex", "ruff_cache", "ruff_formatter", @@ -2017,7 +1941,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2026,15 +1950,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2059,31 +1983,32 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2096,23 +2021,23 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "serde", "serde_derive", @@ -2121,14 +2046,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -2151,9 +2076,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "siphasher" @@ -2184,36 +2109,30 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -2229,9 +2148,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -2240,18 +2159,19 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", "windows-sys 0.52.0", ] @@ -2281,22 +2201,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -2330,19 +2250,10 @@ dependencies = [ ] [[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2355,9 +2266,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2367,18 +2278,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -2407,7 +2318,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -2438,7 +2349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", - "nu-ansi-term 0.46.0", + "nu-ansi-term", "once_cell", "regex", "sharded-slab", @@ -2450,18 +2361,6 @@ dependencies = [ ] [[package]] -name = "tracing-tree" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" -dependencies = [ - "nu-ansi-term 0.49.0", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] name = "typed-arena" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2532,9 +2431,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_names2" @@ -2572,9 +2471,9 @@ checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2584,15 +2483,15 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "rand", @@ -2602,13 +2501,13 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" +checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", ] [[package]] @@ -2629,9 +2528,9 @@ dependencies = [ [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", @@ -2674,7 +2573,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -2696,7 +2595,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2709,9 +2608,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "which" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" dependencies = [ "either", "home", @@ -2746,11 +2645,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2765,7 +2664,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2783,7 +2682,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2803,18 +2711,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2825,9 +2733,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2837,9 +2745,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2849,15 +2757,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2867,9 +2775,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2879,9 +2787,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2891,9 +2799,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2903,15 +2811,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -2930,3 +2838,24 @@ checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" dependencies = [ "winapi", ] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix index 43170c4312145..244b85b4a3710 100644 --- a/pkgs/development/python-modules/ruff-api/default.nix +++ b/pkgs/development/python-modules/ruff-api/default.nix @@ -5,16 +5,15 @@ cargo, darwin, fetchFromGitHub, + libiconv, pythonOlder, rustc, rustPlatform, - ufmt, - usort, }: buildPythonPackage rec { pname = "ruff-api"; - version = "0.0.6"; + version = "0.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,13 +22,14 @@ buildPythonPackage rec { owner = "amyreese"; repo = "ruff-api"; rev = "refs/tags/v${version}"; - hash = "sha256-nZKf0LpCoYwWoLDGoorJ+zQSLyuxfWu3LOygocVlYSs="; + hash = "sha256-wST5TfIcw5rezaL9ZygoK3RYsGA9wzfnC3aDdc3g4tU="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "ruff-0.3.7" = "sha256-PS4YJpVut+KtEgSlTVtoVdlu6FVipPIzsl01/Io5N64="; + "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; + "ruff-0.4.10" = "sha256-FRBuvXtnbxRWoI0f8SM0U0Z5TRyX5Tbgq3d34Oh2bG4="; }; }; @@ -43,6 +43,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreServices + libiconv ]; # Tests have issues at the moment, check with next update diff --git a/pkgs/development/python-modules/runs/default.nix b/pkgs/development/python-modules/runs/default.nix index d161a33a108a5..19ea9683b3784 100644 --- a/pkgs/development/python-modules/runs/default.nix +++ b/pkgs/development/python-modules/runs/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/rec/runs"; changelog = "https://github.com/rec/runs/blob/${src.rev}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ryd-client/default.nix b/pkgs/development/python-modules/ryd-client/default.nix new file mode 100644 index 0000000000000..958a96b2c3b77 --- /dev/null +++ b/pkgs/development/python-modules/ryd-client/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, +}: +buildPythonPackage rec { + pname = "ryd-client"; + version = "0.0.6"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PxrVdVw+dAkF8WWzYyg2/B5CFurNPA5XRNtH9uu/SiY="; + }; + + build-system = [ setuptools ]; + dependencies = [ requests ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "ryd_client" ]; + + meta = { + description = "Python client library for the Return YouTube Dislike API"; + homepage = "https://github.com/bbilly1/ryd-client"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix index a4a729ce4280c..08ce5f72eaaa3 100644 --- a/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "StarCraft II - client protocol"; homepage = "https://github.com/Blizzard/s2client-proto"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 426e65615bb0f..bd53e3b3ef2bb 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2024.6.0"; + version = "2024.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pZAg7e3GHpZm8eRzzkqih2Tl97PJdBS+sVzZvlIqh7Y="; + hash = "sha256-bCEG1sNPv7uI49IMbzVyiW1e49NRKJZpYwHCGjxUG+o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index c8e1e294ef1dd..4f07633db51f0 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "8.2.3"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 + version = "8.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cP3GCp2mGivtjyA76vqtO7mJyZjHeNkvBLl2kXxOT5w="; + hash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 4153fe1aa8113..d33c4597e8704 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/Hundemeier/sacn"; changelog = "https://github.com/Hundemeier/sacn/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/safe/default.nix b/pkgs/development/python-modules/safe/default.nix deleted file mode 100644 index e59107fc33a15..0000000000000 --- a/pkgs/development/python-modules/safe/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, -}: - -buildPythonPackage rec { - version = "0.4"; - pname = "Safe"; - - src = fetchPypi { - inherit pname version; - sha256 = "a2fdac9fe8a9dcf02b438201d6ce0b7be78f85dc6492d03edfb89be2adf489de"; - }; - - buildInputs = [ nose ]; - - meta = with lib; { - homepage = "https://github.com/lepture/safe"; - license = licenses.bsd3; - description = "Check password strength"; - }; -} diff --git a/pkgs/development/python-modules/safeio/default.nix b/pkgs/development/python-modules/safeio/default.nix index 890e986a81b54..d1920654d2ef3 100644 --- a/pkgs/development/python-modules/safeio/default.nix +++ b/pkgs/development/python-modules/safeio/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Safely make I/O operations to files in Python even from multiple threads"; homepage = "https://github.com/Animenosekai/safeIO"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index c3e03f98876d3..9d818bb3808d2 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "safetensors"; - version = "0.4.3"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,13 +26,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "safetensors"; rev = "refs/tags/v${version}"; - hash = "sha256-Rc+o7epQJ8qEvdgbFnGvXxBr/U4eULZwkKNEaPlJkyU="; + hash = "sha256-7tJeWs7kodK4Su8EaCjBuuWoMb93Ty3uiBrHZHdeTJc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-tzNEUvWgolSwX0t/JLgYcTEIv3/FiKxoTJ4VjFQs8AY="; + hash = "sha256-Frcru/GGWHDxd027mvjJu3iR30KO2ddpPz54kGD6mjc="; }; sourceRoot = "${src.name}/bindings/python"; @@ -68,11 +68,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "safetensors" ]; - meta = with lib; { + meta = { homepage = "https://github.com/huggingface/safetensors"; description = "Fast (zero-copy) and safe (unlike pickle) format for storing tensors"; changelog = "https://github.com/huggingface/safetensors/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix index c94427bdf083d..0ff590ea25c9b 100644 --- a/pkgs/development/python-modules/safety-schemas/default.nix +++ b/pkgs/development/python-modules/safety-schemas/default.nix @@ -12,22 +12,20 @@ buildPythonPackage rec { pname = "safety-schemas"; - version = "0.0.2"; + version = "0.0.3"; pyproject = true; src = fetchPypi { pname = "safety_schemas"; inherit version; - hash = "sha256-fRsEDsBkgPBc/2tF6nqT4JyJQt+GT7DQHd62fDI8+ow="; + hash = "sha256-s5VU+cAQ5PEffJ5Xc+sx0slsFk96WVwnOpiwdND7mPQ="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; pythonRelaxDeps = [ "dparse" ]; - propagatedBuildInputs = [ + dependencies = [ dparse packaging pydantic diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 3999897c90820..2db623d74f026 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, setuptools, click, urllib3, @@ -13,33 +13,37 @@ jinja2, marshmallow, authlib, - jwt, rich, typer, pydantic, safety-schemas, typing-extensions, + filelock, + psutil, + git, pytestCheckHook, }: buildPythonPackage rec { pname = "safety"; - version = "3.2.3"; + version = "3.2.5"; disabled = pythonOlder "3.7"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-QUFUk08XJ9r4pkc0k5RP7LOAVAw/AIddwa43c4L32D8="; + src = fetchFromGitHub { + owner = "pyupio"; + repo = "safety"; + rev = "refs/tags/${version}"; + hash = "sha256-vLibQfSwxZF48KL/vfkCOUi2qH5QGMySbdakLQNP+Ug="; }; postPatch = '' substituteInPlace safety/safety.py \ - --replace-fail "telemetry=True" "telemetry=False" + --replace-fail "telemetry: bool = True" "telemetry: bool = False" substituteInPlace safety/util.py \ - --replace-fail "telemetry = True" "telemetry = False" + --replace-fail "telemetry: bool = True" "telemetry: bool = False" substituteInPlace safety/cli.py \ --replace-fail "disable-optional-telemetry', default=False" \ "disable-optional-telemetry', default=True" @@ -47,18 +51,14 @@ buildPythonPackage rec { --replace-fail "telemetry=True" "telemetry=False" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ - "packaging" "dparse" - "authlib" - "pydantic" + "filelock" ]; - propagatedBuildInputs = [ + dependencies = [ setuptools click urllib3 @@ -69,23 +69,26 @@ buildPythonPackage rec { jinja2 marshmallow authlib - jwt rich typer pydantic safety-schemas typing-extensions + filelock + psutil ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + git + pytestCheckHook + ]; # Disable tests depending on online services disabledTests = [ "test_announcements_if_is_not_tty" "test_check_live" - "test_check_live_cached" + "test_debug_flag" "test_get_packages_licenses_without_api_key" - "test_validate_with_policy_file_using_invalid_keyword" "test_validate_with_basic_policy_file" ]; diff --git a/pkgs/development/python-modules/samarium/default.nix b/pkgs/development/python-modules/samarium/default.nix new file mode 100644 index 0000000000000..89d5a700a7bcb --- /dev/null +++ b/pkgs/development/python-modules/samarium/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + crossandra, + dahlia, + pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "samarium"; + version = "0.6.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "samarium-lang"; + repo = "samarium"; + rev = "refs/tags/${version}"; + hash = "sha256-sOkJ67B8LaIA2cwCHaFnc16lMG8uaegBJCzF6Li77vk="; + }; + + build-system = [ poetry-core pythonRelaxDepsHook ]; + dependencies = [ crossandra dahlia ]; + + pythonRelaxDeps = [ "crossandra" ]; + + meta = with lib; { + changelog = "https://github.com/samarium-lang/samarium/blob/${src.rev}/CHANGELOG.md"; + description = "The Samarium Programming Language"; + license = licenses.mit; + homepage = "https://samarium-lang.github.io/Samarium"; + maintainers = with maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix deleted file mode 100644 index d2f547f32ca25..0000000000000 --- a/pkgs/development/python-modules/sampledata/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - pytz, - six, - versiontools, -}: - -buildPythonPackage rec { - pname = "sampledata"; - version = "0.3.7"; - format = "setuptools"; - - meta = { - description = "Sample Data generator for Python "; - homepage = "https://github.com/jespino/sampledata"; - license = lib.licenses.bsd3; - }; - - src = fetchPypi { - inherit pname version; - sha256 = "1kx2j49lag30d32zhzsr50gl5b949wa4lcdap2filg0d07picsdh"; - }; - - buildInputs = [ - nose - versiontools - ]; - propagatedBuildInputs = [ - pytz - six - ]; - - # ERROR: test_image_path_from_directory (tests.tests.TestImageHelpers) - # ERROR: test_image_stream (tests.tests.TestImageHelpers) - doCheck = false; - - checkPhase = '' - nosetests -e "TestImageHelpers" - ''; -} diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 5323935b7c536..cfeface653cab 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix index f5fb012436bfe..1b82f6039878e 100644 --- a/pkgs/development/python-modules/sane/default.nix +++ b/pkgs/development/python-modules/sane/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/python-pillow/Sane"; - description = "Python interface to the SANE scanner and frame grabber "; + description = "Python interface to the SANE scanner and frame grabber"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index 7e7897cc509b1..c542076886d53 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic-routing"; changelog = "https://github.com/sanic-org/sanic-routing/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 52de4af8f1486..68b4ccc3d8f79 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic-testing"; changelog = "https://github.com/sanic-org/sanic-testing/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 939d68c5f3feb..8885c4951dd39 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -168,6 +168,6 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/sanic/"; changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix index 780f8560840e2..98a9503f44572 100644 --- a/pkgs/development/python-modules/sarif-om/default.nix +++ b/pkgs/development/python-modules/sarif-om/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Classes implementing the SARIF 2.1.0 object model"; homepage = "https://github.com/microsoft/sarif-python-om"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 4d2f02313d48c..6f5adae67d84f 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, hypothesis, fetchPypi, @@ -11,6 +12,7 @@ numpy, psutil, pynvml, + nvidia-ml-py, pytestCheckHook, pythonOlder, rich, @@ -18,13 +20,13 @@ buildPythonPackage rec { pname = "scalene"; - version = "1.5.42.2"; + version = "1.5.43.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-0ZGk0xFBFSeeg4vjNXu/ppGdEKGhUc2ql4R6oWG23aQ="; + hash = "sha256-LtD7v3pLz4UCnh6xlhkPdcEjyu3mt+YQPYZ0nNCLuDw="; }; nativeBuildInputs = [ @@ -37,9 +39,13 @@ buildPythonPackage rec { cloudpickle jinja2 psutil - pynvml rich - ]; + pynvml + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ]; + + pythonRemoveDeps = [ + "nvidia-ml-py3" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "nvidia-ml-py" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 10d557f774952..24badfd1d1ded 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.2.0"; + version = "32.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P5Lmosa8PrqDYEbdoDLnby0ET4KsfbLWzXHmWHhy8ss="; + hash = "sha256-o+c2aB9oAI5xyHj2xtQowSP4Wjq6RAAmasXjrzXR5ko="; }; dontConfigure = true; @@ -156,6 +156,6 @@ buildPythonPackage rec { asl20 cc-by-40 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 102d4d6adc83a..c0b86fd2ddfda 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/dbader/schedule"; changelog = "https://github.com/dbader/schedule/blob/${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 4df6f0af21f08..6e3b6e3d5ed62 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, cachecontrol, fetchFromGitHub, + fetchpatch, importlib-resources, mistune, mypy, @@ -56,6 +57,11 @@ buildPythonPackage rec { ++ cachecontrol.optional-dependencies.filecache ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + patches = [ (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/common-workflow-language/schema_salad/pull/840.patch"; + hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8="; + } ) ]; + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; preCheck = '' diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index fb58a91c68e57..57cc5902ed73f 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Python extension module which implements the fast marching method"; homepage = "https://github.com/scikit-fmm/scikit-fmm"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index aedf88316a465..12d798ab02388 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.45"; + version = "0.4.46"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Kpn7Z+LJPZ9rNxQLXFtACJvfpRdDs58cy+1QlbbODLA="; + hash = "sha256-lihStYseIthw74kMSDHYpYaLCJGIKlx4gb0VqQu8tc4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 79a27c1dfaaf1..39a5e8437ab12 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -8,9 +8,6 @@ scipy, pandas, matplotlib, - tox, - coverage, - flake8, nbval, pyvisa, networkx, @@ -22,38 +19,39 @@ sphinx, nbsphinx, openpyxl, - qtpy, - pyqtgraph, - pyqt5, setuptools, pytestCheckHook, - pytest-cov, pytest-mock, }: buildPythonPackage rec { pname = "scikit-rf"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "scikit-rf"; - repo = pname; + repo = "scikit-rf"; rev = "refs/tags/v${version}"; - hash = "sha256-xLgttefCRj8U2Wqif/28FiSjPjQn9YYCB+stlhZiIUo="; + hash = "sha256-K+iOpgEKwYtv8be/dLeDHYUDI8xZsoqB7mYDkVeCA10="; }; - buildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=skrf" "" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { plot = [ matplotlib ]; xlsx = [ openpyxl ]; netw = [ networkx ]; @@ -68,28 +66,20 @@ buildPythonPackage rec { nbsphinx openpyxl ]; - qtapps = [ - qtpy - pyqtgraph - pyqt5 - ]; }; + env = lib.optionalAttrs stdenv.isDarwin { MPLBACKEND = "Agg"; }; + nativeCheckInputs = [ - tox - coverage - flake8 - pytest-cov pytest-mock nbval matplotlib pyvisa openpyxl networkx + pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; - # test_calibration.py generates a divide by zero error on darwin # https://github.com/scikit-rf/scikit-rf/issues/972 disabledTestPaths = lib.optional ( diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index 1f0531e684123..fcdb7a495bc55 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -20,15 +20,15 @@ buildPythonPackage rec { pname = "scikit-tda"; - version = "1.0.0"; + version = "1.1.1"; format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; repo = "scikit-tda"; - rev = "v${version}"; - sha256 = "0yhmf5jmxywyj6l9q0rfv9r8wpdk063fvvfnb4azwwccblgz37rj"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-sf7UxCFJZlIMGOgNFwoh/30U7xsBCZuJ3eumsjEelMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 43e256b1fba69..c6daa99905d2d 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -92,6 +92,7 @@ buildPythonPackage { postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \ + --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \ ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index e05a957ab9cf7..6c39cc2af8b62 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.5"; + version = "3.3.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; rev = "refs/tags/${version}"; - hash = "sha256-wmziU00n2EjpXw8f1NwFRTUvpOftj+wa9ZiXVDh5hco="; + hash = "sha256-Z9HUeZPsskEPTwRRwK4z4p2Lv7Ukg7du6OAxvDwEcPc="; }; build-system = [ diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 645ded228605b..815a267c03916 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "SVG Optimizer / Cleaner "; + description = "SVG Optimizer / Cleaner"; mainProgram = "scour"; homepage = "https://github.com/scour-project/scour"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/scramp/default.nix b/pkgs/development/python-modules/scramp/default.nix index 53a8faaaa7ee7..63014b75aa347 100644 --- a/pkgs/development/python-modules/scramp/default.nix +++ b/pkgs/development/python-modules/scramp/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Implementation of the SCRAM authentication protocol"; homepage = "https://github.com/tlocke/scramp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 1a7a426af6a38..fa2c1ab63c40e 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -3,32 +3,31 @@ fetchPypi, buildPythonPackage, scrapy, - bsddb3, + setuptools, }: buildPythonPackage rec { pname = "scrapy-deltafetch"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "13f7968bd0ffae133e2a1dede215e683b8c95285f046260603a5c3e25f2d57b0"; + hash = "sha256-E/eWi9D/rhM+Kh3t4hXmg7jJUoXwRiYGA6XD4l8tV7A="; }; - propagatedBuildInputs = [ - bsddb3 - scrapy - ]; + dependencies = [ scrapy ]; + + build-system = [ setuptools ]; # no tests doCheck = false; pythonImportsCheck = [ "scrapy_deltafetch" ]; - meta = with lib; { + meta = { description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; - license = licenses.bsd3; - maintainers = with maintainers; [ evanjs ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ evanjs ]; }; } diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index e987c8ab4c6b3..ddb8416598b2c 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/alecxe/scrapy-fake-useragent"; changelog = "https://github.com/alecxe/scrapy-fake-useragent/blob/master/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index 9583ae6b28d97..a480429b6f31f 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing interactive command-line applications"; homepage = "https://pypi.org/project/scripttest/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 4afc0219d9003..9214204db210e 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -3,56 +3,45 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, + + # build-system meson-python, + numpy, pkg-config, + + # buildInputs Accelerate, blas, lapack, - numpy, + + # dependencies scipy, + # check inputs pytestCheckHook, }: buildPythonPackage rec { pname = "scs"; - version = "3.2.4"; + version = "3.2.6"; pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; - rev = version; - hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs="; + rev = "refs/tags/${version}"; + hash = "sha256-Sl0+1/uEXAg+V2ijDFGmez6hBKQjbi63gN26lPCiEnI="; fetchSubmodules = true; }; - patches = [ - # needed for building against netlib's reference blas implementation and - # the pkg-config patch. remove on next update - (fetchpatch { - name = "find-and-ld-lapack.patch"; - url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch"; - hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg="; - }) - # add support for pkg-config. remove on next update - (fetchpatch { - name = "use-pkg-config.patch"; - url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch"; - hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA="; - }) - # fix test_solve_random_cone_prob on linux after scipy 1.12 update - # https://github.com/bodono/scs-python/pull/82 - (fetchpatch { - name = "scipy-1.12-fix.patch"; - url = "https://github.com/bodono/scs-python/commit/4baf4effdc2ce7ac2dd1beaf864f1a5292eb06c6.patch"; - hash = "sha256-U/F5MakwYZN5hCaeAkcCG38WQxX9mXy9OvhyEQqN038="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "numpy >= 2.0.0" "numpy" + ''; - nativeBuildInputs = [ + build-system = [ meson-python + numpy pkg-config ]; @@ -65,7 +54,7 @@ buildPythonPackage rec { lapack ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; @@ -73,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; - meta = with lib; { + meta = { description = "Python interface for SCS: Splitting Conic Solver"; longDescription = '' Solves convex cone programs via operator splitting. @@ -82,7 +71,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 6331affe5d6d8..a69a2b6b27c93 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pylhc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4phANoYohuCaLbzO4TgRkSS+UHE8CnzonpEd46xzD0M="; + hash = "sha256-h1gEqzmKCUr8+w3Fv8lv35/0itZwela//AQsD3u0UJA="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index dd311a7642530..4d46563e92a84 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/ludbb/secp256k1-py"; description = "Python FFI bindings for secp256k1"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 0d2a5cf8bb92e..f78cda89176c3 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Adds optional security headers and cookie attributes for Python web frameworks"; homepage = "https://github.com/TypeError/secure.py"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 091bf550bdf3c..322446fd0353b 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { mainProgram = "segments"; homepage = "https://github.com/cldf/segments"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix deleted file mode 100644 index b2b79711c259f..0000000000000 --- a/pkgs/development/python-modules/selectors2/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - psutil, - mock, -}: - -buildPythonPackage rec { - version = "2.0.2"; - format = "setuptools"; - pname = "selectors2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b"; - }; - - patches = [ ./mapping-import.patch ]; - - nativeCheckInputs = [ - nose - psutil - mock - ]; - - checkPhase = '' - # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 - # Trick to disable certain tests that depend on timing which - # will always fail on hydra - export TRAVIS="" - nosetests tests/test_selectors2.py \ - --exclude=test_above_fd_setsize - ''; - - meta = with lib; { - homepage = "https://www.github.com/SethMichaelLarson/selectors2"; - description = "Back-ported, durable, and portable selectors"; - license = licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/selectors2/mapping-import.patch b/pkgs/development/python-modules/selectors2/mapping-import.patch deleted file mode 100644 index 64f74a5ce29bf..0000000000000 --- a/pkgs/development/python-modules/selectors2/mapping-import.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/selectors2.py b/selectors2.py -index 1625a30..c4a1231 100644 ---- a/selectors2.py -+++ b/selectors2.py -@@ -22,7 +22,8 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. - --from collections import namedtuple, Mapping -+from collections import namedtuple -+from collections.abc import Mapping - import errno - import math - import platform diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index c9e17cb0a2aa6..06beaabdbcd5f 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/hsoft/send2trash"; changelog = "https://github.com/arsenetar/send2trash/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index ece4555cc3f46..5f76694f3cbe8 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - home-assistant-bluetooth, poetry-core, pytestCheckHook, pythonOlder, - sensor-state-data, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix index ea6503bd001ec..1b88987698ce1 100644 --- a/pkgs/development/python-modules/sentence-splitter/default.nix +++ b/pkgs/development/python-modules/sentence-splitter/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Text to sentence splitter using heuristic algorithm by Philipp Koehn and Josh Schroeder"; homepage = "https://github.com/mediacloud/sentence-splitter"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 3e891a8ad6a5b..cd522d2b06e6f 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -63,14 +63,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.7.1"; + version = "2.12.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-MxpG4R6kWozBR5RiSBI/rCSsM2Gv2XJcx8B3IV3LGVk="; + hash = "sha256-34/QDus1KKCD2fe0ZTmgB1hTqMC7M6/fuuqKYRRsJ2E="; }; postPatch = '' @@ -156,6 +156,8 @@ buildPythonPackage rec { pytestCheckHook ]; + __darwinAllowLocalNetworking = true; + disabledTests = [ # depends on git revision "test_default_release" @@ -185,6 +187,9 @@ buildPythonPackage rec { # assert count_item_types["sessions"] == 1 # assert 0 == 1 "test_auto_session_tracking_with_aggregates" + # timing sensitive + "test_profile_captured" + "test_continuous_profiler_manual_start_and_stop" ]; pythonImportsCheck = [ "sentry_sdk" ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index 91cd37883e855..754ef870f8656 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -3,7 +3,6 @@ blockdiag, buildPythonPackage, fetchFromGitHub, - pynose, pytestCheckHook, pythonOlder, setuptools, @@ -27,11 +26,9 @@ buildPythonPackage rec { dependencies = [ blockdiag ]; - nativeCheckInputs = [ - pynose - pytestCheckHook - ]; + patches = [ ./fix_test_generate.patch ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "src/seqdiag/tests/" ]; pythonImportsCheck = [ "seqdiag" ]; diff --git a/pkgs/development/python-modules/seqdiag/fix_test_generate.patch b/pkgs/development/python-modules/seqdiag/fix_test_generate.patch new file mode 100644 index 0000000000000..d96c1308e6ed7 --- /dev/null +++ b/pkgs/development/python-modules/seqdiag/fix_test_generate.patch @@ -0,0 +1,25 @@ +diff --git a/src/seqdiag/tests/test_generate_diagram.py b/src/seqdiag/tests/test_generate_diagram.py +index cdd340f..a1dd2d4 100644 +--- a/src/seqdiag/tests/test_generate_diagram.py ++++ b/src/seqdiag/tests/test_generate_diagram.py +@@ -13,19 +13,5 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-import os +- + from blockdiag.tests.test_generate_diagram import (get_diagram_files, +- testcase_generator) +- +-import seqdiag.command +- +- +-def test_generate(): +- mainfunc = seqdiag.command.main +- basepath = os.path.dirname(__file__) +- files = get_diagram_files(basepath) +- options = [] +- +- for testcase in testcase_generator(basepath, mainfunc, files, options): +- yield testcase ++ test_generate_with_separate) diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix index aa9cd7c01fa9b..a8a06ed89ab24 100644 --- a/pkgs/development/python-modules/seqeval/default.nix +++ b/pkgs/development/python-modules/seqeval/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Python framework for sequence labeling evaluation"; homepage = "https://github.com/chakki-works/seqeval"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/serialio/default.nix b/pkgs/development/python-modules/serialio/default.nix index d06091fccd2e2..e5cfb9bc6d8c6 100644 --- a/pkgs/development/python-modules/serialio/default.nix +++ b/pkgs/development/python-modules/serialio/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-asyncio, - pytestCheckHook, pythonOlder, pyserial, sockio, diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 324ad056cc58a..10f0561849722 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Ridiculously fast object serialization"; homepage = "https://github.com/clarkduvall/serpy"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index d0d9167083495..147c9953bc47e 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -1,5 +1,4 @@ { - stdenv, buildPythonPackage, fetchFromGitHub, lib, diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 734eef48a0efb..89ece83ec0546 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,11 +1,15 @@ { - callPackage, lib, buildPythonPackage, fetchPypi, + maturin, pythonOlder, + rustPlatform, + rustc, + cargo, semantic-version, setuptools, + setuptools-rust, setuptools-scm, tomli, typing-extensions, @@ -38,13 +42,32 @@ buildPythonPackage rec { doCheck = false; - passthru.tests.pyo3 = callPackage ./pyo3-test { }; + passthru.tests = { + pyo3 = maturin.tests.pyo3.override { + format = "setuptools"; + buildAndTestSubdir = null; + + nativeBuildInputs = + [ setuptools-rust ] + ++ [ + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + preConfigure = '' + # sourceRoot puts Cargo.lock in the wrong place due to the + # example setup. + cd examples/word-count + ''; + }; + }; meta = with lib; { description = "Setuptools plugin for Rust support"; homepage = "https://github.com/PyO3/setuptools-rust"; changelog = "https://github.com/PyO3/setuptools-rust/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix b/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix deleted file mode 100644 index b8f2c593a656c..0000000000000 --- a/pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - callPackage, - cargo, - rustPlatform, - rustc, - setuptools-rust, -}: - -callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix { - # Isolated builds break for this package, because PyO3 is not - # in the build root of the Python Package: - # - # https://github.com/pypa/pip/issues/6276 - # - format = "setuptools"; - - nativeBuildInputs = - [ setuptools-rust ] - ++ [ - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - preConfigure = '' - # sourceRoot puts Cargo.lock in the wrong place due to the - # example setup. - cd examples/word-count - ''; -} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 3bc6b0f9a6b1e..9614680b08f88 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -2,6 +2,7 @@ stdenv, lib, buildPythonPackage, + distutils, fetchFromGitHub, python, wheel, @@ -33,6 +34,10 @@ buildPythonPackage rec { # Requires pytest, causing infinite recursion. doCheck = false; + passthru.tests = { + inherit distutils; + }; + meta = with lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = "https://github.com/pypa/setuptools"; diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix index a410c430f60cc..4eb5d9f81322e 100644 --- a/pkgs/development/python-modules/sexpdata/default.nix +++ b/pkgs/development/python-modules/sexpdata/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/jd-boyd/sexpdata"; changelog = "https://github.com/jd-boyd/sexpdata/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 9819cf04b54db..408697153b180 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.4"; + version = "2.0.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Xcc2En+scACbjTCaDut08+CJeeUwz3AX8vUH72Lmz7g="; + hash = "sha256-v/I2a8eGv6bLNT1rR9BEPFcMMndmEuUn7ke232P8/jI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 926bc4d48cb43..e35ca8ff6f027 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,5 +1,6 @@ { python, + pythonAtLeast, lib, stdenv, pyside2, @@ -7,28 +8,47 @@ qt5, libxcrypt, llvmPackages_15, - pythonAtLeast, }: stdenv.mkDerivation { pname = "shiboken2"; - inherit (pyside2) version src; + inherit (pyside2) version src patches; - patches = [ ./nix_compile_cflags.patch ]; - - postPatch = '' - cd sources/shiboken2 - ''; + postPatch = + (lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace \ + ez_setup.py \ + build_scripts/main.py \ + build_scripts/options.py \ + build_scripts/utils.py \ + build_scripts/wheel_override.py \ + build_scripts/wheel_utils.py \ + sources/shiboken2/CMakeLists.txt \ + sources/shiboken2/data/shiboken_helpers.cmake \ + --replace-fail "from distutils" "import setuptools; from distutils" + substituteInPlace \ + build_scripts/config.py \ + build_scripts/main.py \ + build_scripts/options.py \ + build_scripts/setup_runner.py \ + build_scripts/utils.py \ + --replace-fail "import distutils" "import setuptools; import distutils" + '') + + '' + cd sources/shiboken2 + ''; CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + (python.withPackages (ps: with ps; [ setuptools ])) + ]; buildInputs = [ llvmPackages_15.libclang - python python.pkgs.setuptools qt5.qtbase qt5.qtxmlpatterns @@ -59,6 +79,5 @@ stdenv.mkDerivation { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; - broken = pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch b/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch deleted file mode 100644 index c3c63dc67ba9a..0000000000000 --- a/pkgs/development/python-modules/shiboken2/nix_compile_cflags.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp~ 2020-07-08 14:37:13.022476435 -0700 -+++ pyside-setup-everywhere-src-5.12.6/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp 2020-07-08 14:37:18.271484269 -0700 -@@ -330,17 +330,15 @@ - } - #endif // NEED_CLANG_BUILTIN_INCLUDES - -- // Append the c++ include paths since Clang is unable to find <list> etc -- // on RHEL 7 with g++ 6.3 or CentOS 7.2. -- // A fix for this has been added to Clang 5.0, so, the code can be removed -- // once Clang 5.0 is the minimum version. -- if (needsGppInternalHeaders()) { -- const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(QStringLiteral("g++"))); -- for (const HeaderPath &h : gppPaths) { -- if (h.path.contains("c++") -- || h.path.contains("sysroot")) { // centOS -- headerPaths.append(h); -- } -+ const HeaderPaths gppPaths = gppInternalIncludePaths(QStringLiteral("g++")); -+ for (const HeaderPath &h : gppPaths) { -+ // PySide2 requires that Qt headers are not -isystem -+ // https://bugreports.qt.io/browse/PYSIDE-787 -+ if (!h.path.contains("-qt")) { -+ // add using -isystem -+ headerPaths.append(h); -+ } else { -+ headerPaths.append({h.path, HeaderType::Standard}); - } - } - #else - diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index 39c61bc8cc3b5..e3d5490a6c36a 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -64,10 +64,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; homepage = "https://wiki.qt.io/Qt_for_Python"; changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs/changes-${finalAttrs.version}?h=v${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - gebner - Enzime - ]; + maintainers = with lib.maintainers; [ gebner ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix new file mode 100644 index 0000000000000..d22649c725ef3 --- /dev/null +++ b/pkgs/development/python-modules/shiny/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + + appdirs, + asgiref, + click, + htmltools, + linkify-it-py, + markdown-it-py, + mdit-py-plugins, + python-multipart, + questionary, + starlette, + uvicorn, + watchfiles, + websockets, + + pytestCheckHook, + pytest-asyncio, + pytest-playwright, + pytest-xdist, + pytest-timeout, + pytest-rerunfailures, + pandas, +}: + +buildPythonPackage rec { + pname = "shiny"; + version = "0.10.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "posit-dev"; + repo = "py-shiny"; + rev = "refs/tags/v${version}"; + hash = "sha256-s1j9bMAapO0iRXsuNxiwlNaVv2EoWcl9U7WnHwQe9n8="; + }; + + build-system = [ setuptools ]; + dependencies = [ + appdirs + asgiref + click + htmltools + linkify-it-py + markdown-it-py + mdit-py-plugins + python-multipart + questionary + starlette + uvicorn + watchfiles + websockets + ]; + + pythonImportsCheck = [ "shiny" ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-playwright + pytest-xdist + pytest-timeout + pytest-rerunfailures + pandas + ]; + + meta = { + changelog = "https://github.com/posit-dev/py-shiny/blob/${src.rev}/CHANGELOG.md"; + description = "Build fast, beautiful web applications in Python"; + license = lib.licenses.mit; + homepage = "https://shiny.posit.co/py"; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 010fd7aad9998..804c33c3e744c 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/show-in-file-manager/default.nix b/pkgs/development/python-modules/show-in-file-manager/default.nix index 0d52bdb52bd4e..a43b08ee1c9e1 100644 --- a/pkgs/development/python-modules/show-in-file-manager/default.nix +++ b/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { something with them. ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index 4d4e15659c55e..f52b15c7dfafe 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "sievelib"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eM8es/WZENFBASjOk1KVbbwkmzxTr7NirOiSLt7F3N8="; + hash = "sha256-z0cUBzFVMs9x2/b2YrAAzq0rR3pwz/XEshvF1DJLpT4="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix index 0dcd543346667..7bf0f0ef5b7ec 100644 --- a/pkgs/development/python-modules/signalslot/default.nix +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index ef386cfd378e2..a03238cf2e00c 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "Sign JSON with Ed25519 signatures"; homepage = "https://github.com/matrix-org/python-signedjson"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sigparse/default.nix b/pkgs/development/python-modules/sigparse/default.nix new file mode 100644 index 0000000000000..d06a2a91e49dc --- /dev/null +++ b/pkgs/development/python-modules/sigparse/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytestCheckHook, + fetchpatch +}: + +buildPythonPackage rec { + pname = "sigparse"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Lunarmagpie"; + repo = "sigparse"; + rev = "refs/tags/v${version}"; + hash = "sha256-VzWDqplYgwrJXXd5IUzEIp0YRuofybqmGrNKPaGqQFM="; + }; + + patches = [ + # pyproject.toml version file is set as 1.0.0 + (fetchpatch { + url = "https://github.com/Lunarmagpie/sigparse/pull/14/commits/44780382410bc6913bdd8ff7e92948078adb736c.patch"; + hash = "sha256-3EOkdBQDBodMBp4ENdvquJlRvAAywQhdWAX4dWFmhL0="; + }) + ]; + + build-system = [ poetry-core ]; + pythonImportsCheck = [ "sigparse" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Backports python 3.10 typing features into 3.7, 3.8, and 3.9"; + license = lib.licenses.mit; + homepage = "https://github.com/Lunarmagpie/sigparse"; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index 56d7ecd6c5e94..50afaabf6e989 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { homepage = "https://github.com/sigstore/sigstore-python"; changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "sigstore"; }; } diff --git a/pkgs/development/python-modules/sigtools/default.nix b/pkgs/development/python-modules/sigtools/default.nix index d1122d16cfbf3..46c3e3caad9f6 100644 --- a/pkgs/development/python-modules/sigtools/default.nix +++ b/pkgs/development/python-modules/sigtools/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Utilities for working with inspect.Signature objects"; homepage = "https://sigtools.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index c529e2ab04ae8..b876c0e487015 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/simple-salesforce/simple-salesforce"; changelog = "https://github.com/simple-salesforce/simple-salesforce/blob/v${version}/CHANGES"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index ea3fdd268e4c6..bfa761b59e442 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + unittestCheckHook, mock, isPy3k, }: @@ -22,16 +22,14 @@ buildPythonPackage { }; nativeCheckInputs = [ - nose mock + unittestCheckHook ]; postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py ''; - checkPhase = "nosetests tests/test.py"; - meta = with lib; { description = "Memory-based naive bayesian text classifier"; homepage = "https://github.com/hickeroar/simplebayes"; diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index e69f39820c476..f241cd0a29689 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index e31fe1873f189..3cd1ddface07c 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency"; homepage = "https://github.com/adbar/simplemma"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix index d717ab1b32b81..2c3203446683d 100644 --- a/pkgs/development/python-modules/simplenote/default.nix +++ b/pkgs/development/python-modules/simplenote/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Python library for the simplenote.com web service"; homepage = "http://readthedocs.org/docs/simplenotepy/en/latest/api.html"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix index cc4e4fa3f3a7a..809493dc0a300 100644 --- a/pkgs/development/python-modules/single-source/default.nix +++ b/pkgs/development/python-modules/single-source/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, poetry-core, + toml, pytest-mock, pytestCheckHook, pythonOlder, @@ -11,34 +11,33 @@ buildPythonPackage rec { pname = "single-source"; - version = "0.3.0"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rabbit72"; repo = "single-source"; rev = "refs/tags/v${version}"; - hash = "sha256-bhfMRIeJUd5JhN2tPww7fdbmHQ7ypcsZrYSa55v0+W8="; + hash = "sha256-4l9ochlscQoWJVkYN8Iq2DsiU7qoOf7nUFYgBOebK/g="; }; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ importlib-metadata ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ + toml pytest-mock pytestCheckHook ]; pythonImportsCheck = [ "single_source" ]; - meta = with lib; { + meta = { description = "Access to the project version in Python code for PEP 621-style projects"; homepage = "https://github.com/rabbit72/single-source"; changelog = "https://github.com/rabbit72/single-source/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 01de3d2c0b4e9..e9305188ca6b7 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -6,7 +6,9 @@ python, isPyPy, pythonAtLeast, + pythonOlder, sip-module ? "sip", + setuptools, }: buildPythonPackage rec { @@ -14,8 +16,7 @@ buildPythonPackage rec { version = "4.19.25"; format = "other"; - # relies on distutils - disabled = isPyPy || pythonAtLeast "3.12"; + disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; @@ -30,6 +31,12 @@ buildPythonPackage rec { }) ]; + postPatch = lib.optionalString (pythonAtLeast "3.12") '' + substituteInPlace configure.py --replace-fail "from distutils" "from setuptools._distutils" + ''; + + propagatedBuildInputs = lib.optional (pythonAtLeast "3.12") setuptools; + configurePhase = '' ${python.executable} ./configure.py \ --sip-module ${sip-module} \ @@ -40,7 +47,13 @@ buildPythonPackage rec { enableParallelBuilding = true; pythonImportsCheck = [ - sip-module + # https://www.riverbankcomputing.com/pipermail/pyqt/2023-January/045094.html + # the import check for "sip" will fail, as it segfaults as the interperter is shutting down. + # This is an upstream bug with sip4 on python3.12, and happens in the ubuntu packages version as well. + # As the pacakge works fine until exit, just remove the import check for now. + # See discussion at https://github.com/NixOS/nixpkgs/pull/327976#discussion_r1706488319 + (lib.optional (pythonOlder "3.12") sip-module) + "sipconfig" ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 38e604de874fe..8a398654b08ce 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -5,8 +5,6 @@ pythonOlder, setuptools, packaging, - ply, - toml, tomli, # tests diff --git a/pkgs/development/python-modules/sjcl/default.nix b/pkgs/development/python-modules/sjcl/default.nix index cca5d21cec0b0..ba519e78e952e 100644 --- a/pkgs/development/python-modules/sjcl/default.nix +++ b/pkgs/development/python-modules/sjcl/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pycryptodome, unittestCheckHook, }: diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 19048dfc9ca83..28a8f1771f4e1 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, numpy, scikit-learn, @@ -28,15 +27,6 @@ buildPythonPackage rec { hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ="; }; - # Remove at next skorch release: - patches = [ - (fetchpatch { - name = "unbreak-tests-with-sklearn-1.4"; - url = "https://github.com/skorch-dev/skorch/commit/1f7a779d0aa78589e17262c206f5775f2fcd75f8.diff"; - hash = "sha256-X3SgjgDeq3PlBI13cC56LIL1dV1e+Z3tsBj9sz5pizo="; - }) - ]; - disabled = pythonOlder "3.8"; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index f1320e68a867d..2ce2555a25ca6 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pillow, pytestCheckHook, pythonOlder, @@ -17,12 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-dtef"; rev = version; hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pillow skytemple-files ]; diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index ab4d8d085b261..8d1087f4ab838 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, appdirs, dungeon-eos, explorerscript, @@ -10,12 +11,9 @@ pillow, setuptools, skytemple-rust, - tilequant, pyyaml, pmdsky-debug-py, range-typed-integers, - importlib-resources, - typing-extensions, pythonOlder, # optional dependancies for SpriteCollab aiohttp, @@ -31,43 +29,48 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.6.5"; + version = "1.7.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-files"; rev = version; - hash = "sha256-y6VHRfwQNoehp06BoZXuprYtsiGgoNL4rztJw40P4FI="; + hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0="; # Most patches are in submodules fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + name = "fix-tests.patch"; + url = "https://github.com/SkyTemple/skytemple-files/commit/854e5514e6c63ba082618d14643e3a4b30a6c2b2.patch"; + hash = "sha256-oTV2EQQ2OPgu2pYB2fLd4jODfybnV29YNLxzDs2v6Cg="; + }) + ]; + postPatch = '' substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \ - --replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" + --replace-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\"" ''; + build-system = [ setuptools ]; + buildInputs = [ armips ]; - propagatedBuildInputs = - [ - appdirs - dungeon-eos - explorerscript - ndspy - pillow - setuptools - skytemple-rust - tilequant - pyyaml - pmdsky-debug-py - range-typed-integers - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - typing-extensions - ]; + dependencies = [ + appdirs + dungeon-eos + explorerscript + ndspy + pillow + skytemple-rust + pyyaml + pmdsky-debug-py + range-typed-integers + ]; passthru.optional-dependencies = { spritecollab = [ @@ -78,7 +81,7 @@ buildPythonPackage rec { ] ++ gql.optional-dependencies.aiohttp; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook parameterized xmldiff diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix index b13416271f584..20c6187a2c25a 100644 --- a/pkgs/development/python-modules/skytemple-icons/default.nix +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/SkyTemple/skytemple-icons"; description = "Icons for SkyTemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix index 0ea529c5ab287..e50bc2ae59aa8 100644 --- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix +++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, explorerscript, fetchFromGitHub, + setuptools, gobject-introspection, gtk3, gtksourceview4, @@ -23,16 +24,18 @@ buildPythonPackage rec { pname = "skytemple-ssb-debugger"; - version = "1.6.4"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple-ssb-debugger"; rev = version; - hash = "sha256-whnwFwPYPGF+UtjrzRKgXJNPsUGvmE+HHKJcPf0qcuA="; + hash = "sha256-S38Nw7FntacEdwdGu2d/zUKOsGostVy9+U2KPxlvI5Q="; }; + build-system = [ setuptools ]; + buildInputs = [ gtk3 gtksourceview4 @@ -41,7 +44,7 @@ buildPythonPackage rec { gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = [ + dependencies = [ explorerscript ndspy nest-asyncio diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index d4f5eb2af44d8..7eeb546c5d5d9 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -15,7 +15,6 @@ flask-sockets, gunicorn, moto, - numpy, pyramid, pytest-asyncio, pytestCheckHook, diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 6eb35709fabc5..9f6e1cba8a5b0 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, aiodns, aiohttp, boto3, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.30.0"; + version = "3.31.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-KJC0M5sk1dlCzadQ1/MBEnWuAGva/MP2MygqehH2fTg="; + hash = "sha256-6fuC2yIGtjIxnEiI2/1sQ5RZB18WlteozyS8/XDTwkg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index d76fb9fa16792..6dc89369d0c39 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Lazy-loading, fancy-sliceable iterable"; homepage = "https://github.com/soft-matter/slicerator"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 527cf726d39da..87cc7f7cf77c3 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + nix-update-script, buildPythonPackage, crytic-compile, fetchFromGitHub, @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-KmbmljtmMtrJxgSMJjQ8fdk6RpEXcAVBuo24EsyMV8k="; + hash = "sha256-KWLv0tpd1FHZ9apipVPWw6VjtfYpngsH7XDQQ3luBZA="; }; nativeBuildInputs = [ @@ -84,6 +84,8 @@ buildPythonPackage rec { version = "${version}"; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Static Analyzer for Solidity"; longDescription = '' diff --git a/pkgs/development/python-modules/slpp/default.nix b/pkgs/development/python-modules/slpp/default.nix index c21a183269a0a..10c964c61177c 100644 --- a/pkgs/development/python-modules/slpp/default.nix +++ b/pkgs/development/python-modules/slpp/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Simple lua-python parser"; homepage = "https://github.com/SirAnthony/slpp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix index 2c812f5405ba6..a31cb56a3a364 100644 --- a/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/pkgs/development/python-modules/smhi-pkg/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "smhi-pkg"; - version = "1.0.16"; + version = "1.0.17"; format = "setuptools"; src = fetchFromGitHub { owner = "joysoftware"; repo = "pypi_smhi"; rev = "refs/tags/${version}"; - hash = "sha256-jcIXzAZO9SxC/0apdjAVv1GmBTbdlasfXr1/Tj9adNc="; + hash = "sha256-dJh44JGWy3VafTnwwxWcr5cXClmzY1YuySy1RJzOak8="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/smpp-pdu/default.nix b/pkgs/development/python-modules/smpp-pdu/default.nix index f42c8dd217a33..a515b53716274 100644 --- a/pkgs/development/python-modules/smpp-pdu/default.nix +++ b/pkgs/development/python-modules/smpp-pdu/default.nix @@ -2,11 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, - pydantic, - requests, pytestCheckHook, - pytest-asyncio, setuptools, }: diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 16c96ce311d46..4a1753d7a7aeb 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; + hash = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; }; propagatedBuildInputs = [ six ]; @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-smpplib/python-smpplib"; changelog = "https://github.com/python-smpplib/python-smpplib/releases/tag/${version}"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index 5570972d24a49..c07ac11055e68 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { mainProgram = "snakebite"; homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix index cb41b71dc4a04..19365d837ff2f 100644 --- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "9.1.1"; + version = "9.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jANSGNdWmc6ERClLR/pExoboyz8gUL2FW3W7kDQDOQo="; + hash = "sha256-WMbJP17YnDzFVcr6YepT5Ltw+Jo6PPn7ayIrjx2k+go="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index 493f142724e3c..26646c5af2131 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -7,19 +7,18 @@ snakemake-interface-common, throttler, wrapt, - snakemake, }: buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.2.2"; + version = "3.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-syUjK32RPV9FMV7RSpXy+PJ2AVigGH+ywm6iTjUAuec="; + hash = "sha256-xfqxUla3qFnGZSFpWVCmtSJLqCK6XJF1OtDF1EDXbZU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix index dd2e2f192b815..4c697fcdb9238 100644 --- a/pkgs/development/python-modules/snapshottest/default.nix +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Snapshot testing for pytest, unittest, Django, and Nose"; homepage = "https://github.com/syrusakbary/snapshottest"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index cfc61601b34d9..77bc5b2cd1529 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.11.0"; + version = "3.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "snowflake_connector_python"; inherit version; - hash = "sha256-MWnAFKA+X1hVESYF45OJelUuVYlTxp8loC4zsZmIZNA="; + hash = "sha256-Mg4Lb4zYVW4ZyLhySckxcAI4spWDE6/HozEI1n2ofYI="; }; build-system = [ @@ -90,6 +90,6 @@ buildPythonPackage rec { homepage = "https://github.com/snowflakedb/snowflake-connector-python"; changelog = "https://github.com/snowflakedb/snowflake-connector-python/blob/v${version}/DESCRIPTION.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index 1441caa2cd5a4..a366853ded7ac 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.4.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-app-django"; rev = "refs/tags/${version}"; - hash = "sha256-BvPQo0pXffGYu0tpy5yHT9lJVwOTewBiX5GLeezBrhE="; + hash = "sha256-W9boogixZ7X6qysfh2YEat+TOBy1VNreGr27y8hno+0="; }; propagatedBuildInputs = [ social-auth-core ]; diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix index da423a4730526..c41bef8e1c7fc 100644 --- a/pkgs/development/python-modules/sockjs/default.nix +++ b/pkgs/development/python-modules/sockjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; + hash = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/socksio/default.nix b/pkgs/development/python-modules/socksio/default.nix index 02de4ab9cd6e0..decae7430fa27 100644 --- a/pkgs/development/python-modules/socksio/default.nix +++ b/pkgs/development/python-modules/socksio/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchpatch, fetchPypi, - pythonAtLeast, flit-core, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index a3adf24ecb7d5..ecb04654073a4 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, click, fetchFromGitHub, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.2.2"; + version = "6.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; - rev = "refs/tags/v.${version}"; - hash = "sha256-xlfVxQFsBKKpEsVmPlxn0sSyePNEmhly6wS/lTvP3DA="; + rev = "refs/tags/v${version}"; + hash = "sha256-Hl3nW31EoqjziYMeeHip/Ieq8eYLa7//qrENThPa7ns="; }; postPatch = '' diff --git a/pkgs/development/python-modules/solaredge/default.nix b/pkgs/development/python-modules/solaredge/default.nix deleted file mode 100644 index 1d942f8ca6acf..0000000000000 --- a/pkgs/development/python-modules/solaredge/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - python-dateutil, - pythonOlder, - pytz, - requests, -}: - -buildPythonPackage rec { - pname = "solaredge"; - version = "0.0.4"; - format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz"; - }; - - propagatedBuildInputs = [ - python-dateutil - pytz - requests - ]; - - # Project has no tests - doCheck = false; - pythonImportsCheck = [ "solaredge" ]; - - meta = with lib; { - description = "Python wrapper for Solaredge monitoring service"; - homepage = "https://github.com/bertouttier/solaredge"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/solarlog-cli/default.nix b/pkgs/development/python-modules/solarlog-cli/default.nix new file mode 100644 index 0000000000000..346d68fc914c3 --- /dev/null +++ b/pkgs/development/python-modules/solarlog-cli/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + hatchling, + aiohttp, +}: + +buildPythonPackage rec { + pname = "solarlog-cli"; + version = "0.1.6"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "dontinelli"; + repo = "solarlog_cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-Bliq1n6xH0cZQHueiGDyalIo0zms8zCSpUGq2KH5xZY="; + }; + + build-system = [ hatchling ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "solarlog_cli" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/dontinelli/solarlog_cli/releases/tag/v${version}"; + description = "Python library to access the Solar-Log JSON interface"; + homepage = "https://github.com/dontinelli/solarlog_cli"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index c8de14dd7fdd8..5d4e946c85184 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -10,21 +10,21 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-5rlgDnPYTtuVMincG5CgVwNh/IGmZk6ItvzdB/wHmgg="; + hash = "sha256-fq891LX6PukUEfrXplulhnisuPX/RqLAQ/5ty/Fvm9k="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ regex ]; + dependencies = [ regex ]; # loops forever doCheck = !stdenv.isDarwin; @@ -33,9 +33,10 @@ buildPythonPackage rec { meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; - mainProgram = "somajo-tokenizer"; homepage = "https://github.com/tsproisl/SoMaJo"; + changelog = "https://github.com/tsproisl/SoMaJo/blob/v${version}/CHANGES.txt"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; + mainProgram = "somajo-tokenizer"; }; } diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index a764cf6d5ddec..967119bbe776c 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -34,7 +34,7 @@ let description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; homepage = "https://grantjenks.com/docs/sortedcontainers/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/soundcard/default.nix b/pkgs/development/python-modules/soundcard/default.nix new file mode 100644 index 0000000000000..6fd42cd2ec91e --- /dev/null +++ b/pkgs/development/python-modules/soundcard/default.nix @@ -0,0 +1,50 @@ +{ + buildPythonPackage, + cffi, + fetchPypi, + lib, + libpulseaudio, + numpy, + setuptools, + testers, +}: +let + version = "0.4.3"; +in +buildPythonPackage { + inherit version; + pname = "soundcard"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "SoundCard"; + hash = "sha256-QQg1UUuhCAmAPLmIfUJw85K1nq82WRW7lFFq8/ix0Dc="; + }; + + patchPhase = '' + substituteInPlace soundcard/pulseaudio.py \ + --replace "'pulse'" "'${libpulseaudio}/lib/libpulse.so'" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + cffi + numpy + ]; + + # doesn't work because there are not many soundcards in the + # sandbox. See VM-test + # pythonImportsCheck = [ "soundcard" ]; + + passthru.tests.vm-with-soundcard = testers.runNixOSTest ./test.nix; + + meta = { + description = "Pure-Python Real-Time Audio Library"; + homepage = "https://github.com/bastibe/SoundCard"; + changelog = "https://github.com/bastibe/SoundCard/blob/${version}/README.rst#changelog"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ matthiasdotsh ]; + }; +} diff --git a/pkgs/development/python-modules/soundcard/test.nix b/pkgs/development/python-modules/soundcard/test.nix new file mode 100644 index 0000000000000..720e7336cd6af --- /dev/null +++ b/pkgs/development/python-modules/soundcard/test.nix @@ -0,0 +1,47 @@ +{ + name = "Python Soundcard Library Test"; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ (pkgs.python3.withPackages (ps: [ ps.soundcard ])) ]; + + hardware.pulseaudio.enable = true; + hardware.pulseaudio.systemWide = true; + + virtualisation.qemu.options = [ + "-device virtio-sound-pci,audiodev=my_audiodev" + "-audiodev wav,id=my_audiodev" + ]; + }; + + interactive.nodes.machine = + { ... }: + { + services.openssh.enable = true; + services.openssh.settings.PermitRootLogin = "yes"; + users.extraUsers.root.initialPassword = ""; + users.extraUsers.root.hashedPassword = null; + users.extraUsers.root.hashedPasswordFile = null; + users.extraUsers.root.initialHashedPassword = null; + virtualisation.forwardPorts = [ + { + from = "host"; + host.port = 2222; + guest.port = 22; + } + ]; + }; + + testScript = + let + script = builtins.toFile "import.py" '' + import soundcard + ''; + in + '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("python ${script}") + ''; +} diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 7b46166ec2f40..fa777afe1f410 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "soundcloud-v2"; - version = "1.3.8"; + version = "1.5.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg="; + hash = "sha256-cnM70Yz9xw3TPqGk8VYAag6u1nLjQS2kS7xRBJtFodU="; }; nativeBuildInputs = [ setuptools ]; @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Python wrapper for the v2 SoundCloud API"; homepage = "https://github.com/7x11x13/soundcloud.py"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 96dfbe9d8440b..b5583765da31b 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, hatchling, - isPy3k, }: buildPythonPackage rec { @@ -28,6 +27,6 @@ buildPythonPackage rec { description = "CSS4 selector implementation for Beautiful Soup"; license = licenses.mit; homepage = "https://github.com/facelessuser/soupsieve"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 0798bd32324ed..aefb730b229d2 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -2,7 +2,9 @@ lib, fetchPypi, buildPythonPackage, + stdenv, pythonOlder, + overrideSDK, rustPlatform, bitstring, cachetools, @@ -18,27 +20,32 @@ pyyaml, pytestCheckHook, }: - +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; +in buildPythonPackage rec { pname = "sourmash"; - version = "4.8.4"; - format = "pyproject"; - disabled = pythonOlder "3.8"; + version = "4.8.11"; + pyproject = true; + disabled = pythonOlder "3.9"; + + stdenv = stdenv'; src = fetchPypi { inherit pname version; - hash = "sha256-Q1hMESwzEHGXcd4XW4nLqU8cLTCxrqRgAOr1qB77roo="; + hash = "sha256-GganbfRkuSaFd5qqpu0CpXe91zpKsyly6BNFgQNNNL8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-HisWvJgx15OfYoMzzqYm1JyY1/jmGXBSZZmuNaKTDjI="; + hash = "sha256-im/TPxnT8c2QbWlzCY60wVwJFRIhSnVW7E4kv6bm0p4="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook + bindgenHook ]; buildInputs = [ iconv ]; diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index fd548f5eb311e..66b1c20655124 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Align tokenizations for spaCy and transformers"; homepage = "https://github.com/explosion/spacy-alignments"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix index 85201465bb4a7..8ac6396cf0abc 100644 --- a/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -1,6 +1,5 @@ { lib, - callPackage, fetchPypi, buildPythonPackage, wandb, diff --git a/pkgs/development/python-modules/spacy-pkuseg/default.nix b/pkgs/development/python-modules/spacy-pkuseg/default.nix index 04b8ca7e71dc9..f1896a50ad182 100644 --- a/pkgs/development/python-modules/spacy-pkuseg/default.nix +++ b/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Toolkit for multi-domain Chinese word segmentation (spaCy fork)"; homepage = "https://github.com/explosion/spacy-pkuseg"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 0f47280570c6c..9842e22c92d94 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -20,7 +20,6 @@ preshed, pydantic, pytestCheckHook, - python, pythonOlder, requests, setuptools, @@ -135,6 +134,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spaCy"; changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/spark-parser/default.nix b/pkgs/development/python-modules/spark-parser/default.nix index 3543cc0abadbc..f82b7df763426 100644 --- a/pkgs/development/python-modules/spark-parser/default.nix +++ b/pkgs/development/python-modules/spark-parser/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - nose, + unittestCheckHook, click, }: @@ -17,9 +17,15 @@ buildPythonPackage rec { sha256 = "0np2y4jcir4a4j18wws7yzkz2zj6nqhdhn41rpq8pyskg6wrgfx7"; }; - buildInputs = [ nose ]; propagatedBuildInputs = [ click ]; + nativeCheckInputs = [ unittestCheckHook ]; + unittestFlagsArray = [ + "-s" + "test" + "-v" + ]; + meta = with lib; { description = "Early-Algorithm Context-free grammar Parser"; mainProgram = "spark-parser-coverage"; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index cfd6569472052..6c6e5b76eeafb 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { changelog = "https://sparse.pydata.org/en/stable/changelog.html"; downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix new file mode 100644 index 0000000000000..3613763f3105d --- /dev/null +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -0,0 +1,76 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + oldest-supported-numpy, + setuptools, + ansitable, + matplotlib, + numpy, + scipy, + typing-extensions, + coverage, + flake8, + pytest, + pytest-timeout, + pytest-xvfb, + sympy, + pytestCheckHook, + pythonRelaxDepsHook, +}: + +buildPythonPackage rec { + pname = "spatialmath-python"; + version = "1.1.10"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "spatialmath_python"; + inherit version; + hash = "sha256-7h29RHCrxdexpabtxMQx/7RahQmCDGHhdJ1WETvtfYg="; + }; + + nativeBuildInputs = [ + oldest-supported-numpy + setuptools + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ "pre-commit" ]; + + propagatedBuildInputs = [ + ansitable + matplotlib + numpy + scipy + typing-extensions + ]; + + passthru.optional-dependencies = { + dev = [ + coverage + flake8 + pytest + pytest-timeout + pytest-xvfb + sympy + ]; + }; + + pythonImportsCheck = [ "spatialmath" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Provides spatial maths capability for Python"; + homepage = "https://pypi.org/project/spatialmath-python/"; + license = licenses.mit; + maintainers = with maintainers; [ + djacu + a-camarillo + ]; + }; +} diff --git a/pkgs/development/python-modules/spdx-lookup/default.nix b/pkgs/development/python-modules/spdx-lookup/default.nix index 5da39999ace3d..420ce4c68976c 100644 --- a/pkgs/development/python-modules/spdx-lookup/default.nix +++ b/pkgs/development/python-modules/spdx-lookup/default.nix @@ -3,12 +3,14 @@ fetchFromGitHub, buildPythonPackage, nix-update-script, + setuptools, spdx, }: buildPythonPackage rec { pname = "spdx-lookup"; version = "0.3.2"; + pyproject = true; src = fetchFromGitHub { owner = "bbqsrc"; @@ -17,10 +19,15 @@ buildPythonPackage rec { hash = "sha256-jtzhqRAj1BWdU8AuR7Gr343mL5alLXhi+SyCkCI5AAU="; }; - propagatedBuildInputs = [ spdx ]; + build-system = [ setuptools ]; + + dependencies = [ spdx ]; pythonImportsCheck = [ "spdx_lookup" ]; + # upstream has no tests + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/spdx/default.nix b/pkgs/development/python-modules/spdx/default.nix index 0f8b434c2b74a..a99ee507936b6 100644 --- a/pkgs/development/python-modules/spdx/default.nix +++ b/pkgs/development/python-modules/spdx/default.nix @@ -3,11 +3,13 @@ fetchFromGitHub, buildPythonPackage, nix-update-script, + setuptools, }: buildPythonPackage rec { pname = "spdx"; version = "2.5"; + pyproject = true; src = fetchFromGitHub { owner = "bbqsrc"; @@ -16,8 +18,13 @@ buildPythonPackage rec { hash = "sha256-lfTgAX4Wl01xrvLA12ZUqjah7ZiLafMAU+yNNdVkRk0="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "spdx" ]; + # upstream has no tests + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix index d47382a5c213c..1ec6bc84493d1 100644 --- a/pkgs/development/python-modules/speg/default.nix +++ b/pkgs/development/python-modules/speg/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - speg, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 300402b931072..bebf413b2b58e 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "spglib"; - version = "2.4.0"; + version = "2.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-bmP57mG3DxU6ItO1ULGD2lMfiQR1kX/OIDutRZeqwkM="; + hash = "sha256-+LtjiJe+kbnb1MCF2f3h9pBI9ZSeIPODLLlDjldBjUs="; }; nativeBuildInputs = [ @@ -40,6 +40,12 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + postPatch = '' + # relax v2 constrain in [build-system] intended for binary backward compat + substituteInPlace pyproject.toml \ + --replace-fail "numpy~=2.0" "numpy" + ''; + propagatedBuildInputs = [ numpy ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 1a25fef81c244..931f08e8068e9 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.1.1"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinx_autoapi"; inherit version; - hash = "sha256-tfbjxhzYbAzbfud6nVgMD9EWcmxbKc3LHx1fMKW8ob0="; + hash = "sha256-H51Ws6mNVlPR+tVkSr7tLAQs7DBKEm73LCNtrkrxa5A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 5c65ccaeb4124..15d4262b69697 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-book-theme"; changelog = "https://github.com/executablebooks/sphinx-book-theme/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-comments/default.nix b/pkgs/development/python-modules/sphinx-comments/default.nix index 867a457c0cf1f..65dedffdfacbb 100644 --- a/pkgs/development/python-modules/sphinx-comments/default.nix +++ b/pkgs/development/python-modules/sphinx-comments/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Add comments and annotation to your documentation"; homepage = "https://github.com/executablebooks/sphinx-comments"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 2b6fbde61ad3d..032caf4a0e83a 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_design"; - hash = "sha256-7I48XFn+1ASbOlouIJNg/qsxgpNGtfagx8NCuJQIIZI="; + hash = "sha256-tE7qNxk4bQTXZcGoJXysorPm+EIdezpedCwP1F+E5jI="; }; nativeBuildInputs = [ flit-core ]; @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-design"; changelog = "https://github.com/executablebooks/sphinx-design/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 051da27792f8a..ab45c1b8bfaf4 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; + hash = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; }; nativeBuildInputs = [ flit-core ]; @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-external-toc"; changelog = "https://github.com/executablebooks/sphinx-external-toc/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index f1b4aa32402e0..7627dddd4ba54 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension to include jinja templates in documentation"; homepage = "https://github.com/tardyp/sphinx-jinja"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index cca7c7fa4845f..0df375058c153 100644 --- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex"; changelog = "https://github.com/executablebooks/sphinx-jupyterbook-latex/raw/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix index f24112e2379e1..66ca1490bacab 100644 --- a/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix +++ b/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-multitoc-numbering"; changelog = "https://github.com/executablebooks/sphinx-multitoc-numbering/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix index 98b962b1f4b79..863f93848846d 100644 --- a/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, - pynose, + pytestCheckHook, setuptools, sphinx, sphinx-rtd-theme, @@ -25,17 +25,11 @@ buildPythonPackage rec { dependencies = [ sphinx-rtd-theme ]; nativeCheckInputs = [ - pynose + pytestCheckHook sphinx ]; - checkPhase = '' - runHook preCheck - - nosetests tests - - runHook postCheck - ''; + pytestFlagsArray = [ "tests/build.py" ]; pythonImportsCheck = [ "sphinx_rtd_dark_mode" ]; diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index cc6ac01aad99b..bae64efe89490 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-thebe"; changelog = "https://github.com/executablebooks/sphinx-thebe/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/pkgs/development/python-modules/sphinx-togglebutton/default.nix index f8b2c288ec93e..4af3ba41ce103 100644 --- a/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Toggle page content and collapse admonitions in Sphinx"; homepage = "https://github.com/executablebooks/sphinx-togglebutton"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix index 36ee3d3c55593..f935b694e630d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Sphinx extension to add asyncio-specific markups"; homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index c190e1e625a58..dbd91f0e5da66 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 8fcb0c2c8f581..159cc00b32efa 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index ee5021688f8e5..1710b5212fd91 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -1,28 +1,31 @@ { lib, buildPythonPackage, + docutils, fetchPypi, flit-core, - docutils, - sphinx, - requests, jinja2, + pythonOlder, + requests, + sphinx, }: buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.5.2"; - format = "pyproject"; + version = "2.6.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-FwjjlMTIhAD/v4Ig+uqrJJybdPqpPG+7OMuJwSqWo84="; + hash = "sha256-9ymYfxL50ZDGlLzo2LXiBnuo2svWxnl37H/c6ENACjA="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ docutils sphinx requests @@ -38,9 +41,10 @@ buildPythonPackage rec { meta = with lib; { description = "Confluence builder for sphinx"; - mainProgram = "sphinx-build-confluence"; homepage = "https://github.com/sphinx-contrib/confluencebuilder"; + changelog = "https://github.com/sphinx-contrib/confluencebuilder/blob/v${version}/CHANGES.rst"; license = licenses.bsd1; maintainers = with maintainers; [ graysonhead ]; + mainProgram = "sphinx-build-confluence"; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix index db263eab0f5b2..18554a01e18ee 100644 --- a/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - unittestCheckHook, setuptools, sphinx, ditaa, diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index 0d4735caa6d02..e21f983ee759a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index bf41b078d55e5..6a455531ab0d4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, sphinx, - sphinxcontrib-serializinghtml, }: buildPythonPackage rec { @@ -29,6 +28,6 @@ buildPythonPackage rec { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a9125ef5d468f..6bff5f2fc6c72 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/sphinx-contrib/spelling"; changelog = "https://github.com/sphinx-contrib/spelling/blob/${version}/docs/source/history.rst"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 972a77858f574..50c892cd5cd51 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.19"; + version = "0.4.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gen+bH4NvEbxnxr5HStisB1BqyKIS4n1VoHyAK4mXUk="; + hash = "sha256-LuO9H5yi80nAgjpPNQfZHEEOf5a+IPBR/vevFmXzQco="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix b/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix index 45cf5dda26cf5..3f56d44878e65 100644 --- a/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, setuptools-scm, sphinx, diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e86ea75eb4cef..00017c3408812 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -5,7 +5,6 @@ pythonOlder, redis, requests, - six, urllib3, }: diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 64f8c26489414..3cdfc65811fe9 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, asn1crypto, - astunparse, bincopy, bitstring, click, @@ -17,16 +16,14 @@ hexdump, libusbsio, oscrypto, + packaging, platformdirs, prettytable, - pylink-square, pyocd, - pyocd-pemicro, - pypemicro, pyserial, requests, ruamel-yaml, - setuptools, + setuptools-scm, sly, spsdk, testers, @@ -39,31 +36,30 @@ buildPythonPackage rec { pname = "spsdk"; - version = "2.1.1"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; repo = "spsdk"; rev = "refs/tags/${version}"; - hash = "sha256-cWz2zML/gb9l2C5VEBti+nX3ZLyGbLFyLZGjk5GfTJw="; + hash = "sha256-qFgG9jdF667EtMqXGGk/oxTEi+6J2s/3gKokP+JaFVw="; }; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools-scm ]; pythonRelaxDeps = [ - "click" - "cryptography" - "platformdirs" "requests" + "packaging" "typing-extensions" ]; - propagatedBuildInputs = [ + # Remove unneeded unfree package. pyocd-pemicro is only used when + # generating a pyinstaller package, which we don't do. + pythonRemoveDeps = [ "pyocd-pemicro" ]; + + dependencies = [ asn1crypto - astunparse bincopy bitstring click @@ -77,12 +73,10 @@ buildPythonPackage rec { hexdump libusbsio oscrypto + packaging platformdirs prettytable - pylink-square pyocd - pyocd-pemicro - pypemicro pyserial requests ruamel-yaml @@ -97,11 +91,6 @@ buildPythonPackage rec { voluptuous ]; - disabledTests = [ - "test_nxpcrypto_create_signature_algorithm" - "test_nxpimage_sb31_kaypair_not_matching" - ]; - pythonImportsCheck = [ "spsdk" ]; passthru.tests.version = testers.testVersion { package = spsdk; }; diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 10ea12e7fefae..77452fbccde61 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index edcb8dff3bb92..e03c86a80a596 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -5,7 +5,6 @@ sqlalchemy, setuptools-scm, setuptools, - sphinx, pytestCheckHook, pytest-sugar, pymysql, diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix deleted file mode 100644 index 93703010e5920..0000000000000 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchPypi, - fetchpatch, - python, - scripttest, - pytz, - pbr, - tempita, - decorator, - sqlalchemy, - six, - sqlparse, - testrepository, -}: - -buildPythonPackage rec { - pname = "sqlalchemy-migrate"; - version = "0.13.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b"; - }; - - patches = [ - # See: https://review.openstack.org/#/c/608382/ - # https://github.com/openstack/sqlalchemy-migrate/pull/18 - (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch"; - sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; - }) - ./python3.11-comp.diff - ]; - - postPatch = '' - substituteInPlace test-requirements.txt \ - --replace "ibm_db_sa>=0.3.0;python_version<'3.0'" "" \ - --replace "ibm-db-sa-py3;python_version>='3.0'" "" \ - --replace "tempest-lib>=0.1.0" "" \ - --replace "testtools>=0.9.34,<0.9.36" "" \ - --replace "pylint" "" - ''; - - nativeCheckInputs = [ - scripttest - pytz - testrepository - ]; - propagatedBuildInputs = [ - pbr - tempita - decorator - sqlalchemy - six - sqlparse - ]; - - doCheck = !stdenv.isDarwin; - - checkPhase = '' - export PATH=$PATH:$out/bin - echo sqlite:///__tmp__ > test_db.cfg - # depends on ibm_db_sa - rm migrate/tests/changeset/databases/test_ibmdb2.py - # wants very old testtools - rm migrate/tests/versioning/test_schema.py - # transient failures on py27 - substituteInPlace migrate/tests/versioning/test_util.py --replace "test_load_model" "noop" - ${python.interpreter} setup.py test - ''; - - meta = with lib; { - homepage = "https://opendev.org/x/sqlalchemy-migrate"; - description = "Schema migration tools for SQLAlchemy"; - license = licenses.asl20; - maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]); - broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; - }; -} diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff b/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff deleted file mode 100644 index c8e201b0ca6d8..0000000000000 --- a/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py -index 5fb86b1..fae0ce4 100644 ---- a/migrate/versioning/shell.py -+++ b/migrate/versioning/shell.py -@@ -108,7 +108,7 @@ def main(argv=None, **kwargs): - parser.error("Invalid command %s" % command) - - parser.set_usage(inspect.getdoc(command_func)) -- f_args, f_varargs, f_kwargs, f_defaults = inspect.getargspec(command_func) -+ f_args, f_varargs, f_kwargs, f_defaults, _, _, _ = inspect.getfullargspec(command_func) - for arg in f_args: - parser.add_option( - "--%s" % arg, diff --git a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index 492b0521201dd..1adb1c21d046f 100644 --- a/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -2,17 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, - pytestCheckHook, + setuptools, pythonOlder, six, sqlalchemy, + pytestCheckHook, }: buildPythonPackage rec { pname = "sqlalchemy-mixins"; version = "2.0.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,15 +23,14 @@ buildPythonPackage rec { hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six sqlalchemy ]; - nativeCheckInputs = [ - nose - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sqlalchemy_mixins" ]; diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix index bc9fd2ffcb230..811e70487945e 100644 --- a/pkgs/development/python-modules/sqlite-anyio/default.nix +++ b/pkgs/development/python-modules/sqlite-anyio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlite-anyio"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "davidbrochart"; repo = "sqlite-anyio"; rev = "refs/tags/v${version}"; - hash = "sha256-lOUGT9SUxvzTvTDpiwx7Oa+0o3/lnrJ9xxMYFQAmFZk="; + hash = "sha256-cZyTpFmYD0l20Cmxl+Hwfh3oVkWvtXD45dMpcSwA2QE="; }; build-system = [ hatchling ]; @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/davidbrochart/sqlite-anyio"; changelog = "https://github.com/davidbrochart/sqlite-anyio/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 08a23ed4f273c..239ac5a0149a6 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.5"; + version = "1.8.7.post1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ADs0Tfd8iR1OSGkV7pFdRw0RDHbxk6Ztje1AvSIdWqI="; + hash = "sha256-rycF/D6knpOHlmTZBVysq9DMqCadwv1eq8vkuhpZ2hQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index cad54edc8ebbb..5b39b5b89bc48 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sqlmodel"; - version = "0.0.19"; + version = "0.0.21"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "sqlmodel"; rev = "refs/tags/${version}"; - hash = "sha256-Fr/umAgTbcfBtui+V/ncp4no+pquLExB/dInSFhsgGc="; + hash = "sha256-8Lw3UHHDs/jn65JHGh3bQOQJeNiSnjdc10yRQrwIC/8="; }; patches = [ diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 211bbafd06662..75eccd5268eb0 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://www.sqlobject.org/"; changelog = "https://github.com/sqlobject/sqlobject/blob/${version}/docs/News.rst"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index c87c7442761f6..8b229ed9ef390 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -6,13 +6,12 @@ pythonOlder, pygtrie, orjson, - python, setuptools-scm, }: buildPythonPackage rec { pname = "sqltrie"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QR5IlMHrDNsauKW3VQG0ibMUwetATuwX4fszGPzKuxg="; + hash = "sha256-elW1hCB0sXc+GyIO0358EwcIn8J1qJZE2pOLAxqxhwA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix index 6c907d58a2a5a..6ac658f7ef794 100644 --- a/pkgs/development/python-modules/srp/default.nix +++ b/pkgs/development/python-modules/srp/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "srp"; - version = "1.0.20"; + version = "1.0.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LbRTvc4mue6tNnp7V4MHTvgOhIK/MMAUCnuJg2oFRwc="; + hash = "sha256-hmgTvPUhGJoVY+bKMRK29U/fclpBCi2+u28NhLgqHx0="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 5e443c6665b54..9455f16b18f61 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/idlesign/srptools"; changelog = "https://github.com/idlesign/srptools/blob/v${version}/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index d4ae26479ca60..b1badbc6c71ba 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; + hash = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; }; nativeCheckInputs = [ @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/cdown/srt"; description = "Tiny but featureful Python library for parsing, modifying, and composing SRT files"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index baeaf9436c5ca..b6526f96e2395 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sse-starlette"; - version = "2.1.2"; + version = "2.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "sysid"; repo = "sse-starlette"; rev = "refs/tags/v${version}"; - hash = "sha256-/aL0IkMdHNt7Ms1Et+xf00B9FGI31FuHAiJbxVMm3w0="; + hash = "sha256-cnUx3wYawyqt/m/FB6abxknMbc64k09a1kAJoA4yN6w="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/ssg/default.nix b/pkgs/development/python-modules/ssg/default.nix index 53fbbb0f3868e..a54b198a4533c 100644 --- a/pkgs/development/python-modules/ssg/default.nix +++ b/pkgs/development/python-modules/ssg/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, - python3, + python, unittestCheckHook, setuptools, @@ -45,7 +45,7 @@ buildPythonPackage { pythonImportsCheck = [ "ssg" ]; - postInstall = "rm -rf $out/${python3.sitePackages}/scripts"; + postInstall = "rm -rf $out/${python.sitePackages}/scripts"; meta = with lib; { description = "TCRF syllable segmenter for Thai"; diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 37d133ef17df5..1422b50c320d1 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { mainProgram = "sshtunnel"; homepage = "https://github.com/pahaz/sshtunnel"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ssort/default.nix b/pkgs/development/python-modules/ssort/default.nix new file mode 100644 index 0000000000000..71a950b98bd70 --- /dev/null +++ b/pkgs/development/python-modules/ssort/default.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + pathspec, + pytestCheckHook, + pyyaml, +}: + +buildPythonPackage rec { + pname = "ssort"; + version = "0.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bwhmather"; + repo = "ssort"; + rev = "refs/tags/${version}"; + hash = "sha256-P/FUayCC7KfXjtzclTPLhLw5o0bV4L98tes69w+038o="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pathspec ]; + + pythonImportsCheck = [ "ssort" ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + meta = { + description = "Automatically sorting python statements within a module"; + homepage = "https://github.com/bwhmather/ssort"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "ssort"; + }; +} diff --git a/pkgs/development/python-modules/stamina/default.nix b/pkgs/development/python-modules/stamina/default.nix new file mode 100644 index 0000000000000..eb80b58254add --- /dev/null +++ b/pkgs/development/python-modules/stamina/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling + +, tenacity +, typing-extensions + +, anyio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "stamina"; + version = "24.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hynek"; + repo = "stamina"; + rev = version; + hash = "sha256-gn8kbLLj+wMPtIwnsOdKDEhBsLApkl3K6mf/bQT3qT8="; + }; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + tenacity + typing-extensions + ]; + + pythonImportsCheck = [ "stamina" ]; + + nativeCheckInputs = [ + pytestCheckHook + anyio + ]; + + meta = with lib; { + description = "Production-grade retries for Python"; + homepage = "https://github.com/hynek/stamina"; + changelog = "https://github.com/hynek/stamina/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/python-modules/stanio/default.nix b/pkgs/development/python-modules/stanio/default.nix index 27d754a7d8944..a87e753c1886f 100644 --- a/pkgs/development/python-modules/stanio/default.nix +++ b/pkgs/development/python-modules/stanio/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stanio"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3uQpMU2WXzkBga+o/3/4FERG7rWMwlR8zBCLpz5nROI="; + hash = "sha256-NI1S+UfexDHhGPS2AcTFKWkpuGQB1NTdWqk3Ow1K5Kw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix index 4f43cb0120b01..5664dc2eaefb5 100644 --- a/pkgs/development/python-modules/statistics/default.nix +++ b/pkgs/development/python-modules/statistics/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Python 2.* port of 3.4 Statistics Module"; homepage = "https://github.com/digitalemagine/py-statistics"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index ee3d79302a2c2..2e92efe1e5bd0 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/daltonmaag/statmake"; changelog = "https://github.com/daltonmaag/statmake/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 1f6e5df951125..21127c85adf8d 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - pynose, mock, + pytestCheckHook, }: buildPythonPackage rec { @@ -12,21 +12,21 @@ buildPythonPackage rec { version = "4.0.1"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-mXY9qBv+qNr2s9ItEarMsBqND1LqUh2qs351ikyn0Sg="; + src = fetchFromGitHub { + owner = "jsocol"; + repo = "pystatsd"; + rev = "refs/tags/v${version}"; + hash = "sha256-g830TjFERKUguFKlZeaOhCTlaUs0wcDg4bMdRDr3smw="; }; nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ - pynose mock + pytestCheckHook ]; - checkPhase = '' - nosetests -sv - ''; + pytestFlagsArray = [ "statsd/tests.py" ]; meta = with lib; { maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index d7447e6c33b71..d917d3ebf7359 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -39,6 +39,13 @@ buildPythonPackage rec { setuptools-scm ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ]; + }; + dependencies = [ numpy packaging @@ -57,7 +64,5 @@ buildPythonPackage rec { homepage = "https://www.github.com/statsmodels/statsmodels"; changelog = "https://github.com/statsmodels/statsmodels/releases/tag/v${version}"; license = licenses.bsd3; - # Fails at build time - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index d52b7eaa072d9..12e58966b0178 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "1.0.3"; + version = "1.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-RMNQRjnP+tTrEU9j3zxmOx/C5cdqwYlD514noZiwtzQ="; + hash = "sha256-bqMecvlqsrVNk8d03iF1zlNQqDP798AkuzcYo6U59gU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix index 9c739a6ec1997..6109e6ce2fc7c 100644 --- a/pkgs/development/python-modules/stdlib-list/default.nix +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "List of Python Standard Libraries"; homepage = "https://github.com/jackmaney/python-stdlib-list"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 6578e3c119575..0744764df1ae7 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/florisla/stm32loader"; changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 0abcbcf4bef7e..d7698c977d0ab 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { homepage = "https://github.com/dropbox/stone"; changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "stone"; }; } diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix new file mode 100644 index 0000000000000..e7ca1728ee101 --- /dev/null +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + aiohttp, + pytz, +}: + +buildPythonPackage rec { + pname = "stookwijzer"; + version = "1.4.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fwestenberg"; + repo = "stookwijzer"; + rev = "refs/tags/v${version}"; + hash = "sha256-QXCusmbt40Tg73ozl9nIDgMtQJ152uNhOuFyHn+OEA8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + pytz + ]; + + pythonImportsCheck = [ "stookwijzer" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/fwestenberg/stookwijzer/releases/tag/v${version}"; + description = "Python package for the Stookwijzer API"; + homepage = "https://github.com/fwestenberg/stookwijzer"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index dba3b101142f4..1e3a816d6572d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.235.1"; + version = "0.237.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-jfV1/n5YbVn658PF7PTIWV17UwEglFjszZufb+yy5ug="; + hash = "sha256-w9ADHKpYijUtN/tB9ANN2ebTMNw8wvqMuYP9fNkisQw="; }; patches = [ diff --git a/pkgs/development/python-modules/strct/default.nix b/pkgs/development/python-modules/strct/default.nix index eff84c1f1dcb2..989b4e006d30b 100644 --- a/pkgs/development/python-modules/strct/default.nix +++ b/pkgs/development/python-modules/strct/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, setuptools, pytestCheckHook, + pytest-cov-stub, sortedcontainers, }: @@ -19,13 +20,6 @@ buildPythonPackage rec { hash = "sha256-uPM2U+emZUCGqEhIeTBmaOu8eSfK4arqvv9bItBWpUs="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail \ - '"--cov' \ - '#"--cov' - ''; - # don't append .dev0 to version env.RELEASING_PROCESS = "1"; @@ -33,6 +27,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub sortedcontainers ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index c30512d1171d7..52f4a122bc04f 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.36.0"; + version = "1.37.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oSr58Othq1gy9DgzYlex7CDrKdjg4Ma0CnkRa6k5vJw="; + hash = "sha256-Rj73KLoh504FEi43BOivZEp727WCLigbja9KCkh2GHk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 651ebc559731b..eea52b8fa8f26 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -81,6 +81,6 @@ buildPythonPackage rec { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 793a83c3bc08c..9e5a4ed1e3e35 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://hitchdev.com/strictyaml/"; changelog = "https://hitchdev.com/strictyaml/changelog/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 3823eb4ea1b9f..159f2c43d0c27 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "9.12.0"; + version = "10.6.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-y8Umq9DwAckgwyO6fEDM497hZH2SDp2+yuNIjzc2dSQ="; + hash = "sha256-QcywraWSjYlTDtBtF6cb+/X06k8jJOMNjWNqKrcYCnQ="; }; build-system = [ setuptools ]; @@ -37,6 +37,6 @@ buildPythonPackage rec { homepage = "https://github.com/stripe/stripe-python"; changelog = "https://github.com/stripe/stripe-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/strpdatetime/default.nix b/pkgs/development/python-modules/strpdatetime/default.nix new file mode 100644 index 0000000000000..f7e758bd1c3fd --- /dev/null +++ b/pkgs/development/python-modules/strpdatetime/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + textx, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "strpdatetime"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "RhetTbull"; + repo = "strpdatetime"; + rev = "v${version}"; + hash = "sha256-eb3KJCFRkEt9KEP1gMQYuP50qXqItrexJhKvtJDHl9o="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ textx ]; + pythonRelaxDeps = [ "textx" ]; + + patches = [ ./fix-locale.patch ]; + + pythonImportsCheck = [ "strpdatetime" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Parse strings into Python datetime objects"; + license = lib.licenses.psfl; + changelog = "https://github.com/RhetTbull/strpdatetime/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://github.com/RhetTbull/strpdatetime"; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/strpdatetime/fix-locale.patch b/pkgs/development/python-modules/strpdatetime/fix-locale.patch new file mode 100644 index 0000000000000..d79bd63c66556 --- /dev/null +++ b/pkgs/development/python-modules/strpdatetime/fix-locale.patch @@ -0,0 +1,10 @@ +diff --git a/tests/test_strpdatetime.py b/tests/test_strpdatetime.py +index 6c371d6..a3d0232 100644 +--- a/tests/test_strpdatetime.py ++++ b/tests/test_strpdatetime.py +@@ -44,5 +44,4 @@ TEST_DATA = [ + @pytest.mark.parametrize("string, format, expected", TEST_DATA) + def test_datetime_strptime(string, format, expected): + """Test datetime_strptime""" +- locale.setlocale(locale.LC_ALL, "en_US.UTF-8") + assert strpdatetime(string, format) == expected diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 2cbf24c15db03..0831fd99bbb61 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -11,12 +11,11 @@ pytestCheckHook, pythonOlder, simplejson, - twisted, }: buildPythonPackage rec { pname = "structlog"; - version = "24.1.0"; + version = "24.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,10 +24,10 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-0Yc28UEeozK2+IqILFTqHoTiM5L2SA4t6jld4qTBSzQ="; + hash = "sha256-z3ecgsep/BQJ+Fv78rV4XiFU4+1aaUEfNEtIqy44KV4="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-vcs hatchling @@ -40,7 +39,6 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook simplejson - twisted ]; pythonImportsCheck = [ "structlog" ]; diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 6587e6193e118..f8d9015b28405 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index ef36962843072..7b37464a69be5 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -2,18 +2,18 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, clickclick, dnspython, requests, - pytest, - pytest-cov, + pytestCheckHook, isPy3k, }: buildPythonPackage rec { pname = "stups-cli-support"; version = "1.1.20"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { @@ -23,7 +23,9 @@ buildPythonPackage rec { sha256 = "1r6g29gd009p87m8a6wv4rzx7f0564zdv67qz5xys4wsgvc95bx0"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ clickclick dnspython requests @@ -31,10 +33,7 @@ buildPythonPackage rec { preCheck = "export HOME=$TEMPDIR"; - nativeCheckInputs = [ - pytest - pytest-cov - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Helper library for all STUPS command line tools"; diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 2b4efbaacb2fe..494c8ecf1e9ee 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + pythonAtLeast, requests, stups-cli-support, stups-zign, @@ -43,5 +44,8 @@ buildPythonPackage rec { homepage = "https://github.com/zalando-stups/stups-fullstop-cli"; license = licenses.asl20; maintainers = [ maintainers.mschuwalow ]; + # Uses regex patterns deprecated in 3.9: + # re.error: global flags not at the start of the expression at ... + broken = pythonAtLeast "3.11"; }; } diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index af90fcb193485..1415e07ab1afc 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -2,11 +2,11 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, requests, stups-cli-support, stups-zign, - pytest, - pytest-cov, + pytestCheckHook, hypothesis, pythonOlder, }: @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "stups-pierone"; version = "1.1.51"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,11 @@ buildPythonPackage rec { hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "stups-zign" ]; + + dependencies = [ requests stups-cli-support stups-zign @@ -36,8 +40,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - pytest - pytest-cov + pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 6201fa99cab33..3d9c4cd07735e 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -2,17 +2,17 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, requests, mock, - pytest, - pytest-cov, + pytestCheckHook, isPy3k, }: buildPythonPackage rec { pname = "stups-tokens"; version = "1.1.19"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { @@ -22,12 +22,13 @@ buildPythonPackage rec { sha256 = "09z3l3xzdlwpivbi141gk1k0zd9m75mjwbdy81zc386rr9k8s0im"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ mock - pytest - pytest-cov + pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index c6fb2495dd27a..1c54cdb512120 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -3,17 +3,17 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, stups-tokens, stups-cli-support, - pytest, - pytest-cov, + pytestCheckHook, isPy3k, }: buildPythonPackage rec { pname = "stups-zign"; version = "1.2"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { @@ -31,7 +31,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ stups-tokens stups-cli-support ]; @@ -40,10 +42,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR "; - nativeCheckInputs = [ - pytest - pytest-cov - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "OAuth2 token management command line utility"; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index f669da48ddd53..6adb88a40f328 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.11"; + version = "0.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HKtToMh4dAUpA654tFkUEM9DLPGr9XRQK0ezYzNPzqk="; + hash = "sha256-vH4jdH8ZqMSGqHa/4WzvSy7IcN8b3rr/TswsWtoSxOw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index d34a49f46ff18..23347af0ff452 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -1,95 +1,89 @@ { lib, - appdirs, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + babelfish, beautifulsoup4, - buildPythonPackage, chardet, click, + click-option-group, dogpile-cache, enzyme, - fetchFromGitHub, guessit, - pysrt, - pytestCheckHook, - pythonOlder, - pytz, + srt, + pysubs2, rarfile, requests, - six, + platformdirs, stevedore, + tomli, + + pytestCheckHook, + pytest-cov, + pytest-xdist, + mypy, sympy, vcrpy, }: buildPythonPackage rec { pname = "subliminal"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Diaoul"; - repo = pname; + repo = "subliminal"; rev = "refs/tags/${version}"; - hash = "sha256-P4gVxKKCGKS3MC4F3yTAaOSv36TtdoYfrf61tBHg8VY="; + hash = "sha256-g7gg2qdLKl7bg/nNXRWN9wZaNShOOc38sVASZrIycMU="; }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --pep8 --flakes" "" - ''; - propagatedBuildInputs = [ - appdirs babelfish beautifulsoup4 chardet click + click-option-group dogpile-cache enzyme guessit - pysrt - pytz + srt + pysubs2 rarfile requests - six + platformdirs stevedore + tomli ]; nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-xdist + mypy sympy vcrpy - pytestCheckHook ]; pythonImportsCheck = [ "subliminal" ]; disabledTests = [ - # Tests rewuire network access - "test_refine_video_metadata" + # Tests require network access + "test_refine" "test_scan" "test_hash" - "test_provider_pool_list_subtitles" - "test_async_provider_pool_list_subtitles" - "test_list_subtitles" - "test_download_bad_subtitle" - # Not implemented - "test_save_subtitles" - ]; - - disabledTestPaths = [ - # AttributeError: module 'rarfile' has no attribute 'custom_check' - "tests/test_legendastv.py" ]; - meta = with lib; { + meta = { description = "Python library to search and download subtitles"; homepage = "https://github.com/Diaoul/subliminal"; changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; # Too many tests fail ever since a certain python-updates merge, see: # https://github.com/Diaoul/subliminal/issues/1062 . Disabling tests # alltogether may produce a not completly failing executable, but that diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index f039a30d522ac..d756f3c7ac7e9 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -9,13 +9,12 @@ poetry-core, pytestCheckHook, pythonOlder, - toml-adapt, xmltodict, }: buildPythonPackage rec { pname = "succulent"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; rev = "refs/tags/${version}"; - hash = "sha256-+S4ekvaQvbBxjUQkG+Bd9lYdZwHB3oq7Ay9kWquCcyE="; + hash = "sha256-lU4M/ObX2mhHgYsc72zLp87g1lJ6ikfTeEojEdJwjGs="; }; pythonRelaxDeps = [ "flask" ]; diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix new file mode 100644 index 0000000000000..054f0b0cb4346 --- /dev/null +++ b/pkgs/development/python-modules/suds/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pytestCheckHook, + setuptools, + six, +}: + +buildPythonPackage rec { + pname = "suds"; + version = "1.1.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HVz6dBFxk7JEpCM/JGxIPZ9BGYtEjF8UqLrRHE9knys="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + six + ]; + + pythonImportsCheck = [ "suds" ]; + + meta = { + changelog = "https://github.com/suds-community/suds/blob/v${version}/CHANGELOG.md"; + description = "Lightweight SOAP python client for consuming Web Services"; + homepage = "https://github.com/suds-community/suds"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ wrmilling ]; + }; +} diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index afabfff242f2d..e1bfc94ceab46 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -159,7 +159,7 @@ buildPythonPackage rec { description = "Python for Solar Physics"; homepage = "https://sunpy.org"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; broken = true; }; } diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index 10603bb5cd344..535b6d253727a 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, python-dateutil, requests, @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +19,7 @@ buildPythonPackage rec { owner = "rokam"; repo = "sunweg"; rev = "refs/tags/${version}"; - hash = "sha256-9VzDOl393+jm6Nf40X4ZPMBbRc6KOwOQkpTNoqBsw1M="; + hash = "sha256-/pniECgavRiQdKzNtPINNhOijUW/uhPEOQJtjfr46ps="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/supervise-api/default.nix b/pkgs/development/python-modules/supervise-api/default.nix index 9ef2083eb0ce4..841663678e562 100644 --- a/pkgs/development/python-modules/supervise-api/default.nix +++ b/pkgs/development/python-modules/supervise-api/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - substituteAll, supervise, setuptools, pytestCheckHook, diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 493f761c85119..8a8dd2ed16520 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; + hash = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; postPatch = '' @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://sure.readthedocs.io/"; changelog = "https://github.com/gabrielfalcao/sure/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index a3eb4b8f09fdf..9f9cca8b929de 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "SVG path objects and parser"; homepage = "https://github.com/regebro/svg.path"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/svgutils/default.nix b/pkgs/development/python-modules/svgutils/default.nix index 0ed18cdf3cf8f..40e50d9b9a0f7 100644 --- a/pkgs/development/python-modules/svgutils/default.nix +++ b/pkgs/development/python-modules/svgutils/default.nix @@ -2,11 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, setuptools, lxml, - matplotlib, pytestCheckHook, - pynose, }: buildPythonPackage rec { @@ -21,18 +20,28 @@ buildPythonPackage rec { hash = "sha256-ITvZx+3HMbTyaRmCb7tR0LKqCxGjqDdV9/2taziUD0c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - lxml - matplotlib - ]; + dependencies = [ lxml ]; + + patches = [ + # Remove nose dependency, see: https://github.com/btel/svg_utils/pull/131 - nativeCheckInputs = [ - pytestCheckHook - pynose + # this first commit is required, as isort moved nose imports + (fetchpatch2 { + url = "https://github.com/btel/svg_utils/commit/48b078a729aeb6b1160142ab65157474c95a61b6.patch?full_index=1"; + hash = "sha256-9toOFfNkgGF3TvM340vYOTkuSEHBeiyBRSGqqobfiqI="; + }) + + # migrate to pytest + (fetchpatch2 { + url = "https://github.com/btel/svg_utils/commit/931a80220be7c0efa2fc6e1d47858d69a08df85e.patch?full_index=1"; + hash = "sha256-SMv0i8p3s57TDn6NM17RrHF9kVgsy2YJJ0KEBQKn2J0="; + }) ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "svgutils" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/swifter/default.nix b/pkgs/development/python-modules/swifter/default.nix new file mode 100644 index 0000000000000..53c5ea5c508ac --- /dev/null +++ b/pkgs/development/python-modules/swifter/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dask, + pandas, + psutil, + tqdm, + ipywidgets, + ray, +}: + +buildPythonPackage rec { + pname = "swifter"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jmcarpenter2"; + repo = "swifter"; + rev = "refs/tags/${version}"; + hash = "sha256-lgdf8E9GGjeLY4ERzxqtjQuYVtdtIZt2HFLSiNBbtX4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pandas + psutil + dask + tqdm + ] ++ dask.optional-dependencies.dataframe; + + optional-dependencies = { + groupby = [ ray ]; + notebook = [ ipywidgets ]; + }; + + pythonImportsCheck = [ "swifter" ]; + + # tests may hang due to ignoring cpu core limit + # https://github.com/jmcarpenter2/swifter/issues/221 + doCheck = false; + + meta = { + description = "Package which efficiently applies any function to a pandas dataframe or series in the fastest available manner"; + homepage = "https://github.com/jmcarpenter2/swifter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/switchbot-api/default.nix b/pkgs/development/python-modules/switchbot-api/default.nix index 06eae69b07e78..ee048637b4350 100644 --- a/pkgs/development/python-modules/switchbot-api/default.nix +++ b/pkgs/development/python-modules/switchbot-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "switchbot-api"; - version = "2.1.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SeraphicCorp"; repo = "py-switchbot-api"; rev = "refs/tags/v${version}"; - hash = "sha256-dJLjWwBzrT3GnsRpTIXu3SkVDUlnAbRwBlfSQaHWPzc="; + hash = "sha256-jpm01wDVLgGr5SMaevxiYGfv8tVa1ibRtcHkEK3yb58="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index fd5c524f18a6a..21bd1348525cb 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, dbus-python, fetchFromGitHub, diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 0d2e4b3d3377a..57e3c394843d8 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/cjw296/sybil"; changelog = "https://github.com/simplistix/sybil/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index 08340ae69b9aa..40a69fc50322a 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-W3cg/+nU0Zp5pDhkoHqUemYImlDKlZDVbB7jZ3dScnk="; + hash = "sha256-rKYze8Z7F6cEkpex6UCFUW9+mf2UWT+T86C5COhYQHY="; }; build-system = [ diff --git a/pkgs/development/python-modules/synologydsm-api/default.nix b/pkgs/development/python-modules/synologydsm-api/default.nix deleted file mode 100644 index 6fc64f5baad7e..0000000000000 --- a/pkgs/development/python-modules/synologydsm-api/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, - fetchpatch, - poetry-core, - requests, - urllib3, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "synologydsm-api"; - version = "1.0.2"; - - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "hacf-fr"; - repo = "synologydsm-api"; - rev = "v${version}"; - hash = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8="; - }; - - patches = [ - # https://github.com/hacf-fr/synologydsm-api/pull/84 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/hacf-fr/synologydsm-api/commit/f1ea2be927388bdff6d43d09027b82a854635e34.patch"; - hash = "sha256-+c25zLkTtjeX7IE+nZEnjrWfnDhDJpeHN7qRKO5rF4g="; - }) - ]; - - nativeBuildInputs = [ - poetry-core - ]; - - pythonRelaxDeps = [ "urllib3" ]; - - propagatedBuildInputs = [ - requests - urllib3 - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "synology_dsm" ]; - - meta = with lib; { - description = "Python API for communication with Synology DSM"; - mainProgram = "synologydsm-api"; - homepage = "https://github.com/hacf-fr/synologydsm-api"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index ac6cdafda0314..379091993e0ad 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Pytest Snapshot Test Utility"; homepage = "https://github.com/tophat/syrupy"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 7638e67378ae4..1c2906333437f 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -10,7 +10,7 @@ pyinstaller-versionfile, pytest-order, pytestCheckHook, - python3, + python, pythonOlder, requests, setuptools, @@ -79,7 +79,7 @@ buildPythonPackage rec { cp -r build/lib/tabcmd/__main__.py $out/bin/ # Create a 'tabcmd' script with python3 shebang - echo "#!${python3}/bin/python3" > $out/bin/tabcmd + echo "#!${python.interpreter}" > $out/bin/tabcmd # Append __main__.py contents cat $out/bin/__main__.py >> $out/bin/tabcmd @@ -91,11 +91,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "tabcmd" ]; meta = with lib; { + broken = true; description = "Command line client for working with Tableau Server"; homepage = "https://github.com/tableau/tabcmd"; changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "tabcmd"; }; } diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index 1d9b22ce5b4e7..9f841867cb5ef 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/tableau/document-api-python"; changelog = "https://github.com/tableau/document-api-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index e37539b18de64..032b4e189b70f 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/tableau/server-client-python"; changelog = "https://github.com/tableau/server-client-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 38c58f5cb313b..443b83ce78103 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -76,6 +76,6 @@ buildPythonPackage rec { homepage = "https://tablib.readthedocs.io/"; changelog = "https://github.com/jazzband/tablib/raw/v${version}/HISTORY.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 2cf02af4efb23..ad437fd3497bb 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; + hash = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index cc91b6ea395f1..4df1e2b709325 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "refs/tags/v${version}"; - hash = "sha256-wO6yMMU5fxk8GQ0e4ZCse2atlR4wrzulZOFXkVKAsmU="; + hash = "sha256-47n/BjTHkw0rT8xTHGZOMNwZTy0nDuoHsTJrRyr8qjc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/takethetime/default.nix b/pkgs/development/python-modules/takethetime/default.nix index 6c397f7535c84..e5671d5c08e8d 100644 --- a/pkgs/development/python-modules/takethetime/default.nix +++ b/pkgs/development/python-modules/takethetime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "TakeTheTime"; inherit version; - sha256 = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; + hash = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index d1d7697331d01..5e601845b4cc3 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://tatsu.readthedocs.io/"; changelog = "https://github.com/neogeny/TatSu/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index f2cec77022a70..d9a0c20070de4 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -82,6 +82,6 @@ buildPythonPackage rec { homepage = "https://github.com/thebigmunch/tbm-utils"; changelog = "https://github.com/thebigmunch/tbm-utils/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tdir/default.nix b/pkgs/development/python-modules/tdir/default.nix index 4f0fe0ee60594..c00e0b3f0bc5d 100644 --- a/pkgs/development/python-modules/tdir/default.nix +++ b/pkgs/development/python-modules/tdir/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/rec/tdir"; changelog = "https://github.com/rec/tdir/blob/${src.rev}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/telegram-text/default.nix b/pkgs/development/python-modules/telegram-text/default.nix index be123911f871b..f14ed0d939b72 100644 --- a/pkgs/development/python-modules/telegram-text/default.nix +++ b/pkgs/development/python-modules/telegram-text/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 0aafd816d039d..18b67b6bf5022 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -6,12 +6,12 @@ packaging, pyelftools, tlsh, - nose, + setuptools, }: buildPythonPackage rec { pname = "telfhash"; version = "0.9.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "trendmicro"; @@ -23,22 +23,21 @@ buildPythonPackage rec { # The tlsh library's name is just "tlsh" postPatch = '' substituteInPlace requirements.txt \ - --replace "python-tlsh" "tlsh" \ - --replace "py-tlsh" "tlsh" + --replace-fail "python-tlsh" "tlsh" \ + --replace-fail "py-tlsh" "tlsh" \ + --replace-fail "nose>=1.3.7" "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ capstone pyelftools tlsh packaging ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; + doCheck = false; # no tests pythonImportsCheck = [ "telfhash" ]; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 66b7e1aee3db9..77326c7152c18 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU="; }; + pythonRelaxDeps = [ "defusedxml" ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix deleted file mode 100644 index 718eeb93eb2dd..0000000000000 --- a/pkgs/development/python-modules/tempita/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nose, -}: - -buildPythonPackage { - version = "0.5.3-2016-09-28"; - format = "setuptools"; - pname = "tempita"; - - src = fetchFromGitHub { - owner = "agramfort"; - repo = "tempita"; - rev = "47414a7c6e46a9a9afe78f0bce2ea299fa84d10"; - sha256 = "0f33jjjs5rvp7ar2j6ggyfykcrsrn04jaqcq71qfvycf6b7nw3rn"; - }; - - buildInputs = [ nose ]; - - meta = { - homepage = "https://github.com/agramfort/tempita"; - description = "Very small text templating language"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 6c2a136d831ea..23c8e031c4892 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/tempora"; changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index edaa10babf943..ce6a6f9b36885 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1183"; + version = "3.0.1208"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-XMKW8GELpO+gt+prHLArrCda/HxNSkd9AI7yzu8Hp0M="; + hash = "sha256-AwkzoGJm+lI853Riq4VACU18nUn0jvUCFmMRJdFhcJM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorflow-estimator/bin.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix index 7146208c4d653..1acfcec9a8780 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/bin.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/bin.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.11.0"; + version = "2.15.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-6jtkrP/z2aJE8GF4yb3ty90/Eltn0IiNuoIpSY0GRos="; + hash = "sha256-rt8h7sf7LckRUPyRoc4SvETbtyJ4oItY55/4fJ4o8VM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 0f54cade00cd6..140a77942dab1 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -4,8 +4,6 @@ fetchurl, buildPythonPackage, isPy3k, - pythonOlder, - pythonAtLeast, astor, gast, google-pasta, @@ -19,6 +17,7 @@ grpcio, mock, scipy, + distutils, wheel, jax, opt-einsum, @@ -31,7 +30,7 @@ python, keras-applications, keras-preprocessing, - addOpenGLRunpath, + addDriverRunpath, astunparse, flatbuffers, h5py, @@ -91,7 +90,10 @@ buildPythonPackage { h5py ] ++ lib.optional (!isPy3k) mock; - build-system = [ wheel ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; + build-system = [ + distutils + wheel + ] ++ lib.optionals cudaSupport [ addDriverRunpath ]; preConfigure = '' unset SOURCE_DATE_EPOCH @@ -189,7 +191,7 @@ buildPythonPackage { chmod a+rx "$lib" patchelf --set-rpath "$rrPath" "$lib" ${lib.optionalString cudaSupport '' - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" ''} done ''; @@ -208,19 +210,15 @@ buildPythonPackage { "tensorflow.python.framework" ]; - meta = with lib; { + meta = { description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jyp abbradar ]; - platforms = platforms.all; - # Cannot import tensortfow on python 3.12 as it still dependends on distutils: - # ModuleNotFoundError: No module named 'distutils' - # https://github.com/tensorflow/tensorflow/issues/58073 - broken = pythonAtLeast "3.12"; + badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 0f71cbc008b1c..53cff3494dea1 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,83 +1,67 @@ { - version = "2.16.1"; + version = "2.17.0"; x86_64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow_cpu-2.16.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0j4311fav3b4wdhw9wb3zvc3grvgxddl28i4kwnbsvvjb191pcs5"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1aacn68b88bnnmpl1q0irih0avzm2lfyhwr3wldg144n5zljlrbx"; }; x86_64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow_cpu-2.16.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0b8q3r2ql7rknlshiv3bh3hj9zll0dn6w0wdxnqgg18cljys5nhh"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0swhlncyaxdhygml1z246799lihfp72yxym845n46z4gm0s3hb86"; }; x86_64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow_cpu-2.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "12vv2jxybdfa8nq7r2y53vl7lvmaacb1xmy2368hkwqm2ld4mplg"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "11a2i78hdlmzfkzxpr3g07n6cr2l8jmjdz5h73ipvmjkw7zq7wz7"; }; x86_64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow_cpu-2.16.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0vvv3cr10r6kgkalk3hydqz18y4lp990pm4vwq8mbwdi101m59mf"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0v31jwlhbbv5aby3zlr1lk5gjwqq6y41vpf4mnwlj69jj0wlv3qw"; }; x86_64-linux_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "17v85433ns360rcccx7pnkhjzd003cr8p6rj51wqb3gl7gkldf83"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0xa1brn4207c0rcilnjmadmnmyyg5zb2dfh2p43whbpbdmsfds2a"; }; x86_64-linux_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0w3jd7siamvhgd7si59zpv3rdpq3s2ii3hhcdaimji66axv095hy"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1v5l57rqpl6i00mzx2ksvdh1dx2gfis6vhnkcl550znbskg96z0l"; }; x86_64-linux_311_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "014liy5wnbi2d2lnr8lqhd7221a4a1v6gzih7nv5qfnf1h86234k"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0ll55lwn6igja9xyin3ilf0v1yv5drw6y6d8vbx8zgay3dxpffc3"; }; x86_64-linux_312_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0qd09bxfnad969y2h3mlzib51y6xcsqipq1w278k1fl8ayxky4ja"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1977hcs0rk1z2sjh7h8497m6r1yskzgj8nya50wyskgvdbmbzmqa"; }; aarch64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1n3qf0snjwrc0lcahls4bi2qhpd4yrd531b80vlq89j0gjkjl5cj"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "0ird9r7s7pib89k9d66wdblkibh1n02li57a5vxbh8pdfkzprqyx"; }; aarch64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1aygypgm5fbpskf6xvzni2yd9l49hf3ls855z2aq0as73m3m81df"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "05bgybxgwwrqvxcrvlrx3wdxy03vags2pis8lp1sn85g52n86rmk"; }; aarch64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1c0bqiq2hbzcqhaym3s3s0dsp06m07mqgvm35z14nz395pxgjzb1"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "17cxqqpz1dk3iddi36c91arkanxb5xnfnsfcikhck9lglf7gk0na"; }; aarch64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1ai2hrmn1il0hididdvhd005pjcn6hjivpgcw7dbhmdv6vacs4n6"; - }; - x86_64-darwin_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp39-cp39-macosx_10_15_x86_64.whl"; - sha256 = "0dkcd1v0ivjp6v5pngg0x461wci94nxvwprc6jwgi7rqgyx3zkz9"; - }; - x86_64-darwin_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp310-cp310-macosx_10_15_x86_64.whl"; - sha256 = "0rnlxrb4q2cgqaifalhpji15g1f3m9flqfvfj2p2sv3lvmbg2ydb"; - }; - x86_64-darwin_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp311-cp311-macosx_10_15_x86_64.whl"; - sha256 = "1xc9lis61adk2y22a82i3rvc0j7qznf4fqwg2pd1665zlhybi9gq"; - }; - x86_64-darwin_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp312-cp312-macosx_10_15_x86_64.whl"; - sha256 = "10g8y02ncp5l7f133vank6h01palc445h6s9jndmmy7vm33c7jh9"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1zrscms9qkfpiscnl8c7ibfipwpw8jrdfvwh4wb69p9rxvqgxbbj"; }; aarch64-darwin_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp39-cp39-macosx_12_0_arm64.whl"; - sha256 = "0541ldysc1a06xcb632340gn1c33w245lzqwq2f2p6hm2ifqp1a2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-macosx_12_0_arm64.whl"; + sha256 = "01a3hjnrgjp2i0ciwyy0gki41cy32prvjhr20zhlcjwbssarxy4p"; }; aarch64-darwin_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp310-cp310-macosx_12_0_arm64.whl"; - sha256 = "1crrd4izayqwji5gxjw1g9qppkvfsc8p1mr7z6hiipxidys6ldwf"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-macosx_12_0_arm64.whl"; + sha256 = "10ypfpmgppvvf3h7hl0m9i8ndjpk2n2v04jlaw907icviapfapsi"; }; aarch64-darwin_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp311-cp311-macosx_12_0_arm64.whl"; - sha256 = "0kg4g4p563nhw0l2jzydhw4ycyj3dkgqzzm0m3z8k7vzsb8na86c"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-macosx_12_0_arm64.whl"; + sha256 = "0kd62x53fzv6zcxh4bggakiczxd8ghjrjr9hn6fi7yyc4in6vlp8"; }; aarch64-darwin_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.16.1/tensorflow-2.16.1-cp312-cp312-macosx_12_0_arm64.whl"; - sha256 = "1hnzfpfncw8fa84y0jivpfyb5cbbd4cvpln72wkcxpvhj23nvw5v"; + url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-macosx_12_0_arm64.whl"; + sha256 = "0482xdh9mj65iz4651llfznbc268yqm0j9dvx9rfii97svyb867f"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5f41420dffbca..b1a2dd0f90979 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -5,7 +5,7 @@ lib, fetchFromGitHub, symlinkJoin, - addOpenGLRunpath, + addDriverRunpath, fetchpatch, fetchzip, linkFarm, @@ -308,7 +308,7 @@ let perl protobuf-core protobuf-extra - ] ++ lib.optional cudaSupport addOpenGLRunpath; + ] ++ lib.optional cudaSupport addDriverRunpath; buildInputs = [ @@ -581,7 +581,7 @@ let postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" done ''; @@ -664,11 +664,11 @@ buildPythonPackage { wrapt ] ++ lib.optionals withTensorboard [ tensorboard ]; - nativeBuildInputs = lib.optionals cudaSupport [ addOpenGLRunpath ]; + nativeBuildInputs = lib.optionals cudaSupport [ addDriverRunpath ]; postFixup = lib.optionalString cudaSupport '' find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" + addDriverRunpath "$lib" patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnnMerged}/lib:${lib.getLib nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" done diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index acd2bc0857b30..b0ad86eccab8e 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.16.1" +version="2.17.0" bucket="https://storage.googleapis.com/tensorflow/versions/${version}" @@ -20,10 +20,6 @@ url_and_key_list=( "aarch64-linux_310 $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_311 $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_312 $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" -"x86_64-darwin_39 $bucket/tensorflow-${version}-cp39-cp39-macosx_10_15_x86_64.whl" -"x86_64-darwin_310 $bucket/tensorflow-${version}-cp310-cp310-macosx_10_15_x86_64.whl" -"x86_64-darwin_311 $bucket/tensorflow-${version}-cp311-cp311-macosx_10_15_x86_64.whl" -"x86_64-darwin_312 $bucket/tensorflow-${version}-cp312-cp312-macosx_10_15_x86_64.whl" "aarch64-darwin_39 $bucket/tensorflow-${version}-cp39-cp39-macosx_12_0_arm64.whl" "aarch64-darwin_310 $bucket/tensorflow-${version}-cp310-cp310-macosx_12_0_arm64.whl" "aarch64-darwin_311 $bucket/tensorflow-${version}-cp311-cp311-macosx_12_0_arm64.whl" diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index fdf4b5dab44ec..7773844c2febc 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Terminals served by Tornado websockets"; homepage = "https://github.com/jupyter/terminado"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/terminaltexteffects/default.nix b/pkgs/development/python-modules/terminaltexteffects/default.nix index 78310f2fd9674..27b07d5615888 100644 --- a/pkgs/development/python-modules/terminaltexteffects/default.nix +++ b/pkgs/development/python-modules/terminaltexteffects/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, poetry-core, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index bcd58d8cc9e9a..a06f880b8cc72 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.6.2"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-kkyRQ2cYldx4vK5hAo6LOr+k3YqJihKreE+DTNVHYdM="; + hash = "sha256-P5cU5TZ2zWVIkFp4USjofA6mOshG9IdjhYLXnY2z9fY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix index e3da4c482f9ec..cc5907be5b37a 100644 --- a/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -1,7 +1,6 @@ { lib, aiohttp, - aioresponses, aresponses, backoff, buildPythonPackage, diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 2561a15c763ef..cfc4922eccf7a 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -3,13 +3,16 @@ fetchPypi, lib, - # build dependencies + # build-system cython, - leptonica, pkg-config, + setuptools, + + # native dependencies + leptonica, tesseract4, - # propagates + # dependencies pillow, # tests @@ -23,17 +26,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; + hash = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; }; # https://github.com/sirfz/tesserocr/issues/314 postPatch = '' - sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesseract.pxd + sed -i '/allheaders.h/a\ pass\n\ncdef extern from "leptonica/pix_internal.h" nogil:' tesserocr/tesseract.pxd ''; - nativeBuildInputs = [ + build-system = [ cython pkg-config + setuptools ]; buildInputs = [ @@ -41,12 +45,16 @@ buildPythonPackage rec { tesseract4 ]; - propagatedBuildInputs = [ pillow ]; + dependencies = [ pillow ]; pythonImportsCheck = [ "tesserocr" ]; nativeCheckInputs = [ unittestCheckHook ]; + preCheck = '' + rm -rf tesserocr + ''; + meta = with lib; { changelog = "https://github.com/sirfz/tesserocr/releases/tag/v${version}"; description = "Simple, Pillow-friendly, wrapper around the tesseract-ocr API for Optical Character Recognition (OCR)"; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index a4b20a75d15bb..0ca740b2c655c 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.7.1"; + version = "4.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-li9okYMPW6PM03cFQRfHKzr48eOguNXmmHnSCBgDqYo="; + hash = "sha256-cmMuX3tKVGe4F+dQlOqQSTS/e49oWuudOekeL/j0YFw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix index 1b1527cc4872b..c2b85fe8f9d75 100644 --- a/pkgs/development/python-modules/testing-postgresql/default.nix +++ b/pkgs/development/python-modules/testing-postgresql/default.nix @@ -46,6 +46,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "pg8000 >= 1.10" "pg8000" + substituteInPlace tests/test_postgresql.py \ + --replace-fail "self.assertRegexpMatches" "self.assertRegex" ''; pythonImportsCheck = [ "testing.postgresql" ]; diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index 7f8ad55c602c5..d4292ef2c3703 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testrail-api"; - version = "1.13.1"; + version = "1.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tolstislon"; repo = "testrail-api"; rev = "refs/tags/${version}"; - hash = "sha256-VH63shGCBOkbHcUFL4M/QvuVrS+y2JiM1YYBJgZ6r/w="; + hash = "sha256-GR1yhky33XZZFcPEO2WRvVUkmekG9HoM00doVgTCD+0="; }; build-system = [ diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 9217aff5a8ff1..ec6a5d6624254 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; + hash = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; }; nativeCheckInputs = [ testresources ]; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 6e98a9f3461e2..df074958d1cdc 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; + hash = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/texsoup/default.nix b/pkgs/development/python-modules/texsoup/default.nix index 697d160adc8e5..86519f929c7e8 100644 --- a/pkgs/development/python-modules/texsoup/default.nix +++ b/pkgs/development/python-modules/texsoup/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Fault-tolerant Python3 package for searching, navigating, and modifying LaTeX documents"; homepage = "https://github.com/alvinwan/TexSoup"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 8a95ecf22feaf..31e94229e7712 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; + hash = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index 0f51381f540f8..b331d1fdd2f7a 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "textdistance"; - version = "4.6.2"; + version = "4.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AeH7z3uHHrj0GRHZT0YbC5nPgAM4TuDhw0ylwaerLtA="; + hash = "sha256-1tq8ULTqgyzc8OHmAhvQx/zZreFViI15u2o8Mfzi3G8="; }; # There aren't tests @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/life4/textdistance"; changelog = "https://github.com/life4/textdistance/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 38d07c9f10956..89ba02bf4f258 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { mainProgram = "textfsm"; homepage = "https://github.com/google/textfsm"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix index 10d123e08da39..82ebb624d73e4 100644 --- a/pkgs/development/python-modules/texttable/default.nix +++ b/pkgs/development/python-modules/texttable/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/foutaise/texttable"; changelog = "https://github.com/foutaise/texttable/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index ea00817ab76de..37aa589b29ea4 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -12,12 +12,13 @@ syrupy, time-machine, tree-sitter, + tree-sitter-languages, typing-extensions, }: buildPythonPackage rec { pname = "textual"; - version = "0.70.0"; + version = "0.72.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-nOgiMT+q2pc94Q6g3MvKQVhGJYSGNnoE+5/foK62zLM="; + hash = "sha256-iNl9bos1GBLmHRvSgqYD8b6cptmmMktXkDXQbm3xMtc="; }; build-system = [ poetry-core ]; @@ -40,7 +41,7 @@ buildPythonPackage rec { optional-dependencies = { syntax = [ tree-sitter - # tree-sitter-languages + tree-sitter-languages ]; }; @@ -50,19 +51,19 @@ buildPythonPackage rec { pytestCheckHook syrupy time-machine - ] ++ optional-dependencies.syntax; + tree-sitter + ]; disabledTestPaths = [ - # snapshot tests require syrupy<4 + # Snapshot tests require syrupy<4 "tests/snapshot_tests/test_snapshots.py" ]; disabledTests = [ # Assertion issues "test_textual_env_var" - "test_softbreak_split_links_rendered_correctly" - # requires tree-sitter-languages which is not packaged in nixpkgs + # Requirements for tests are not quite ready "test_register_language" "test_language_binary_missing" ]; diff --git a/pkgs/development/python-modules/textx/default.nix b/pkgs/development/python-modules/textx/default.nix index ec8779e4ccce0..ea0f56717d522 100644 --- a/pkgs/development/python-modules/textx/default.nix +++ b/pkgs/development/python-modules/textx/default.nix @@ -14,42 +14,30 @@ html5lib, jinja2, psutil, - pytestCheckHook, + flit-core, }: let textx = buildPythonPackage rec { pname = "textx"; - version = "3.0.0"; - format = "setuptools"; + version = "4.0.1"; + pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-uZlO82dKtWQQR5+Q7dWk3+ZoUzAjDJ8qzC4UMLCtnBk="; + hash = "sha256-qiKOG6B7yWWzkL7bmcRAVv6AOHKTWmrlrsJlXD5RoaQ="; }; - postPatch = '' - substituteInPlace setup.cfg --replace "click >=7.0, <8.0" "click >=7.0" - ''; - outputs = [ "out" "testout" ]; - nativeBuildInputs = [ - mkdocs - twine - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ - arpeggio - click - future - setuptools - ]; + dependencies = [ arpeggio ]; postInstall = '' # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx @@ -89,16 +77,19 @@ let textx-data-dsl = buildPythonPackage rec { pname = "textx-data-dsl"; version = "1.0.0"; + pyproject = true; + inherit (textx) src; - # `format` isn't included in the output of `mk-python-derivation`. - # So can't inherit format: `error: attribute 'format' missing`. - format = "setuptools"; pathToSourceRoot = "tests/functional/registration/projects/data_dsl"; sourceRoot = "${src.name}/" + pathToSourceRoot; - propagatedBuildInputs = [ + + build-system = [ flit-core ]; + + dependencies = [ textx textx-types-dsl ]; + meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; @@ -109,14 +100,19 @@ let textx-flow-codegen = buildPythonPackage rec { pname = "textx-flow-codegen"; version = "1.0.0"; + pyproject = true; + inherit (textx) src; - format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/flow_codegen"; sourceRoot = "${src.name}/" + pathToSourceRoot; - propagatedBuildInputs = [ - click + + build-system = [ flit-core ]; + dependencies = [ textx + click ]; + meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; @@ -127,11 +123,16 @@ let textx-flow-dsl = buildPythonPackage rec { pname = "textx-flow-dsl"; version = "1.0.0"; + pyproject = true; + inherit (textx) src; - format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/flow_dsl"; sourceRoot = "${src.name}/" + pathToSourceRoot; - propagatedBuildInputs = [ textx ]; + + build-system = [ flit-core ]; + dependencies = [ textx ]; + meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; @@ -142,11 +143,16 @@ let textx-types-dsl = buildPythonPackage rec { pname = "textx-types-dsl"; version = "1.0.0"; + pyproject = true; + inherit (textx) src; - format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/types_dsl"; sourceRoot = "${src.name}/" + pathToSourceRoot; - propagatedBuildInputs = [ textx ]; + + build-system = [ flit-core ]; + dependencies = [ textx ]; + meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX language for testing"; @@ -157,11 +163,16 @@ let textx-example-project = buildPythonPackage rec { pname = "textx-example-project"; version = "1.0.0"; + pyproject = true; + inherit (textx) src; - format = "setuptools"; + pathToSourceRoot = "tests/functional/subcommands/example_project"; sourceRoot = "${src.name}/" + pathToSourceRoot; - propagatedBuildInputs = [ textx ]; + + build-system = [ flit-core ]; + dependencies = [ textx ]; + meta = with lib; { inherit (textx.meta) license maintainers; description = "Sample textX sub-command for testing"; diff --git a/pkgs/development/python-modules/textx/tests.nix b/pkgs/development/python-modules/textx/tests.nix index b991c8ed25c9f..ff1c888d2dbbe 100644 --- a/pkgs/development/python-modules/textx/tests.nix +++ b/pkgs/development/python-modules/textx/tests.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + attrs, click, gprof2dot, html5lib, @@ -20,6 +21,7 @@ buildPythonPackage { pname = "textx-tests"; inherit (textx) version; + pyproject = false; srcs = textx.testout; @@ -27,6 +29,7 @@ buildPythonPackage { dontInstall = true; nativeCheckInputs = [ + attrs click gprof2dot html5lib @@ -43,6 +46,9 @@ buildPythonPackage { ]; pytestFlagsArray = [ "tests/functional" ]; + disabledTests = [ + "test_examples" # assertion error: 0 == 12 + ]; meta = with lib; { inherit (textx.meta) license maintainers; diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix index 9b548f1a9127b..bdc80d921c048 100644 --- a/pkgs/development/python-modules/threadloop/default.nix +++ b/pkgs/development/python-modules/threadloop/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Library to run tornado coroutines from synchronous Python"; homepage = "https://github.com/GoodPete/threadloop"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix index c30c0a018d21e..e20e1aea09acb 100644 --- a/pkgs/development/python-modules/three-merge/default.nix +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Simple library for merging two strings with respect to a base one"; homepage = "https://github.com/spyder-ide/three-merge"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index f33ba9cfa2f64..4052080fc351b 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, + distutils, fetchPypi, - pythonAtLeast, pythonOlder, setuptools, six, @@ -13,15 +13,17 @@ buildPythonPackage rec { version = "0.20.0"; pyproject = true; - # Still uses distutils - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-TdZi6t9riuvopBcpUnvWmt9s6qKoaBy+9k0Sc7Po/ro="; }; - build-system = [ setuptools ]; + build-system = [ + distutils + setuptools + ]; dependencies = [ six ]; diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index d70ed13e37e8b..c9e962a3acb0f 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = "thriftpy2"; rev = "refs/tags/v${version}"; - hash = "sha256-F/h2XhzLA89CwgorKhrvKrajFbT9maiF3RBkulQQ9bk="; + hash = "sha256-GBJL+IqZpT1/msJLiwiS5YDyB4hIe/e3pYPWx0A+lWY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index ec9c4a0f4dd17..f2e74ad90c93e 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-fFibRF3SoDOje6M9YmZI0dwYVn/cvgXqmClvqvNy5f8="; + hash = "sha256-1Gc/WF8eEGT17z2CiuSLUIngDZVoHdBhfsUddNUBwWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tiktoken/Cargo.lock b/pkgs/development/python-modules/tiktoken/Cargo.lock index e65fd819d3d4c..c0ae6a2870677 100644 --- a/pkgs/development/python-modules/tiktoken/Cargo.lock +++ b/pkgs/development/python-modules/tiktoken/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bit-set" @@ -34,15 +34,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bstr" -version = "1.6.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -66,22 +66,28 @@ dependencies = [ ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "indoc" -version = "1.0.9" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -89,30 +95,30 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -120,9 +126,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", @@ -132,25 +138,32 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" dependencies = [ "cfg-if", "indoc", "libc", "memoffset", "parking_lot", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -159,9 +172,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" dependencies = [ "once_cell", "target-lexicon", @@ -169,9 +182,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" dependencies = [ "libc", "pyo3-build-config", @@ -179,50 +192,52 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" dependencies = [ + "heck", "proc-macro2", + "pyo3-build-config", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -232,9 +247,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -243,9 +258,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -261,46 +276,35 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.36", + "syn", ] [[package]] name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "syn" -version = "1.0.109" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.36" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -309,13 +313,13 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tiktoken" -version = "0.5.1" +version = "0.7.0" dependencies = [ "bstr", "fancy-regex", @@ -332,19 +336,20 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -353,42 +358,48 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index d7b8b6c1c631f..ffcead40165d8 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -9,7 +9,6 @@ rustc, setuptools, setuptools-rust, - wheel, libiconv, requests, regex, @@ -17,10 +16,10 @@ }: let pname = "tiktoken"; - version = "0.5.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - hash = "sha256-J+dzVkIyAE9PgQ/R+FI2Zz7DpW7X8SBvye2GcOvtuXo="; + hash = "sha256-EHcmbpScJOApH2w1BDPG8JcTZezisXOiO8O5+d7+9rY="; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock @@ -33,20 +32,19 @@ buildPythonPackage { src postPatch ; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; - nativeBuildInput = [ + build-system = [ setuptools setuptools-rust - wheel ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-Q7XO+auj4tKDAGbqNn9pmJg8EJvooN2ie0lWwZVrld4="; + hash = "sha256-i0AQUu9ERDWBw0kjTTTyn4VHMig/k2/7wX2884MCGx8="; }; nativeBuildInputs = [ @@ -58,7 +56,7 @@ buildPythonPackage { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - propagatedBuildInputs = [ + dependencies = [ requests regex blobfile diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 8d2490f428e07..17d3827f48530 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.13.0"; + version = "2.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-SjenPLLr4JoWK5HAokwgW+bw3mfAZiuDb1N7Za5wtrw="; + hash = "sha256-u5RxNv+hsL+0yxtiWeYHtmMQY7bvb8WY7ipouj+IZJ8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index a775c3d01f25b..de944d5b26b31 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, asgineer, bcrypt, buildPythonPackage, @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "24.4.1"; + version = "24.07.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qt6VKExigzMaEb5ZEEPHCe5DSYdx5KPIfVC0khx7pP4="; + hash = "sha256-zm+3vk2ZeaZjciANNVSVxDT5S2LhOAl3B4AE2RgA5Tw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/timing-asgi/default.nix b/pkgs/development/python-modules/timing-asgi/default.nix index 30798baa5ba1e..c67885f692609 100644 --- a/pkgs/development/python-modules/timing-asgi/default.nix +++ b/pkgs/development/python-modules/timing-asgi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - asynctest, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index a02c90152435a..af86c57bae64b 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -3,13 +3,18 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system pdm-backend, + + # dependencies huggingface-hub, - numpy, pyyaml, safetensors, torch, torchvision, + + # checks expecttest, pytestCheckHook, pytest-timeout, @@ -17,7 +22,7 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.7"; + version = "1.0.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,14 +31,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-0o88gOZvHXblGPwyRIz2D3sD7wdg0J0knrAFlognEOY="; + hash = "sha256-z7v1CTwIqdF8xhfGa2mtFi0sFjhOhM7X/q1OQ5qHA7c="; }; build-system = [ pdm-backend ]; dependencies = [ huggingface-hub - numpy pyyaml safetensors torch diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix index 8d9d2bf4920cf..f525e40d16b96 100644 --- a/pkgs/development/python-modules/tinycss/default.nix +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://tinycss.readthedocs.io"; changelog = "https://github.com/Kozea/tinycss/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tinytag/default.nix b/pkgs/development/python-modules/tinytag/default.nix new file mode 100644 index 0000000000000..c155019517923 --- /dev/null +++ b/pkgs/development/python-modules/tinytag/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tinytag"; + version = "1.10.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tinytag"; + repo = "tinytag"; + rev = "refs/tags/${version}"; + hash = "sha256-Kg67EwDIi/Io7KKnNiqPzQKginrfuE6FAeOCjFgEJkY="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "tinytag" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Read audio file metadata"; + homepage = "https://github.com/tinytag/tinytag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix deleted file mode 100644 index f716c1b715f89..0000000000000 --- a/pkgs/development/python-modules/tissue/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - nose, - pep8, -}: - -buildPythonPackage rec { - pname = "tissue"; - version = "0.9.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ pep8 ]; - - meta = with lib; { - homepage = "https://github.com/WoLpH/tissue"; - description = "Tissue - automated pep8 checker for nose"; - license = licenses.lgpl2; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 813fe48eb0745..b6bd8b10719ce 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { mainProgram = "titlecase"; homepage = "https://github.com/ppannuto/python-titlecase"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index b1248d18b283b..e161c5495f593 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -3,18 +3,19 @@ buildPythonPackage, fetchFromGitHub, setuptools, + nix-update-script, }: buildPythonPackage rec { pname = "tlds"; - version = "2023110300"; + version = "2024071000"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-rmKqY7Z4bBR4r+w4gH04g0Xm9N7QeMVcuFR3pB/pOQY="; + hash = "sha256-xt2IdF7V8NUW9nUg8x7XbMHLWir6CHAQcRIiH6ejV5M="; }; nativeBuildInputs = [ setuptools ]; @@ -24,6 +25,8 @@ buildPythonPackage rec { # no tests doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Automatically updated list of valid TLDs taken directly from IANA"; homepage = "https://github.com/kichik/tlds"; diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 450f40234378a..1d715c6758f74 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -1,30 +1,45 @@ { lib, buildPythonPackage, - fetchPypi, - pythonAtLeast, + fetchFromGitHub, + setuptools, ecdsa, + hypothesis, + pythonAtLeast, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "tlslite-ng"; - version = "0.7.6"; - format = "setuptools"; - - # https://github.com/tlsfuzzer/tlslite-ng/issues/501 - disabled = pythonAtLeast "3.12"; + version = "0.8.0b1-unstable-2024-06-24"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "6ab56f0e9629ce3d807eb528c9112defa9f2e00af2b2961254e8429ca5c1ff00"; + src = fetchFromGitHub { + owner = "tlsfuzzer"; + repo = "tlslite-ng"; + rev = "4d2c6b8fc8d14bb5c90c8360bdb6f617e8e38591"; + hash = "sha256-VCQjxZIs4rzlFrIakXI7YeLz7Ws9WRf8zGPcSryO9Ko="; }; - buildInputs = [ ecdsa ]; + build-system = [ setuptools ]; + + dependencies = [ ecdsa ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + # This file imports asyncore which is removed in 3.12 + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "tlslite/integration/tlsasyncdispatchermixin.py" + ]; meta = with lib; { + changelog = "https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v${version}"; description = "Pure python implementation of SSL and TLS"; - homepage = "https://pypi.python.org/pypi/tlslite-ng"; - license = licenses.lgpl2; + homepage = "https://github.com/tlsfuzzer/tlslite-ng"; + license = licenses.lgpl21Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index e276725a53a89..9a7eec1354f61 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 8e221c312bae0..81b90b520552c 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -13,6 +13,7 @@ prettytable, pytest-mock, pytestCheckHook, + pytest-cov-stub, pythonOlder, requests, setuptools, @@ -37,7 +38,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace-fail "==" ">=" substituteInPlace pytest.ini \ - --replace ' --cov toggl -m "not premium"' "" + --replace ' -m "not premium"' "" ''; build-system = [ @@ -60,6 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pytest-mock faker factory-boy diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index cda6f1b7a58ef..aca17db0e74e5 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -137,7 +137,7 @@ buildPythonPackage rec { description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; homepage = "https://github.com/huggingface/tokenizers"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/tomli-w/default.nix b/pkgs/development/python-modules/tomli-w/default.nix index c864dfe142656..3741f4e2881e9 100644 --- a/pkgs/development/python-modules/tomli-w/default.nix +++ b/pkgs/development/python-modules/tomli-w/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - callPackage, fetchFromGitHub, flit-core, }: diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 74a9f78b2e4ba..20ae66d60fcd4 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - callPackage, fetchFromGitHub, flit-core, unittestCheckHook, diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index f7d1a069434a9..12644de66f1e4 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Topological sort algorithm"; homepage = "https://pypi.python.org/pypi/toposort/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index e2899c081e08b..a10be3732efa7 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -7,7 +7,7 @@ python, pythonAtLeast, pythonOlder, - addOpenGLRunpath, + addDriverRunpath, callPackage, cudaPackages, future, @@ -16,13 +16,12 @@ pyyaml, requests, setuptools, - torch-bin, typing-extensions, sympy, jinja2, networkx, filelock, - openai-triton, + triton, }: let @@ -44,7 +43,7 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; nativeBuildInputs = lib.optionals stdenv.isLinux [ - addOpenGLRunpath + addDriverRunpath autoPatchelfHook autoAddDriverRunpath ]; @@ -88,7 +87,7 @@ buildPythonPackage { jinja2 networkx filelock - ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ openai-triton ]; + ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ]; postInstall = '' # ONNX conversion @@ -121,7 +120,7 @@ buildPythonPackage { pythonImportsCheck = [ "torch" ]; - passthru.gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; }; + passthru.tests = callPackage ./tests.nix {}; meta = { description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 40f26d2821835..afc1fd6e74e1b 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -26,7 +26,6 @@ # tests.cudaAvailable: callPackage, - torchWithCuda, # Native build inputs cmake, @@ -53,9 +52,9 @@ cffi, click, typing-extensions, - # ROCm build and `torch.compile` requires `openai-triton` + # ROCm build and `torch.compile` requires `triton` tritonSupport ? (!stdenv.isDarwin), - openai-triton, + triton, # Unit tests hypothesis, @@ -202,8 +201,11 @@ let ]); "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); + # This used to be a deep package set comparison between cudaPackages and + # effectiveMagma.cudaPackages, making torch too strict in cudaPackages. + # In particular, this triggered warnings from cuda's `aliases.nix` "Magma cudaPackages does not match cudaPackages" = - cudaSupport && (effectiveMagma.cudaPackages != cudaPackages); + cudaSupport && (effectiveMagma.cudaPackages.cudaVersion != cudaPackages.cudaVersion); "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport; }; in @@ -486,7 +488,7 @@ buildPythonPackage rec { CoreServices libobjc ] - ++ lib.optionals tritonSupport [ openai-triton ] + ++ lib.optionals tritonSupport [ triton ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; @@ -514,7 +516,7 @@ buildPythonPackage rec { # torch/csrc requires `pybind11` at runtime pybind11 - ] ++ lib.optionals tritonSupport [ openai-triton ]; + ] ++ lib.optionals tritonSupport [ triton ]; propagatedCxxBuildInputs = [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; diff --git a/pkgs/development/python-modules/torch/gpu-checks.nix b/pkgs/development/python-modules/torch/gpu-checks.nix deleted file mode 100644 index 55a4b45f71522..0000000000000 --- a/pkgs/development/python-modules/torch/gpu-checks.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - torchWithCuda, - torchWithRocm, - callPackage, -}: - -let - accelAvailable = - { - feature, - versionAttr, - torch, - cudaPackages, - }: - cudaPackages.writeGpuTestPython - { - inherit feature; - libraries = [ torch ]; - name = "${feature}Available"; - } - '' - import torch - message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" - assert torch.cuda.is_available() and torch.version.${versionAttr}, message - print(message) - ''; -in -{ - tester-cudaAvailable = callPackage accelAvailable { - feature = "cuda"; - versionAttr = "cuda"; - torch = torchWithCuda; - }; - tester-rocmAvailable = callPackage accelAvailable { - feature = "rocm"; - versionAttr = "hip"; - torch = torchWithRocm; - }; -} diff --git a/pkgs/development/python-modules/torch/mk-runtime-check.nix b/pkgs/development/python-modules/torch/mk-runtime-check.nix new file mode 100644 index 0000000000000..61180a19aaba5 --- /dev/null +++ b/pkgs/development/python-modules/torch/mk-runtime-check.nix @@ -0,0 +1,20 @@ +{ + cudaPackages, + feature, + libraries, + versionAttr, + pythonPackages, +}: + +(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; }) + { + inherit feature; + inherit libraries; + name = "${feature}Available"; + } + '' + import torch + message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" + assert torch.cuda.is_available() and torch.version.${versionAttr}, message + print(message) + '' diff --git a/pkgs/development/python-modules/torch/mk-torch-compile-check.nix b/pkgs/development/python-modules/torch/mk-torch-compile-check.nix new file mode 100644 index 0000000000000..268ed5297da94 --- /dev/null +++ b/pkgs/development/python-modules/torch/mk-torch-compile-check.nix @@ -0,0 +1,38 @@ +{ + cudaPackages, + feature ? null, + lib, + libraries, + name ? if feature == null then "torch-compile-cpu" else "torch-compile-${feature}", + pythonPackages, + stdenv, +}: +let + deviceStr = if feature == null then "" else '', device="cuda"''; +in +(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; }) + { + inherit name feature libraries; + makeWrapperArgs = [ + "--suffix" + "PATH" + ":" + "${lib.getBin stdenv.cc}/bin" + ]; + } + '' + import torch + + + @torch.compile + def opt_foo2(x, y): + a = torch.sin(x) + b = torch.cos(y) + return a + b + + + print( + opt_foo2( + torch.randn(10, 10${deviceStr}), + torch.randn(10, 10${deviceStr}))) + '' diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix index 5a46d0886868c..e3f2ca44ba5a9 100644 --- a/pkgs/development/python-modules/torch/tests.nix +++ b/pkgs/development/python-modules/torch/tests.nix @@ -1,3 +1,31 @@ { callPackage }: -callPackage ./gpu-checks.nix { } +rec { + # To perform the runtime check use either + # `nix run .#python3Packages.torch.tests.tester-cudaAvailable` (outside the sandbox), or + # `nix build .#python3Packages.torch.tests.tester-cudaAvailable.gpuCheck` (in a relaxed sandbox) + tester-cudaAvailable = callPackage ./mk-runtime-check.nix { + feature = "cuda"; + versionAttr = "cuda"; + libraries = ps: [ ps.torchWithCuda ]; + }; + tester-rocmAvailable = callPackage ./mk-runtime-check.nix { + feature = "rocm"; + versionAttr = "hip"; + libraries = ps: [ ps.torchWithRocm ]; + }; + + compileCpu = tester-compileCpu.gpuCheck; + tester-compileCpu = callPackage ./mk-torch-compile-check.nix { + feature = null; + libraries = ps: [ ps.torch ]; + }; + tester-compileCuda = callPackage ./mk-torch-compile-check.nix { + feature = "cuda"; + libraries = ps: [ ps.torchWithCuda ]; + }; + tester-compileRocm = callPackage ./mk-torch-compile-check.nix { + feature = "rocm"; + libraries = ps: [ ps.torchWithRocm ]; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index be9710041f9cd..44205578a38de 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -1,13 +1,11 @@ { lib, stdenv, - addOpenGLRunpath, + addDriverRunpath, autoPatchelfHook, buildPythonPackage, cudaPackages, fetchurl, - ffmpeg_4, - ffmpeg_5, ffmpeg_6, sox, pythonAtLeast, @@ -33,9 +31,7 @@ buildPythonPackage rec { buildInputs = [ - # We need to patch the lib/_torchaudio_ffmpeg[4-6] - ffmpeg_4.dev - ffmpeg_5.dev + # We need to patch lib/torio/_torio_ffmpeg6 ffmpeg_6.dev sox ] @@ -54,7 +50,7 @@ buildPythonPackage rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook - addOpenGLRunpath + addDriverRunpath ]; dependencies = [ torch-bin ]; @@ -63,6 +59,12 @@ buildPythonPackage rec { addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch" ''; + preFixup = '' + # TorchAudio loads the newest FFmpeg that works, so get rid of the + # old ones. + rm $out/${python.sitePackages}/torio/lib/{lib,_}torio_ffmpeg{4,5}.* + ''; + # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`. dontStrip = true; diff --git a/pkgs/development/python-modules/torchcrepe/default.nix b/pkgs/development/python-modules/torchcrepe/default.nix new file mode 100644 index 0000000000000..d292f0de81e1a --- /dev/null +++ b/pkgs/development/python-modules/torchcrepe/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + librosa, + pytestCheckHook, + pythonOlder, + resampy, + scipy, + setuptools, + torch, + torchaudio, + tqdm, +}: + +buildPythonPackage { + pname = "torchcrepe"; + version = "0.0.23"; + pyproject = true; + build-system = [ setuptools ]; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "maxrmorrison"; + repo = "torchcrepe"; + # No releases: https://github.com/maxrmorrison/torchcrepe/commit/e2c305878ec7a89aec85a01f8d223a75a36d30b6 + rev = "e2c305878ec7a89aec85a01f8d223a75a36d30b6"; + hash = "sha256-fhBU5KFDNDG4g4KNivE/dRpMPyu1QNa9xKN6HIz3tK4="; + }; + + dependencies = [ + librosa + resampy + scipy + torch + torchaudio + tqdm + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "torchcrepe" ]; + + meta = { + description = "Pytorch implementation of the CREPE pitch tracker"; + homepage = "https://github.com/maxrmorrison/torchcrepe"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 79d245c926d25..c0aae74f178f6 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { torch tqdm typer - ] ++ typer.passthru.optional-dependencies.all; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/torchlibrosa/default.nix b/pkgs/development/python-modules/torchlibrosa/default.nix index 9ea19d6157a54..8587f6382b237 100644 --- a/pkgs/development/python-modules/torchlibrosa/default.nix +++ b/pkgs/development/python-modules/torchlibrosa/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index b0e0e46a303ca..a98c7178fe715 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -1,28 +1,35 @@ { lib, buildPythonPackage, - fetchFromGitHub, pythonOlder, + fetchFromGitHub, + + # dependencies numpy, lightning-utilities, - cloudpickle, - scikit-learn, - scikit-image, packaging, pretty-errors, - psutil, - py-deprecate, + + # buildInputs torch, + + # checks + cloudpickle, + psutil, pytestCheckHook, - torchmetrics, - pytorch-lightning, pytest-doctestplus, pytest-xdist, + pytorch-lightning, + scikit-image, + scikit-learn, + + # passthru + torchmetrics, }: let pname = "torchmetrics"; - version = "1.4.0.post0"; + version = "1.4.1"; in buildPythonPackage { inherit pname version; @@ -34,7 +41,7 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-tQqlLfdk8rSJqwR3rC7kqnM+pLFYZSPHfI7RmIi2Iq4="; + hash = "sha256-NOxj1vVY9ynCS/Pf6V+ONNx50jjKqfkhzYbc60Sf4Qw="; }; dependencies = [ @@ -42,21 +49,20 @@ buildPythonPackage { lightning-utilities packaging pretty-errors - py-deprecate ]; # Let the user bring their own instance buildInputs = [ torch ]; nativeCheckInputs = [ - pytorch-lightning - scikit-learn - scikit-image cloudpickle psutil pytestCheckHook pytest-doctestplus pytest-xdist + pytorch-lightning + scikit-image + scikit-learn ]; # A cyclic dependency in: integrations/test_lightning.py @@ -86,11 +92,11 @@ buildPythonPackage { pythonImportsCheck = [ "torchmetrics" ]; - meta = with lib; { + meta = { description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)"; homepage = "https://lightning.ai/docs/torchmetrics/"; changelog = "https://github.com/Lightning-AI/torchmetrics/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ SomeoneSerge ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ SomeoneSerge ]; }; } diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index e075696881104..638f1844eaba4 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -154,14 +154,19 @@ buildPythonPackage rec { # undeterministic "test_distributed_collector_updatepolicy" "test_timeit" + + # On a 24 + # assert torch.get_num_threads() == max(1, init_threads - 3) + # AssertionError: assert 23 == 21 + "test_auto_num_threads" ]; - meta = with lib; { + meta = { description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; homepage = "https://github.com/pytorch/rl"; changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; # ~3k tests fail with: RuntimeError: internal error broken = stdenv.isLinux && stdenv.isAarch64; }; diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index fc731fae2e07e..d796159cbb9f9 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -1,7 +1,7 @@ { lib, stdenv, - addOpenGLRunpath, + addDriverRunpath, autoPatchelfHook, buildPythonPackage, cudaPackages, @@ -41,7 +41,7 @@ buildPythonPackage { nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook - addOpenGLRunpath + addDriverRunpath ]; dependencies = [ diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 38afe65df6cf2..2a5c06f5ab38e 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "Web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/torrent-parser/default.nix b/pkgs/development/python-modules/torrent-parser/default.nix index baa2fbe76b214..ae1c3a6016248 100644 --- a/pkgs/development/python-modules/torrent-parser/default.nix +++ b/pkgs/development/python-modules/torrent-parser/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/7sDream/torrent_parser"; changelog = "https://github.com/7sDream/torrent_parser/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 6bd00159fd8e0..61fedf42b0853 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "towncrier"; - version = "23.11.0"; + version = "24.7.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0="; + hash = "sha256-V6BX+u2ryt8aYvb5utcmrlZsHzGkETON24MWmT9YOz0="; }; postPatch = '' @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/towncrier/"; changelog = "https://github.com/twisted/towncrier/blob/${version}/NEWS.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index b143ab8d8563d..4c358cce9012b 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -8,7 +8,6 @@ py, six, virtualenv, - setuptools-scm, toml, tomli, filelock, @@ -72,6 +71,6 @@ buildPythonPackage rec { mainProgram = "tox"; homepage = "https://github.com/tox-dev/tox"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index eb53e74cebb6b..22a136daddcd0 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -5,13 +5,12 @@ buildPythonPackage, fetchPypi, hatchling, - pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-P7kb8gzPjRwl6KpKbh/k7QqjGU6m+HVBbMCuoabG+5M="; + hash = "sha256-2YGUm37i3gAKXLygtjLYVB+kGk0+84pY70CUyU3BzbY="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 02494a535bfd6..44e1b68a257c2 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchurl, substituteAll, buildPythonPackage, fetchPypi, @@ -11,9 +10,7 @@ cryptography, pkgconfig, # see nativeBuildInputs pkg-config, # see nativeBuildInputs - pycparser, pytestCheckHook, - python, pyyaml, setuptools-scm, tpm2-tss, diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix index 024859c6be28f..dd51ff779e2bb 100644 --- a/pkgs/development/python-modules/tracerite/default.nix +++ b/pkgs/development/python-modules/tracerite/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/sanic-org/tracerite"; changelog = "https://github.com/sanic-org/tracerite/releases/tag/v${version}"; license = licenses.unlicense; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 4e140e15743ed..a12ffea156bd0 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "soft-matter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AChtnwkGDzD4O0h0POmQrHJbgFvbFZUp15H4fKqm0Co="; + hash = "sha256-6i1IfdxgV6bpf//mXATpnsQ0zN26S8rlL0/1ql68sd8="; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { homepage = "https://github.com/soft-matter/trackpy"; changelog = "https://github.com/soft-matter/trackpy/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 720ead19e0109..984d95c00cb12 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "trafilatura"; - version = "1.10.0"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-exBXPi3Ra2cC9W9WhYsl80/4HWsW5CmvCjsmbwdGru4="; + hash = "sha256-F9IHTs/ixWK/CGPefoOfrRTMZtX5gJB0HqqRjqv7+dU="; }; # Patch out gui cli because it is not supported in this packaging and @@ -32,7 +32,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace-fail '"trafilatura_gui=trafilatura.gui:main",' "" substituteInPlace tests/cli_tests.py \ - --replace-fail "trafilatura_bin = 'trafilatura'" "trafilatura_bin = '$out/bin/trafilatura'" + --replace-fail 'trafilatura_bin = "trafilatura"' \ + 'trafilatura_bin = "${placeholder "out"}/bin/trafilatura"' ''; build-system = [ setuptools ]; @@ -60,16 +61,17 @@ buildPythonPackage rec { "test_queue" "test_redirection" "test_whole" + "test_is_live_page" ]; pythonImportsCheck = [ "trafilatura" ]; - meta = with lib; { + meta = { description = "Python package and command-line tool designed to gather text on the Web"; homepage = "https://trafilatura.readthedocs.io"; changelog = "https://github.com/adbar/trafilatura/blob/v${version}/HISTORY.md"; - license = licenses.asl20; - maintainers = with maintainers; [ jokatzke ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jokatzke ]; mainProgram = "trafilatura"; }; } diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index e2335a8b1b7b7..f222f9dba2a07 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -3,8 +3,6 @@ buildPythonPackage, fetchPypi, pythonOlder, - numpy, - pytestCheckHook, }: buildPythonPackage rec { @@ -28,6 +26,6 @@ buildPythonPackage rec { description = "Explicitly typed attributes for Python"; homepage = "https://pypi.python.org/pypi/traits"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index dfc793888bac7..e00ebe4ce1b77 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, isPy27, pytestCheckHook, - nose, + setuptools, numpy, pandas, xarray, @@ -14,47 +13,40 @@ buildPythonPackage rec { pname = "traittypes"; - version = "unstable-2019-06-23"; - format = "setuptools"; + version = "0.2.1-unstable-2020-07-17"; + pyproject = true; disabled = isPy27; src = fetchFromGitHub { owner = "jupyter-widgets"; repo = pname; - rev = "0a030b928991dec732c17a7a1cb13acbcd7650a2"; - sha256 = "0rlm5krmq6n8yi47dgdsjyrkz3m079pndpbzkz2gx98pb3jd9pjs"; + rev = "af2ebeec9e58b73a12d4cf841bd506d6eadb8868"; + hash = "sha256-q7kt8b+yDHsWML/wCeND9PrZMVjemhzG7Ih1OtHbnTw="; }; - patches = [ - (fetchpatch { - name = "fix-intarray-test.patch"; - url = "https://github.com/minrk/traittypes/commit/a02441e5b259e5858453a853207260c9bd4efbb5.patch"; - sha256 = "120dsvr5nksizw75z1ah3h38mi399fxbvz5anakica557jahi0aw"; - }) - ]; + postPatch = '' + substituteInPlace traittypes/tests/test_traittypes.py \ + --replace-fail "np.int" "int" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ traitlets ]; + dependencies = [ traitlets ]; nativeCheckInputs = [ numpy pandas xarray - nose pytestCheckHook ]; - disabledTestPaths = lib.optionals (lib.versionAtLeast numpy.version "1.17") [ - # https://github.com/jupyter-widgets/traittypes/blob/master/setup.py#L86-L87 - "traittypes/tests/test_traittypes.py" - ]; - pythonImportsCheck = [ "traittypes" ]; - meta = with lib; { + meta = { description = "Trait types for NumPy, SciPy, XArray, and Pandas"; homepage = "https://github.com/jupyter-widgets/traittypes"; - license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index fa4cef5acb9c8..2b3e0515894a5 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://transaction.readthedocs.io/"; changelog = "https://github.com/zopefoundation/transaction/blob/${version}/CHANGES.rst"; license = licenses.zpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index cc522d35fc011..13345ce1c4a68 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -3,8 +3,11 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + + # build-system setuptools, - # propagated build inputs + + # dependencies filelock, huggingface-hub, numpy, @@ -16,7 +19,8 @@ tokenizers, safetensors, tqdm, - # optional dependencies + + # optional-dependencies diffusers, scikit-learn, tensorflow, @@ -55,7 +59,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.42.3"; + version = "4.44.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -64,7 +68,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-vcwOFprscE8R3AdIJudYme9vvSFJvF+iCzRzBhiggr8="; + hash = "sha256-i3KKfkYvKRYrs/kiwBJdyFzMiXKwyBEeUuZcHszip3k="; }; build-system = [ setuptools ]; @@ -82,7 +86,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = + optional-dependencies = let audio = [ librosa diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 0f7310ca5c1fe..74ce55dd4b133 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -9,19 +9,18 @@ pycodestyle, pygraphviz, pytestCheckHook, - pythonAtLeast, setuptools, six, }: buildPythonPackage rec { pname = "transitions"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NULDcQjpPirl8hUgjsVzLJSncpN4VKECzXNFuWf+5hs="; + hash = "sha256-L4SQ29vUGTZs7xUWAyqwbQfMtYOe9UkF6EKkcmktQgQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix index a118e4ffe0cca..9636b3dc95354 100644 --- a/pkgs/development/python-modules/tree-sitter-languages/default.nix +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -1,12 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, setuptools -, wheel -, cython -, tree-sitter0_21 -, pytestCheckHook -, python +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + tree-sitter, + pytestCheckHook, + python, }: buildPythonPackage rec { @@ -34,20 +34,14 @@ buildPythonPackage rec { build-system = [ setuptools - wheel cython ]; - dependencies = [ - # https://github.com/grantjenks/py-tree-sitter-languages/issues/67 - tree-sitter0_21 - ]; + dependencies = [ tree-sitter ]; # Generate languages.so file (build won't fail without this, but tests will). preBuild = '' ${python.pythonOnBuildForHost.interpreter} build.py ''; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; # Without cd $out, tests fail to import the compiled cython extensions. # Without copying the ./tests/ directory to $out, pytest won't detect the # tests and run them. See also: @@ -64,5 +58,7 @@ buildPythonPackage rec { homepage = "https://github.com/grantjenks/py-tree-sitter-languages"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # https://github.com/grantjenks/py-tree-sitter-languages/issues/67 + broken = versionAtLeast tree-sitter.version "0.22"; }; } diff --git a/pkgs/development/python-modules/tree-sitter0_21/default.nix b/pkgs/development/python-modules/tree-sitter/0_21.nix index 665f7d6b56ce9..1d3326ea967a5 100644 --- a/pkgs/development/python-modules/tree-sitter0_21/default.nix +++ b/pkgs/development/python-modules/tree-sitter/0_21.nix @@ -6,15 +6,15 @@ pythonOlder, pythonAtLeast, setuptools, + distutils, }: buildPythonPackage rec { - pname = "tree-sitter0_21"; + pname = "tree-sitter"; version = "0.21.3"; pyproject = true; - # https://github.com/tree-sitter/py-tree-sitter/issues/209 - disabled = pythonAtLeast "3.12" || pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tree-sitter"; @@ -30,6 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "tree_sitter" ]; + # Needed explicitly for Python >= 3.12 as tree-sitter provides + # calls to distutils functions to compile language files + dependencies = lib.optionals (pythonAtLeast "3.12") [ distutils ]; + preCheck = '' rm -r tree_sitter ''; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 9c090790124ab..1d2a9b15374c7 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -57,6 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "Requests-like API built on top of twisted.web's Agent"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index daa6282fb1a3e..91c3deed553d3 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,17 +11,17 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.1"; - format = "pyproject"; + version = "4.4.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-dn/jyGa6dObZqdIWw07MHP4vvz8SmmwR1ZhxcFpZGro="; + hash = "sha256-XFP2/gHi+uNXrTO3ltv9tOr+shFDVPRs85YIgGEU7Pg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index e66716474dd57..7c8f0cbaa28b9 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "trio-asyncio"; - version = "0.14.1"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-634fcYAn5J1WW71J/USAMkJaZI8JmKoQneQEhz2gYFc="; + hash = "sha256-6c+4sGEpCVC8wxBg+dYgkOwRAUOi/DTITrDx3M2koyE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 87bc67368d560..39a9ee4baa4f3 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -69,6 +69,6 @@ buildPythonPackage rec { description = "WebSocket client and server implementation for Python Trio"; homepage = "https://github.com/HyperionGray/trio-websocket"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch b/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch index d31a4798af05c..d31a4798af05c 100644 --- a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch +++ b/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch diff --git a/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch b/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch index 3941d54b8b37f..3941d54b8b37f 100644 --- a/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch +++ b/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix index bdf722bbc0fca..0189278bc0e9b 100644 --- a/pkgs/development/python-modules/openai-triton/bin.nix +++ b/pkgs/development/python-modules/triton/bin.nix @@ -1,7 +1,7 @@ { lib, stdenv, - addOpenGLRunpath, + addDriverRunpath, cudaPackages, buildPythonPackage, fetchurl, @@ -64,7 +64,7 @@ buildPythonPackage rec { old = [ "-lcuda" ]; new = [ "-lcuda" - "-L${addOpenGLRunpath.driverLink}" + "-L${addDriverRunpath.driverLink}" "-L${cudaPackages.cuda_cudart}/lib/stubs/" ]; @@ -80,12 +80,12 @@ buildPythonPackage rec { meta = with lib; { description = "Language and compiler for custom Deep Learning operations"; - homepage = "https://github.com/openai/triton/"; - changelog = "https://github.com/openai/triton/releases/tag/v${version}"; + homepage = "https://github.com/triton-lang/triton/"; + changelog = "https://github.com/triton-lang/triton/releases/tag/v${version}"; # Includes NVIDIA's ptxas, but redistributions of the binary are not limited. # https://docs.nvidia.com/cuda/eula/index.html # triton's license is MIT. - # openai-triton-bin includes ptxas binary, therefore unfreeRedistributable is set. + # triton-bin includes ptxas binary, therefore unfreeRedistributable is set. license = with licenses; [ unfreeRedistributable mit diff --git a/pkgs/development/python-modules/openai-triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix index 5c542ac187ee3..5c542ac187ee3 100644 --- a/pkgs/development/python-modules/openai-triton/binary-hashes.nix +++ b/pkgs/development/python-modules/triton/binary-hashes.nix diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/triton/default.nix index 8e3ed7bad51c6..771f57f775357 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/triton/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, fetchpatch, setuptools, - pytestCheckHook, cmake, ninja, pybind11, @@ -27,7 +26,7 @@ }: let - ptxas = "${cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) + ptxas = lib.getExe' cudaPackages.cuda_nvcc "ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) in buildPythonPackage rec { pname = "triton"; @@ -48,10 +47,13 @@ buildPythonPackage rec { url = "https://github.com/openai/triton/commit/52c146f66b79b6079bcd28c55312fc6ea1852519.patch"; hash = "sha256-098/TCQrzvrBAbQiaVGCMaF3o5Yc3yWDxzwSkzIuAtY="; }) + + # Upstream startded pinning CUDA version and falling back to downloading from Conda + # in https://github.com/triton-lang/triton/pull/1574/files#diff-eb8b42d9346d0a5d371facf21a8bfa2d16fb49e213ae7c21f03863accebe0fcfR120-R123 + ./0000-dont-download-ptxas.patch ] ++ lib.optionals (!cudaSupport) [ - ./0000-dont-download-ptxas.patch - # openai-triton wants to get ptxas version even if ptxas is not + # triton wants to get ptxas version even if ptxas is not # used, resulting in ptxas not found error. ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch ]; @@ -90,8 +92,7 @@ buildPythonPackage rec { --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" - cat << \EOF > python/triton/common/build.py - + cat << \EOF >> python/triton/common/build.py def libcuda_dirs(): return [ "${addDriverRunpath.driverLink}/lib" ] EOF @@ -126,11 +127,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ filelock - # openai-triton uses setuptools at runtime: + # triton uses setuptools at runtime: # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652 setuptools ]; + NIX_CFLAGS_COMPILE = lib.optionals cudaSupport [ + # Pybind11 started generating strange errors since python 3.12. Observed only in the CUDA branch. + # https://gist.github.com/SomeoneSerge/7d390b2b1313957c378e99ed57168219#file-gistfile0-txt-L1042 + "-Wno-stringop-overread" + ]; + # Avoid GLIBCXX mismatch with other cuda-enabled python packages preConfigure = '' @@ -190,7 +197,7 @@ buildPythonPackage rec { # and pythonImportsCheck is commented back. import-triton = runCommand "import-triton" - { nativeBuildInputs = [ (python.withPackages (ps: [ ps.openai-triton ])) ]; } + { nativeBuildInputs = [ (python.withPackages (ps: [ ps.triton ])) ]; } '' python << \EOF import triton diff --git a/pkgs/development/python-modules/openai-triton/prefetch.sh b/pkgs/development/python-modules/triton/prefetch.sh index f218718a5cf30..f218718a5cf30 100755 --- a/pkgs/development/python-modules/openai-triton/prefetch.sh +++ b/pkgs/development/python-modules/triton/prefetch.sh diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index ec13fb857cee7..a62a953eda7a0 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2024.5.22"; + version = "2024.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-imJCu7XJrojTTPZl6Bayh9IhKXPId336717BjXKsHQM="; + hash = "sha256-gyjyrCzj/Xc8uzfHZaDteoP4ncVkx9RS8Dm2kknQrDU="; }; postPatch = '' @@ -27,7 +27,7 @@ let --replace '"calver"' "" ''; - nativeBuildInputs = [ + build-system = [ calver setuptools ]; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index e70bfcdc802dd..8a2bdcfd5d8aa 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, defusedxml, lxml, relatorio, @@ -12,7 +13,6 @@ polib, python-sql, werkzeug, - wrapt, passlib, pydot, levenshtein, @@ -27,17 +27,19 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.2.4"; - format = "setuptools"; + version = "7.2.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iYx9qpZmf2r8Ndynx+jyyrLnAmB56NgjleUoLtyz+20="; + hash = "sha256-Vz1bYIwhvH8SHZnmv9ZuaoOnNe378gtIWK2UQDBQxas="; }; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ defusedxml lxml @@ -47,7 +49,6 @@ buildPythonPackage rec { polib python-sql werkzeug - wrapt passlib # extra dependencies diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix new file mode 100644 index 0000000000000..60ded9cc82ddf --- /dev/null +++ b/pkgs/development/python-modules/ttfautohint-py/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + distutils, + ttfautohint, + fonttools, +}: + +buildPythonPackage rec { + pname = "ttfautohint-py"; + version = "0.5.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fonttools"; + repo = "ttfautohint-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-NTog461RpyHKo/Qpicj3tflehaKj9LlZEN9qeCMM6JQ="; + }; + + postPatch = '' + substituteInPlace src/python/ttfautohint/__init__.py \ + --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint.so"' + ''; + + env.TTFAUTOHINTPY_BUNDLE_DLL = false; + + build-system = [ + setuptools + setuptools-scm + distutils + ]; + + buildInputs = [ ttfautohint ]; + + nativeCheckInputs = [ + pytestCheckHook + fonttools + ]; + + pythonImportsCheck = [ "ttfautohint" ]; + + meta = { + description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; + homepage = "https://github.com/fonttools/ttfautohint-py"; + changelog = "https://github.com/fonttools/ttfautohint-py/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix index 8c875737a62bd..3b202c52c7e97 100644 --- a/pkgs/development/python-modules/ttn-client/default.nix +++ b/pkgs/development/python-modules/ttn-client/default.nix @@ -4,13 +4,14 @@ buildPythonPackage, fetchFromGitHub, hatchling, + pytest-asyncio, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "ttn-client"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,17 +20,25 @@ buildPythonPackage rec { owner = "angelnu"; repo = "thethingsnetwork_python_client"; rev = "refs/tags/v${version}"; - hash = "sha256-AVEPOsEV/oJ5qM0w18dokH2R6zr1kvvJ1diR7GWqJwg="; + hash = "sha256-MnQEYPrkJVs+yxRRYF5FpDDc6k6qAbAnSzNl+p1bmgY="; }; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "ttn_client" ]; + disabledTests = [ + # Test require network access + "test_connection_auth_error" + ]; + meta = with lib; { description = "Module to fetch/receive and parse uplink messages from The Thinks Network"; homepage = "https://github.com/angelnu/thethingsnetwork_python_client"; diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index dc6cc76abb64d..700f97a68b5f2 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -102,6 +102,6 @@ buildPythonPackage rec { mainProgram = "ttp"; homepage = "https://github.com/dmulyalin/ttp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 3b351c3a608ff..3d5384614c3c4 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; + hash = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; }; @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/bibanon/tubeup"; changelog = "https://github.com/bibanon/tubeup/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index 3179f22b5a5ef..c831f7a0108cd 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -9,14 +9,14 @@ }: let pname = "tuya-device-sharing-sdk"; - version = "0.2.0"; + version = "0.1.9"; in buildPythonPackage { inherit pname version; src = fetchPypi { inherit pname version; - hash = "sha256-fu8zh59wlnxtstNbNL8mIm10tiXy22oPbi6oUy5x8c8="; + hash = "sha256-mBKR+ttBo0VF33pEmYdjbyM4bGgyDiYexIIsf8mXZW4="; }; # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index f31bee02bc17d..bb7f83599ecdb 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, cmake, diff --git a/pkgs/development/python-modules/twisted/CVE-2024-41671.patch b/pkgs/development/python-modules/twisted/CVE-2024-41671.patch new file mode 100644 index 0000000000000..5f1cd6c25d2d5 --- /dev/null +++ b/pkgs/development/python-modules/twisted/CVE-2024-41671.patch @@ -0,0 +1,250 @@ +From 1cc35b0189eea0687da4d72fbfd187305b5022ab Mon Sep 17 00:00:00 2001 +From: Adi Roiban <adiroiban@gmail.com> +Date: Mon, 29 Jul 2024 14:27:23 +0100 +Subject: [PATCH 1/2] Merge commit from fork + +Address GHSA-c8m8-j448-xjx7 +--- + src/twisted/web/http.py | 21 +++-- + src/twisted/web/test/test_http.py | 126 ++++++++++++++++++++++++++---- + 2 files changed, 126 insertions(+), 21 deletions(-) + +diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py +index 1c598380ac..3b784f5e3c 100644 +--- a/src/twisted/web/http.py ++++ b/src/twisted/web/http.py +@@ -2000,16 +2000,21 @@ class _ChunkedTransferDecoder: + @returns: C{False}, as there is either insufficient data to continue, + or no data remains. + """ +- if ( +- self._receivedTrailerHeadersSize + len(self._buffer) +- > self._maxTrailerHeadersSize +- ): +- raise _MalformedChunkedDataError("Trailer headers data is too long.") +- + eolIndex = self._buffer.find(b"\r\n", self._start) + + if eolIndex == -1: + # Still no end of network line marker found. ++ # ++ # Check if we've run up against the trailer size limit: if the next ++ # read contains the terminating CRLF then we'll have this many bytes ++ # of trailers (including the CRLFs). ++ minTrailerSize = ( ++ self._receivedTrailerHeadersSize ++ + len(self._buffer) ++ + (1 if self._buffer.endswith(b"\r") else 2) ++ ) ++ if minTrailerSize > self._maxTrailerHeadersSize: ++ raise _MalformedChunkedDataError("Trailer headers data is too long.") + # Continue processing more data. + return False + +@@ -2019,6 +2024,8 @@ class _ChunkedTransferDecoder: + del self._buffer[0 : eolIndex + 2] + self._start = 0 + self._receivedTrailerHeadersSize += eolIndex + 2 ++ if self._receivedTrailerHeadersSize > self._maxTrailerHeadersSize: ++ raise _MalformedChunkedDataError("Trailer headers data is too long.") + return True + + # eolIndex in this part of code is equal to 0 +@@ -2342,8 +2349,8 @@ class HTTPChannel(basic.LineReceiver, policies.TimeoutMixin): + self.__header = line + + def _finishRequestBody(self, data): +- self.allContentReceived() + self._dataBuffer.append(data) ++ self.allContentReceived() + + def _maybeChooseTransferDecoder(self, header, data): + """ +diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py +index 33d0a49fca..815854bccb 100644 +--- a/src/twisted/web/test/test_http.py ++++ b/src/twisted/web/test/test_http.py +@@ -135,7 +135,7 @@ class DummyHTTPHandler(http.Request): + data = self.content.read() + length = self.getHeader(b"content-length") + if length is None: +- length = networkString(str(length)) ++ length = str(length).encode() + request = b"'''\n" + length + b"\n" + data + b"'''\n" + self.setResponseCode(200) + self.setHeader(b"Request", self.uri) +@@ -563,17 +563,23 @@ class HTTP0_9Tests(HTTP1_0Tests): + + class PipeliningBodyTests(unittest.TestCase, ResponseTestMixin): + """ +- Tests that multiple pipelined requests with bodies are correctly buffered. ++ Pipelined requests get buffered and executed in the order received, ++ not processed in parallel. + """ + + requests = ( + b"POST / HTTP/1.1\r\n" + b"Content-Length: 10\r\n" + b"\r\n" +- b"0123456789POST / HTTP/1.1\r\n" +- b"Content-Length: 10\r\n" +- b"\r\n" + b"0123456789" ++ # Chunk encoded request. ++ b"POST / HTTP/1.1\r\n" ++ b"Transfer-Encoding: chunked\r\n" ++ b"\r\n" ++ b"a\r\n" ++ b"0123456789\r\n" ++ b"0\r\n" ++ b"\r\n" + ) + + expectedResponses = [ +@@ -590,14 +596,16 @@ class PipeliningBodyTests(unittest.TestCase, ResponseTestMixin): + b"Request: /", + b"Command: POST", + b"Version: HTTP/1.1", +- b"Content-Length: 21", +- b"'''\n10\n0123456789'''\n", ++ b"Content-Length: 23", ++ b"'''\nNone\n0123456789'''\n", + ), + ] + +- def test_noPipelining(self): ++ def test_stepwiseTinyTube(self): + """ +- Test that pipelined requests get buffered, not processed in parallel. ++ Imitate a slow connection that delivers one byte at a time. ++ The request handler (L{DelayedHTTPHandler}) is puppeted to ++ step through the handling of each request. + """ + b = StringTransport() + a = http.HTTPChannel() +@@ -606,10 +614,9 @@ class PipeliningBodyTests(unittest.TestCase, ResponseTestMixin): + # one byte at a time, to stress it. + for byte in iterbytes(self.requests): + a.dataReceived(byte) +- value = b.value() + + # So far only one request should have been dispatched. +- self.assertEqual(value, b"") ++ self.assertEqual(b.value(), b"") + self.assertEqual(1, len(a.requests)) + + # Now, process each request one at a time. +@@ -618,8 +625,95 @@ class PipeliningBodyTests(unittest.TestCase, ResponseTestMixin): + request = a.requests[0].original + request.delayedProcess() + +- value = b.value() +- self.assertResponseEquals(value, self.expectedResponses) ++ self.assertResponseEquals(b.value(), self.expectedResponses) ++ ++ def test_stepwiseDumpTruck(self): ++ """ ++ Imitate a fast connection where several pipelined ++ requests arrive in a single read. The request handler ++ (L{DelayedHTTPHandler}) is puppeted to step through the ++ handling of each request. ++ """ ++ b = StringTransport() ++ a = http.HTTPChannel() ++ a.requestFactory = DelayedHTTPHandlerProxy ++ a.makeConnection(b) ++ ++ a.dataReceived(self.requests) ++ ++ # So far only one request should have been dispatched. ++ self.assertEqual(b.value(), b"") ++ self.assertEqual(1, len(a.requests)) ++ ++ # Now, process each request one at a time. ++ while a.requests: ++ self.assertEqual(1, len(a.requests)) ++ request = a.requests[0].original ++ request.delayedProcess() ++ ++ self.assertResponseEquals(b.value(), self.expectedResponses) ++ ++ def test_immediateTinyTube(self): ++ """ ++ Imitate a slow connection that delivers one byte at a time. ++ ++ (L{DummyHTTPHandler}) immediately responds, but no more ++ than one ++ """ ++ b = StringTransport() ++ a = http.HTTPChannel() ++ a.requestFactory = DummyHTTPHandlerProxy # "sync" ++ a.makeConnection(b) ++ ++ # one byte at a time, to stress it. ++ for byte in iterbytes(self.requests): ++ a.dataReceived(byte) ++ # There is never more than one request dispatched at a time: ++ self.assertLessEqual(len(a.requests), 1) ++ ++ self.assertResponseEquals(b.value(), self.expectedResponses) ++ ++ def test_immediateDumpTruck(self): ++ """ ++ Imitate a fast connection where several pipelined ++ requests arrive in a single read. The request handler ++ (L{DummyHTTPHandler}) immediately responds. ++ ++ This doesn't check the at-most-one pending request ++ invariant but exercises otherwise uncovered code paths. ++ See GHSA-c8m8-j448-xjx7. ++ """ ++ b = StringTransport() ++ a = http.HTTPChannel() ++ a.requestFactory = DummyHTTPHandlerProxy ++ a.makeConnection(b) ++ ++ # All bytes at once to ensure there's stuff to buffer. ++ a.dataReceived(self.requests) ++ ++ self.assertResponseEquals(b.value(), self.expectedResponses) ++ ++ def test_immediateABiggerTruck(self): ++ """ ++ Imitate a fast connection where a so many pipelined ++ requests arrive in a single read that backpressure is indicated. ++ The request handler (L{DummyHTTPHandler}) immediately responds. ++ ++ This doesn't check the at-most-one pending request ++ invariant but exercises otherwise uncovered code paths. ++ See GHSA-c8m8-j448-xjx7. ++ ++ @see: L{http.HTTPChannel._optimisticEagerReadSize} ++ """ ++ b = StringTransport() ++ a = http.HTTPChannel() ++ a.requestFactory = DummyHTTPHandlerProxy ++ a.makeConnection(b) ++ ++ overLimitCount = a._optimisticEagerReadSize // len(self.requests) * 10 ++ a.dataReceived(self.requests * overLimitCount) ++ ++ self.assertResponseEquals(b.value(), self.expectedResponses * overLimitCount) + + def test_pipeliningReadLimit(self): + """ +@@ -1522,7 +1616,11 @@ class ChunkedTransferEncodingTests(unittest.TestCase): + lambda b: None, # pragma: nocov + ) + p._maxTrailerHeadersSize = 10 +- p.dataReceived(b"3\r\nabc\r\n0\r\n0123456789") ++ # 9 bytes are received so far, in 2 packets. ++ # For now, all is ok. ++ p.dataReceived(b"3\r\nabc\r\n0\r\n01234567") ++ p.dataReceived(b"\r") ++ # Once the 10th byte is received, the processing fails. + self.assertRaises( + http._MalformedChunkedDataError, + p.dataReceived, +-- +2.45.2 + diff --git a/pkgs/development/python-modules/twisted/CVE-2024-41810.patch b/pkgs/development/python-modules/twisted/CVE-2024-41810.patch new file mode 100644 index 0000000000000..092291eb946ae --- /dev/null +++ b/pkgs/development/python-modules/twisted/CVE-2024-41810.patch @@ -0,0 +1,84 @@ +From 6df3fd0be944b763046829edf5fd46b6b4a42303 Mon Sep 17 00:00:00 2001 +From: Adi Roiban <adiroiban@gmail.com> +Date: Mon, 29 Jul 2024 14:28:03 +0100 +Subject: [PATCH 2/2] Merge commit from fork + +Added HTML output encoding the "URL" parameter of the "redirectTo" function +--- + src/twisted/web/_template_util.py | 2 +- + src/twisted/web/test/test_util.py | 39 ++++++++++++++++++++++++++++++- + 2 files changed, 39 insertions(+), 2 deletions(-) + +diff --git a/src/twisted/web/_template_util.py b/src/twisted/web/_template_util.py +index 230c33f3e8..7266079ac2 100644 +--- a/src/twisted/web/_template_util.py ++++ b/src/twisted/web/_template_util.py +@@ -92,7 +92,7 @@ def redirectTo(URL: bytes, request: IRequest) -> bytes: + </body> + </html> + """ % { +- b"url": URL ++ b"url": escape(URL.decode("utf-8")).encode("utf-8") + } + return content + +diff --git a/src/twisted/web/test/test_util.py b/src/twisted/web/test/test_util.py +index 1e763009ca..9847dcbb8b 100644 +--- a/src/twisted/web/test/test_util.py ++++ b/src/twisted/web/test/test_util.py +@@ -5,7 +5,6 @@ + Tests for L{twisted.web.util}. + """ + +- + import gc + + from twisted.internet import defer +@@ -64,6 +63,44 @@ class RedirectToTests(TestCase): + targetURL = "http://target.example.com/4321" + self.assertRaises(TypeError, redirectTo, targetURL, request) + ++ def test_legitimateRedirect(self): ++ """ ++ Legitimate URLs are fully interpolated in the `redirectTo` response body without transformation ++ """ ++ request = DummyRequest([b""]) ++ html = redirectTo(b"https://twisted.org/", request) ++ expected = b""" ++<html> ++ <head> ++ <meta http-equiv=\"refresh\" content=\"0;URL=https://twisted.org/\"> ++ </head> ++ <body bgcolor=\"#FFFFFF\" text=\"#000000\"> ++ <a href=\"https://twisted.org/\">click here</a> ++ </body> ++</html> ++""" ++ self.assertEqual(html, expected) ++ ++ def test_maliciousRedirect(self): ++ """ ++ Malicious URLs are HTML-escaped before interpolating them in the `redirectTo` response body ++ """ ++ request = DummyRequest([b""]) ++ html = redirectTo( ++ b'https://twisted.org/"><script>alert(document.location)</script>', request ++ ) ++ expected = b""" ++<html> ++ <head> ++ <meta http-equiv=\"refresh\" content=\"0;URL=https://twisted.org/"><script>alert(document.location)</script>\"> ++ </head> ++ <body bgcolor=\"#FFFFFF\" text=\"#000000\"> ++ <a href=\"https://twisted.org/"><script>alert(document.location)</script>\">click here</a> ++ </body> ++</html> ++""" ++ self.assertEqual(html, expected) ++ + + class ParentRedirectTests(SynchronousTestCase): + """ +-- +2.45.2 + diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 8449cc2a6f125..5ef809fef8c46 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -73,6 +73,12 @@ buildPythonPackage rec { url = "https://github.com/mweinelt/twisted/commit/e69e652de671aac0abf5c7e6c662fc5172758c5a.patch"; hash = "sha256-LmvKUTViZoY/TPBmSlx4S9FbJNZfB5cxzn/YcciDmoI="; }) + + # https://github.com/twisted/twisted/security/advisories/GHSA-cf56-g6w6-pqq2 + ./CVE-2024-41671.patch + + # https://github.com/twisted/twisted/security/advisories/GHSA-c8m8-j448-xjx7 + ./CVE-2024-41810.patch ]; __darwinAllowLocalNetworking = true; @@ -226,6 +232,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/twisted"; description = "Asynchronous networking framework written in Python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/twitch-python/default.nix b/pkgs/development/python-modules/twitch-python/default.nix index ea16e8927feca..9cf268fc0b645 100644 --- a/pkgs/development/python-modules/twitch-python/default.nix +++ b/pkgs/development/python-modules/twitch-python/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Twitch module for Python"; homepage = "https://github.com/PetterKraabol/Twitch-Python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix index 6ceb6b5313664..28bb7ba4adb30 100644 --- a/pkgs/development/python-modules/twitchapi/default.nix +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "4.2.0"; + version = "4.2.1"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "refs/tags/v${version}"; - hash = "sha256-QAxLYujnsudaiz9UepwrBA835Pct5h4VcE9ZrbkwMmg="; + hash = "sha256-DT8Q8x+OvrxnoLWwdS/Gv8x5cepJPIF1ZPyOumnwq2E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix deleted file mode 100644 index 89137a3263913..0000000000000 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-lang, -}: - -buildPythonPackage rec { - pname = "twitter.common.collections"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "ede4caff74928156f7ff38dac9b0811893de41966c39cd5b2fdea53418349ca8"; - }; - - propagatedBuildInputs = [ twitter-common-lang ]; - - meta = with lib; { - description = "Twitter's common collections"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix deleted file mode 100644 index f7b900f2ca11b..0000000000000 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-log, -}: - -buildPythonPackage rec { - pname = "twitter.common.confluence"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "323dde2c519f85020569d7a343432f3aac16bce6ebe5e34774dbde557296697c"; - }; - - propagatedBuildInputs = [ twitter-common-log ]; - - meta = with lib; { - description = "Twitter's API to the confluence wiki"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix deleted file mode 100644 index 10043c7ead8f3..0000000000000 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-lang, -}: - -buildPythonPackage rec { - pname = "twitter.common.dirutil"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "49aeecad2434ac23c16abbfc1fccffd3790c056a9eb01468ec26c83e65a10119"; - }; - - propagatedBuildInputs = [ twitter-common-lang ]; - - meta = with lib; { - description = "Utilities for manipulating and finding files and directories"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix deleted file mode 100644 index 975b6d128d0b0..0000000000000 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "twitter.common.lang"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22"; - }; - - meta = with lib; { - description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix deleted file mode 100644 index bd7a2fec8198e..0000000000000 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-options, - twitter-common-dirutil, -}: - -buildPythonPackage rec { - pname = "twitter.common.log"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "7160a864eed30044705e05b816077dd193aec0c66f50ef1c077b7f8490e0d06a"; - }; - - propagatedBuildInputs = [ - twitter-common-options - twitter-common-dirutil - ]; - - meta = with lib; { - description = "Twitter's common logging library"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix deleted file mode 100644 index 47aa9e70824e5..0000000000000 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "twitter.common.options"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1"; - }; - - meta = with lib; { - description = "Twitter's optparse wrapper"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 60c7f0f444467..6522246a71e12 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/crossbario/txaio"; changelog = "https://github.com/crossbario/txaio/blob/v${version}/docs/releases.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 98530fb9f413a..aa30df3c3c1cd 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "GitHub API client implemented using Twisted"; homepage = "https://github.com/tomprince/txgithub"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index aeabc80a94259..62b4b5c4ef0d6 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Asynchronous Python HTTP for Humans"; homepage = "https://github.com/tardyp/txrequests"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index b2b9704d5425c..c9be16e2eba4c 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -53,7 +53,7 @@ pythonAtLeast, }: let - version = "7.2.0"; + version = "7.3.0"; api = [ aiohttp fastapi @@ -155,7 +155,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-2d31wzUz0/FcrejDIog2EI4BXgjd7XXpN4tRXpLk5DI="; + hash = "sha256-tnM6ye0Sxh8P2bm3awE72GvXEY0gXX1Sv+wPr77wRGU="; }; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 1c4352caa48fd..7bdb9a9158209 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -6,15 +6,11 @@ cryptography, fetchPypi, geoip, - idna, incremental, lsof, mock, - pyopenssl, pytestCheckHook, - python, pythonOlder, - service-identity, twisted, zope-interface, }: diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 93fcfe9b18d7f..2d90225201507 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { hash = "sha256-F+gfA7ofrbMEE5SrVt9H3s2mZKQLyr6roNUmL4EMJbI="; }; + pythonRelaxDeps = [ "psutil" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index ed9bc62959cc4..751f5b715a04a 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -2,6 +2,7 @@ lib, fetchPypi, buildPythonPackage, + setuptools, setuptools-scm, attrs, pdfminer-six, @@ -16,21 +17,24 @@ buildPythonPackage rec { pname = "typecode"; - version = "30.0.1"; - format = "setuptools"; + version = "30.0.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Glc5QiTVr//euymeNTxGN+FVaOEa6cUxHGyGo9bQrJc="; + hash = "sha256-F2idIK8K5hFueX7yxd5l8M6AkSjPDmhHmzS9a6S8OJg="; }; dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ attrs pdfminer-six commoncode @@ -48,7 +52,7 @@ buildPythonPackage rec { "TestFileTypesDataDriven" # Many of the failures below are reported in: - # https://github.com/nexB/typecode/issues/36 + # https://github.com/aboutcode-org/typecode/issues/36 # AssertionError: assert 'application/x-bytecode.python'... "test_compiled_python_1" @@ -63,9 +67,9 @@ buildPythonPackage rec { meta = with lib; { description = "Comprehensive filetype and mimetype detection using libmagic and Pygments"; - homepage = "https://github.com/nexB/typecode"; - changelog = "https://github.com/nexB/typecode/releases/tag/v${version}"; + homepage = "https://github.com/aboutcode-org/typecode"; + changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 68f1a238107e3..9cf7744433028 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Python AST modules with type comment support"; homepage = "https://github.com/python/typed_ast"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 66f59fb6f0ad0..f093f43f1b8b0 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -79,6 +79,6 @@ buildPythonPackage rec { homepage = "https://gitlab.com/sscherfke/typed-settings"; changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 41e7c35791ac7..472b5b882f8ac 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { homepage = "https://github.com/agronholm/typeguard"; changelog = "https://github.com/agronholm/typeguard/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix index b54ad8d256f6f..e38822f9039a5 100644 --- a/pkgs/development/python-modules/typer-shell/default.nix +++ b/pkgs/development/python-modules/typer-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typer-shell"; - version = "0.1.9"; + version = "0.1.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "FergusFettes"; repo = "typer-shell"; rev = "refs/tags/v${version}"; - hash = "sha256-y66Je9E0IWDuGrHtd1D8zP7E0EVfvrF3KOlA2dRFU+s="; + hash = "sha256-Yr+TLEgIRy5hOAYWv9CnDVT3qm36Pzwsj60yFrzaXIQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 298db51c8f7b5..9839f6d6c55d5 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, click, - colorama, coverage, fetchPypi, pdm-backend, @@ -33,11 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ click typing-extensions - ]; + # Build includes the standard optional by default + # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72 + ] ++ optional-dependencies.standard; - passthru.optional-dependencies = { - all = [ - colorama + optional-dependencies = { + standard = [ shellingham rich ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-sugar pytest-xdist pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ]; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index b7ae5e53db882..e29c3127290a3 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -1,19 +1,9 @@ -{ - lib, - stdenv, - aiobotocore, - botocore, - buildPythonPackage, - fetchPypi, - pythonOlder, - setuptools, - typing-extensions, -}: +{ lib, stdenv, aiobotocore, botocore, buildPythonPackage, fetchPypi, pythonOlder +, setuptools, typing-extensions, }: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; - buildTypesAiobotocorePackage = - serviceName: version: hash: + buildTypesAiobotocorePackage = serviceName: version: hash: buildPythonPackage rec { pname = "types-aiobotocore-${serviceName}"; inherit version; @@ -24,16 +14,14 @@ let src = fetchPypi { pname = if builtins.elem serviceName oldStylePackages then - "types-aiobotocore-${serviceName}" - else - "types_aiobotocore_${toUnderscore serviceName}"; + "types-aiobotocore-${serviceName}" + else + "types_aiobotocore_${toUnderscore serviceName}"; inherit version hash; }; build-system = [ setuptools ]; - dependencies = [ - aiobotocore - botocore - ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + dependencies = [ aiobotocore botocore ] + ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; # Module has no tests doCheck = false; pythonImportsCheck = [ "types_aiobotocore_${toUnderscore serviceName}" ]; @@ -44,1417 +32,1291 @@ let maintainers = with maintainers; [ mbalatsko ]; }; }; -in -rec { +in rec { types-aiobotocore-accessanalyzer = - buildTypesAiobotocorePackage "accessanalyzer" "2.13.0" - "sha256-2rGRzXYKK3p9OCb0navkEMfhOD5KHkn8wcBPL1LaNSw="; + buildTypesAiobotocorePackage "accessanalyzer" "2.13.1" + "sha256-Uaet2w0Re7mCVBJhbjxMv6dvBj96VfKTl5XTAG1WoaY="; - types-aiobotocore-account = - buildTypesAiobotocorePackage "account" "2.13.0" - "sha256-AZFkiL11ITJ7BqrQ2n6O36KZTkEnHfWPgCfrNujkSUM="; + types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.13.1" + "sha256-eOfLc045Qvn5lz36My+v1vNAvQkPzSfabaVxIBC+kok="; - types-aiobotocore-acm = - buildTypesAiobotocorePackage "acm" "2.13.0" - "sha256-3ix+COBwfB2vw9SZdg4VWTll8xnJHklVHGxzETuARIk="; + types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.13.1" + "sha256-+X87aqLD7+COapS6//oMv+lLxjs6ULQptAXW7FYSgcE="; - types-aiobotocore-acm-pca = - buildTypesAiobotocorePackage "acm-pca" "2.13.0" - "sha256-ZnVAvkJfc0T4bjEA2nCXz3HRkqYc25Y/J+1+rs5BP3s="; + types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.13.1" + "sha256-vc/stXsbP5/HF4SpDZoxNJ11prW2Dg38s7v3sxWHOMg="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0" - "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; + "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; - types-aiobotocore-amp = - buildTypesAiobotocorePackage "amp" "2.13.0" - "sha256-WTFXRsPvia7R7E0E1eUj70j+0gfSz7357jW8rRtjF4M="; + types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.13.1" + "sha256-KybFUBaKKGfZJmJ/hdu3M7evD8yD1cwZS1AUPsy+kX4="; - types-aiobotocore-amplify = - buildTypesAiobotocorePackage "amplify" "2.13.0" - "sha256-aTDO+xerXkn8pXEaaP5AMjIxN5WfHjsrwhg+mywYshM="; + types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.13.1" + "sha256-a9p6mO8N+jbuifKbeshURjlVDENL1m1XzZE7pI6OPQU="; types-aiobotocore-amplifybackend = - buildTypesAiobotocorePackage "amplifybackend" "2.13.0" - "sha256-SjPzrFsewsxhtFZ9I+M8TdogzhIHZ5+EQDezOKjxjzI="; + buildTypesAiobotocorePackage "amplifybackend" "2.13.1" + "sha256-PysfMHgo+GsSi+fK6jyk90wNVX4ItZwg1clES+ShzAM="; types-aiobotocore-amplifyuibuilder = - buildTypesAiobotocorePackage "amplifyuibuilder" "2.13.0" - "sha256-X7rXIFPTWoLSH8qeEr82lasrMWmMxIcvf54GqFhrBuI="; + buildTypesAiobotocorePackage "amplifyuibuilder" "2.13.1" + "sha256-tNOZIhKR8QkDBbD9baqRHqoRCJAdRJPjkW0FVj8/k0M="; types-aiobotocore-apigateway = - buildTypesAiobotocorePackage "apigateway" "2.13.0" - "sha256-MeO+lzOoycmkMyYRo5oGv38imF3FxE3PqldSByd80IM="; + buildTypesAiobotocorePackage "apigateway" "2.13.1" + "sha256-SEU6Qw0LCpYKvlnjh4XZXGogmXilbLVuN/eYEt18aO0="; types-aiobotocore-apigatewaymanagementapi = - buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.13.0" - "sha256-nzo28vBn5eB6DTBJd0MKqnWglnVnFvTctK6AvdUUIl4="; + buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.13.1" + "sha256-zUgJ0eOJkzcu0y7zcrfHwhar0wdon7antjzy0HeJuQU="; types-aiobotocore-apigatewayv2 = - buildTypesAiobotocorePackage "apigatewayv2" "2.13.0" - "sha256-09iYkY/l9OlvJ8G6t2RDjidefo7xRcCNvHXwNuct+eM="; + buildTypesAiobotocorePackage "apigatewayv2" "2.13.1" + "sha256-+8A7eXo01Z2EAaps1fFFiWWvNdO+DpTM8PV0n2whpvg="; types-aiobotocore-appconfig = - buildTypesAiobotocorePackage "appconfig" "2.13.0" - "sha256-LcRjuQxaVqSaBL2o5zZSwJcFvWpnJppGWrodhxVTylw="; + buildTypesAiobotocorePackage "appconfig" "2.13.1" + "sha256-uhhxVP+Og+FiOoko8gjdUavhTP4o+wwrXm834wc4Lac="; types-aiobotocore-appconfigdata = - buildTypesAiobotocorePackage "appconfigdata" "2.13.0" - "sha256-GdNvsp/kLjvbk0AXe81RU0OpOy8rNtsYbUCzzsbNqak="; + buildTypesAiobotocorePackage "appconfigdata" "2.13.1" + "sha256-xCrDWBX8jR2851rMALz7itYxffvnah6yOq8S6UO4NvE="; types-aiobotocore-appfabric = - buildTypesAiobotocorePackage "appfabric" "2.13.0" - "sha256-Zjrdq4psuqLpx5Dfc+jFz1bJjr6aN/lw4cxdrP1FxYc="; + buildTypesAiobotocorePackage "appfabric" "2.13.1" + "sha256-oz8iPiF6L2aITqmDraIZ4vMJTHMEFfNF9gDMj21vggE="; - types-aiobotocore-appflow = - buildTypesAiobotocorePackage "appflow" "2.13.0" - "sha256-3FzQHi9zHeIOw+4VC+4ad+tcgqHkIOnVbwLIDOX29qY="; + types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.13.1" + "sha256-1rlhU3wAGvl1XSE+wkulJdyeV93en4VvnjpnaB12gi8="; types-aiobotocore-appintegrations = - buildTypesAiobotocorePackage "appintegrations" "2.13.0" - "sha256-w8A+hrPeNSIHHcybIYHX3Yv14eAsJeVE5oQaRlqC7cc="; + buildTypesAiobotocorePackage "appintegrations" "2.13.1" + "sha256-DB7kuMeIW9XStOSw2h9jsQPfAiwK94m7xbdOoy6cpPw="; types-aiobotocore-application-autoscaling = - buildTypesAiobotocorePackage "application-autoscaling" "2.13.0" - "sha256-dY3cmGpEBK0IR6A32rv3rQlA0HPRVEQ38uRF1tVHpkE="; + buildTypesAiobotocorePackage "application-autoscaling" "2.13.1" + "sha256-aJaPxZXm4lBh4EDsiC7HauXmS+GNzhtQXPTF73mDHw8="; types-aiobotocore-application-insights = - buildTypesAiobotocorePackage "application-insights" "2.13.0" - "sha256-rMjqSqhjIVRwDGWuMh/l42R40HDH/YNO61GJecPS8ns="; + buildTypesAiobotocorePackage "application-insights" "2.13.1" + "sha256-tZj8H/seTnIxtTybQhJ8u5p9Roiq0mbxuX/k6OriZOI="; types-aiobotocore-applicationcostprofiler = - buildTypesAiobotocorePackage "applicationcostprofiler" "2.13.0" - "sha256-bwkDaXZzvzs+o1xc7Iw49Q/OkDqgGkERsmc5mg5cDGU="; + buildTypesAiobotocorePackage "applicationcostprofiler" "2.13.1" + "sha256-QYyROZOiHB40gRKjQnRcwQWGAX44zbwPPamfdGrpvhU="; - types-aiobotocore-appmesh = - buildTypesAiobotocorePackage "appmesh" "2.13.0" - "sha256-Q8EH1n2JyREf6C16pa1aaI3G12OtUODcRtffVq4T/kI="; + types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.13.1" + "sha256-o+pcPaWXhZsVadQzDWQi/8+IHY44Sk4z7ckzGO9rPtE="; types-aiobotocore-apprunner = - buildTypesAiobotocorePackage "apprunner" "2.13.0" - "sha256-jUYqurcU2DLVlWwEglTQciaukFTv27k54AuuROfcySE="; + buildTypesAiobotocorePackage "apprunner" "2.13.1" + "sha256-EOv5cWNlnQkmg5iJNliw/PXBGwYdriOnuUAOpvE+QiE="; types-aiobotocore-appstream = - buildTypesAiobotocorePackage "appstream" "2.13.0" - "sha256-Zlt7YYpOwMDM3QKu0w+dbdQ+hyEVY7LiZmAj6pwAbpA="; + buildTypesAiobotocorePackage "appstream" "2.13.1" + "sha256-WD7ddhaEp6cs9wswWYvyABEVwvvn8dNGmjcQhRfOG7I="; - types-aiobotocore-appsync = - buildTypesAiobotocorePackage "appsync" "2.13.0" - "sha256-8/BY5YO5fpICY/sr65eNlask8ndV2XvywOlx2OrtHyI="; + types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.13.1" + "sha256-azWY8AV3qVs70WKd8/izDCbyddAZaa+AJoWKZhOcX70="; types-aiobotocore-arc-zonal-shift = - buildTypesAiobotocorePackage "arc-zonal-shift" "2.13.0" - "sha256-ekiWpPFp19h60dcWlDh4kDxwKGHMQnGktqf79lyKRl8="; + buildTypesAiobotocorePackage "arc-zonal-shift" "2.13.1" + "sha256-auQRpYcMG/DQXNWCu4KFKqMomo2MeQENeDFvpBC864Q="; - types-aiobotocore-athena = - buildTypesAiobotocorePackage "athena" "2.13.0" - "sha256-fgYlxpwdOFJJT3M7KL3ZptXAA3Kh5bqI49dlpDTqb/c="; + types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.13.1" + "sha256-7caEszKVxK7pyoyqDr0kkT7rtekljZ/+E6svg99pL1E="; types-aiobotocore-auditmanager = - buildTypesAiobotocorePackage "auditmanager" "2.13.0" - "sha256-KSB1DTKg4lqffLOznLbWVkoyJzlzY4vBY/yDs5iU4Zw="; + buildTypesAiobotocorePackage "auditmanager" "2.13.1" + "sha256-bNfXtBabYFgNdWu6F4tmmgHBvM5xRHpruDTPVIX10WU="; types-aiobotocore-autoscaling = - buildTypesAiobotocorePackage "autoscaling" "2.13.0" - "sha256-TJ7kUw4+I4ULd0C6h1jPxSXcdQdKVCex4kCKDaoh4VA="; + buildTypesAiobotocorePackage "autoscaling" "2.13.1" + "sha256-yOKRClE2ziH7YraQ/RDKuJosPmFbk6l2VyY/VNKzyPI="; types-aiobotocore-autoscaling-plans = - buildTypesAiobotocorePackage "autoscaling-plans" "2.13.0" - "sha256-gwrLUcGcLzrHUcr2IC00n5AARmomcplngo4Wen/KLSI="; + buildTypesAiobotocorePackage "autoscaling-plans" "2.13.1" + "sha256-Pq9A+24LbD/izfWjv2my7RZRmuEoEkpYnqKsJUTGVIc="; - types-aiobotocore-backup = - buildTypesAiobotocorePackage "backup" "2.13.0" - "sha256-zvzQxpvc9BLRhyEFJuGy+eWXBp164g4GNK0h6MlmOus="; + types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.13.1" + "sha256-fAoxWR8TV+8boe1XHt+dhSK0e+1RDc4MEy+Wn7DZcPk="; types-aiobotocore-backup-gateway = - buildTypesAiobotocorePackage "backup-gateway" "2.13.0" - "sha256-aEb7RKPyB2bqBY0stzW4pQs7bxo/p2k48/+L5C5YGzg="; + buildTypesAiobotocorePackage "backup-gateway" "2.13.1" + "sha256-UU3C5zdJG3OXpevSnLnWiPIQR/0ear0IC7pBvRw6SJo="; types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.13.0" - "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; + "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; - types-aiobotocore-batch = - buildTypesAiobotocorePackage "batch" "2.13.0" - "sha256-pbtnM1AriZtRP/HJc41dDlobc3xSsTfTp/zJocuKlg8="; + types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.13.1" + "sha256-7K1ifpUy/tnVyOn5cT0Bpqp01LL3mFlJQjxb5BAiR28="; types-aiobotocore-billingconductor = - buildTypesAiobotocorePackage "billingconductor" "2.13.0" - "sha256-xF44RthHgDDS5ByOypisgNuc+WEMVNrv5HLGzYR9JYE="; + buildTypesAiobotocorePackage "billingconductor" "2.13.1" + "sha256-jIddm3hMFtQ2/LYEpHCSnTUq/DfBco7TzFUN9VeO/lw="; - types-aiobotocore-braket = - buildTypesAiobotocorePackage "braket" "2.13.0" - "sha256-HrvVOyhXIyyYeWOUGd7/j8Tzl3jTLntxxjvy/Mc7wrE="; + types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.13.1" + "sha256-4icZ+SDl/c3Cnzikw+FDuNO14QxihzqcXTaGd89SOQ8="; - types-aiobotocore-budgets = - buildTypesAiobotocorePackage "budgets" "2.13.0" - "sha256-xz4ufUY8jlYNfM3s+v1eKTfwd4kNILHyc/R2RnDomJ0="; + types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.13.1" + "sha256-57X0EZ8KLu3A2RYSZDEhqltgWtMEH4Hr8gXTbIAXUrY="; - types-aiobotocore-ce = - buildTypesAiobotocorePackage "ce" "2.13.0" - "sha256-v5BUWy2kn0FCu3Megiz14zRNMz5FA8sU70JAseQ+ta4="; + types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.13.1" + "sha256-518KyYlsHBtAimVhM6ADzQkCKZ2hMtS4sKXQZjrSZ/A="; - types-aiobotocore-chime = - buildTypesAiobotocorePackage "chime" "2.13.0" - "sha256-77yNiBRXsIHdzq0l3OuDcpgLP+Os8fQ0BHD2mbG6318="; + types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.13.1" + "sha256-5KtJXVleXuSVrRMb9Dc/dcIuMRlx1R2dkH8uOA8kebQ="; types-aiobotocore-chime-sdk-identity = - buildTypesAiobotocorePackage "chime-sdk-identity" "2.13.0" - "sha256-XNCLUW6nzzZjyvHCaaIJ/T4gTM8N+442xCeL8XBNTsI="; + buildTypesAiobotocorePackage "chime-sdk-identity" "2.13.1" + "sha256-lGKZbWAXwEutqjkj9kV/88VqZMjDpIXeuye20E7quPY="; types-aiobotocore-chime-sdk-media-pipelines = - buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.13.0" - "sha256-qbOkIqemaH4TCqW2/6gYTyfPOlwHyRPLmz5f88HI+b0="; + buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.13.1" + "sha256-nZhgUByQ/2hmY77PPPICSiOpSg5pabOFCfxUq374wqw="; types-aiobotocore-chime-sdk-meetings = - buildTypesAiobotocorePackage "chime-sdk-meetings" "2.13.0" - "sha256-TVZRLx8lI0yZN6nOtdq3WhF6OkUFMWGTp25351JTE5E="; + buildTypesAiobotocorePackage "chime-sdk-meetings" "2.13.1" + "sha256-KNZ79bAJQemRhR65c/Zruh8SRubdHcPfVeqwsf5y/vg="; types-aiobotocore-chime-sdk-messaging = - buildTypesAiobotocorePackage "chime-sdk-messaging" "2.13.0" - "sha256-48fjMzUahQ7P4cC0b5JG8czayHNAWuVvgD6v7/LTkjU="; + buildTypesAiobotocorePackage "chime-sdk-messaging" "2.13.1" + "sha256-SYvTxDOoqoje4fp0V7CMMKns7PNaGF2uEuXTbhIPHFY="; types-aiobotocore-chime-sdk-voice = - buildTypesAiobotocorePackage "chime-sdk-voice" "2.13.0" - "sha256-lxDHSs3VxWJ4Evu9msY3f9rWb+Fm8yrrsZy8usMu4vE="; + buildTypesAiobotocorePackage "chime-sdk-voice" "2.13.1" + "sha256-CZmTJGl9IXnYnlKsnq49o7TOHjFYQXf7g7H6dQ98Clg="; types-aiobotocore-cleanrooms = - buildTypesAiobotocorePackage "cleanrooms" "2.13.0" - "sha256-AVUVMbvgYxkc8ksqwoFTyjxUbb79Yl4577Scavnj0Cs="; + buildTypesAiobotocorePackage "cleanrooms" "2.13.1" + "sha256-0sxIwTUs2usAhuJ0sghw1QUDKu87pwx1zKOUdDvPCXM="; - types-aiobotocore-cloud9 = - buildTypesAiobotocorePackage "cloud9" "2.13.0" - "sha256-AYixLXRtXT24h3mFOQ2cWfTLNbXQHmGPnx/VZ7IK4ow="; + types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.13.1" + "sha256-4JNR2drXNI2sJ1JXkk5NQgwK1CeAxrpxTHvSbdcX7Ds="; types-aiobotocore-cloudcontrol = - buildTypesAiobotocorePackage "cloudcontrol" "2.13.0" - "sha256-FBRfBadhpoAcLMgAe7hAJbTtjgPRPSlJESuDZPriGv0="; + buildTypesAiobotocorePackage "cloudcontrol" "2.13.1" + "sha256-CHdqWRL1ZIJCQ65Dts87w6IFlU4ZpRD9GSvXah78Kow="; types-aiobotocore-clouddirectory = - buildTypesAiobotocorePackage "clouddirectory" "2.13.0" - "sha256-ELw+jWSGWPeQJNiv18908fodXCKE8/sJ0/wzOgkixuA="; + buildTypesAiobotocorePackage "clouddirectory" "2.13.1" + "sha256-2oXpXFuO3jJ+lvFsjuAh3pw2lhfnuRLGtIcUep4QwJw="; types-aiobotocore-cloudformation = - buildTypesAiobotocorePackage "cloudformation" "2.13.0" - "sha256-8s+cGZ339c8Xf/AGFR6Y6Fsdz1pOW3KlYKAuo1e12Ss="; + buildTypesAiobotocorePackage "cloudformation" "2.13.1" + "sha256-M4D5z53xl8hX4q4/Co5UJIUw9JxbxTQf7hhQp/FpVA0="; types-aiobotocore-cloudfront = - buildTypesAiobotocorePackage "cloudfront" "2.13.0" - "sha256-9uGsmz+S8Te3/hOZoIZIqLg0EG3Mz/fM1k8LWSe4rLY="; + buildTypesAiobotocorePackage "cloudfront" "2.13.1" + "sha256-GQrg1dPD0HgIe04znp1rajEd/Fmp7B/rP06lsLQ8uV0="; - types-aiobotocore-cloudhsm = - buildTypesAiobotocorePackage "cloudhsm" "2.13.0" - "sha256-/uqAAVrtejrLdZEFrDhK84nhhr8An4Ha2O6HbcnfPL0="; + types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.13.1" + "sha256-ASmEjSNYbZ1CANSSNw2Fi7ieKVE42WNDISpqTjBOVM4="; types-aiobotocore-cloudhsmv2 = - buildTypesAiobotocorePackage "cloudhsmv2" "2.13.0" - "sha256-/QZuBKPxLDmZXB15Mlia4nKhVpDniavrHbjsdtg+61g="; + buildTypesAiobotocorePackage "cloudhsmv2" "2.13.1" + "sha256-154gs9XMFcz2urECTUwyeZK3iafwK2OYaCKaCMjCZf8="; types-aiobotocore-cloudsearch = - buildTypesAiobotocorePackage "cloudsearch" "2.13.0" - "sha256-TJ8gYpQgqtIJv6COksxKzv0QvlMrnGJF6+vclKxkONM="; + buildTypesAiobotocorePackage "cloudsearch" "2.13.1" + "sha256-QCm7i0wXtPBG5pT9V0WA9SCWjcT9bPDU2T2alCNfZEI="; types-aiobotocore-cloudsearchdomain = - buildTypesAiobotocorePackage "cloudsearchdomain" "2.13.0" - "sha256-wzMsnA1GbS8VIc0wCL9hWdsYV/ygCYmorBzEjbQbhTc="; + buildTypesAiobotocorePackage "cloudsearchdomain" "2.13.1" + "sha256-V39w95ufoIbbDWUIPiVtdqZPTiaosV+cMBXKljbuEWY="; types-aiobotocore-cloudtrail = - buildTypesAiobotocorePackage "cloudtrail" "2.13.0" - "sha256-2XXac5p2UGkczHqR0h3Nf8Q6pAcfML3b9pMwEXwz2XM="; + buildTypesAiobotocorePackage "cloudtrail" "2.13.1" + "sha256-BB7gmQoj30OZ2PqEzwzz8XwZuuJsLRJAXETzkP/nTzg="; types-aiobotocore-cloudtrail-data = - buildTypesAiobotocorePackage "cloudtrail-data" "2.13.0" - "sha256-VcJu3TW7Ha8VBZoJSH3owe6ufCSoIYQqfOfEg1Trx5Y="; + buildTypesAiobotocorePackage "cloudtrail-data" "2.13.1" + "sha256-FwnZNsSIHD5pLYJepyP5Vde7nd/TFNPMCEcKLsKZv28="; types-aiobotocore-cloudwatch = - buildTypesAiobotocorePackage "cloudwatch" "2.13.0" - "sha256-BPWVovVZAd/sif+YTkGM/WpOoJp6uwpUMeKmGFd/LGg="; + buildTypesAiobotocorePackage "cloudwatch" "2.13.1" + "sha256-hgn4kDF2hEasQG2JjvQ8alzWEhfHeFvfk4mTOCHLfvs="; types-aiobotocore-codeartifact = - buildTypesAiobotocorePackage "codeartifact" "2.13.0" - "sha256-kNaKAn54V5xhQv1faxjrhChZ7icBAJJZTqibSdwYTk4="; + buildTypesAiobotocorePackage "codeartifact" "2.13.1" + "sha256-CE4aG69icMYwW/y+IpBhN1Vtkt+yIaQuIPCiZ0lnV58="; types-aiobotocore-codebuild = - buildTypesAiobotocorePackage "codebuild" "2.13.0" - "sha256-myGVjxJ/1CvAt913JQXE9/7pGW8anI4F2JrEX7lgaOQ="; + buildTypesAiobotocorePackage "codebuild" "2.13.1" + "sha256-HLKQS+IaiJsVQpgGKocHgHFews+br3qogOHw+fhGbJA="; types-aiobotocore-codecatalyst = - buildTypesAiobotocorePackage "codecatalyst" "2.13.0" - "sha256-gCJYgtZcErsh6e/dupRxG2tDdau4wB9nT+HJdRgI6gc="; + buildTypesAiobotocorePackage "codecatalyst" "2.13.1" + "sha256-EYP61ycy0paJ/Q6H7b67aRvEvqam3q4wAtbLlG/+2zc="; types-aiobotocore-codecommit = - buildTypesAiobotocorePackage "codecommit" "2.13.0" - "sha256-rcJSBY35FT2aG91rsZqxS3QwYkP9MBfCQLAgR8ZZ60g="; + buildTypesAiobotocorePackage "codecommit" "2.13.1" + "sha256-yFKsTfVAe6lN9WFzHRtmCuuNElQzC1LkMnvgLFayDwM="; types-aiobotocore-codedeploy = - buildTypesAiobotocorePackage "codedeploy" "2.13.0" - "sha256-pjVsGz/wmxwm3r1a5M9oMqRYACXpzsBJZR62GFQKw9Q="; + buildTypesAiobotocorePackage "codedeploy" "2.13.1" + "sha256-8W/45jb4kJhaIIr9SoSDkhsl9FLZtsijaxsPjuk7tno="; types-aiobotocore-codeguru-reviewer = - buildTypesAiobotocorePackage "codeguru-reviewer" "2.13.0" - "sha256-t+ZK1nVpuAEzTzokBQ+HDd9pbRNv/Z+AsYA+3+nHKLE="; + buildTypesAiobotocorePackage "codeguru-reviewer" "2.13.1" + "sha256-5Uz2Cfxg1GMsoYS5i337jVcXXrZYPZEhHt7KM2OlTrA="; types-aiobotocore-codeguru-security = - buildTypesAiobotocorePackage "codeguru-security" "2.13.0" - "sha256-Or5a/BiJnYMvXDZvCRJ59GsvYr8Um/ziypVohwarFYg="; + buildTypesAiobotocorePackage "codeguru-security" "2.13.1" + "sha256-u6h54g4yHE6rVfi7t9q8RtRZWPgEGqGOIOphOAwq/MU="; types-aiobotocore-codeguruprofiler = - buildTypesAiobotocorePackage "codeguruprofiler" "2.13.0" - "sha256-UZHJByboBKeyGYF6SfdFzcuZKAUOyK8Uh92cdQ4Z36g="; + buildTypesAiobotocorePackage "codeguruprofiler" "2.13.1" + "sha256-Ryj6wcXqRcT5qXQIvD2foKz+5HuH0VT2K3hvzoc6tx0="; types-aiobotocore-codepipeline = - buildTypesAiobotocorePackage "codepipeline" "2.13.0" - "sha256-9ewkKGfQeeIPLYsgiq3RI2f8Q+g1/QFaqTvcqpXtPt8="; + buildTypesAiobotocorePackage "codepipeline" "2.13.1" + "sha256-CoU0OEGz2DuFLeNqCWWj8oE2MoSSdXyKB+NT3Pt942A="; - types-aiobotocore-codestar = - buildTypesAiobotocorePackage "codestar" "2.13.0" - "sha256-nvkAGHA2VL7tGHz/VZiWHKRcHDN87eDq8js127VlZMk="; + types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.13.1" + "sha256-bbn+UQa3FTVDSh9MkkSIzjXrJ5VRE2Cey0qsy8ayKKo="; types-aiobotocore-codestar-connections = - buildTypesAiobotocorePackage "codestar-connections" "2.13.0" - "sha256-huStUWVW5h9PPm4k0IjZoS7mBXYEf1nuc/BbYASjJYo="; + buildTypesAiobotocorePackage "codestar-connections" "2.13.1" + "sha256-IlKwnmjBJGg4/t/nsmNU3SHg9Bt/xUTlPHEyDyDHPP8="; types-aiobotocore-codestar-notifications = - buildTypesAiobotocorePackage "codestar-notifications" "2.13.0" - "sha256-9Amvc3yj1khFTLpYsqUGPlTRCjbW3J9Y7Htr9gkSEAQ="; + buildTypesAiobotocorePackage "codestar-notifications" "2.13.1" + "sha256-A50/E6erKSQWHjAJ9CpRIz5/waUwO4yqagdVULraO9o="; types-aiobotocore-cognito-identity = - buildTypesAiobotocorePackage "cognito-identity" "2.13.0" - "sha256-Vr+ZB3RAWOdioDoKn6O8LCQGqM67x+3Yvq6DvYjwbSQ="; + buildTypesAiobotocorePackage "cognito-identity" "2.13.1" + "sha256-GXDC1bJbPy6wWrHWQMOlMR7x9hGhO9jzWv/8JXkPyGk="; types-aiobotocore-cognito-idp = - buildTypesAiobotocorePackage "cognito-idp" "2.13.0" - "sha256-ryZ+wZ3acevXf3gIZV37Lb2t5LGtz6RVrKok6OUYt7Q="; + buildTypesAiobotocorePackage "cognito-idp" "2.13.1" + "sha256-vlKEPVh/5By2I7McROQdNa8XlF3Q6nrA/pgIeDWUPgg="; types-aiobotocore-cognito-sync = - buildTypesAiobotocorePackage "cognito-sync" "2.13.0" - "sha256-XnAF9Zz+BslG+teKTgWVKqBKxv159gJqRVvP3fF2BU4="; + buildTypesAiobotocorePackage "cognito-sync" "2.13.1" + "sha256-lFEn4TQ8ESrm0HAb+YMYiEqaZAqkX1kZLLn7hbSzAQc="; types-aiobotocore-comprehend = - buildTypesAiobotocorePackage "comprehend" "2.13.0" - "sha256-NzcktZnXaylZ0OzDWQV9r7G+Yk/QJvqApcBOggk5yg4="; + buildTypesAiobotocorePackage "comprehend" "2.13.1" + "sha256-F2t0c8J+h2o5fZlAwRGtF9UmHyYilrrncRkTIMA5mC4="; types-aiobotocore-comprehendmedical = - buildTypesAiobotocorePackage "comprehendmedical" "2.13.0" - "sha256-cn1rch5FwLmFJPM5G8YmKzRuZ5VEyB1vkapOeSg0QEA="; + buildTypesAiobotocorePackage "comprehendmedical" "2.13.1" + "sha256-nkjUjOLIuYC95pltFInfXDrvM4SckHf7+iJSQC2WQ1k="; types-aiobotocore-compute-optimizer = - buildTypesAiobotocorePackage "compute-optimizer" "2.13.0" - "sha256-e+WsU3fcS7Al+IEibaxaM7lYFFHJNEaW2ULd37wA17o="; + buildTypesAiobotocorePackage "compute-optimizer" "2.13.1" + "sha256-p/49yh4DHMWyetWVyLh1vqOnpWxKfQaP26UNOzQJ/U0="; - types-aiobotocore-config = - buildTypesAiobotocorePackage "config" "2.13.0" - "sha256-wWrYX1uqUkHegLr3bjyP3TZjBst6+dCMEpK1lXVnMo0="; + types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.13.1" + "sha256-JXg+fCdaGBJ++phhSjUz9tFtZTH2L8RwlGbkE00b/WE="; - types-aiobotocore-connect = - buildTypesAiobotocorePackage "connect" "2.13.0" - "sha256-OfnncqMXbS7bH7VqKlvMNuj4ixmoli3MlDxrMq1Zmj0="; + types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.13.1" + "sha256-8eI2xD1RcI7djPKdCL1vevnFUSZPuHYEsOdqiVM0cfA="; types-aiobotocore-connect-contact-lens = - buildTypesAiobotocorePackage "connect-contact-lens" "2.13.0" - "sha256-PEOGQ3/cMA2JxN87CyJx4FeuY2l6YP9ZMsVlZQuVnOI="; + buildTypesAiobotocorePackage "connect-contact-lens" "2.13.1" + "sha256-n8vtERLR98IyPF7jOBdzkEz+Jf+A234MbORfcVN0wRw="; types-aiobotocore-connectcampaigns = - buildTypesAiobotocorePackage "connectcampaigns" "2.13.0" - "sha256-pdEDzu2cBdsdDZ9MBkuXXXouIWLczlnQLLLrJ2ZrdvE="; + buildTypesAiobotocorePackage "connectcampaigns" "2.13.1" + "sha256-QSOX1MYrg+L1ESOEzE296Ne8d5F3aaKztiBlxJtsAiE="; types-aiobotocore-connectcases = - buildTypesAiobotocorePackage "connectcases" "2.13.0" - "sha256-7HQAZPgHTGNmE3cZKsPE3Q1FSD1DOpxhmgx7k2VvRfI="; + buildTypesAiobotocorePackage "connectcases" "2.13.1" + "sha256-4EdnxtOLZDryEUaMulCkenje8zSt8mujs0QPvl7MhpA="; types-aiobotocore-connectparticipant = - buildTypesAiobotocorePackage "connectparticipant" "2.13.0" - "sha256-mxTtpPu8ejJhwBUqpIJld9tQgx2+KdZDCWLxgz3KIbI="; + buildTypesAiobotocorePackage "connectparticipant" "2.13.1" + "sha256-6iMw+gk9HIPv6l7j6lwSKmQPeHs07bhEL7eY5TnIEJk="; types-aiobotocore-controltower = - buildTypesAiobotocorePackage "controltower" "2.13.0" - "sha256-BpX2KPUIEzev3J59SjXr2+87So9AYcPP4NqqqYxg7nM="; + buildTypesAiobotocorePackage "controltower" "2.13.1" + "sha256-vPCIltZMsBBEqHCKh5BQ9ZuwZrjqzhUIpLfS1KGCtz4="; - types-aiobotocore-cur = - buildTypesAiobotocorePackage "cur" "2.13.0" - "sha256-R23tUBiFw3XIwd5dPEKosq+JjOcaan4mefgrnb/tnZ4="; + types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.13.1" + "sha256-PPFJQ2Hh3KCTTe6dGAyuTNjYSQ8s42lvf4/ZIhLxVnk="; types-aiobotocore-customer-profiles = - buildTypesAiobotocorePackage "customer-profiles" "2.13.0" - "sha256-g52TkGMLMtLZceDfPEuT/+A/uiVdqnZODxzJUwihin0="; + buildTypesAiobotocorePackage "customer-profiles" "2.13.1" + "sha256-qckqfZP20Rlg/MiZUsFV+mBmrbRNob5jm655l2Osons="; - types-aiobotocore-databrew = - buildTypesAiobotocorePackage "databrew" "2.13.0" - "sha256-Gejx2MwkOofstb/goBp0C9qSWcpLW2E5Fgn46VAtK0w="; + types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.13.1" + "sha256-qmh7lRfGBt6YsyC08BDAFyPsJ/h4JqCqUNup5Fmymbg="; types-aiobotocore-dataexchange = - buildTypesAiobotocorePackage "dataexchange" "2.13.0" - "sha256-fQzxx8jCPu4/TdtNrOQITAEFGzyPccCNK6diQu/4Imo="; + buildTypesAiobotocorePackage "dataexchange" "2.13.1" + "sha256-A+FeXDt+0noA2GwfHYiq7qyZ1/qYS+WlIn/ZmJvkPPs="; types-aiobotocore-datapipeline = - buildTypesAiobotocorePackage "datapipeline" "2.13.0" - "sha256-GTh5tb9BwtM2zNvAQ47DvwlbgwNhOuL9Vofq3MVJ7ic="; + buildTypesAiobotocorePackage "datapipeline" "2.13.1" + "sha256-5IEPIDBzw3BnFjMpuBhPxjPwcWoKBEhGcYIv7BFHzjk="; - types-aiobotocore-datasync = - buildTypesAiobotocorePackage "datasync" "2.13.0" - "sha256-wdInWu2P70+17ir7mpBK/qO7+sT5bp/lKIkOQwfk3tk="; + types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.13.1" + "sha256-PBThgOkESfmfCgehLRboigoPNgB1ncQy+pTArVwyNNQ="; - types-aiobotocore-dax = - buildTypesAiobotocorePackage "dax" "2.13.0" - "sha256-qFfp+vOsmY43ipbENzgzQXBoNnTQ+jFXyxe9QL7y58c="; + types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.13.1" + "sha256-XnENL/AXDPbiYHoP4q5dIPnZjntzEps4Z7+Zz0idGGc="; types-aiobotocore-detective = - buildTypesAiobotocorePackage "detective" "2.13.0" - "sha256-K9ofKUFMP3qY86xRNgpjZen6R1gOcvVZ0ry9A7geTKQ="; + buildTypesAiobotocorePackage "detective" "2.13.1" + "sha256-HPG0D8TOQDotnHwL6PsG4mpB2IgBA9mlC5sWQPwy9iQ="; types-aiobotocore-devicefarm = - buildTypesAiobotocorePackage "devicefarm" "2.13.0" - "sha256-hfqMkbY/VKpx9Ew0Li9eCiBN17LK/UOZWYpoAZ2IaQo="; + buildTypesAiobotocorePackage "devicefarm" "2.13.1" + "sha256-e2RQBZS4cXWEKtN6cQdUG/lSyP7J+alzfNlZ/8hYKUc="; types-aiobotocore-devops-guru = - buildTypesAiobotocorePackage "devops-guru" "2.13.0" - "sha256-nQv5dFtxEwm1PJExUdId8LOXF/stNBIg96wgJJb+nYQ="; + buildTypesAiobotocorePackage "devops-guru" "2.13.1" + "sha256-zWl43w6QWSzXnBcoCuvQFv33TbgcQrPZ1A/YdturwVk="; types-aiobotocore-directconnect = - buildTypesAiobotocorePackage "directconnect" "2.13.0" - "sha256-Gc5vGyASaYsEqYRGX9fbIuOYNVKzdjFYXd20U1Wo8BM="; + buildTypesAiobotocorePackage "directconnect" "2.13.1" + "sha256-1pSPSX7Agzst4aTALLE0ZCyMZVrdnI43GQIjrO95b7E="; types-aiobotocore-discovery = - buildTypesAiobotocorePackage "discovery" "2.13.0" - "sha256-Hjq8egh2iPANaq4LehzVS/kMX/Uh0/S7YFFPDuTA+N4="; + buildTypesAiobotocorePackage "discovery" "2.13.1" + "sha256-8AL6/4Hc0e6Ew+IttkS+TH/elbNk7kAEVrlEykdiYZU="; - types-aiobotocore-dlm = - buildTypesAiobotocorePackage "dlm" "2.13.0" - "sha256-fS4Y28YisR0C3MQWQsBwCfKfqaffZCbHu6sZZeao/ds="; + types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.13.1" + "sha256-2CyerhSqGOrXVvPVBe0f1Z/EzZVwWXHtskTAQHX9iDE="; - types-aiobotocore-dms = - buildTypesAiobotocorePackage "dms" "2.13.0" - "sha256-BzWDZW/196ajDFw47jOZyTJPcZkAHKgzMYU4NmKeyUg="; + types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.13.1" + "sha256-u2fQo8rxuAwME7tBm16HrSUy+WXS/Pd9HW/MEMZ+Tc4="; - types-aiobotocore-docdb = - buildTypesAiobotocorePackage "docdb" "2.13.0" - "sha256-oTf+KiNaXrDYdMCZMF+O/tAPmsybWldtT86WhnreN20="; + types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.13.1" + "sha256-tuBnHhnTRo/3qp8ZVSOsgZA8uY/9ZAKhu5GTcxGSbas="; types-aiobotocore-docdb-elastic = - buildTypesAiobotocorePackage "docdb-elastic" "2.13.0" - "sha256-xK+ixxVGf6Hr/NJGu4k4vlq8V5cpSPViHKsfjusQaKY="; + buildTypesAiobotocorePackage "docdb-elastic" "2.13.1" + "sha256-DEFQP9zCXZaol/CIw1DYfFcIq2eia8dFxFA2wXdt3oI="; - types-aiobotocore-drs = - buildTypesAiobotocorePackage "drs" "2.13.0" - "sha256-v/h5WFjIR51RjwCn02abRfo8fu+tnncldVPd71xJt7s="; + types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.13.1" + "sha256-ZElJBbRMRxIbpEGGfukE3960MoeprT2Cutf72657KJ0="; - types-aiobotocore-ds = - buildTypesAiobotocorePackage "ds" "2.13.0" - "sha256-Em0eoBCYM0HmkJBgVJKsEyLZDhVu2zW9OKZ5TEQ1xEE="; + types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.13.1" + "sha256-0+zSG+xITYFMddqkeFLPTD3nKdZhJXRbIgqbWQ9COB0="; - types-aiobotocore-dynamodb = - buildTypesAiobotocorePackage "dynamodb" "2.13.0" - "sha256-AXclEe7W1pqC8JVsOY9afICCUT7lIcwR7De0JMuPbSM="; + types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.13.1" + "sha256-YJxyiLgbryyzCOpWUdpw28uSALB4+aNPX4kc7kq5LHA="; types-aiobotocore-dynamodbstreams = - buildTypesAiobotocorePackage "dynamodbstreams" "2.13.0" - "sha256-QETi2ToYBF8UQq1+aNW3ZaNEI+haQTQq76yes/U/dpk="; + buildTypesAiobotocorePackage "dynamodbstreams" "2.13.1" + "sha256-L2MY8Bg84pACtheQqvx5ifZE8Vk/BPP0WV9phEJkzYQ="; - types-aiobotocore-ebs = - buildTypesAiobotocorePackage "ebs" "2.13.0" - "sha256-Oftnt6MpThaa3USfEGZeAvx0pCiY0vQImtNWVwk3ACs="; + types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.13.1" + "sha256-sFwvDd2fIsK/86xxpJ+V3WyIQQTpCLzJL5U01ecliSk="; - types-aiobotocore-ec2 = - buildTypesAiobotocorePackage "ec2" "2.13.0" - "sha256-GvUGSs/nQTL3VJpVsFx9mAI9nBx+gnk6yhwRfTpSiSk="; + types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.13.1" + "sha256-2UZIX3qB+1+zmI2MNNvWuW0W8J7ALTn6L2HulWJkNbE="; types-aiobotocore-ec2-instance-connect = - buildTypesAiobotocorePackage "ec2-instance-connect" "2.13.0" - "sha256-P3kqtbGfUKRCJzZqPjg5DpuUADyo9OQvBzqX+e6eoZw="; + buildTypesAiobotocorePackage "ec2-instance-connect" "2.13.1" + "sha256-1JfthjzoPg7AKiJ8+IDeub+z2h6jc8PSELzbSsZPJ+s="; - types-aiobotocore-ecr = - buildTypesAiobotocorePackage "ecr" "2.13.0" - "sha256-Qv3/a0zCZZ7HSH/egZeRBb+8QnWWVIq4FI+UnA/l7Ls="; + types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.13.1" + "sha256-M7SBFTH0R0pR/DNspYLVJT3ZjEIakkqcCVxt0by8GPI="; types-aiobotocore-ecr-public = - buildTypesAiobotocorePackage "ecr-public" "2.13.0" - "sha256-yKGswYQKMKkagsVI9Kxae04Xrdrn8dXZSy0BkQ6RzG0="; + buildTypesAiobotocorePackage "ecr-public" "2.13.1" + "sha256-5xDlfYf5sVngVkz7cUlBVp3mZgyy7Ir9NTI9OABaAg4="; - types-aiobotocore-ecs = - buildTypesAiobotocorePackage "ecs" "2.13.0" - "sha256-6Bc80WQMAmA8LzLEC/ADFz1kc7oRQLYb7YZH8FOfmVs="; + types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.13.1" + "sha256-/Agvt1KPHs4tlvUPIsv3WkSISYzTf5MDF2W2p4K4ix0="; - types-aiobotocore-efs = - buildTypesAiobotocorePackage "efs" "2.13.0" - "sha256-NIB1DC4qaMXEwrDOHcnRAifKUH0LouzyKlCd7448PZk="; + types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.13.1" + "sha256-lZip3L9g49AhZDfiLMI6Sub4tareaGK21M3x/8SL0Ds="; - types-aiobotocore-eks = - buildTypesAiobotocorePackage "eks" "2.13.0" - "sha256-isdFNO1MOrx3O9l4DWjUN/GmfJk2PnprHrAfeaLDkgA="; + types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.13.1" + "sha256-jcLVLCcwX2rZX6rkFXK/WnrFY24DP4cs1KOS4/SatdU="; types-aiobotocore-elastic-inference = - buildTypesAiobotocorePackage "elastic-inference" "2.13.0" - "sha256-886NH6Lg6mLHdVCRqZ/c+z1DgQ6Yy5DYX7Gd9kf3lMg="; + buildTypesAiobotocorePackage "elastic-inference" "2.13.1" + "sha256-fpf+83EIrfw0b8eRVPzv8Jso2rig/YwNvwnV1BXUTjU="; types-aiobotocore-elasticache = - buildTypesAiobotocorePackage "elasticache" "2.13.0" - "sha256-8vm8VQENdxdjhMEg7I9SyQX//LLnKE++SvIRhyCgb7Q="; + buildTypesAiobotocorePackage "elasticache" "2.13.1" + "sha256-YJDj31GBbfqvMzQieBbiqroi1c7XY+ls5WLioDopfxs="; types-aiobotocore-elasticbeanstalk = - buildTypesAiobotocorePackage "elasticbeanstalk" "2.13.0" - "sha256-L8/0MxGvGLTfwrNSPyYVtfz46TXJVPn+0pBGPs+SwGo="; + buildTypesAiobotocorePackage "elasticbeanstalk" "2.13.1" + "sha256-QQftlSV3/ecfKJ+XLnh28dfQksqKSu6GL07YfnEeLjM="; types-aiobotocore-elastictranscoder = - buildTypesAiobotocorePackage "elastictranscoder" "2.13.0" - "sha256-UiN9U4WpqgBs8fCcteUTz7bzwFBwJV7mpOMvEZIy7r8="; + buildTypesAiobotocorePackage "elastictranscoder" "2.13.1" + "sha256-L1Dvy5scS/PP3YWQ/Z8N/YjqeEennSbIGwxUNFwLYAM="; - types-aiobotocore-elb = - buildTypesAiobotocorePackage "elb" "2.13.0" - "sha256-ok+Ystctf+09dxI2Q+lXeucckPQZSJSyx6fbPsYgOn4="; + types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.13.1" + "sha256-/vVRG4ss0RWlPk7fuSfITmFcXvRRGeRt4BDQlQudRgM="; - types-aiobotocore-elbv2 = - buildTypesAiobotocorePackage "elbv2" "2.13.0" - "sha256-e8UsYdshyUhdyGxo6ZNhYMw3H5MyL2NjZ6IVDoJN1/0="; + types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.13.1" + "sha256-YBnWgaK55Jo1IoQRziUoY7IIcVHjwXXlBQ5HmvEXwpw="; - types-aiobotocore-emr = - buildTypesAiobotocorePackage "emr" "2.13.0" - "sha256-k+/+TC9m2v7t9O+etubXMGrD1FJ2Ul2eGYf2MwPYDyc="; + types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.13.1" + "sha256-6vuMBCR5cd8H7VXvPZpTyxPex9/71PfE2aVmZSRPVxw="; types-aiobotocore-emr-containers = - buildTypesAiobotocorePackage "emr-containers" "2.13.0" - "sha256-LFmBCNyHEG5j0oK3waIrVQd1KeE7sd50JdD5J+rjxX4="; + buildTypesAiobotocorePackage "emr-containers" "2.13.1" + "sha256-oiAWpmJBs/kvNdKXnHqvWpY3DnX31r3QvW2JzOXXZVg="; types-aiobotocore-emr-serverless = - buildTypesAiobotocorePackage "emr-serverless" "2.13.0" - "sha256-Y0LOqCJs15OO+n3vmIi0g2DU3DLzus1lvZXQU1FjDVI="; + buildTypesAiobotocorePackage "emr-serverless" "2.13.1" + "sha256-+nuAIs7l6xVSGcMg01AdohUqTkU4vSWbU+8hZ+jT5PI="; types-aiobotocore-entityresolution = - buildTypesAiobotocorePackage "entityresolution" "2.13.0" - "sha256-L1y4kgUBTQx4DfFP9/Yegz0T8I5Qcvv6Ll99NFCuC0Q="; + buildTypesAiobotocorePackage "entityresolution" "2.13.1" + "sha256-zgMGXC6b2ooZhZFdaQDnf/Nx5IJAsqTW6egXMRtO4qg="; - types-aiobotocore-es = - buildTypesAiobotocorePackage "es" "2.13.0" - "sha256-N1u90rw2M4Sr6CQgB3tXBAmXX/Qu5jG8QHfRn4gmxxU="; + types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.13.1" + "sha256-xjWWFmGM03NGlOKlOo0v7L8lVy03q3P8wBhLYEKa7xs="; - types-aiobotocore-events = - buildTypesAiobotocorePackage "events" "2.13.0" - "sha256-3E01v7MvD0NC5QXMG7zQ1m66sa9oo6VAzVqMwQaUQ04="; + types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.13.1" + "sha256-Pvsd2abp28BF7V+2IOJgNlxHLiXy/3rDxNQ0S6aowCU="; types-aiobotocore-evidently = - buildTypesAiobotocorePackage "evidently" "2.13.0" - "sha256-KDJlHpf+95/H7axc65nY2XNTtxSUox2iAG2SQkRw600="; + buildTypesAiobotocorePackage "evidently" "2.13.1" + "sha256-6icdeO3oML5yEkfbA6Oaao+bX3scvXhTqefVO9SpBBo="; - types-aiobotocore-finspace = - buildTypesAiobotocorePackage "finspace" "2.13.0" - "sha256-or5hhp/ZxYw5DN6LUpAqcR/2bDmRppT1a/9L0+mRcSA="; + types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.13.1" + "sha256-Ee30GzLvU5oERCCJEzzxNHim4Dy1kA0UZ1GJBvBWLZc="; types-aiobotocore-finspace-data = - buildTypesAiobotocorePackage "finspace-data" "2.13.0" - "sha256-80Y0tP4x+fWeJg+zaS/c3TxYflD8Hto7vNNuDqApRrg="; + buildTypesAiobotocorePackage "finspace-data" "2.13.1" + "sha256-1e7WBzT7N9q0zq2xBihunaUUPgg5LE/krn3rRnB4gLw="; - types-aiobotocore-firehose = - buildTypesAiobotocorePackage "firehose" "2.13.0" - "sha256-Wtz55HZjmJwAcZhhuGGq4U+LGg+/xfADcXXCtgNVpGQ="; + types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.13.1" + "sha256-Tso0OK3RVPr3MEalyLKZlnBPAA3W1dIE26ZOxSV4uRs="; - types-aiobotocore-fis = - buildTypesAiobotocorePackage "fis" "2.13.0" - "sha256-8O3BKG+R6CL7CSYWcxPrKfcsJGkSoIbI0DTOXLzS2/Q="; + types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.13.1" + "sha256-XL0LHEP21vqplbAe8YnakAFM47LCp8D+uXnlzUxG+DY="; - types-aiobotocore-fms = - buildTypesAiobotocorePackage "fms" "2.13.0" - "sha256-lUo54nWEsFMcNDC7rpBFc3VhNjafUax1Utc76BWd/bM="; + types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.13.1" + "sha256-VfwYpj2KVH6P1ELW1YTHlfms4pNdFsbJ/cPch5ygM7I="; - types-aiobotocore-forecast = - buildTypesAiobotocorePackage "forecast" "2.13.0" - "sha256-LB2Ms4okxEMMOEwMd8/JykfnzmsOKRsSOF92UAlI+Kw="; + types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.13.1" + "sha256-jn2O34ZHKZXzoTSreNfPUn8hdY4OR8JYmK3bbkh7Gjk="; types-aiobotocore-forecastquery = - buildTypesAiobotocorePackage "forecastquery" "2.13.0" - "sha256-atPLPwuCkYDv3vyYQuj9+2VkLx4tL0q5/S8g24oapSY="; + buildTypesAiobotocorePackage "forecastquery" "2.13.1" + "sha256-ZBup38Uw4U9d7QbLgAfxortKEIUq3TJbevgJIya77fk="; types-aiobotocore-frauddetector = - buildTypesAiobotocorePackage "frauddetector" "2.13.0" - "sha256-2XZkPccKpLYIXNKhIRuheJVnAOLr2f8mya/vuefX0d4="; + buildTypesAiobotocorePackage "frauddetector" "2.13.1" + "sha256-xSR3m24DmGDvaq7aCYcmM5ZYktoNDaTYIat0N1qICD4="; - types-aiobotocore-fsx = - buildTypesAiobotocorePackage "fsx" "2.13.0" - "sha256-Sxhfg/weC3nSRYdT2BnPiL1zzHMtXV0X0iDar2LQFiY="; + types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.13.1" + "sha256-YIZ3hBCtHtT0S9DUC0nMTUv6CIf+zeBhcCwaR1AOfvM="; - types-aiobotocore-gamelift = - buildTypesAiobotocorePackage "gamelift" "2.13.0" - "sha256-UowdjQc9yaP5Y9XCcynACAUrHJzFZXeeCRWT8NvSLhs="; + types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.13.1" + "sha256-V1G7mp/+nvF5bA/E6yGby1lykK/G7O9Q1cPbEuyJQ+8="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" - "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; + "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; - types-aiobotocore-glacier = - buildTypesAiobotocorePackage "glacier" "2.13.0" - "sha256-lJNVoAMtqdFmzFX9RKmVoW0Ww0EGRWFrB4HpD8EL7i8="; + types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.13.1" + "sha256-hEwuAdbhYop3DmUQQFSrFG1pgqGVqFWp+LGutURhPao="; types-aiobotocore-globalaccelerator = - buildTypesAiobotocorePackage "globalaccelerator" "2.13.0" - "sha256-vYJcni53gQDsns8fPNQTsbSIu2pKlfHOi+Y6ZBsIlrQ="; + buildTypesAiobotocorePackage "globalaccelerator" "2.13.1" + "sha256-eId3UX9+TGCRGXfQKQl0nFdhtsKex6G4t8FWstwi+c0="; - types-aiobotocore-glue = - buildTypesAiobotocorePackage "glue" "2.13.0" - "sha256-lpk9u8K+XKTHa/U0y42B6WJ/LMH9Sftp958PbwTeJiE="; + types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.13.1" + "sha256-sCQiehUAJHXQ5gaSrR4Cly3X4xYelficyLvdudBFVmg="; - types-aiobotocore-grafana = - buildTypesAiobotocorePackage "grafana" "2.13.0" - "sha256-mnCvxOER/AasPUVwwfLl/jYsb/HgU6n2nJs5vtCgD0Y="; + types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.13.1" + "sha256-TAUw1rS+xXf6CDJ1tZBoBQ+0QF3va81ZKr9kAfZCi1g="; types-aiobotocore-greengrass = - buildTypesAiobotocorePackage "greengrass" "2.13.0" - "sha256-pEBpwnQBOwzbr76xdEggj9Nrp7aPJjRHGV0lpU45GDY="; + buildTypesAiobotocorePackage "greengrass" "2.13.1" + "sha256-CNPpXxrRN83LzxrsGpzdevytWDR/fpCADkRo59SNMQ8="; types-aiobotocore-greengrassv2 = - buildTypesAiobotocorePackage "greengrassv2" "2.13.0" - "sha256-PiioTpD0PMyQStz7C4PP7/jPhCFGPGAJmV6tEroM8TE="; + buildTypesAiobotocorePackage "greengrassv2" "2.13.1" + "sha256-WI+Jt+83JB3khjm1gix094Sapxbs+yNKIRhgRs6L+pk="; types-aiobotocore-groundstation = - buildTypesAiobotocorePackage "groundstation" "2.13.0" - "sha256-doSLPlEx0bEJHGMPDSUXWRmuJwdfiOaDCxkd32kFU/Y="; + buildTypesAiobotocorePackage "groundstation" "2.13.1" + "sha256-7wDtgajzXuJx2Ydpfvi7SWyr3bR5jw20mnadkyienfA="; types-aiobotocore-guardduty = - buildTypesAiobotocorePackage "guardduty" "2.13.0" - "sha256-HyptnMArByCpLsFRTZWFHIptEaPLujUiyGHDUshW+3w="; + buildTypesAiobotocorePackage "guardduty" "2.13.1" + "sha256-e35CQoyx1e5wSd5A5W4pAWK8WmbAftJqTpMcmijUShw="; - types-aiobotocore-health = - buildTypesAiobotocorePackage "health" "2.13.0" - "sha256-o+AKZJnVXd/MDaP0Ws2ImRHmudPJkmJIinNtE1HLX90="; + types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.13.1" + "sha256-DAMRdMfG+Ry8PkiECiJCwIXUbjTXWGZ6EfgxPI6BRfo="; types-aiobotocore-healthlake = - buildTypesAiobotocorePackage "healthlake" "2.13.0" - "sha256-whj5Wf3XLhhzJz0pH9ewMrrReI+8UiVmnuU9oi+0KRM="; + buildTypesAiobotocorePackage "healthlake" "2.13.1" + "sha256-m1LqsoGlWh7Hga+l/uZ3OZa6NK9yd00BviT0VDfuue4="; types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.13.0" - "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; + "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; - types-aiobotocore-iam = - buildTypesAiobotocorePackage "iam" "2.13.0" - "sha256-zT6k0pAwR3ActVWyUsE5blqv78xHuQGQlJKvjqI06Os="; + types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.13.1" + "sha256-g9Tkt2rOIg9Y9RwlTh80eiX2BEj4TqhGNWWMKomFEKU="; types-aiobotocore-identitystore = - buildTypesAiobotocorePackage "identitystore" "2.13.0" - "sha256-rmrC8PXW1KyrZo0T2pA9bsHCGSR3DIPYP827jCPR7Ao="; + buildTypesAiobotocorePackage "identitystore" "2.13.1" + "sha256-SslzL8/NmeF4nHNO/7BGHle/brlzc/V4D+ssqfcZNFo="; types-aiobotocore-imagebuilder = - buildTypesAiobotocorePackage "imagebuilder" "2.13.0" - "sha256-rP9XtYKaG8sCSeF0HTGCLofTIbg0iyCjozqUAwQvOFk="; + buildTypesAiobotocorePackage "imagebuilder" "2.13.1" + "sha256-GgkFg7I/a5wa03SlZtxYV2aGolNgzoB7TZrQkp7rjYI="; types-aiobotocore-importexport = - buildTypesAiobotocorePackage "importexport" "2.13.0" - "sha256-iZHJ4C/Ai7cSnWQsUsb9D1eMr8+17XQr+okJkb6KquM="; + buildTypesAiobotocorePackage "importexport" "2.13.1" + "sha256-ovXUrl03Mut4QJZeItbxbtiuTDt3beGv0SjUBxZLyrs="; types-aiobotocore-inspector = - buildTypesAiobotocorePackage "inspector" "2.13.0" - "sha256-uVr5nzXn9/OlJgcGckH6Qi5eOWULyhwBbDehHxMHk60="; + buildTypesAiobotocorePackage "inspector" "2.13.1" + "sha256-imFheQxmne5h9hN6yQOlSLWRDjdEYAW2enHhbTv+ei0="; types-aiobotocore-inspector2 = - buildTypesAiobotocorePackage "inspector2" "2.13.0" - "sha256-BENRjvjKgd9fy4zt1LXqcDhUhK/OJG5FyIaSRl+NnPA="; + buildTypesAiobotocorePackage "inspector2" "2.13.1" + "sha256-N/xZO2FneEYp7Ux5OIM9XXHEyiZGfA5pDogPB7R8Les="; types-aiobotocore-internetmonitor = - buildTypesAiobotocorePackage "internetmonitor" "2.13.0" - "sha256-bhC316GPUqjSpmrsyZAZgCHcPGubEBXqXsueTnXaAOg="; + buildTypesAiobotocorePackage "internetmonitor" "2.13.1" + "sha256-vEDQ6b8yf6yopj0cce1LIKR53ipmbAx5T/BI47shgEQ="; - types-aiobotocore-iot = - buildTypesAiobotocorePackage "iot" "2.13.0" - "sha256-xXYong7il5S1cjAJUJe1d4gSkn+6c/eBe7FIjEmNYl4="; + types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.13.1" + "sha256-osgn2jHhrm9TiecS+jPV7VQW80ci8klwS85yFf4U6ik="; - types-aiobotocore-iot-data = - buildTypesAiobotocorePackage "iot-data" "2.13.0" - "sha256-bQah1T+GlZryFRE8Z7vpNUEVJmXjCX05GWYR5Y8KANk="; + types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.13.1" + "sha256-WLlWLxNPIOi+f2lsL/aM7TMfHsW+nCP+kDv8irqKlK0="; types-aiobotocore-iot-jobs-data = - buildTypesAiobotocorePackage "iot-jobs-data" "2.13.0" - "sha256-0lWhcUjZ4R8etiKugTuELzpbF/7+7rfbAsXAmB8OXRM="; + buildTypesAiobotocorePackage "iot-jobs-data" "2.13.1" + "sha256-O5Qi0KLLqwZhK45Uzt3ufoS2sIuNaB/0gKR9y+KjEEU="; types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.2" - "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; + "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; types-aiobotocore-iot1click-devices = - buildTypesAiobotocorePackage "iot1click-devices" "2.13.0" - "sha256-Ge098mg+jeOxwpBr3BMELnRD0cqZqmRSArHh/m2OsBE="; + buildTypesAiobotocorePackage "iot1click-devices" "2.13.1" + "sha256-56U6mEIPQxNaBbml+3efOg0Bcoy0aTe6wlYGVg/Rkjk="; types-aiobotocore-iot1click-projects = - buildTypesAiobotocorePackage "iot1click-projects" "2.13.0" - "sha256-hf5aYWELJQniMsldhHv25/2Rqk3SnSGbJ0OBsdDO/us="; + buildTypesAiobotocorePackage "iot1click-projects" "2.13.1" + "sha256-jkU6nulurbaTVshG1RCdvYFB23kQNn8VJhuuvLrpI8M="; types-aiobotocore-iotanalytics = - buildTypesAiobotocorePackage "iotanalytics" "2.13.0" - "sha256-T784XUsVCpZKSfl8JtrCA8zYieE7WRFUS0GjGkiMb7M="; + buildTypesAiobotocorePackage "iotanalytics" "2.13.1" + "sha256-3m6Naodc/JUxmSIVO3St6DVvBGMNQmelz7UW7xw7g5w="; types-aiobotocore-iotdeviceadvisor = - buildTypesAiobotocorePackage "iotdeviceadvisor" "2.13.0" - "sha256-vY8bUjfix0ooShceyA56KkI3VvTQhWQdO2KAFOQK/fs="; + buildTypesAiobotocorePackage "iotdeviceadvisor" "2.13.1" + "sha256-HScTcygNmLUZIaj+jBp0gbPHEyhvpWC3l5KrON7+yNQ="; types-aiobotocore-iotevents = - buildTypesAiobotocorePackage "iotevents" "2.13.0" - "sha256-x7GlfEgtPacEjliok6xIqJ0wYC/AZqYDHPiGrXRmpGg="; + buildTypesAiobotocorePackage "iotevents" "2.13.1" + "sha256-f3GMaGbe8iaz9oBX3A9GVCeyDztAl/Z8FFUqNlt60K8="; types-aiobotocore-iotevents-data = - buildTypesAiobotocorePackage "iotevents-data" "2.13.0" - "sha256-eCf9pN4Xra2TTjes8hDFegbkmM/pz1onMS5ntJKE1E0="; + buildTypesAiobotocorePackage "iotevents-data" "2.13.1" + "sha256-5gf8jxI3g2aB6Nq+6qZELrFc3S0yyxswnAP7lDERSvs="; types-aiobotocore-iotfleethub = - buildTypesAiobotocorePackage "iotfleethub" "2.13.0" - "sha256-VMIE+miyZDZRG9BYy/q6Y+FQngScblfnL3UKQVY0VhA="; + buildTypesAiobotocorePackage "iotfleethub" "2.13.1" + "sha256-ioxTcKwSmYOuLykUwiRwFkOUim5TWqL8aD4KCMONHkI="; types-aiobotocore-iotfleetwise = - buildTypesAiobotocorePackage "iotfleetwise" "2.13.0" - "sha256-rVC6BOWbPKiivjAyqGlG1sYPwAPMDfy0puzrk+2ow+U="; + buildTypesAiobotocorePackage "iotfleetwise" "2.13.1" + "sha256-R04IXZingyp/1DDL30QOhNjnbfoLIj4+GLkzWoCquqQ="; types-aiobotocore-iotsecuretunneling = - buildTypesAiobotocorePackage "iotsecuretunneling" "2.13.0" - "sha256-XtNzPH9a+FZg6RgXuJFkkHj4utt84u/PYWpHz3fQOC8="; + buildTypesAiobotocorePackage "iotsecuretunneling" "2.13.1" + "sha256-q2zWTqraceZkg8kPVptFBmK2xuVvhFbx6EEpqcuWi7I="; types-aiobotocore-iotsitewise = - buildTypesAiobotocorePackage "iotsitewise" "2.13.0" - "sha256-52y4FXYR7Hk3pjNe8Er9j94tGuLnPKx2sf+YJtyg8Sg="; + buildTypesAiobotocorePackage "iotsitewise" "2.13.1" + "sha256-r8ye5bXfJjggdS2CSAzB1MTxUqW3WYnRhgyty1zUt8E="; types-aiobotocore-iotthingsgraph = - buildTypesAiobotocorePackage "iotthingsgraph" "2.13.0" - "sha256-GZBsVNbdQ8J936kW8UfVfOwIw9ftEttSl942pcDxr4A="; + buildTypesAiobotocorePackage "iotthingsgraph" "2.13.1" + "sha256-DUyf0i1vj8/YKZEvpeI28Cxaa4m9jz9LNKIxM8mLFvQ="; types-aiobotocore-iottwinmaker = - buildTypesAiobotocorePackage "iottwinmaker" "2.13.0" - "sha256-hE+juDpyRZ0zPsSGMGt037o7NLN0z7Co7m+HCKSh5Fc="; + buildTypesAiobotocorePackage "iottwinmaker" "2.13.1" + "sha256-apD3UPBHiyMDEbf3y1L5tENdWEfum8LvCNc5dIq7tvc="; types-aiobotocore-iotwireless = - buildTypesAiobotocorePackage "iotwireless" "2.13.0" - "sha256-O8F7NN8hkQiDJNy8Y3Cx1w1WwUGH0y9YtGIz8Wcj1/E="; + buildTypesAiobotocorePackage "iotwireless" "2.13.1" + "sha256-Z133nUtghZZJNhSJdn1kwCyoerN+sANlikrse2Up0Mo="; - types-aiobotocore-ivs = - buildTypesAiobotocorePackage "ivs" "2.13.0" - "sha256-dZHvgOfBn61k6VMcFGBmBZ4BrR1TUgTPx55Rvw3+isc="; + types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.13.1" + "sha256-/xTDdUOgKRBROTAWa/Yo1to7fEDXDzeidbljgFe1QQo="; types-aiobotocore-ivs-realtime = - buildTypesAiobotocorePackage "ivs-realtime" "2.13.0" - "sha256-LF9SEkOMDBq2yvlQHPBx4pLByEzRtgOZS8x1btm0snc="; + buildTypesAiobotocorePackage "ivs-realtime" "2.13.1" + "sha256-rnGISy6NHILsoihnWVOAt9ESTcOTeBHt2VD/mlgwWXc="; - types-aiobotocore-ivschat = - buildTypesAiobotocorePackage "ivschat" "2.13.0" - "sha256-Bv5lSIWGbFJxpMK//ZUm8ewaf0d7XuAgZcYA1EghVtA="; + types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.13.1" + "sha256-9xCBsQGk8LKSl3sbZ+wgbzWICNfZM6rPcTrVBZ6qEjM="; - types-aiobotocore-kafka = - buildTypesAiobotocorePackage "kafka" "2.13.0" - "sha256-5hMlJfYR8qYQg9S12xwKHxIt7Grv3F0CwUE/p0WP2ZU="; + types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.13.1" + "sha256-xksZ5c/RNGUQkaLjchkngrsNFrS4MPcLp6t6RUkyeTo="; types-aiobotocore-kafkaconnect = - buildTypesAiobotocorePackage "kafkaconnect" "2.13.0" - "sha256-ecnz27IztSMrBt4xc4DsZbNpliciSswNIOHT3t6tTXg="; + buildTypesAiobotocorePackage "kafkaconnect" "2.13.1" + "sha256-YXWl72Ai1/RMXtHIjyNgrq14Kar64OcZumCzotqI0Oo="; - types-aiobotocore-kendra = - buildTypesAiobotocorePackage "kendra" "2.13.0" - "sha256-nhKOiHgIC59fwH1HTLusuTgiaOJ5KidRm9DHuGQmQnE="; + types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.13.1" + "sha256-6SHFiSXNJGeq2FdvSW/G8adYO3CGw/IBH5Q0TLWCvfI="; types-aiobotocore-kendra-ranking = - buildTypesAiobotocorePackage "kendra-ranking" "2.13.0" - "sha256-FBQDcjY3tx1M3012LzP2FO/1z9WQ9xihburpWv9Tq78="; + buildTypesAiobotocorePackage "kendra-ranking" "2.13.1" + "sha256-+OhqW5cU8bu5bYf6u4hcilZYfUrxaVwJCSY77MrkPXU="; types-aiobotocore-keyspaces = - buildTypesAiobotocorePackage "keyspaces" "2.13.0" - "sha256-rEOkdFru0ZbjPWLvC9TlAd46r9bviqEmpKPvL0MqhjI="; + buildTypesAiobotocorePackage "keyspaces" "2.13.1" + "sha256-OYXYg9JF3cwJFvWVkvrWNSJN1VYpqBAlzxCBvNW4Z1I="; - types-aiobotocore-kinesis = - buildTypesAiobotocorePackage "kinesis" "2.13.0" - "sha256-0f/Nl7BqZ+AFAJrckS1DtZGl3QNWCIsJAusVgkXuTvQ="; + types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.13.1" + "sha256-JhGNdHtkiPvMht53v6n7wNR8/bry/zoDoqqzygMyo4g="; types-aiobotocore-kinesis-video-archived-media = - buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.13.0" - "sha256-nl6GBcrpUaBWghji5309vsHGxWuRHe8R1Z0w1OSpf2k="; + buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.13.1" + "sha256-uE/3/iBMMIk2qSjLcZ9Jv26Tfpr83p12jNnZme7gWLU="; types-aiobotocore-kinesis-video-media = - buildTypesAiobotocorePackage "kinesis-video-media" "2.13.0" - "sha256-EX0Wq0B/2gOhX6ekSDpWUsC57wrVPBXakf7zjLql7i0="; + buildTypesAiobotocorePackage "kinesis-video-media" "2.13.1" + "sha256-e1zl7BksbzYyhrNz3y+b+6g/iPmeUZkj4lgJjWFIyQY="; types-aiobotocore-kinesis-video-signaling = - buildTypesAiobotocorePackage "kinesis-video-signaling" "2.13.0" - "sha256-2YYJskPHKJJGwvfWKT3CA2XZFcJ//dSroaZj8Z3Zz/M="; + buildTypesAiobotocorePackage "kinesis-video-signaling" "2.13.1" + "sha256-2+B07qNWd1UXfVa7yeV31mBQ8d9L/5arYWTNjMaYfpQ="; types-aiobotocore-kinesis-video-webrtc-storage = - buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.13.0" - "sha256-TPueQ1LwzxJVM11CfA5Uy+s1wgZ4cFtFg2h9lwX/Bqk="; + buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.13.1" + "sha256-f4ZEhcEKLz9tXnZ5jY2YlbBejX6H80be3GPIRbx4XxE="; types-aiobotocore-kinesisanalytics = - buildTypesAiobotocorePackage "kinesisanalytics" "2.13.0" - "sha256-MrjUkjhU9spam5WRWNMNrEaUV+VDj5bLb4jEOpxSnic="; + buildTypesAiobotocorePackage "kinesisanalytics" "2.13.1" + "sha256-hHR/i8xW0Qy+IG3grNl7cyzBJDfXCcAzUaOEP1wF3G0="; types-aiobotocore-kinesisanalyticsv2 = - buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.13.0" - "sha256-ApnELs3BVh05bLJvzFfLgbn1kY2IjItbjZh8xw90UPo="; + buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.13.1" + "sha256-csqNXzwvVd0nMKA+52gVLt/PGik94ObuCxUrCWUfAAQ="; types-aiobotocore-kinesisvideo = - buildTypesAiobotocorePackage "kinesisvideo" "2.13.0" - "sha256-+xPIVVF1QdCbs/yaWKlD5WHc400MwV01BJAKlau85I4="; + buildTypesAiobotocorePackage "kinesisvideo" "2.13.1" + "sha256-O129CbGxMDABLOQca2Xb4tK76+Xm/ZdfLASp42kT/JE="; - types-aiobotocore-kms = - buildTypesAiobotocorePackage "kms" "2.13.0" - "sha256-Vc7G2TRaxerOVf+wG6T5gHqR0atMP0SdehJe+55GZZc="; + types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.13.1" + "sha256-WXaLZBIbash+K+F1RaSUGU1WnEg58DON2dgzsgUpZ0Y="; types-aiobotocore-lakeformation = - buildTypesAiobotocorePackage "lakeformation" "2.13.0" - "sha256-os4//4oH0mvWDeA8TyuZc3WL4Zqs2blepwLx+3W/RKw="; + buildTypesAiobotocorePackage "lakeformation" "2.13.1" + "sha256-0951Vo8Y8hRrgveEGigll6mfG7YYSpNSXBPfzgS/4o0="; - types-aiobotocore-lambda = - buildTypesAiobotocorePackage "lambda" "2.13.0" - "sha256-M1j3PX0xDOwp6N2kPR2B9q0hzKZ8SlGkNlRNQHl4F3o="; + types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.13.1" + "sha256-7B6cg/p00awvo8rN0NKh+A1vbBer6TTAYNjIFYQAW10="; types-aiobotocore-lex-models = - buildTypesAiobotocorePackage "lex-models" "2.13.0" - "sha256-i/nA25zWKIpg25TJJqKnFaudaSUjbPc7PHXtixu3rIE="; + buildTypesAiobotocorePackage "lex-models" "2.13.1" + "sha256-mcJOptD3eqAg+C2Ghgemd6juQCklxAmeiELstnubF4g="; types-aiobotocore-lex-runtime = - buildTypesAiobotocorePackage "lex-runtime" "2.13.0" - "sha256-0R7Z1p9CVjtWKlhs1n4jDMDheOQXn5jrbxIGK6Hz3+A="; + buildTypesAiobotocorePackage "lex-runtime" "2.13.1" + "sha256-4j0rWpj8fE+MOZ0s6kB9KTQ2KIeWBXrxfmnY8qkKXtw="; types-aiobotocore-lexv2-models = - buildTypesAiobotocorePackage "lexv2-models" "2.13.0" - "sha256-aLJfuoQrT10rDwqZXGdE8d5WQ5GnSwAhO3ttX4ZhdG8="; + buildTypesAiobotocorePackage "lexv2-models" "2.13.1" + "sha256-mHRxhIYfxjSSEFc3AHF/wcJHt3CAEqlfH6dJC/NWLnA="; types-aiobotocore-lexv2-runtime = - buildTypesAiobotocorePackage "lexv2-runtime" "2.13.0" - "sha256-7LXp7pXpgCx083rzIeytSzoRKsI9Lry/k356/mwlWQM="; + buildTypesAiobotocorePackage "lexv2-runtime" "2.13.1" + "sha256-QfTy63MBeZpwVNOowmy9VmkMEkpy9ZVyIHyifyDTmiU="; types-aiobotocore-license-manager = - buildTypesAiobotocorePackage "license-manager" "2.13.0" - "sha256-ayM9VLN9jAmJeMXWmJwa5knSIK/goX+IFP5IJyaYYN0="; + buildTypesAiobotocorePackage "license-manager" "2.13.1" + "sha256-S23klxiPDQkyCy4xMzxh0exywft91qwkAxDit/vUb2Y="; types-aiobotocore-license-manager-linux-subscriptions = - buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.13.0" - "sha256-gbVx6et48YFYzqqhhHg1OhhbYBCTUOv7me9mxcFEx/w="; + buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.13.1" + "sha256-u2O+8yfE8goI29SUJ1lKTJ8h5KNmVFAb0Iob9RF1ZmQ="; types-aiobotocore-license-manager-user-subscriptions = - buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.13.0" - "sha256-Nm50NIyIhRJ7zy/riVNYZhGW4iJXV1BZdHukpFFQi+c="; + buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.13.1" + "sha256-Zet0z6TYa7VPEJd8f6fOkI44hC8Ia6h3gsQ/CLokBy4="; types-aiobotocore-lightsail = - buildTypesAiobotocorePackage "lightsail" "2.13.0" - "sha256-POUIiTtEa85VA6s7FtwP8TSNdo1MNe+6IWIDDIKpFMs="; + buildTypesAiobotocorePackage "lightsail" "2.13.1" + "sha256-RozP6XcqZnOuSWlSK4C9tLm74OnzBe8n9f9mrXHQhX0="; - types-aiobotocore-location = - buildTypesAiobotocorePackage "location" "2.13.0" - "sha256-nVxbggkxC82171TDifKU7NRcohmiWdGKBbAY6cNLZkM="; + types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.13.1" + "sha256-skC7EDojgvq38MIZLBwFnMCEPcnYs3bB8nEN2Ca0Toc="; - types-aiobotocore-logs = - buildTypesAiobotocorePackage "logs" "2.13.0" - "sha256-rwImBaQiRyo/FMibogZwe+cuJVNkKCK05R7O6RFt1hc="; + types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.13.1" + "sha256-GRK5GRJBX9jn7hiXrBxTH3cyByDbfoW7Q+SxBi1tsPg="; types-aiobotocore-lookoutequipment = - buildTypesAiobotocorePackage "lookoutequipment" "2.13.0" - "sha256-eOB6McK2F4B2c1vQmc26OsU/N8HAVtm3ZUBSZzkRyUA="; + buildTypesAiobotocorePackage "lookoutequipment" "2.13.1" + "sha256-dokSUVIcQAXkiPjB8cL4/HNW0vwh6Qz+npRzvELA0fc="; types-aiobotocore-lookoutmetrics = - buildTypesAiobotocorePackage "lookoutmetrics" "2.13.0" - "sha256-mTfRSAwyOYBk3fcPgcwilZ0o7sEB1U5msLt9AOzUNnY="; + buildTypesAiobotocorePackage "lookoutmetrics" "2.13.1" + "sha256-/CWGYa+qwyI9ULV7uAM8FXJOnP/pdiHQK1A+C2se1gw="; types-aiobotocore-lookoutvision = - buildTypesAiobotocorePackage "lookoutvision" "2.13.0" - "sha256-JyMI0ldwLZcY20vTs5lIda2EjRhnzyJVw3/EQKkxPQs="; + buildTypesAiobotocorePackage "lookoutvision" "2.13.1" + "sha256-r5VzRqV7QHygTvRNb3Hfucr1V97U6k77SWYpz4hbSaw="; - types-aiobotocore-m2 = - buildTypesAiobotocorePackage "m2" "2.13.0" - "sha256-CAqHIVnso4h6Vw7nK3Oy1BbMxywPmHt6oaJcpCQk6GM="; + types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.13.1" + "sha256-rM8R5/foSrAn6tg/mKSI33fRuZHcvvZE4gReNgMUdxo="; types-aiobotocore-machinelearning = - buildTypesAiobotocorePackage "machinelearning" "2.13.0" - "sha256-MIqF9A9KPW2yzWHeEhX8usTtT92GuAEKAYf9FhjxW90="; + buildTypesAiobotocorePackage "machinelearning" "2.13.1" + "sha256-DphFsB4gD/drCtzonYMi00Uf6xZDxnZMwrPe3NhghOQ="; - types-aiobotocore-macie = - buildTypesAiobotocorePackage "macie" "2.7.0" - "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; + types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" + "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; - types-aiobotocore-macie2 = - buildTypesAiobotocorePackage "macie2" "2.13.0" - "sha256-83zr/u4Q6KhFm3Id0nY6yVAtBZhD45jWXaqRdyPftNU="; + types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.13.1" + "sha256-biycbIuk14p+Ith65PIqsYjjXsJJfKu3zpmSE+OzYWo="; types-aiobotocore-managedblockchain = - buildTypesAiobotocorePackage "managedblockchain" "2.13.0" - "sha256-ZaQSNpRsGarE8NCcoafeRokn2HfdKApexxLwcz7rUVM="; + buildTypesAiobotocorePackage "managedblockchain" "2.13.1" + "sha256-Y0f3zLBsmV4q1CHr3EnFJEfonvl/rxlSiJv6KZRE5Io="; types-aiobotocore-managedblockchain-query = - buildTypesAiobotocorePackage "managedblockchain-query" "2.13.0" - "sha256-kjxNEPAKBHsCKnJI+WgdVhEmrVURHfyUUwHOLSNazn0="; + buildTypesAiobotocorePackage "managedblockchain-query" "2.13.1" + "sha256-eafaAWDhDSUnw/JmvlHi0h8Ozm5ZHx23cKmwLQgbouU="; types-aiobotocore-marketplace-catalog = - buildTypesAiobotocorePackage "marketplace-catalog" "2.13.0" - "sha256-LG6cM9E5KgkMR2On3Z45UN3VgfcBtIPtBpt8OmTbhP8="; + buildTypesAiobotocorePackage "marketplace-catalog" "2.13.1" + "sha256-11WiQ99Eel1MZtnjQgmifvsq7teJPqhyJxC979W+Ttg="; types-aiobotocore-marketplace-entitlement = - buildTypesAiobotocorePackage "marketplace-entitlement" "2.13.0" - "sha256-jPzcbqjrCS22zhDmrOK9KOvYv7y15iY88FSad2t9Dyc="; + buildTypesAiobotocorePackage "marketplace-entitlement" "2.13.1" + "sha256-LjDaNH9w+pyWsMPqa2GbRIs1kbAhNbNeFR6bOnFrSlw="; types-aiobotocore-marketplacecommerceanalytics = - buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.13.0" - "sha256-Mtpin8e/YS95wDCII4w4lD9KiL4jXyYbeEDEGaLb38U="; + buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.13.1" + "sha256-kIl2+04Iev+BLFrW0HsvQFac2qB6u/hTlkT+To65bl4="; types-aiobotocore-mediaconnect = - buildTypesAiobotocorePackage "mediaconnect" "2.13.0" - "sha256-/fpb6bsagRYCil2SOWviJjdqNEMJjD7WMemzRf7C63o="; + buildTypesAiobotocorePackage "mediaconnect" "2.13.1" + "sha256-Aou0aqeTNsykokkuUGn8KJ+5+pIqcTFHnCc4yNbLsiU="; types-aiobotocore-mediaconvert = - buildTypesAiobotocorePackage "mediaconvert" "2.13.0" - "sha256-MSL3mYBrUDBeLitsWfR3Q2mwRzpoclL/oJkaFxc6TTw="; + buildTypesAiobotocorePackage "mediaconvert" "2.13.1" + "sha256-CGKpFDh5+MXhGF8yfZlsUDOW1bLnQ4E6W/PyAexYtF8="; types-aiobotocore-medialive = - buildTypesAiobotocorePackage "medialive" "2.13.0" - "sha256-hZGqU1HI/0et9myUffbJDHFhsCkpl8x5M+iNgsxeNnk="; + buildTypesAiobotocorePackage "medialive" "2.13.1" + "sha256-dhicdKLUuAFUHNihBeyME4Im1rtaAn/jECoA0Vartj8="; types-aiobotocore-mediapackage = - buildTypesAiobotocorePackage "mediapackage" "2.13.0" - "sha256-HD2rT2bgrFPGQQrHicz/1jnP9pbLnp+KN/kdA+Dp12U="; + buildTypesAiobotocorePackage "mediapackage" "2.13.1" + "sha256-7ho2qJjBNWqcJ2qdvTCFUbc2R8CZRuzjyH7tkHv8ZlI="; types-aiobotocore-mediapackage-vod = - buildTypesAiobotocorePackage "mediapackage-vod" "2.13.0" - "sha256-iXg4JDx3U42iwFVrpHHqk6yhCnHA0g9NA+f25BR85Ws="; + buildTypesAiobotocorePackage "mediapackage-vod" "2.13.1" + "sha256-O5Gk5Ok0wWHYsP/6IrPL/8tkh1teCDmBoeph4eYOpnw="; types-aiobotocore-mediapackagev2 = - buildTypesAiobotocorePackage "mediapackagev2" "2.13.0" - "sha256-B91QlIhMp9hGgJsToYseTQSB4n3Sgei4Bdgl3RmU5cw="; + buildTypesAiobotocorePackage "mediapackagev2" "2.13.1" + "sha256-ik87A7P4Oro/Fy/gz/KQJsPubsun9ZMlEP5Y/xHGM2w="; types-aiobotocore-mediastore = - buildTypesAiobotocorePackage "mediastore" "2.13.0" - "sha256-2UwHy/6Ni/6rmd+OW1FKXp2jSDueGntuVInNt2kbHR8="; + buildTypesAiobotocorePackage "mediastore" "2.13.1" + "sha256-v1JAKOy99C2H7k2vkE3SdM/BRjoBpEm0pHRSoxwyGKM="; types-aiobotocore-mediastore-data = - buildTypesAiobotocorePackage "mediastore-data" "2.13.0" - "sha256-L+Lo4cSR905FO7fkyFgJAhJ7JXmwpZY6yrAs3sI9Pow="; + buildTypesAiobotocorePackage "mediastore-data" "2.13.1" + "sha256-7HAibOEHV2DOsLNmd5sjXePOnGiX7sQClwiD1IMAS5Q="; types-aiobotocore-mediatailor = - buildTypesAiobotocorePackage "mediatailor" "2.13.0" - "sha256-eLnheUZLKCaklJuihJbnOi/nK/4G4QWpnpz8PWRYDa0="; + buildTypesAiobotocorePackage "mediatailor" "2.13.1" + "sha256-Ymg6jpoBQDcy/VEaLEluYII/817DcK69uii9EHmjX1A="; types-aiobotocore-medical-imaging = - buildTypesAiobotocorePackage "medical-imaging" "2.13.0" - "sha256-5r6e/tA+U8IJhX89/aQBSnEzOECDFqIoQ1t906c8p8s="; + buildTypesAiobotocorePackage "medical-imaging" "2.13.1" + "sha256-OzNc5eyipNPA0TFajfpXFa6kXj7tNupoe7p2EeDFygM="; - types-aiobotocore-memorydb = - buildTypesAiobotocorePackage "memorydb" "2.13.0" - "sha256-2IKR1goAmHifDr1emN4VORd9WV1rZMbfEapVc+TQ9WE="; + types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.13.1" + "sha256-GvcEWHpCR0J1ftCbH4rK3JJcG5KtRtvTm5YSEEn6gjg="; types-aiobotocore-meteringmarketplace = - buildTypesAiobotocorePackage "meteringmarketplace" "2.13.0" - "sha256-M/B4jn9RFGHHa1xbC7JeCQdKPqC7eU2Dv8wEIH0J9jQ="; + buildTypesAiobotocorePackage "meteringmarketplace" "2.13.1" + "sha256-TNg2yvdEcBSJ9U1nsc+ihWodc//IPdOJ9miMZDYC05U="; - types-aiobotocore-mgh = - buildTypesAiobotocorePackage "mgh" "2.13.0" - "sha256-mzvCnITcMJzMfpfRQFyIVpbtfVPY4qy5OLyb3UIlqUo="; + types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.13.1" + "sha256-t5owrAOVv4cMsUKbrT/QDd66pdz3LrWm0DcJ0g/fxVo="; - types-aiobotocore-mgn = - buildTypesAiobotocorePackage "mgn" "2.13.0" - "sha256-RejNbn28WmZ+ioSAKYFIegfC1AkbkRWLd65IwnWgzHY="; + types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.13.1" + "sha256-xsAWfONvXq6x0BHSQkH+L2ikANbsq8+RNWV4iPhq94Y="; types-aiobotocore-migration-hub-refactor-spaces = - buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.13.0" - "sha256-HR9zSE6SOLTYqQZV+RowVCV+YfVafbuCvfNvrNYUVgo="; + buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.13.1" + "sha256-PDpmWUxroS2y8Kh3aasITL4w+7XGcwEZ3nJL+ffCRKQ="; types-aiobotocore-migrationhub-config = - buildTypesAiobotocorePackage "migrationhub-config" "2.13.0" - "sha256-WWfZkvq+OgnYGrTRcJfLJCZGsjpUy2AsEMkTyb+CUcs="; + buildTypesAiobotocorePackage "migrationhub-config" "2.13.1" + "sha256-pdT8i6eGekkTPAa87cibkSyjw6KyI482jOhkfFqiyRs="; types-aiobotocore-migrationhuborchestrator = - buildTypesAiobotocorePackage "migrationhuborchestrator" "2.13.0" - "sha256-icVLvU1ZI1/5/owDALeg25qCK1Ny3PVrCvfydIfBCO8="; + buildTypesAiobotocorePackage "migrationhuborchestrator" "2.13.1" + "sha256-AA25qAEWLaQBQ+1hJKoRrGax4f23CGSGoMpvdaym2xo="; types-aiobotocore-migrationhubstrategy = - buildTypesAiobotocorePackage "migrationhubstrategy" "2.13.0" - "sha256-rgKjBmULUFRAFr8b6J9m58aoR2pKkSjLhJY7lkZOKRY="; + buildTypesAiobotocorePackage "migrationhubstrategy" "2.13.1" + "sha256-CEqR0phDFZUtMH+JJqjbxLwHIC8ReiFTYG9MKFZajbE="; - types-aiobotocore-mobile = - buildTypesAiobotocorePackage "mobile" "2.13.0" - "sha256-BICpQNN+Br+iDoMeTNSNyNacVgI1OrfcyZkDBl2SoUo="; + types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.13.1" + "sha256-OBWSp6n3xpuAdWEP1DB+LoSd/Ds6tWSzMgC0fIYepPs="; - types-aiobotocore-mq = - buildTypesAiobotocorePackage "mq" "2.13.0" - "sha256-+Y1GRkcDbR4SXOIGneHepAS/qrgjnM7K26po8Nf1YsA="; + types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.13.1" + "sha256-xv2s3Ek2KvWUzDrOPWOpXC/kLC+VGhzQBihimhFZelY="; - types-aiobotocore-mturk = - buildTypesAiobotocorePackage "mturk" "2.13.0" - "sha256-s3unZa/uhHtqArgIuBNoWcTnAFj9rduODKfs6gtc2fw="; + types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.13.1" + "sha256-a1f/szq1zAskaf+28hpcxz9d5S5mYteZUo9TksnTAok="; - types-aiobotocore-mwaa = - buildTypesAiobotocorePackage "mwaa" "2.13.0" - "sha256-ZS8XXr4rroDTCDSuPep8kG7e/h8v9i7499UJrQfgEDk="; + types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.13.1" + "sha256-vUQSThUV6hGv4gsNMp+HC0thbxGf9j7XjWECUULJYT4="; - types-aiobotocore-neptune = - buildTypesAiobotocorePackage "neptune" "2.13.0" - "sha256-fvEnIIx66IrTx4exrIJm/KVytf0F+fb3RpmUVE2niXA="; + types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.13.1" + "sha256-du5vrwZMa/1UkKImJ2AM1FYAsdZlvmHwB+jWvf9IPHA="; types-aiobotocore-network-firewall = - buildTypesAiobotocorePackage "network-firewall" "2.13.0" - "sha256-R12G5XKsP034MeJ2Tf2bctcrMVlfQ6o9ZDCBpdLN/+E="; + buildTypesAiobotocorePackage "network-firewall" "2.13.1" + "sha256-NZT7U3kF9He4+MhlKU/CDzt0Q6wW2dBIsGqXqQ1ne0o="; types-aiobotocore-networkmanager = - buildTypesAiobotocorePackage "networkmanager" "2.13.0" - "sha256-H2tj/8DQqtT1GIZP1FmRuAR/bf5Q5d1VOoCcsgsQxJA="; + buildTypesAiobotocorePackage "networkmanager" "2.13.1" + "sha256-xxcaP5s5vDReUEVQxis/4Kz+7e8UPXt0Mp4Uu9yLVXA="; - types-aiobotocore-nimble = - buildTypesAiobotocorePackage "nimble" "2.13.0" - "sha256-00Di+tYc0/CTTUOu1ax1lNp/2tfCvB58L9ETzqWEjRE="; + types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.13.1" + "sha256-uLVJekBSmrJ1KjR1yXK4I97S1iAWiNobiShDBujRmmw="; - types-aiobotocore-oam = - buildTypesAiobotocorePackage "oam" "2.13.0" - "sha256-q9sBKS2BiiuCGvv+pkm/WSgN70a/KY7gLgxayG3yu98="; + types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.13.1" + "sha256-thtnloGS4BEg5bdnEc4dIOZ/rAaojWQlQ+Nso5E1uks="; - types-aiobotocore-omics = - buildTypesAiobotocorePackage "omics" "2.13.0" - "sha256-bNahQYb5iuNxk+XQSpf61w68hjGA6Hm62zr70Gj2UeU="; + types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.13.1" + "sha256-Ak4nOBS8PlchtSZ7u2WdcvqcPS8CHx2gkb1IeE7CO78="; types-aiobotocore-opensearch = - buildTypesAiobotocorePackage "opensearch" "2.13.0" - "sha256-zpvBC/rJ/7+C1JDwpiZtksC964po0TuHPBeW6yvD5ww="; + buildTypesAiobotocorePackage "opensearch" "2.13.1" + "sha256-lrX9vNiaXekBoqBCUwiRcGrFOj98eAw+1VdtM/VrFvM="; types-aiobotocore-opensearchserverless = - buildTypesAiobotocorePackage "opensearchserverless" "2.13.0" - "sha256-E3N6ewi/YCAeoHBW5WS0FwkO5YjZURxUJhSnESWuG40="; + buildTypesAiobotocorePackage "opensearchserverless" "2.13.1" + "sha256-gYTMzWB1EpskiLA+CQvShpCnvJ7PM5x65NavdsksrJg="; - types-aiobotocore-opsworks = - buildTypesAiobotocorePackage "opsworks" "2.13.0" - "sha256-LGOxPGYIIXqu/+4SenVUAWhpo7xiSf76wkv8RmSaWro="; + types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.13.1" + "sha256-BqudWGmHb0LhamtuuKnKf7S7aXIrQQUo0jcdAch1Kl0="; types-aiobotocore-opsworkscm = - buildTypesAiobotocorePackage "opsworkscm" "2.13.0" - "sha256-inV4lalhHYvkbyIHcG3DQfAllLSW15sUYHr9b0yhg0g="; + buildTypesAiobotocorePackage "opsworkscm" "2.13.1" + "sha256-e90/qTD/BfUnlJPwZS3VvUR5MA58qZ8Dz40emRzeqQ8="; types-aiobotocore-organizations = - buildTypesAiobotocorePackage "organizations" "2.13.0" - "sha256-KjQ+zOmxStuXKokL3R1JfZhKwEpH/FRhfhpfz78rZw0="; + buildTypesAiobotocorePackage "organizations" "2.13.1" + "sha256-rSxR2YdgwNIPAVreMalDA2CBwAjFqmjV9vpeuzexGKM="; - types-aiobotocore-osis = - buildTypesAiobotocorePackage "osis" "2.13.0" - "sha256-LfEOIg6J72v6JBlpl5QFEuqxA28CWJCP+bkhtIvQB6c="; + types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.13.1" + "sha256-pjnHLL/OY2Z30DbB/dG+EmQmw26mpMNLJRiVu75zhhE="; - types-aiobotocore-outposts = - buildTypesAiobotocorePackage "outposts" "2.13.0" - "sha256-Ss1iKr7EUhLXTT/bSM63HX01NNuKtpKWLodVaZIfNso="; + types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.13.1" + "sha256-+gsLaRbZBueYif1UC90Ig6gPYTR3OIn7SAoiROg+CQA="; - types-aiobotocore-panorama = - buildTypesAiobotocorePackage "panorama" "2.13.0" - "sha256-POEZh26xXi3VJWuGaWjf4r8XHL9RKdrEkpb3gqAWWOQ="; + types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.13.1" + "sha256-mCpsk5JMKBf44kTImSSK7tUd+VOXRDAwsT3DdOAoW2U="; types-aiobotocore-payment-cryptography = - buildTypesAiobotocorePackage "payment-cryptography" "2.13.0" - "sha256-3X8YP4T3ZhW4QG9eUZDK/YEH4GrqsjlYKcajkx3EwrQ="; + buildTypesAiobotocorePackage "payment-cryptography" "2.13.1" + "sha256-JnT1V2QCppuYsl8s2UHGHSowVWubTLj54sgV3/D3JkY="; types-aiobotocore-payment-cryptography-data = - buildTypesAiobotocorePackage "payment-cryptography-data" "2.13.0" - "sha256-jk2OPWSuPMSU5N4dGhEKacjcker9fWnvKqFAB0CR71o="; + buildTypesAiobotocorePackage "payment-cryptography-data" "2.13.1" + "sha256-tTib8+P2WYf02iYlek/yp0miVOa1aIhEG2+vHeB1gik="; types-aiobotocore-personalize = - buildTypesAiobotocorePackage "personalize" "2.13.0" - "sha256-ev7xOsnF0HscpYbp8P4tcHCs9NepHHWU0LCetScAlx0="; + buildTypesAiobotocorePackage "personalize" "2.13.1" + "sha256-uNKKj6WvtZStJJhsetQhvPIMpLHrnlEyO+JYYIztNnc="; types-aiobotocore-personalize-events = - buildTypesAiobotocorePackage "personalize-events" "2.13.0" - "sha256-l3p0VtDiGp8FyXjDjSgiX2IjvLizx9kkv3EvJEIFNBI="; + buildTypesAiobotocorePackage "personalize-events" "2.13.1" + "sha256-8M6LEacfNmx7o5wCInAKhwzABh8EJ0yQovDsE5cuJFo="; types-aiobotocore-personalize-runtime = - buildTypesAiobotocorePackage "personalize-runtime" "2.13.0" - "sha256-f79eCbB0RFbcNbmPFWpT830y+42QXb5+dM1WTab9cP0="; + buildTypesAiobotocorePackage "personalize-runtime" "2.13.1" + "sha256-AxfHzSWpYq0bz3VXJ+8z0b8K55dTGGzs09S83tPYLEw="; - types-aiobotocore-pi = - buildTypesAiobotocorePackage "pi" "2.13.0" - "sha256-DzpcGn4lfHbUysUx2S2mcSOOTJJhYS0soEFDapYADkE="; + types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.13.1" + "sha256-N6aLsYFKnrACA/ia6EjiBxQXhp7Pi2TcUUfTaGukoOc="; - types-aiobotocore-pinpoint = - buildTypesAiobotocorePackage "pinpoint" "2.13.0" - "sha256-9CUdzl8WKlgOZK6ovzTT7Kjt9/RuUiER0LAR/T1Su1Q="; + types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.13.1" + "sha256-w3Z9eEu6Ty+yOxvKDyLfwqT7hZLEh7szwXX2ciHYYoY="; types-aiobotocore-pinpoint-email = - buildTypesAiobotocorePackage "pinpoint-email" "2.13.0" - "sha256-57zdAVy4B/Xvr2g81zB4z7pkvrQgcCPq+AhV305OS1Y="; + buildTypesAiobotocorePackage "pinpoint-email" "2.13.1" + "sha256-KnfpYd7H1e4ftRz8KubCVTqtjASurWkK2Qxfpq2z6hU="; types-aiobotocore-pinpoint-sms-voice = - buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.13.0" - "sha256-E6p9sQx8+NPVMXMxD8c1UdZrHYH4Qd0A80JHGFhA7ss="; + buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.13.1" + "sha256-yXiitAUhSJXi4sx/EgKfa3kZ/RWgVnAuA6ieZ2Z1w7Q="; types-aiobotocore-pinpoint-sms-voice-v2 = - buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.13.0" - "sha256-aXh055/gbJJCyG5QVXpIKqw+coxVBGmhw2VPdvZnBik="; + buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.13.1" + "sha256-kaQJUyXlPVDTa7ay30X+MCCexF2ZHYodsgI5Bp1J16g="; - types-aiobotocore-pipes = - buildTypesAiobotocorePackage "pipes" "2.13.0" - "sha256-c42b0kDLfRBE+lJ7r/GUqYqj7Dl/z0aUbpg4y2XEoAU="; + types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.13.1" + "sha256-4BUUZPTbKpbWMCUNH3Mamg0rREiiHt2qic+XVHDKq+4="; - types-aiobotocore-polly = - buildTypesAiobotocorePackage "polly" "2.13.0" - "sha256-be+Ul5pZYU3EuBoSriRHdOECu+8FcIBu/hHsBtMSrCM="; + types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.13.1" + "sha256-jve+PnNP4cmyBWeSxM6G349DbymY7kCE1sfbpDjDTGM="; - types-aiobotocore-pricing = - buildTypesAiobotocorePackage "pricing" "2.13.0" - "sha256-6nulrxv3q74k1Mld1/JtGFx+EQCDuFecxskw1aZvZ3M="; + types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.13.1" + "sha256-gT+aYlKxQm0sXB1iPC59x7rzNmHk9V/CJokpKtmnHaE="; types-aiobotocore-privatenetworks = - buildTypesAiobotocorePackage "privatenetworks" "2.13.0" - "sha256-dB0R/ZUIIgEyWmlvbrFxh53C3Xq92EGrObd/FiQJlOU="; + buildTypesAiobotocorePackage "privatenetworks" "2.13.1" + "sha256-xvb+RgzOJFN35as+bWNFf5WvYRpbr+qmhLQHV15aUQI="; - types-aiobotocore-proton = - buildTypesAiobotocorePackage "proton" "2.13.0" - "sha256-Urwvd8q8FOwhYhl1oi8onuP3r1Qu3V7kCgfH7mN5t8g="; + types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.13.1" + "sha256-zxAn9a/jagk+QDoAtTqw+0E/qGPAHSrWGJzDIwE4mz4="; - types-aiobotocore-qldb = - buildTypesAiobotocorePackage "qldb" "2.13.0" - "sha256-36D0kXk4qitMvkA7If8bZUUdnntEkXFeg2txUzjFzJc="; + types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.13.1" + "sha256-NQcylhXkGqADCiagW4KNL5PEeGB0dT+ggRjPQSfpyQY="; types-aiobotocore-qldb-session = - buildTypesAiobotocorePackage "qldb-session" "2.13.0" - "sha256-39psT/kzcSLJqP3Wy08GBZ9/4guzw/x+ndbNYuLP1ns="; + buildTypesAiobotocorePackage "qldb-session" "2.13.1" + "sha256-SAkisanmZM1N2XnKE5quH6HkMugkggEjQbJ1+kq9MGQ="; types-aiobotocore-quicksight = - buildTypesAiobotocorePackage "quicksight" "2.13.0" - "sha256-15z6hK1P9LREE8ehE+SzTR6BZqUzkFLjw/x3UGuRNAw="; + buildTypesAiobotocorePackage "quicksight" "2.13.1" + "sha256-YOz+MKPoF+NoicK1bbVyNePbvuk4IsauXofTtA7jzhA="; - types-aiobotocore-ram = - buildTypesAiobotocorePackage "ram" "2.13.0" - "sha256-LlVfeu1m0FROsfyWrLcZRFU0cZivHfuLIZNbpLhXvuU="; + types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.13.1" + "sha256-TOxkThUwnulFpdyMFeZB2SjmY0fMDSLkVh15zDEhuLw="; - types-aiobotocore-rbin = - buildTypesAiobotocorePackage "rbin" "2.13.0" - "sha256-AdwPPoUy7jnSTdnAR1w2m9b+txQagRaBUWr8/TOuTjU="; + types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.13.1" + "sha256-LVYmvDjYKBHumG3jjk1NrDSwhZXF/+9QCbKA62lAodU="; - types-aiobotocore-rds = - buildTypesAiobotocorePackage "rds" "2.13.0" - "sha256-tq4SeOB2pAsw7p+zHp7l3A9rkCu8Gx9/shuYA0W3gbY="; + types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.13.1" + "sha256-RnEkNwOuI6m0ySLqL8pUzy2DeLsjYfN5EdtlPA7nQBw="; - types-aiobotocore-rds-data = - buildTypesAiobotocorePackage "rds-data" "2.13.0" - "sha256-n8y+lLePLNr0OQG8V0orUolAk25T9+zjOESwL7hzx0U="; + types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.13.1" + "sha256-PU2usWylU13a3I/GBmymLqt2ViDvMacfS++cPnhwxKo="; - types-aiobotocore-redshift = - buildTypesAiobotocorePackage "redshift" "2.13.0" - "sha256-6wjuDJGyF08s0iVFiz/ZemBxz76ZMiMBO+JBGcBhUL0="; + types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.13.1" + "sha256-CXWyK8HJZx3YIBID2vy0xB8kjnOBONij8fWlCuYVZHg="; types-aiobotocore-redshift-data = - buildTypesAiobotocorePackage "redshift-data" "2.13.0" - "sha256-YRCKvcxvjYvLjvh5s02A9EihxBqTsGMDgByhqbFhlmY="; + buildTypesAiobotocorePackage "redshift-data" "2.13.1" + "sha256-u3ghdTZxEWdjhQVmdv5a/7XUNQcG7NByxzllB4oD89U="; types-aiobotocore-redshift-serverless = - buildTypesAiobotocorePackage "redshift-serverless" "2.13.0" - "sha256-w3xyGATAH0dku7XD4qBR8x4YW9n1lBkxCm45b6oZYw4="; + buildTypesAiobotocorePackage "redshift-serverless" "2.13.1" + "sha256-jMnGJ2mri3hzQnOGigTejZVSuElPpacPiTJLp81M148="; types-aiobotocore-rekognition = - buildTypesAiobotocorePackage "rekognition" "2.13.0" - "sha256-c/74cWPIFaFqZO2/KwuBFzDRFXUN6mGEU4+dhlmZL2c="; + buildTypesAiobotocorePackage "rekognition" "2.13.1" + "sha256-eQJWy1kiCd6Ke/vKMVdNDvPitw4rqVtMvmhYPqcZXpA="; types-aiobotocore-resiliencehub = - buildTypesAiobotocorePackage "resiliencehub" "2.13.0" - "sha256-KWIljOtiUP4vnED4jhtEK+o8KkNd5144rHrGGOFEzSo="; + buildTypesAiobotocorePackage "resiliencehub" "2.13.1" + "sha256-09BtkNGhgwjuMaIpc/O+oMQT23mJ+uXrYojcMTt8HYg="; types-aiobotocore-resource-explorer-2 = - buildTypesAiobotocorePackage "resource-explorer-2" "2.13.0" - "sha256-7TABg31imqlKbOpfhHfEsvBWiuSvXFQXBV5sy4Vypdw="; + buildTypesAiobotocorePackage "resource-explorer-2" "2.13.1" + "sha256-ujnFPsH+IR+XUr2LMRpGw+Ej9ASQjXDJH3nUYN31OHc="; types-aiobotocore-resource-groups = - buildTypesAiobotocorePackage "resource-groups" "2.13.0" - "sha256-n94mli/2Ugq3wfsB7nY6xMG/w4mPnpna7nzKd8tuH9s="; + buildTypesAiobotocorePackage "resource-groups" "2.13.1" + "sha256-IV05dhVccTKTINbgZevIWBX/4BSlTs6UoQaz/sNttCY="; types-aiobotocore-resourcegroupstaggingapi = - buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.13.0" - "sha256-TUX08CfZ+ts1c8nnUVQTXueX7A6Kv/+8gVxvIs/r1vs="; + buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.13.1" + "sha256-j67iuVzyZq6Ps14uQV100KVuHgJ4bW6bE3pDVktDVUU="; types-aiobotocore-robomaker = - buildTypesAiobotocorePackage "robomaker" "2.13.0" - "sha256-Rkys6ilXRFonXAt/w97LYfBbqASrs9pLiB79wgzIXxk="; + buildTypesAiobotocorePackage "robomaker" "2.13.1" + "sha256-zc1mEMFn0FcjxMjvRib8UrUMUX1Jp2bAN7+qeOsPe7o="; types-aiobotocore-rolesanywhere = - buildTypesAiobotocorePackage "rolesanywhere" "2.13.0" - "sha256-nN6qqN6uhy0NvrubHlYjLurHZxbKqmdMMBS3GM0wcXQ="; + buildTypesAiobotocorePackage "rolesanywhere" "2.13.1" + "sha256-98F7KmVtYoS4LK7q8J29PYBAXTTz1Uaac4mBkqflYt0="; - types-aiobotocore-route53 = - buildTypesAiobotocorePackage "route53" "2.13.0" - "sha256-CCG6vttkC1uj7gxRxO7xFnd35gAfhhLm5Dj7VVeJEHc="; + types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.13.1" + "sha256-s9UDZkNyY52aQZS0MNV9g1GMJBGaGNozRLx15Jmuhps="; types-aiobotocore-route53-recovery-cluster = - buildTypesAiobotocorePackage "route53-recovery-cluster" "2.13.0" - "sha256-CQUSDYfeW4Esvi3gTae4xaYZTA6ylPriWV81S6+NeNQ="; + buildTypesAiobotocorePackage "route53-recovery-cluster" "2.13.1" + "sha256-mFpBl/GVTFOkU7YkrfIVUfzWhhgetmI6UkRj66LeDzg="; types-aiobotocore-route53-recovery-control-config = - buildTypesAiobotocorePackage "route53-recovery-control-config" "2.13.0" - "sha256-8chbPLryP96xhv2Y6mPLYnAmUp7tz1KL14EB9OED3aA="; + buildTypesAiobotocorePackage "route53-recovery-control-config" "2.13.1" + "sha256-awmCwODj+26VDh05ObLDIsqWCARBMJxR9ug/GLBWnWA="; types-aiobotocore-route53-recovery-readiness = - buildTypesAiobotocorePackage "route53-recovery-readiness" "2.13.0" - "sha256-gaFNIBWhLBXgSdvrztz702QROQbkwd0+VTAjV0zme2Q="; + buildTypesAiobotocorePackage "route53-recovery-readiness" "2.13.1" + "sha256-3lCdo3P9ma3lmJgHdhBE9M117NUjDecGCACj7hQB3e0="; types-aiobotocore-route53domains = - buildTypesAiobotocorePackage "route53domains" "2.13.0" - "sha256-JvPF9T7h4Vz/9lXQ+JZr+NtmUHj2JTcpdUPq1hH9Z0Y="; + buildTypesAiobotocorePackage "route53domains" "2.13.1" + "sha256-cgqvHKBkj/spPFVTL19oWRiYubLDmtspXBek8JN7Xig="; types-aiobotocore-route53resolver = - buildTypesAiobotocorePackage "route53resolver" "2.13.0" - "sha256-cnyN8S4V+wdlhqhWLwOBlsZxL7LEXy/hPI14+xwCP1o="; + buildTypesAiobotocorePackage "route53resolver" "2.13.1" + "sha256-2zHZi66843jrAwXotc59HHbY160whGKMpiUCpo589Qg="; - types-aiobotocore-rum = - buildTypesAiobotocorePackage "rum" "2.13.0" - "sha256-xEkOqe5WtYJArHH7MIluw/ANTxo2/Yrh4XZoFW12fAM="; + types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.13.1" + "sha256-rFmOs1OOYWF1+vUIsuaZ9VcqYVNVPFZgKKBwpkedi50="; - types-aiobotocore-s3 = - buildTypesAiobotocorePackage "s3" "2.13.0" - "sha256-ENUvZw4nCFffkH2VCfTKg2gzvATLXqh+SbXdPdowJbI="; + types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.13.1" + "sha256-YUnUEu+lR236JG98JscIVjdHEaSiIRkDpbiCbh/6XUY="; types-aiobotocore-s3control = - buildTypesAiobotocorePackage "s3control" "2.13.0" - "sha256-55qykWmSOXfwrZuLq6xgyPSLp+fW1k4sOm9Az8SPAls="; + buildTypesAiobotocorePackage "s3control" "2.13.1" + "sha256-Sqrr0hJgjPEUjkuatFhREo1u5Nm5dW9Qi+tZXKexvK4="; types-aiobotocore-s3outposts = - buildTypesAiobotocorePackage "s3outposts" "2.13.0" - "sha256-ZGWo0IqJls/dZp0nHCjL7kxHoqHThm0IrNH81ecaHiA="; + buildTypesAiobotocorePackage "s3outposts" "2.13.1" + "sha256-rTQbNJbMUyP06qm+LTTZ/ivPxnyEu84vNGNR3fo61u8="; types-aiobotocore-sagemaker = - buildTypesAiobotocorePackage "sagemaker" "2.13.0" - "sha256-UEmw6ehUWFpNECvB5fg9hy4MzsSUYbypb+NPwshH97I="; + buildTypesAiobotocorePackage "sagemaker" "2.13.1" + "sha256-6jnWrBqSQdp/GaCxNh7FjIEJbcNiBNik8cxgVr9kPEA="; types-aiobotocore-sagemaker-a2i-runtime = - buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.13.0" - "sha256-0gSeq5TGWisG+7juOwMikhMcZRyVj1K996sHUuQJhJg="; + buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.13.1" + "sha256-73hItZdNaqCpN6M6IOfN8YFVbPBGwv3D5VkmWxgr650="; types-aiobotocore-sagemaker-edge = - buildTypesAiobotocorePackage "sagemaker-edge" "2.13.0" - "sha256-BhDbkVmqNNw3thOA7dDBf2wsGsOYnT5jsgXvMiQlSp4="; + buildTypesAiobotocorePackage "sagemaker-edge" "2.13.1" + "sha256-2GE6RCGoc1loaJ5rJfNCj+BRtZqLTLe9csSCA5jHIB4="; types-aiobotocore-sagemaker-featurestore-runtime = - buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.13.0" - "sha256-bPXKu5HDDvU9wPb5Av6n2C1sszO1zAfC395oC1x11yA="; + buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.13.1" + "sha256-S/Hof7uG0BMFmPVVviUkMBEbpV8QjXbsbpfpIz7BSUw="; types-aiobotocore-sagemaker-geospatial = - buildTypesAiobotocorePackage "sagemaker-geospatial" "2.13.0" - "sha256-1mXX7egH6VDSUPnxmSAeBUm4tqh9CS+tDjdu+j/tPWo="; + buildTypesAiobotocorePackage "sagemaker-geospatial" "2.13.1" + "sha256-2WWplzOpmcjwhOkmrjX1a80IlCwsA5tfla9jqS+9zPM="; types-aiobotocore-sagemaker-metrics = - buildTypesAiobotocorePackage "sagemaker-metrics" "2.13.0" - "sha256-wt0NAOC+pb6XTD59ZNLksByX4FwAmrQ2HErj15FUA2E="; + buildTypesAiobotocorePackage "sagemaker-metrics" "2.13.1" + "sha256-PHF1mdrFHGQTopPgPvEl+cekfs5eCuUbcPRHW5U2aCU="; types-aiobotocore-sagemaker-runtime = - buildTypesAiobotocorePackage "sagemaker-runtime" "2.13.0" - "sha256-csZFZFJwaxrWFmhzQjdw7DHfTxdfEt41GUh2OQ52wkg="; + buildTypesAiobotocorePackage "sagemaker-runtime" "2.13.1" + "sha256-hPHBgjvUsCY+eSRkpGzEwLkJ+jrn+cen6r9b7PtNgBc="; types-aiobotocore-savingsplans = - buildTypesAiobotocorePackage "savingsplans" "2.13.0" - "sha256-WAPagWtRhqsmwrCXGNTai/uargonI8p9PMx6ER3gUus="; + buildTypesAiobotocorePackage "savingsplans" "2.13.1" + "sha256-3YmkCihwnizc15LPScXdvJ2aDQn10ZbQ7Fqvy4OMDlY="; types-aiobotocore-scheduler = - buildTypesAiobotocorePackage "scheduler" "2.13.0" - "sha256-AjAj8QHxU0aOqWMt98M+Qe5v6Dc72ftWuaQ7omTlkRg="; + buildTypesAiobotocorePackage "scheduler" "2.13.1" + "sha256-qHeotLVmL5kJZXA+moqVgxbDg4WyF3MJ/bxX6l7ypcM="; - types-aiobotocore-schemas = - buildTypesAiobotocorePackage "schemas" "2.13.0" - "sha256-liVnb5YGMACt8P3NXYudpY8Ai5bVqZuv3Q0/WNrLCHg="; + types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.13.1" + "sha256-vJg4UFhLHg5464oB9cXl2Ls/rVDg5BQ82CYtTEzpcyA="; - types-aiobotocore-sdb = - buildTypesAiobotocorePackage "sdb" "2.13.0" - "sha256-Yl/GGw/5EUPuIsPUbrG+g1icYqlewsFLwFdvUCnrT4E="; + types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.13.1" + "sha256-eb/6qwofizpmfQdYDRdbu4MAMdsXJk+e8Aoo9zhWDFc="; types-aiobotocore-secretsmanager = - buildTypesAiobotocorePackage "secretsmanager" "2.13.0" - "sha256-v0mr8Z2VMpMzPVbnxCoGJ4Oc2Az2QI3Emnci4UMe6sc="; + buildTypesAiobotocorePackage "secretsmanager" "2.13.1" + "sha256-ydSlw+KitEn8QaGz0NnYljZGX7uYspum136Qvu8PGVs="; types-aiobotocore-securityhub = - buildTypesAiobotocorePackage "securityhub" "2.13.0" - "sha256-lwsfWc2pkCpsX84z1CfwbWjORqwv+ULpe96Gl4063Fk="; + buildTypesAiobotocorePackage "securityhub" "2.13.1" + "sha256-Pc8hF8ZDrVD2Wb/MMf99nRx5FpfzBHPyvIg2NaRAnH4="; types-aiobotocore-securitylake = - buildTypesAiobotocorePackage "securitylake" "2.13.0" - "sha256-viS9OU1nyW8tk4c0G4oWh48APJf39s/P2Vqo2iLJXbg="; + buildTypesAiobotocorePackage "securitylake" "2.13.1" + "sha256-yM+H0NFlqfkTJAJfr+SZ5shdUMSCWubeg3dwmQjFNxQ="; types-aiobotocore-serverlessrepo = - buildTypesAiobotocorePackage "serverlessrepo" "2.13.0" - "sha256-09grClFgCl+HJX5jmttq7y1HRDuBIn0z16dHO4iRmB4="; + buildTypesAiobotocorePackage "serverlessrepo" "2.13.1" + "sha256-dXPQTeu3zEtimgdXFJ1KLQTvRxfCXiYabLhl0YpmJjk="; types-aiobotocore-service-quotas = - buildTypesAiobotocorePackage "service-quotas" "2.13.0" - "sha256-IKxnbv5AnPFS2MnkruYX3BsQTwrj/dnWhDURTD1/rcU="; + buildTypesAiobotocorePackage "service-quotas" "2.13.1" + "sha256-fVGD8IxKwrtxqBYz3yZjxgoy7NXcDYBpqP5Gp7+0rKg="; types-aiobotocore-servicecatalog = - buildTypesAiobotocorePackage "servicecatalog" "2.13.0" - "sha256-VhxY09Y/GdngzaNQClwDBxrIsxGGUPnUfhnIEmoFa08="; + buildTypesAiobotocorePackage "servicecatalog" "2.13.1" + "sha256-d2PU9AWighlEsgWRzC3Jdzq9oL0GTTCfcRaqQZL85oQ="; types-aiobotocore-servicecatalog-appregistry = - buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.13.0" - "sha256-TCuTVU3ibRuJxqo0YofFDHkKhsqPErqdSIEks1lFGxE="; + buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.13.1" + "sha256-O2SbST9ZOtEc0eANm/D5PakAazJBAmBO8wPeCACRMQQ="; types-aiobotocore-servicediscovery = - buildTypesAiobotocorePackage "servicediscovery" "2.13.0" - "sha256-22jlffIHiNjCGc7Vfz5HhLPrquy/3qTB2MRtjOvKHkk="; + buildTypesAiobotocorePackage "servicediscovery" "2.13.1" + "sha256-cwkclyVKSsjJEUkW+qadtx/1P953xRntntpVhjGGW6U="; - types-aiobotocore-ses = - buildTypesAiobotocorePackage "ses" "2.13.0" - "sha256-4pjWdJ2/5iUM6YOs8lhApi0zDFnsrt9Nja3W59sNZpw="; + types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.13.1" + "sha256-/UJ3+qbExc59yTEfPl5hQl8ti5QDedOmZnZ5QD8+BI8="; - types-aiobotocore-sesv2 = - buildTypesAiobotocorePackage "sesv2" "2.13.0" - "sha256-Cfmcdmx6SjcL+26o1T6yyC/KDYBx/B0jn4wYZizWTuw="; + types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.13.1" + "sha256-GTHNhwOyBApeddCI4lqTHvPUzkzrnnydXudUrUww+GA="; - types-aiobotocore-shield = - buildTypesAiobotocorePackage "shield" "2.13.0" - "sha256-7fo5XF4RMTKWHqDknStr/3T++TCDJvkxXGTw8l2y3n8="; + types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.13.1" + "sha256-gOdnwTbWVK1KYshuFN+Cic4fqC4sdphYbKG+GTuSDw8="; - types-aiobotocore-signer = - buildTypesAiobotocorePackage "signer" "2.13.0" - "sha256-Z7q+pNHlTSyagYUkCIQwsOgNousT7s7VnNEyGqi9LqM="; + types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.13.1" + "sha256-q0PCBQsNMamebAlxydinILcH6xE4ZCSB37nItUoY5fY="; types-aiobotocore-simspaceweaver = - buildTypesAiobotocorePackage "simspaceweaver" "2.13.0" - "sha256-+0aYuQO2nN1nyNFwSL1Fh/CWfLWkb7tu2ZAPtwG5vxw="; + buildTypesAiobotocorePackage "simspaceweaver" "2.13.1" + "sha256-bwDH6nst28rVEYlMFs6UlcyhpAnZdsoZYzlSu6qulKA="; - types-aiobotocore-sms = - buildTypesAiobotocorePackage "sms" "2.13.0" - "sha256-K+l4X7/2e4iv1kip9iPZUj22/HsJhhQGZ0H7rUHg/5g="; + types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.13.1" + "sha256-HqNKZ6DGH+Wdho2bTfNeq72OEs1UzylNPu+nbyf3jd0="; types-aiobotocore-sms-voice = - buildTypesAiobotocorePackage "sms-voice" "2.13.0" - "sha256-6j+YcV4oEB5rZ6k2+Jlzn0irZCd5f1tIIASjKFNkMx4="; + buildTypesAiobotocorePackage "sms-voice" "2.13.1" + "sha256-lC4YEVdgp6ZLjVkwygsi7dUsX9vZ1L/fqbk1EpX/DmE="; types-aiobotocore-snow-device-management = - buildTypesAiobotocorePackage "snow-device-management" "2.13.0" - "sha256-gWuBHbxl8UkEUL2FQ/Gfb1rKmFNHrON72Bo1lxRbwYU="; + buildTypesAiobotocorePackage "snow-device-management" "2.13.1" + "sha256-yniuI6Hgp8XTmRjO74MZRxZYV0ohEE7CAtahIYQz6cg="; - types-aiobotocore-snowball = - buildTypesAiobotocorePackage "snowball" "2.13.0" - "sha256-gpaamDvztO5syi72/O721Li1YUmjnWbsT2fxTi8TfKQ="; + types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.13.1" + "sha256-bKjZGXIWbCFIo7SyLueX8gj9WWjx7nh2P4DArfsMcFI="; - types-aiobotocore-sns = - buildTypesAiobotocorePackage "sns" "2.13.0" - "sha256-39J795V0hlag4UXJPL95hwp/nvYsRKrrFfCA/DSh4Dk="; + types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.13.1" + "sha256-VvbiWdwlApbJcRlAoFzZOG4SekaP7mJVbJCpoF+E6Tk="; - types-aiobotocore-sqs = - buildTypesAiobotocorePackage "sqs" "2.13.0" - "sha256-/rlkm98WGctndpPkt1ffkeK1+EVBecwouhTK2ycdenU="; + types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.13.1" + "sha256-pVRELwjlkLApPYUV+f6ax/ijc7N6C3nsqPBeGisB0HY="; - types-aiobotocore-ssm = - buildTypesAiobotocorePackage "ssm" "2.13.0" - "sha256-Mw6f1xt421x+gA/pmhD9XXDMAIKsDG/oN8/wBVnaRxw="; + types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.13.1" + "sha256-bdeTdx6+Pde+hFzqH5Bn4Jk/4fFe68ihYDCXmpbR44w="; types-aiobotocore-ssm-contacts = - buildTypesAiobotocorePackage "ssm-contacts" "2.13.0" - "sha256-lSwXwyKhLxHwAV8Qdkq0IlDg6UnhlBBjFJthHjSv4TY="; + buildTypesAiobotocorePackage "ssm-contacts" "2.13.1" + "sha256-lJvrcgICIvcGbwPuYlJ4oT3iceItzkOEnSqdJtJB86E="; types-aiobotocore-ssm-incidents = - buildTypesAiobotocorePackage "ssm-incidents" "2.13.0" - "sha256-O4f9e6TkSssRfRW1DWRabocBjElEPyZNbZQwKiGtEmM="; + buildTypesAiobotocorePackage "ssm-incidents" "2.13.1" + "sha256-mpDPfMZqKQV1PYrK5MqNZK/z9x0ObIiZbScpPSZFb1A="; - types-aiobotocore-ssm-sap = - buildTypesAiobotocorePackage "ssm-sap" "2.13.0" - "sha256-m9FxXdOGc4VrM552FB1QIpLnX0dIT+wcK7zWyXLqCm4="; + types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.13.1" + "sha256-mFpwV41A5WDkzxSeKxGnw+NjByPH2M40ShgcNCDw+jM="; - types-aiobotocore-sso = - buildTypesAiobotocorePackage "sso" "2.13.0" - "sha256-biwuRY/iWsjeX61+TXeFmiUbxjPpCuSCrFXXcvwQFW4="; + types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.13.1" + "sha256-DIKi/0zz0O66P+CvgrLZRZ8NvqB0N4zlmIcF8DR5fvg="; types-aiobotocore-sso-admin = - buildTypesAiobotocorePackage "sso-admin" "2.13.0" - "sha256-8K0aNHqTSthROSsUNjoUqeqlkW5ieJx5tjngkNZ+aPY="; + buildTypesAiobotocorePackage "sso-admin" "2.13.1" + "sha256-WO6KbaKvmijEaWCKPbEusudo4vHpJCcSX3aJ6zxWFG0="; - types-aiobotocore-sso-oidc = - buildTypesAiobotocorePackage "sso-oidc" "2.13.0" - "sha256-cHmk1b0IOwKUKq+QWj6BtkVj1sUI2goELu+uOG1WSX4="; + types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.13.1" + "sha256-YriIVUyOpoC6Ry6F28yNRDuH3gwoYishq4TqUgW3CU4="; types-aiobotocore-stepfunctions = - buildTypesAiobotocorePackage "stepfunctions" "2.13.0" - "sha256-MFlLufnrOZuVEz0X4saMIZ6NOmoOZz4ErhGu2qmIU+M="; + buildTypesAiobotocorePackage "stepfunctions" "2.13.1" + "sha256-HijHsOB9bT5ESGdkwS8m3ulkPef8TLsJclAdum8aWCk="; types-aiobotocore-storagegateway = - buildTypesAiobotocorePackage "storagegateway" "2.13.0" - "sha256-NQpTnbyABcbdDOiqNowjyp8eE1FHiiNBP3WfzQuvIWU="; + buildTypesAiobotocorePackage "storagegateway" "2.13.1" + "sha256-KETzBkIcOB8pWBYIzFzIYh2/Y7dc0TGBU6tRQFzGBhQ="; - types-aiobotocore-sts = - buildTypesAiobotocorePackage "sts" "2.13.0" - "sha256-l6LidYUiTrHzuCLlLAU+8XHHpMjy6csClPvGOf7o8Zk="; + types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.13.1" + "sha256-mUp9bdMDsAPqnFmDjfCusId6N2L/oqVgDK3jZjO29s8="; - types-aiobotocore-support = - buildTypesAiobotocorePackage "support" "2.13.0" - "sha256-6Y2NJj3bs88agfiUEzMgl/1Zkci45hoVtNIClzcar/Q="; + types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.13.1" + "sha256-0qjcW4bo4LRYtsNde3ft34sjLEDZkvEOhWOQ9T283fM="; types-aiobotocore-support-app = - buildTypesAiobotocorePackage "support-app" "2.13.0" - "sha256-awkyq4V50G0l5epg1BFD54kMXEYrHe8iso8zlrobvF8="; + buildTypesAiobotocorePackage "support-app" "2.13.1" + "sha256-OvZuJ4yU5el/xSLLJu2ZY94wiHXCtirBeykiHCVsb78="; - types-aiobotocore-swf = - buildTypesAiobotocorePackage "swf" "2.13.0" - "sha256-CIAMqHhr0E0SFz9IyS2fOn/44Xi8oo0WPvVKNsByTfo="; + types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.13.1" + "sha256-sG4tBgtIZ5Gxhg9kWQ/p852XplThz6C46Ck1GsKWWnw="; types-aiobotocore-synthetics = - buildTypesAiobotocorePackage "synthetics" "2.13.0" - "sha256-1jMVFO/QbT+hh+jYt42E9DWV4uIoamdG5NjqdkOqovI="; + buildTypesAiobotocorePackage "synthetics" "2.13.1" + "sha256-ps6hwRhG5iofY95IV0oigJg32AxLJ4SVHN6vrJQ2x6s="; - types-aiobotocore-textract = - buildTypesAiobotocorePackage "textract" "2.13.0" - "sha256-qqgWwtB+7ZvjfQP5JOUrszNtZTDXf44Lb2jrnpQAxmM="; + types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.13.1" + "sha256-L2Cc0AT30rVvRFXg3ESH1g03Ay4lAlQHymG5S9Kr9fc="; types-aiobotocore-timestream-query = - buildTypesAiobotocorePackage "timestream-query" "2.13.0" - "sha256-9FxDlKjBAlhb+Nu1d3A8AGyvaFXk6ejQI2b7f47SguQ="; + buildTypesAiobotocorePackage "timestream-query" "2.13.1" + "sha256-is97L08grAhe1l3SKOudv+X08Bn91j5XDc4MJDnM8iI="; types-aiobotocore-timestream-write = - buildTypesAiobotocorePackage "timestream-write" "2.13.0" - "sha256-yrloTL8MYnHkeVEF2Bp8i2QQ3Yh0IRGiY/VGih41lJQ="; + buildTypesAiobotocorePackage "timestream-write" "2.13.1" + "sha256-hA3oQKMzs4A6JOgZ0LJy1lBWLseeJh6Phh+T9sEaBss="; - types-aiobotocore-tnb = - buildTypesAiobotocorePackage "tnb" "2.13.0" - "sha256-Ln5KwCFTs+7T/ONaVj9TeBmSxsOCxXdUokiCa83ozzg="; + types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.13.1" + "sha256-bZy4/BTpRQ432zzSpJYpxva8204wVuCn2vKXNG8lXRg="; types-aiobotocore-transcribe = - buildTypesAiobotocorePackage "transcribe" "2.13.0" - "sha256-IFlZRCvhK1vZSB4uHwPa1CP678E8UboL4geqHHivrg4="; + buildTypesAiobotocorePackage "transcribe" "2.13.1" + "sha256-vjVVzDiImqPgP2HEsOQYzpU4LXNAzpIyO1qgAoit2tQ="; - types-aiobotocore-transfer = - buildTypesAiobotocorePackage "transfer" "2.13.0" - "sha256-IouagvvqSdfFQ5ZryCukEBXSryTHxT34z4aQu4vG/E4="; + types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.13.1" + "sha256-WB9TqJahHVmhrOUqJ/cj2zh/eqzVmqzXdX3+0V2PXqk="; types-aiobotocore-translate = - buildTypesAiobotocorePackage "translate" "2.13.0" - "sha256-Th2TUSe1gS/hvUEP8UOx3Yxyse7JEtccznZB4TSDlxQ="; + buildTypesAiobotocorePackage "translate" "2.13.1" + "sha256-IAi/rWYer5DV2QJO4NeS6THQ+dAwR0+EvjsPeIlBgdQ="; types-aiobotocore-verifiedpermissions = - buildTypesAiobotocorePackage "verifiedpermissions" "2.13.0" - "sha256-rgjP4mUyhAa8hqnsR+EkNHY4U58Vd90xOcj/WZT3Q1E="; + buildTypesAiobotocorePackage "verifiedpermissions" "2.13.1" + "sha256-XUuwg1HtJ46K3AhRx4l74x6mVfJxyTv7R1gCgeapHOk="; - types-aiobotocore-voice-id = - buildTypesAiobotocorePackage "voice-id" "2.13.0" - "sha256-4ECIbOcUc7DlARzgd+mE0bFr8QDVrpW2ZmMWiFDmIu0="; + types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.13.1" + "sha256-RKJA0GBvEQtZV1fx2W26fF2QCkh0BlEh1FNwuS6hxxo="; types-aiobotocore-vpc-lattice = - buildTypesAiobotocorePackage "vpc-lattice" "2.13.0" - "sha256-H4kG7rpxijqag14yZmNYmSxdSkRcAQw3tD/EVglkMJc="; + buildTypesAiobotocorePackage "vpc-lattice" "2.13.1" + "sha256-bh1qQDmivNGTgQOBxJXlCK4Onmr13d7z9qpdIMjuaH4="; - types-aiobotocore-waf = - buildTypesAiobotocorePackage "waf" "2.13.0" - "sha256-1W4gNPVBvTCSZiC12iymw2LBRwr7i2MlimBStcjinRY="; + types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.13.1" + "sha256-xjqghC+Ul6XFeZSu+tOIe6UCJmAvh5iCZTV6pALk6ls="; types-aiobotocore-waf-regional = - buildTypesAiobotocorePackage "waf-regional" "2.13.0" - "sha256-xRQlOmoSW0w1L/jvS5aUkh3+mwCFMDem4MR8GmXTLDk="; + buildTypesAiobotocorePackage "waf-regional" "2.13.1" + "sha256-07Xbf+aRF1YNjK4MK/dNzmjbyFdTA/Aw/a/XxPLz1mA="; - types-aiobotocore-wafv2 = - buildTypesAiobotocorePackage "wafv2" "2.13.0" - "sha256-AE1njAVbSJZf2Ce5ra6ARUnqOb/FKQpA8mN2TpFiwJ4="; + types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.13.1" + "sha256-H/jRDzPfruygc278Rey4ZlpSqjJjPAxFfbB5Hwx5z34="; types-aiobotocore-wellarchitected = - buildTypesAiobotocorePackage "wellarchitected" "2.13.0" - "sha256-gwk2sUPHH7+k4NcHXMmnSV2lDVZbgZcTJZY8QScoQhY="; + buildTypesAiobotocorePackage "wellarchitected" "2.13.1" + "sha256-/x0aoRNtAdezLG3+8XISYaHhK6jEJDduIHThdbUxfBE="; - types-aiobotocore-wisdom = - buildTypesAiobotocorePackage "wisdom" "2.13.0" - "sha256-kLp8W+KROrwxNC4hgD41EVtjQuw+CPjgbbz2vFec8Us="; + types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.13.1" + "sha256-N86oMUzLeyorE5kOKzdzNZ7xcPTj3RfMUi8Y/COUir8="; - types-aiobotocore-workdocs = - buildTypesAiobotocorePackage "workdocs" "2.13.0" - "sha256-kcFiysNx0GmHJdhgiuAcNWX+WM7p6410oxv11d6nAi8="; + types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.13.1" + "sha256-vze4j28+URgY81Huiv9rLhga+3ZpmZbg9Kok7Kj9Hs0="; - types-aiobotocore-worklink = - buildTypesAiobotocorePackage "worklink" "2.13.0" - "sha256-du7dFEEWnVCZKIOK63SxyakQRXGqqBWUhRPQ7hcsvPo="; + types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.13.1" + "sha256-0GqKRn4wmfqWo2h4bVkBrU8l9rp2l4MEL+mNDzcNk6A="; - types-aiobotocore-workmail = - buildTypesAiobotocorePackage "workmail" "2.13.0" - "sha256-OtL2BuB9ORvHBjbkgTRcnwyt8g5hml/eIR3JZh5XAE0="; + types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.13.1" + "sha256-k0ZNjys7B3Kgh5k71tL8Pe9TfosuMXrjPB8EGk5sHSA="; types-aiobotocore-workmailmessageflow = - buildTypesAiobotocorePackage "workmailmessageflow" "2.13.0" - "sha256-qCxrMdw7XIUfBnpkUP6CuV3qzaJIDGNEHynh38VxH/c="; + buildTypesAiobotocorePackage "workmailmessageflow" "2.13.1" + "sha256-Xs5k6yyCaSdHTCtWw6Xp7LDK5lpIS2oUv3xBavIw+yc="; types-aiobotocore-workspaces = - buildTypesAiobotocorePackage "workspaces" "2.13.0" - "sha256-hP+dRmyRoNOyUXLOtZk92glo80ZJ5RL98++8BWv4dPk="; + buildTypesAiobotocorePackage "workspaces" "2.13.1" + "sha256-DLDVHnrT7OEK3HBd5HOdTx+RQruFOowzVIpg8Sv/wzo="; types-aiobotocore-workspaces-web = - buildTypesAiobotocorePackage "workspaces-web" "2.13.0" - "sha256-no1EEOjNvuRNXlWnOxIQ7ULXyfPzIEAFLfaIDRt4/gg="; + buildTypesAiobotocorePackage "workspaces-web" "2.13.1" + "sha256-JOsQKGy81RNaOebeCph4PXrgngFIva4eHCXQlA8PIko="; - types-aiobotocore-xray = - buildTypesAiobotocorePackage "xray" "2.13.0" - "sha256-Uq7grT2EwFiVvBQNlSFIn00A/gN2Co3DU4fYsW0Bc6U="; + types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.13.1" + "sha256-bxPi1ZV2DOv4Itv/DRoGvop2wHhloj49ovoXBdhWxZY="; } diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index 2ed7a430402c5..f98f653a72783 100755 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update nixfmt curl jq +#!nix-shell -i bash -p nix-update nixfmt-classic curl jq set -eu -o pipefail diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix index ec18f6cbcedb8..78c3cbee88823 100644 --- a/pkgs/development/python-modules/types-appdirs/default.nix +++ b/pkgs/development/python-modules/types-appdirs/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ="; + hash = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ="; }; meta = { - description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs. "; + description = "This is a PEP 561 type stub package for the appdirs package. It can be used by type-checking tools like mypy, pyright, pytype, PyCharm, etc. to check code that uses appdirs."; homepage = "https://pypi.org/project/types-appdirs"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 112c19286a92b..97f9f348d7e27 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.12"; + version = "0.21.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-C+q93gIF3B2meepGT9P5i1cO9PD8glsVWpdPtRsh6Nk="; + hash = "sha256-hKn09CLsUlwxT99Uwjoec+37zsloVglDyi1Bz65iOzg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/types-mock/default.nix b/pkgs/development/python-modules/types-mock/default.nix index dfad6b26d0e47..37b313bc59e95 100644 --- a/pkgs/development/python-modules/types-mock/default.nix +++ b/pkgs/development/python-modules/types-mock/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Type stub package for the mock package"; homepage = "https://pypi.org/project/types-mock"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index e7db25836e8f6..74629872dce73 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "5.26.0.20240422"; + version = "5.27.0.20240626"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-5gdBeBCfl+/p8LIKA1umHXw7A+hn60fSVNKyq2qAXjY="; + hash = "sha256-aDuhQEO63meF4/k3p0mPJDs3iBqRrI2BuSAuz4sZHpw="; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 766f6beebefe8..e850eb837c5b0 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Typing stubs for psutil"; homepage = "https://github.com/python/typeshed"; license = licenses.asl20; - maintainers = with maintainers; [ anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index 8a3f08f8e79a3..2ba7ec577d6d4 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Typing stubs for psycopg2"; homepage = "https://github.com/python/typeshed"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 9fdcd16b0059c..0e2954f895254 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.32.0.20240622"; + version = "2.32.0.20240712"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7V6KQS/MORWdYxk4XACdZChF8lDGOQJxj2Bc2Q+q3jE="; + hash = "sha256-kMB5/wXlSfa/UOAukQIQuYuP8evdGOGchzzSN3N8E1g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index 66c594720ff70..adb56fd0ad826 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -3,8 +3,7 @@ buildPythonPackage, fetchFromGitHub, colorama, - pytest, - pytest-cov, + pytestCheckHook, }: buildPythonPackage { @@ -21,13 +20,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - nativeCheckInputs = [ - pytest - pytest-cov - ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python 2.7 & 3.5+ runtime type-checker"; diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 196c696ff542b..3ed7693ce8874 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "typeshed-client"; - version = "2.5.1"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JelleZijlstra"; repo = "typeshed_client"; rev = "refs/tags/v${version}"; - hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; + hash = "sha256-dEfKZ930Jxa84HUqKpsL2JWQLeeWx6gIMtFHTbiw3Es="; }; build-system = [ setuptools ]; @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/JelleZijlstra/typeshed_client"; changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index 9d0b250f35bc6..41a4b5147fa9a 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Type system library for Python"; homepage = "https://github.com/encode/typesystem"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index 26e01f033fd95..198df9570b688 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Provider of IANA time zone data"; homepage = "https://github.com/python/tzdata"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix index fcd45808087b6..42d4f11a2e71a 100644 --- a/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Micro subset of unicode data files for linkify-it-py"; homepage = "https://github.com/tsutsu3/uc.micro-py"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 62741a5a06c1d..d42a40980629b 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.2.5"; + version = "3.2.7"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PUPk92wugtIZWXP8vq8bJNxqTDhDENKdNhW1kNEcL3E="; + hash = "sha256-fA5It0mr6sjAQECGPOsS//lZJ9OqKelfhdzV770sMHQ="; }; nativeBuildInputs = [ @@ -68,6 +68,6 @@ buildPythonPackage rec { homepage = "https://github.com/googlefonts/ufo2ft"; changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 2cc899002a79f..6eaac11f17f03 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Library to deal with UFO font sources"; homepage = "https://github.com/fonttools/ufoLib2"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 920a211708b1d..48637f4088a0b 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e61110e75a500083f265385b1354b578610f9542e3bbbeedb98a2a6155e4aa6c"; + sha256 = "sha256-TFcVu5SDgfLGQa+CuUk4rSQtm1Nl3RxbfOPXVVaibDo="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 3e2cb60517929..0dc8fea9bc8ad 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Streamlined Cython bindings for the harfbuzz shaping engine"; homepage = "https://github.com/harfbuzz/uharfbuzz"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix index 4fab1494d88b7..c84408b339ed2 100644 --- a/pkgs/development/python-modules/uhi/default.nix +++ b/pkgs/development/python-modules/uhi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; + hash = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 6a93690a5abf3..134e503857def 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "5.2.0"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-VH8b++7C4bLLoZoefc9zd9S7HTkrDiE7Wle3wkwvjoA="; + hash = "sha256-LwG8X1UHsGL7jw4au2Jeo6pcsnRK23rqB5aFBQRTGmI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index b94550bdce50d..129f731b3caee 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Ultra fast JSON encoder and decoder"; homepage = "https://github.com/ultrajson/ultrajson"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 238cc2547a367..8a6f51bded2af 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -17,7 +17,6 @@ scikit-learn, scipy, seaborn, - tbb, tensorflow, tensorflow-probability, tqdm, @@ -93,6 +92,6 @@ buildPythonPackage rec { description = "Uniform Manifold Approximation and Projection"; homepage = "https://github.com/lmcinnes/umap"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/umodbus/default.nix b/pkgs/development/python-modules/umodbus/default.nix index 0ccefecf0d8cc..d45aebe8d0628 100644 --- a/pkgs/development/python-modules/umodbus/default.nix +++ b/pkgs/development/python-modules/umodbus/default.nix @@ -5,7 +5,6 @@ pyserial, pytestCheckHook, pythonOlder, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/unasync/default.nix b/pkgs/development/python-modules/unasync/default.nix index ff43f3c81669e..afdfc152bfa81 100644 --- a/pkgs/development/python-modules/unasync/default.nix +++ b/pkgs/development/python-modules/unasync/default.nix @@ -3,23 +3,28 @@ buildPythonPackage, fetchFromGitHub, setuptools, + tokenize-rt, pytestCheckHook, }: buildPythonPackage rec { pname = "unasync"; - version = "0.5.0"; - - format = "pyproject"; + version = "0.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "python-trio"; repo = "unasync"; rev = "v${version}"; - sha256 = "0h86i09v4909a8nk5lp36jlwz6rsln6vyg3d0i13ykxa6lrx1c2l"; + sha256 = "sha256-ZRvmX1fSfSJ1HNEymzhIuUi3tdjFmUoidfr0rN8c7tk="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ + setuptools + tokenize-rt + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -34,6 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "unasync" ]; meta = with lib; { + changelog = "https://github.com/python-trio/unasync/releases/tag/v${version}"; description = "Project that can transform your asynchronous code into synchronous code"; homepage = "https://github.com/python-trio/unasync"; license = with licenses; [ diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index d20b06a2ee359..9d8cb99be6852 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; src = fetchFromGitHub { owner = "lmfit"; repo = "uncertainties"; rev = "refs/tags/${version}"; - hash = "sha256-AaFazHeq7t4DnG2s9GvmAJ3ni62PWHR//mNPL+WyGSI="; + hash = "sha256-cm0FeJCxyBLN0GCKPnscBCx9p9qCDQdwRfhBRgQIhAo="; }; build-system = [ diff --git a/pkgs/development/python-modules/undefined/default.nix b/pkgs/development/python-modules/undefined/default.nix index ccd803bc08027..59cf5c2a84792 100644 --- a/pkgs/development/python-modules/undefined/default.nix +++ b/pkgs/development/python-modules/undefined/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Ever needed a global object that act as None but not quite?"; homepage = "https://github.com/Carreau/undefined"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix new file mode 100644 index 0000000000000..bcb349bfe36db --- /dev/null +++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + + looseversion, + requests, + selenium, + websockets, +}: + +buildPythonPackage { + pname = "undetected-chromedriver"; + version = "3.5.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ultrafunkamsterdam"; + repo = "undetected-chromedriver"; + # Upstream uses the summaries of commits for specifying versions + rev = "0aa5fbe252370b4cb2b95526add445392cad27ba"; + hash = "sha256-Qe+GrsUPnhjJMDgjdUCloapjj0ggFlm/Dr42WLcmb1o="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + looseversion + requests + selenium + websockets + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "undetected_chromedriver" ]; + + postPatch = '' + substituteInPlace undetected_chromedriver/patcher.py \ + --replace-fail \ + "from distutils.version import LooseVersion" \ + "from looseversion import LooseVersion" + ''; + + meta = with lib; { + description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems"; + homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 0fd4ba8cdc7be..957db7180d59b 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fbqR8SCat+n4pn8HoVveSa4tobikb9rYsCIroYuRAhI="; + hash = "sha256-mIpDQY+gt4rrYooV9qOwIVLBeH9j/m0lTH9OLM+NsKc="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 47a91979bf434..32e7a66db70aa 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchPypi, - nose, + fetchpatch, + pytestCheckHook, six, unidecode, - unittestCheckHook, }: buildPythonPackage rec { @@ -18,15 +18,23 @@ buildPythonPackage rec { sha256 = "25f424258317e4cb41093e2953374b3af1f23097297664731cdb3ae46f6bd6c3"; }; + patches = [ + ./use_pytest_instead_of_nose.patch + # mozilla/unicode-slugify#41: Fix Python 3.12 SyntaxWarning + (fetchpatch { + url = "https://github.com/mozilla/unicode-slugify/commit/a18826f440d0b74e536f5e32ebdcf30e720f20d8.patch"; + hash = "sha256-B27psp0XI5GhoR0l5lFpUOh88hHzjJYzJS5PnIkfFws="; + }) + ]; + propagatedBuildInputs = [ six unidecode ]; - nativeCheckInputs = [ - nose - unittestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "slugify/tests.py" ]; meta = with lib; { description = "Generates unicode slugs"; diff --git a/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch b/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch new file mode 100644 index 0000000000000..4aea175ffa4a5 --- /dev/null +++ b/pkgs/development/python-modules/unicode-slugify/use_pytest_instead_of_nose.patch @@ -0,0 +1,69 @@ +diff --git a/slugify/tests.py b/slugify/tests.py +index 9f636c4..5562e87 100644 +--- a/slugify/tests.py ++++ b/slugify/tests.py +@@ -3,7 +3,7 @@ from __future__ import unicode_literals + + import six + import unittest +-from nose.tools import eq_, raises ++import pytest + + from slugify import slugify, smart_text, SLUG_OK + +@@ -13,31 +13,31 @@ def test_slugify(): + x = '-'.join([u, u]) + y = ' - '.join([u, u]) + +- @raises(ValueError) + def test_incoherent_ok_and_only_ascii_raises_an_error(): + """Checks that only_ascii=True with non ascii "ok" chars actually raises an error.""" +- slugify('angry smiley !', ok='è_é', only_ascii=True) ++ with pytest.raises(ValueError): ++ slugify('angry smiley !', ok='è_é', only_ascii=True) + + def check(x, y): +- eq_(slugify(x), y) ++ assert slugify(x) == y + + def check_only_ascii(x, y): +- eq_(slugify(x, only_ascii=True), y) ++ assert slugify(x, only_ascii=True) == y + + def check_only_ascii_capital(x, y): +- eq_(slugify(x, lower=False, only_ascii=True), y) ++ assert slugify(x, lower=False, only_ascii=True) == y + + def check_only_ascii_lower_nospaces(x, y): +- eq_(slugify(x, lower=True, spaces=False, only_ascii=True), y) ++ assert slugify(x, lower=True, spaces=False, only_ascii=True) == y + + def check_ok_chars(x, y): +- eq_(slugify(x, ok='-♰é_è'), y) ++ assert slugify(x, ok='-♰é_è') == y + + def check_empty_ok_chars(x, y): +- eq_(slugify(x, ok=''), y) ++ assert slugify(x, ok='') == y + + def check_limited_ok_chars_only_ascii(x, y): +- eq_(slugify(x, ok='-', only_ascii=True), y) ++ assert slugify(x, ok='-', only_ascii=True) == y + + s = [('xx x - "#$@ x', 'xx-x-x'), + ('Bän...g (bang)', 'bäng-bang'), +@@ -112,11 +112,11 @@ def test_slugify(): + + #Test custom space replacement + x, y = ('-☀- pretty waves under the sunset 😎', '--~pretty~waves~under~the~sunset') +- eq_(slugify(x, space_replacement='~'), y) ++ assert slugify(x, space_replacement='~') == y + + #Test default auto space replacement + x, y = ('-☀- pretty waves under the sunset 😎', 'pretty~waves~under~the~sunset') +- eq_(slugify(x, ok='~'), y) ++ assert slugify(x, ok='~') == y + + + class SmartTextTestCase(unittest.TestCase): + diff --git a/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch b/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch new file mode 100644 index 0000000000000..904538880a228 --- /dev/null +++ b/pkgs/development/python-modules/unicorn/avoid-distutils-python312.patch @@ -0,0 +1,29 @@ +From bcc65c0be18fc6ea6ec39da89d0de77544fa18c7 Mon Sep 17 00:00:00 2001 +From: Mrmaxmeier <Mrmaxmeier@gmail.com> +Date: Tue, 9 Jul 2024 17:41:08 +0200 +Subject: [PATCH] Drop removed `distutils` import in favor of `sysconfig` + +This patch is available online as https://github.com/unicorn-engine/unicorn/pull/1973 + +diff --git a/unicorn/unicorn.py b/unicorn/unicorn.py +index 2e6a938f43..7204b8215f 100644 +--- a/unicorn/unicorn.py ++++ b/unicorn/unicorn.py +@@ -2,7 +2,7 @@ + from __future__ import annotations + import ctypes + import ctypes.util +-import distutils.sysconfig ++import sysconfig + from functools import wraps + from typing import Any, Callable, List, Tuple, Union + import pkg_resources +@@ -85,7 +85,7 @@ def _load_lib(path, lib_name): + pkg_resources.resource_filename(__name__, 'lib'), + os.path.join(os.path.split(__file__)[0], 'lib'), + '', +- distutils.sysconfig.get_python_lib(), ++ sysconfig.get_path('platlib'), + "/usr/local/lib/" if sys.platform == 'darwin' else '/usr/lib64', + os.getenv('PATH', '')] + diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index a684d0fda8171..de3a0f6a30408 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { sourceRoot = "${src.name}/bindings/python"; + patches = [ + # Python 3.12 compatibility: Drop removed `distutils` import in favor of `sysconfig` + ./avoid-distutils-python312.patch + ]; + prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ ''; diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index ba48416c5157c..d7e9f274d3d5d 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.12"; + version = "0.0.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-V8xmw8CDq0Y89pidcMF+f0A40PfAmkRwcduTFkUguU4="; + hash = "sha256-JQwKMEhDdvvsnXI6QsV2TcuB3mw5NcALbi5kM5xl/Pw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix index 690db790d7005..a9deef7e2eab3 100644 --- a/pkgs/development/python-modules/unittest-data-provider/default.nix +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "PHPUnit-like @dataprovider decorator for unittest"; homepage = "https://github.com/yourlabs/unittest-data-provider"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index 081641c6cb65e..7caf423379784 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -5,33 +5,35 @@ commoncode, fetchPypi, packaging, - pyparsing, pytestCheckHook, pythonOlder, saneyaml, semantic-version, semver, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "univers"; - version = "30.11.0"; - format = "setuptools"; + version = "30.12.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xyrg8B+C5xUN8zHLrMbAe/MWjZb8fCL0MIAz2w4B7/U="; + hash = "sha256-NbsoYfTk5SWyUQZnOdm+ZCXK7wD+DV/updRHqHoU49c="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ attrs packaging - pyparsing semantic-version semver ]; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 55551a5206ef7..b09942f1beec4 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.20"; + version = "0.0.22"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-+wmBsb7zsN6vdNqUvozV317kEZCg1b+lBToRSdN2YM4="; + hash = "sha256-fAz5dhHO5A0pSH6IYcVwNWPxqsNn3urXqnp8GudOrBA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index ef69a9bbe94ea..14a32c0ba8621 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; + hash = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; }; buildInputs = [ unrar ]; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 98a2531fa4db2..64c8234848170 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.14.8"; + version = "0.15.1"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-cZBoGKjIWHJxbG6sDbkjJJt3nSYjrha+Lz9RFdq6d0c="; + hash = "sha256-zDlkqeP89O3u5Yir9Xi+Z6BpLd6r0QXJ563kc2krjAs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 79d2e4389ac6c..7e82256d39178 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { mainProgram = "upass"; homepage = "https://github.com/Kwpolska/upass"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 0798fd1812811..b19508b01754c 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "upb-lib"; rev = "refs/tags/${version}"; - hash = "sha256-y06/XqdmGXTd2Qhr2iXnmIKCSpAetXwI1UXv555ewoc="; + hash = "sha256-YCJl3cIaNmRQ5+GbIDcAvDhI0R4r2AWG2Ba1zmnfbMA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 350d52e9d181c..3ed1ec0028a63 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, requests, pytestCheckHook, responses, @@ -9,17 +10,19 @@ buildPythonPackage rec { pname = "upcloud-api"; - version = "2.5.1"; - format = "setuptools"; + version = "2.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-python-api"; rev = "refs/tags/v${version}"; - hash = "sha256-fMsI0aZ8jA08rrNPm8HmfYz/a3HLUExvvXIeDGPh2e8="; + hash = "sha256-RDGRue9hejNPKIP61GtJHMG5rG3CKvJdsYxVrp6I5W0="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix index 8d93cd5926267..bc2111a78ca59 100644 --- a/pkgs/development/python-modules/uplc/default.nix +++ b/pkgs/development/python-modules/uplc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "uplc"; - version = "0.6.9"; + version = "1.0.4"; format = "pyproject"; @@ -23,10 +23,9 @@ buildPythonPackage rec { owner = "OpShin"; repo = "uplc"; rev = version; - hash = "sha256-djJMNXijMVzMVzw8NZSe3YFRGyAPqdvr0P374Za5XkU="; + hash = "sha256-Mio6VVgQKy1GMeHNk0DITks9Nhr3lA1t7zewu9734j4="; }; - propagatedBuildInputs = [ setuptools poetry-core diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 43422e06177b6..c4c5175b3f980 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.9"; + version = "5.3.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-iwT7P1KNQVrLzgKgoVO4G5wwg3f86D6/0I0FP8xD0rk="; + hash = "sha256-2cTa6AaN4BMJuzLhU9G4e0yl1kqyxblLWsSaIOHYS+o="; }; build-system = [ @@ -94,9 +94,6 @@ buildPythonPackage rec { "tests/test_0066_fix_http_fallback_freeze.py" "tests/test_0088_read_with_http.py" "tests/test_0220_contiguous_byte_ranges_in_http.py" - - # FileNotFoundError: uproot-issue-1043.root - "tests/test_1043_const_std_string.py" ]; pythonImportsCheck = [ "uproot" ]; diff --git a/pkgs/development/python-modules/uri-template/default.nix b/pkgs/development/python-modules/uri-template/default.nix index e37fd44391483..27f91bad92c90 100644 --- a/pkgs/development/python-modules/uri-template/default.nix +++ b/pkgs/development/python-modules/uri-template/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Implementation of RFC 6570 URI Templates"; homepage = "https://github.com/plinss/uri_template/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/urwid-mitmproxy/default.nix b/pkgs/development/python-modules/urwid-mitmproxy/default.nix deleted file mode 100644 index 09e28d2839635..0000000000000 --- a/pkgs/development/python-modules/urwid-mitmproxy/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, -}: - -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/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7e8091dac4dab..7c2024af44d8f 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.14"; + version = "2.6.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-UDYIAAAKmdqtTzV8yn1zkEH0PvOUmVXodxF1ZyubgE0="; + hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c="; }; postPatch = '' @@ -81,6 +81,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/urwid/urwid"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 0f03b4fdbc4ea..c50502c3df549 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/pazz/urwidtrees"; changelog = "https://github.com/pazz/urwidtrees/releases/tag/${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index 1aa4d2bc8d18a..b42c5c8f6aa19 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/unitedstates/python-us/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index eba36519accaa..3b4cd7a0bd233 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Powerful API for invoking with external commands"; homepage = "https://github.com/tarruda/python-ush"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 741c3d39c2130..707a464d7e4f0 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -2,38 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - pynose, + poetry-core, mock, + pytest-cov-stub, + pytest-xdist, + pytestCheckHook }: buildPythonPackage rec { pname = "uvcclient"; - version = "0.11.0"; - format = "setuptools"; + version = "0.12.1"; + pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = pname; - rev = "58e7a53815482b7778481f81cde95f53a60bb6f6"; - sha256 = "0k8aswrk1n08w6pi6dg0zdzsmk23cafihkrss9ywg3i85w7q43x2"; + rev = "refs/tags/v${version}"; + hash = "sha256-ilZTRoSuoJMWlyRfvY/PpTBbr+d6wx+T3cVyW3ZkXlY="; }; - postPatch = '' - substituteInPlace tests/test_camera.py \ - --replace-fail "assertEquals" "assertEqual" - ''; + build-system = [ poetry-core ]; nativeCheckInputs = [ - pynose mock + pytest-cov-stub + pytest-xdist + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { + changelog = "https://github.com/uilibs/uvcclient/blob/${src.rev}/CHANGELOG.md"; description = "Client for Ubiquiti's Unifi Camera NVR"; mainProgram = "uvc"; homepage = "https://github.com/kk7ds/uvcclient"; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 4f2ff7d11ceae..905a923dc7bf2 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -99,6 +99,6 @@ buildPythonPackage rec { description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix index 675e92a1de315..17906660c0e49 100644 --- a/pkgs/development/python-modules/uxsim/default.nix +++ b/pkgs/development/python-modules/uxsim/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "uxsim"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "toruseo"; repo = "UXsim"; rev = "refs/tags/v${version}"; - hash = "sha256-2lN2Cu0XXiYdLiE7phpGqhkBDjkmxLJt4ILb6ORWdCI="; + hash = "sha256-cWtBmBmrQTruRZ8n8O6i9LGlHMR5UvRhcOICvwP383M="; }; patches = [ ./add-qt-plugin-path-to-env.patch ]; diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix index 60cc3c9c6f5e3..fbec2841fcdb7 100644 --- a/pkgs/development/python-modules/validator-collection/default.nix +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, alabaster, attrs, babel, diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index 5ee2b0d6d0c80..65076a08843da 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uwP2Mu10AiDWzlPMRH2+0CMSnibTB8KBY8QZNf+icNA="; + hash = "sha256-uwP2Mu10AiDWzlPMRH2+0CMSnibTB8KBY8QZNf+icNA="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index a2fe7abb3b3ba..11d8c496a7067 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -6,7 +6,6 @@ python-dateutil, pythonAtLeast, pythonOlder, - pythonRelaxDepsHook, setuptools, }: @@ -28,8 +27,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - dependencies = [ python-dateutil ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 920a439d33799..20d4e7b46359a 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/kevin1024/vcrpy"; changelog = "https://github.com/kevin1024/vcrpy/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index f0ebd1f621281..ad5efb0c81055 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -1,58 +1,77 @@ { lib, - awkward, buildPythonPackage, - fetchPypi, + pythonOlder, + fetchFromGitHub, + + # build-system hatch-vcs, hatchling, - numba, + + # dependencies numpy, - notebook, packaging, + + # checks + awkward, + dask-awkward, + notebook, + numba, papermill, pytestCheckHook, - pythonOlder, + sympy, + + stdenv, }: buildPythonPackage rec { pname = "vector"; version = "1.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Fa74kRVg2x6j/6nb1UFNDsV1pQSiw/I+pFFwoYmURm4="; + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "vector"; + rev = "refs/tags/v${version}"; + hash = "sha256-ckwJgh5aWFTwoEBVmKukdk+cmQeOuecLiYD2EcuELGw="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging ]; - checkInputs = [ + nativeCheckInputs = [ awkward + dask-awkward notebook numba papermill pytestCheckHook + sympy ]; pythonImportsCheck = [ "vector" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # AssertionError: assert 2.1073424255447017e-08 == 0.0 + "test_issue_463" + ]; + + meta = { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index 767885292989c..ba1f1d30fbbe8 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "2.2.1"; + version = "2.2.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "refs/tags/v${version}"; - hash = "sha256-mu30v4iZoOYfQZc1P45UZaor6hf+i+gOvGcVGcQYzTo="; + hash = "sha256-MPK5Aim/kGXLMOapttkp5ygl8gIlHv0675sBBf6kyAA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 023d1623a5b19..2536e44bd9600 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.7.5"; + version = "2024.7.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; rev = "refs/tags/${version}"; - hash = "sha256-nGFx4ZqGTLMOmYNZam5jLKUsL3GxyyDwT8WFSEX9Qcs="; + hash = "sha256-+mdIJNWnrw8DHVEes+/X04eTILBt7zgTgNLG80XJlnI="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/verspec/default.nix b/pkgs/development/python-modules/verspec/default.nix index 4064f1a18caeb..2da64ec5f653a 100644 --- a/pkgs/development/python-modules/verspec/default.nix +++ b/pkgs/development/python-modules/verspec/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; + hash = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; }; nativeCheckInputs = [ @@ -39,6 +39,6 @@ buildPythonPackage rec { bsd2 # and asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix new file mode 100644 index 0000000000000..c21ed7733ead5 --- /dev/null +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + gitUpdater, + buildPythonPackage, + pytestCheckHook, + setuptools, + fonttools, + typing-extensions, + ufonormalizer, + ufolib2, + defcon, +}: + +buildPythonPackage rec { + pname = "vfblib"; + version = "0.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "LucasFonts"; + repo = "vfbLib"; + rev = "v${version}"; + hash = "sha256-p+uoSB3LIEi1Zvm8HgsOJcRXngZWXj3BwIlxqIBfmB4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + fonttools + typing-extensions + ufonormalizer + ufolib2 + defcon + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "vfbLib" ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = with lib; { + description = "Converter and deserializer for FontLab Studio 5 VFB files"; + homepage = "https://github.com/LucasFonts/vfbLib"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix index a1695da99aed7..69c55a42035eb 100644 --- a/pkgs/development/python-modules/vg/default.nix +++ b/pkgs/development/python-modules/vg/default.nix @@ -6,7 +6,6 @@ poetry-core, pythonOlder, pytestCheckHook, - setuptools, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index eda027cbc4f36..91d884e210714 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - case, fetchPypi, pytestCheckHook, pythonOlder, @@ -20,7 +19,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - case pytestCheckHook ]; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 2e1e864cb81bb..056e38a32923b 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Script to clone virtualenvs"; mainProgram = "virtualenv-clone"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 75e9d40e860d5..6e7904dbe3cdb 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonOlder, - isPy27, isPyPy, cython, distlib, @@ -88,6 +87,6 @@ buildPythonPackage rec { homepage = "http://www.virtualenv.org"; changelog = "https://github.com/pypa/virtualenv/blob/${version}/docs/changelog.rst"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 62f6315880fa3..37662921905a6 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; + hash = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix index 87c286c8e3425..8bab0d88fe4a7 100644 --- a/pkgs/development/python-modules/visitor/default.nix +++ b/pkgs/development/python-modules/visitor/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = "https://github.com/mbr/visitor"; description = "Tiny pythonic visitor implementation"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index eb3b16c0a3ea5..dd74e0212bc52 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -31,6 +31,13 @@ buildPythonPackage rec { hash = "sha256-77u4R6kIuvfnFpq5vylhOKOTZPNn5ssKjsA61xaZ0x0="; }; + postPatch = '' + # https://numpy.org/devdocs/dev/depending_on_numpy.html#numpy-2-0-specific-advice + # upstream enforce builds with numpy 2+, which is backward compat with 1.xx + substituteInPlace pyproject.toml \ + --replace-fail "numpy>=2.0.0rc2" "numpy" + ''; + patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ (substituteAll { src = ./library-paths.patch; diff --git a/pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch b/pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch new file mode 100644 index 0000000000000..edaebfce508c6 --- /dev/null +++ b/pkgs/development/python-modules/vllm/0001-setup.py-don-t-ask-for-hipcc-version.patch @@ -0,0 +1,24 @@ +From f6a7748bee79fc2e1898968fef844daacfa7860b Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else@someonex.net> +Date: Wed, 31 Jul 2024 12:02:53 +0000 +Subject: [PATCH 1/2] setup.py: don't ask for hipcc --version + +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index 72ef26f1..01e006f9 100644 +--- a/setup.py ++++ b/setup.py +@@ -279,6 +279,7 @@ def _install_punica() -> bool: + + + def get_hipcc_rocm_version(): ++ return "0.0" # `hipcc --version` misbehaves ("unresolved paths") inside the nix sandbox + # Run the hipcc --version command + result = subprocess.run(['hipcc', '--version'], + stdout=subprocess.PIPE, +-- +2.45.1 + diff --git a/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch b/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch new file mode 100644 index 0000000000000..e7a4bcd457617 --- /dev/null +++ b/pkgs/development/python-modules/vllm/0002-setup.py-nix-support-respect-cmakeFlags.patch @@ -0,0 +1,40 @@ +From 10b7e8330bdba319a4162cceb8e5dd4280215b04 Mon Sep 17 00:00:00 2001 +From: SomeoneSerge <else@someonex.net> +Date: Wed, 31 Jul 2024 12:06:15 +0000 +Subject: [PATCH 2/2] setup.py: nix-support (respect cmakeFlags) + +--- + setup.py | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/setup.py b/setup.py +index 01e006f9..14762146 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,6 +15,15 @@ from setuptools import Extension, find_packages, setup + from setuptools.command.build_ext import build_ext + from torch.utils.cpp_extension import CUDA_HOME + ++import os ++import json ++ ++if "NIX_ATTRS_JSON_FILE" in os.environ: ++ with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f: ++ NIX_ATTRS = json.load(f) ++else: ++ NIX_ATTRS = { "cmakeFlags": os.environ.get("cmakeFlags", "").split() } ++ + + def load_module_from_path(module_name, path): + spec = importlib.util.spec_from_file_location(module_name, path) +@@ -159,6 +168,7 @@ class cmake_build_ext(build_ext): + '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={}'.format(outdir), + '-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY={}'.format(self.build_temp), + '-DVLLM_TARGET_DEVICE={}'.format(VLLM_TARGET_DEVICE), ++ *NIX_ATTRS["cmakeFlags"], + ] + + verbose = envs.VERBOSE +-- +2.45.1 + diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 2418f97452db8..3b9e6ee434871 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -1,9 +1,13 @@ { lib, + stdenv, + python, buildPythonPackage, + pythonRelaxDepsHook, fetchFromGitHub, which, ninja, + cmake, packaging, setuptools, torch, @@ -22,6 +26,13 @@ pydantic, aioprometheus, pynvml, + openai, + pyzmq, + tiktoken, + torchvision, + py-cpuinfo, + lm-format-enforcer, + prometheus-fastapi-instrumentator, cupy, writeShellScript, @@ -30,80 +41,73 @@ cudaSupport ? config.cudaSupport, cudaPackages ? { }, - rocmSupport ? config.rocmSupport, + # Has to be either rocm or cuda, default to the free one + rocmSupport ? !config.cudaSupport, rocmPackages ? { }, gpuTargets ? [ ], -}: +}@args: + +let + cutlass = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cutlass"; + rev = "refs/tags/v3.5.0"; + sha256 = "sha256-D/s7eYsa5l/mfx73tE4mnFcTQdYqGmXa9d9TCryw4e4="; + }; +in buildPythonPackage rec { pname = "vllm"; - version = "0.3.3"; - format = "pyproject"; + version = "0.5.3.post1"; + pyproject = true; + + stdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv; src = fetchFromGitHub { owner = "vllm-project"; repo = pname; - rev = "v${version}"; - hash = "sha256-LU5pCPVv+Ws9dL8oWL1sJGzwQKI1IFk2A1I6TP9gXL4="; + rev = "refs/tags/v${version}"; + hash = "sha256-++DK2Y2zz+1KrEcdQc5XFrSjc7fCwMD2DQ/RqY7PoFU="; }; - # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing. - PYTORCH_ROCM_ARCH = lib.optionalString rocmSupport ( - lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets - ); - - # xformers 0.0.23.post1 github release specifies its version as 0.0.24 - # - # cupy-cuda12x is the same wheel as cupy, but built with cuda dependencies, we already have it set up - # like that in nixpkgs. Version upgrade is due to upstream shenanigans - # https://github.com/vllm-project/vllm/pull/2845/commits/34a0ad7f9bb7880c0daa2992d700df3e01e91363 - # - # hipcc --version works badly on NixOS due to unresolved paths. - postPatch = - '' - substituteInPlace requirements.txt \ - --replace "xformers == 0.0.23.post1" "xformers == 0.0.24" - substituteInPlace requirements.txt \ - --replace "cupy-cuda12x == 12.1.0" "cupy == 12.3.0" - substituteInPlace requirements-build.txt \ - --replace "torch==2.1.2" "torch == 2.2.1" - substituteInPlace pyproject.toml \ - --replace "torch == 2.1.2" "torch == 2.2.1" - substituteInPlace requirements.txt \ - --replace "torch == 2.1.2" "torch == 2.2.1" - '' - + lib.optionalString rocmSupport '' - substituteInPlace setup.py \ - --replace "'hipcc', '--version'" "'${writeShellScript "hipcc-version-stub" "echo HIP version: 0.0"}'" - ''; - - preBuild = - lib.optionalString cudaSupport '' - export CUDA_HOME=${cudaPackages.cuda_nvcc} - '' - + lib.optionalString rocmSupport '' - export ROCM_HOME=${rocmPackages.clr} - export PATH=$PATH:${rocmPackages.hipcc} - ''; + patches = [ + ./0001-setup.py-don-t-ask-for-hipcc-version.patch + ./0002-setup.py-nix-support-respect-cmakeFlags.patch + ]; + + # Ignore the python version check because it hard-codes minor versions and + # lags behind `ray`'s python interpreter support + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'set(PYTHON_SUPPORTED_VERSIONS' \ + 'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"' + ''; nativeBuildInputs = [ + cmake ninja + pythonRelaxDepsHook + which + ] ++ lib.optionals rocmSupport [ rocmPackages.hipcc ]; + + build-system = [ packaging setuptools - torch wheel - which - ] ++ lib.optionals rocmSupport [ rocmPackages.hipcc ]; + ]; buildInputs = (lib.optionals cudaSupport ( with cudaPackages; [ cuda_cudart # cuda_runtime.h, -lcudart - cuda_cccl # <thrust/*> + cuda_cccl libcusparse # cusparse.h - libcublas # cublas_v2.h libcusolver # cusolverDn.h + cuda_nvcc + cuda_nvtx + libcublas ] )) ++ (lib.optionals rocmSupport ( @@ -117,30 +121,50 @@ buildPythonPackage rec { ] )); - propagatedBuildInputs = + dependencies = [ - psutil - ray + aioprometheus + fastapi + lm-format-enforcer + numpy + openai + outlines pandas + prometheus-fastapi-instrumentator + psutil + py-cpuinfo pyarrow + pydantic + pyzmq + ray sentencepiece - numpy + tiktoken torch + torchvision transformers - outlines - xformers - fastapi uvicorn - pydantic - aioprometheus + xformers ] ++ uvicorn.optional-dependencies.standard ++ aioprometheus.optional-dependencies.starlette ++ lib.optionals cudaSupport [ - pynvml cupy + pynvml ]; + dontUseCmakeConfigure = true; + cmakeFlags = [ (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}") ]; + + env = + lib.optionalAttrs cudaSupport { CUDA_HOME = "${lib.getDev cudaPackages.cuda_nvcc}"; } + // lib.optionalAttrs rocmSupport { + # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing. + PYTORCH_ROCM_ARCH = lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets; + ROCM_HOME = "${rocmPackages.clr}"; + }; + + pythonRelaxDeps = true; + pythonImportsCheck = [ "vllm" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 5653e5629d402..db8692e77b06e 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; + hash = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; }; disabled = isPyPy; @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Module for reading vCard and vCalendar files"; homepage = "http://eventable.github.io/vobject/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix new file mode 100644 index 0000000000000..1799598a2a6b2 --- /dev/null +++ b/pkgs/development/python-modules/voip-utils/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + opuslib, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "voip-utils"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "voip-utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "~=" ">=" + ''; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "opuslib" ]; + + dependencies = [ opuslib ]; + + pythonImportsCheck = [ "voip_utils" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # no tests as of v0.1.0 + doCheck = false; + + meta = { + changelog = "https://github.com/home-assistant-libs/voip-utils/blob/${src.rev}/CHANGELOG.md"; + description = "Voice over IP Utilities"; + homepage = "https://github.com/home-assistant-libs/voip-utils"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix new file mode 100644 index 0000000000000..9335402ea3f90 --- /dev/null +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-scm, + aiohttp, + beautifulsoup4, + lxml, + pyjwt, + freezegun, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "volkswagencarnet"; + version = "5.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "robinostlund"; + repo = "volkswagencarnet"; + rev = "refs/tags/v${version}"; + hash = "sha256-NpfkhFGxd3VjLjQ8pPpamYgwc5zqWt5CojONe4L1s4s="; + }; + + postPatch = '' + substituteInPlace tests/conftest.py \ + --replace-fail 'pytest_plugins = ["pytest_cov"]' 'pytest_plugins = []' + ''; + + build-system = [ setuptools-scm ]; + + dependencies = [ + aiohttp + beautifulsoup4 + lxml + pyjwt + ]; + + pythonImportsCheck = [ "volkswagencarnet" ]; + + nativeCheckInputs = [ + freezegun + pytest-asyncio + pytestCheckHook + ]; + + meta = { + description = "A python library for volkswagen carnet"; + homepage = "https://github.com/robinostlund/volkswagencarnet"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index c3189b86623e9..23677ab4ec4f3 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -12,8 +12,6 @@ pytest-asyncio, pytestCheckHook, pythonOlder, - setuptools, - websockets, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vsts-cd-manager/default.nix b/pkgs/development/python-modules/vsts-cd-manager/default.nix index 8730f6e0ef2a8..94ebbbe5e4a37 100644 --- a/pkgs/development/python-modules/vsts-cd-manager/default.nix +++ b/pkgs/development/python-modules/vsts-cd-manager/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { description = "Microsoft Azure API Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index c3a3d38b98b76..6c339204f3dc8 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python APIs for interacting with and managing Azure DevOps"; homepage = "https://github.com/microsoft/azure-devops-python-api"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vtjp/default.nix b/pkgs/development/python-modules/vtjp/default.nix index cfc0aaf1b9069..76661675f6818 100644 --- a/pkgs/development/python-modules/vtjp/default.nix +++ b/pkgs/development/python-modules/vtjp/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/Miicroo/python-vasttrafik"; changelog = "https://github.com/Miicroo/python-vasttrafik/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 0b3debdd5dd6e..f68979cf2feae 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, + pytestCheckHook, + fetchpatch2, }: buildPythonPackage rec { @@ -17,10 +18,23 @@ buildPythonPackage rec { sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; }; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + patches = [ + # set of patches from python-ivi/python-vxi11#47 + + # Fix deprecation warning + (fetchpatch2 { + url = "https://github.com/python-ivi/python-vxi11/commit/00722b1b8810ac38bfb47e8c49437055b600dfff.patch?full_index=1"; + hash = "sha256-fZDhg578UY/Q/2li1EmL5WTPx1OUfyebzvvBVK/IyDU="; + }) + + # Removes nose dependency + (fetchpatch2 { + url = "https://github.com/python-ivi/python-vxi11/commit/a8ad324d645d6f7215f207f2cc2988dc49859698.patch?full_index=1"; + hash = "sha256-nkH6ww4jBypEmZeatEb8fpFTB7x/AMppeEmuH9a4v6I="; + }) + ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index e02dbdcdef3cc..eca3bdd9302ec 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -2,13 +2,10 @@ lib, buildPythonPackage, fetchPypi, - pkgs, setuptools, aiofiles, click, - coverage, tomli, - pytest, pytest-mock, pytest-asyncio, pytestCheckHook, diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index 2fa0ee811737d..620f30f2508f5 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy/w3lib"; changelog = "https://github.com/scrapy/w3lib/blob/v${version}/NEWS"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix index 4d6f6938238cf..6b46643985050 100644 --- a/pkgs/development/python-modules/wagtail-modeladmin/default.nix +++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix @@ -2,16 +2,10 @@ lib, buildPythonPackage, dj-database-url, - django, - django-rq, fetchFromGitHub, flit-core, - freezegun, - google-cloud-translate, - polib, python, pythonOlder, - typing-extensions, wagtail, }: diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index c1b509b924dd8..ae55189f99c6a 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "6.1.2"; + version = "6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/bgsbNb2rlwfeyMSFmlp2GAQFbZcuymtEg76xyfTmcE="; + hash = "sha256-WQhujKGBsQ8nSxE5JFAFBN7W/BaCTBl283w8vd0QDSQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 94b004862d598..933823a748c5c 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; + hash = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; }; doCheck = false; diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix index 91d58d85347c3..c627c24290ffa 100644 --- a/pkgs/development/python-modules/waqiasync/default.nix +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8="; + hash = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index cfe32849b5396..5445631c4d153 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -6,7 +6,6 @@ poetry-core, jsonpatch, jsonschema, - six, pytestCheckHook, }: @@ -48,6 +47,6 @@ buildPythonPackage rec { description = "Python object model built on JSON schema and JSON patch"; homepage = "https://github.com/bcwaldon/warlock"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 5081be3853d57..290e4faec0147 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/ines/wasabi"; changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wat/default.nix b/pkgs/development/python-modules/wat/default.nix new file mode 100644 index 0000000000000..4231336c31ce3 --- /dev/null +++ b/pkgs/development/python-modules/wat/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + nuclear, + pydantic, + setuptools, +}: + +buildPythonPackage rec { + pname = "wat"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "igrek51"; + repo = "wat"; + rev = version; + hash = "sha256-WCMMj4KtfWOp6LsS4XHD/M/iepstVasHknEvEUTMMM8="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + nuclear + pydantic + ]; + pythonImportsCheck = [ "wat" ]; + + meta = with lib; { + homepage = "https://igrek51.github.io/wat/"; + description = "Deep inspection of python objects"; + license = licenses.mit; + maintainers = with maintainers; [ parras ]; + }; +} diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index def2bdf1c880e..4e83fb0264259 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -104,6 +104,6 @@ buildPythonPackage rec { homepage = "https://github.com/gorakhargosh/watchdog"; changelog = "https://github.com/gorakhargosh/watchdog/blob/v${version}/changelog.rst"; license = licenses.asl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index 34383f549f999..fb7328d5c34f6 100644 --- a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Library for computing contrast ratios, as required by WCAG 2.0"; homepage = "https://github.com/gsnedders/wcag-contrast-ratio"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 90c83d35964f3..6be8a9fd7f17f 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.5.2"; + version = "9.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pwIiuG3qgvs4Ldh7cyeMEHVsE4vW+PcU4hgxKIh7nrI="; + hash = "sha256-Vn1msRrXQ4SVTIr4b2B4V8O9+TaCNJrTIGYjGr1VbJI="; }; nativeBuildInputs = [ hatchling ]; @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Wilcard File Name matching library"; homepage = "https://github.com/facelessuser/wcmatch"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 27a3bac5d7d11..c79af7be6b5ab 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { homepage = "https://github.com/jquast/wcwidth"; changelog = "https://github.com/jquast/wcwidth/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 321ee830e57c3..2652a524678c6 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - cairosvg, cffi, cssselect2, fetchPypi, diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index fc9aa1050f510..0ccf377ad50db 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.6.5"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-mlM3fzjKwWvIfqH3LxAiRL3MgqT6RbMuAUzzEwLhlZs="; + hash = "sha256-JgnasbhAcdJwa3lpdID+B3Iwuc9peRQZBAC7tBBm54c="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index af0621ad54d44..476445e0d4627 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -2,8 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, asn1crypto, cbor2, + cryptography, pythonOlder, pyopenssl, pytestCheckHook, @@ -11,8 +13,8 @@ buildPythonPackage rec { pname = "webauthn"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,12 +22,15 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-AfQ3lt0WvoThU5kCE7MzhAXwbqmNaCrUqOMWI937hO4="; + hash = "sha256-NBCR5GwmXA6COP9NOYnoD3l1vuOpym/kyNawd8FstLc="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ asn1crypto cbor2 + cryptography pyopenssl ]; @@ -35,7 +40,7 @@ buildPythonPackage rec { disabledTests = [ # TypeError: X509StoreContextError.__init__() missing 1 required... - "test_throws_on_bad_root_cert" + #"test_throws_on_bad_root_cert" ]; meta = with lib; { @@ -43,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/duo-labs/py_webauthn"; changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 2cd7fed14103d..93f2030755c04 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Library for working with color names/values defined by the HTML and CSS specifications"; homepage = "https://github.com/ubernostrum/webcolors"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 6e4d6657763cc..8083b080e44dd 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "webdav4"; - version = "0.9.8"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "skshetry"; repo = "webdav4"; rev = "refs/tags/v${version}"; - hash = "sha256-Le/gABaUxMmSW2SjgucsBKqjxOq1h9UCAWl5YyUsCPk="; + hash = "sha256-LgWYgERRuUODFzUnC08kDJTVRx9vanJ+OU8sREEMVwM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/webdriver-manager/default.nix b/pkgs/development/python-modules/webdriver-manager/default.nix index 411d5b9b78da3..7d6616f1538db 100644 --- a/pkgs/development/python-modules/webdriver-manager/default.nix +++ b/pkgs/development/python-modules/webdriver-manager/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "webdriver-manager"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SergeyPirogov"; repo = "webdriver_manager"; rev = "refs/tags/v${version}"; - hash = "sha256-PdUlloJ4DncnktKQHofn/OLVrgSVyWhaeEEhl3Hgjek="; + hash = "sha256-ZmrQa/2vPwYgSvY3ZUvilg4RizVXpu5hvJJBQVXkK8E="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix deleted file mode 100644 index 4b7c9c3674246..0000000000000 --- a/pkgs/development/python-modules/webhelpers/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - routes, - markupsafe, - webob, - nose, -}: - -buildPythonPackage rec { - pname = "webhelpers"; - version = "1.3"; - - src = fetchPypi { - pname = "WebHelpers"; - inherit version; - sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583"; - }; - - buildInputs = [ - routes - markupsafe - webob - nose - ]; - - # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff - doCheck = false; - - meta = with lib; { - homepage = "https://webhelpers.readthedocs.org/en/latest/"; - description = "Web Helpers"; - license = licenses.free; - maintainers = with maintainers; [ domenkozar ]; - }; -} diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 921b75ef0778a..e574d78da108e 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -2,14 +2,17 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + legacy-cgi, pytestCheckHook, + pythonAtLeast, pythonOlder, }: buildPythonPackage rec { pname = "webob"; version = "1.8.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +22,11 @@ buildPythonPackage rec { hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; }; + build-system = [ setuptools ]; + + # https://github.com/Pylons/webob/issues/437 + dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "webob" ]; @@ -33,6 +41,6 @@ buildPythonPackage rec { description = "WSGI request and response object"; homepage = "https://webob.org/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix deleted file mode 100644 index 37d639ee336b7..0000000000000 --- a/pkgs/development/python-modules/weboob/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - lib, - babel, - buildPythonPackage, - cssselect, - feedparser, - fetchPypi, - gdata, - gnupg, - google-api-python-client, - html2text, - libyaml, - lxml, - mechanize, - nose, - pdfminer-six, - pillow, - prettytable, - pyqt5, - pytestCheckHook, - python-dateutil, - pythonOlder, - pyyaml, - requests, - simplejson, - termcolor, - unidecode, -}: - -buildPythonPackage rec { - pname = "weboob"; - version = "2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw"; - }; - - nativeBuildInputs = [ pyqt5 ]; - - propagatedBuildInputs = [ - babel - cssselect - python-dateutil - feedparser - gdata - gnupg - google-api-python-client - html2text - libyaml - lxml - mechanize - pdfminer-six - pillow - prettytable - pyqt5 - pyyaml - requests - simplejson - termcolor - unidecode - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "with-doctest = 1" "" \ - --replace "with-coverage = 1" "" \ - --replace "weboob.browser.filters.standard," "" \ - --replace "weboob.browser.tests.filters," "" \ - --replace "weboob.tools.application.formatters.json," "" \ - --replace "weboob.tools.application.formatters.table," "" \ - --replace "weboob.tools.capabilities.bank.transactions," "" - ''; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; - - pythonImportsCheck = [ "weboob" ]; - - meta = with lib; { - description = "Collection of applications and APIs to interact with websites"; - homepage = "http://weboob.org"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/webrtc-noise-gain/default.nix b/pkgs/development/python-modules/webrtc-noise-gain/default.nix index 2ee864d32426b..68cc5938bc889 100644 --- a/pkgs/development/python-modules/webrtc-noise-gain/default.nix +++ b/pkgs/development/python-modules/webrtc-noise-gain/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "webrtc-noise-gain"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "webrtc-noise-gain"; rev = "v${version}"; - hash = "sha256-DFEtuO49zXNixLwBjQ/WOiARDhMAXVH+5hfc3eSdPIo="; + hash = "sha256-ALRdj9zBcx05DcSKjAI0oEPruTD/p+pQ0kcqqyHl37A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index fc1b3c7115188..2dee5231dc723 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/kanaka/websockify"; changelog = "https://github.com/novnc/websockify/releases/tag/v${version}"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/webthing-ws/default.nix b/pkgs/development/python-modules/webthing-ws/default.nix index 83f1c813e88d9..3df7d18618139 100644 --- a/pkgs/development/python-modules/webthing-ws/default.nix +++ b/pkgs/development/python-modules/webthing-ws/default.nix @@ -4,7 +4,6 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index cba91268a5eb1..bd168ccb8f599 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.3"; + version = "0.60.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-eIGzcuSKzcpE6UPQKmv0kcFcIFizWOunfOJDHfcw7Yk="; + hash = "sha256-Ht+TSjI1FZ+y/lt5IlepxpT5uOBYeJaNmF7aBw2YUPA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix index 8c46f47ffdaf3..ab11125bb379a 100644 --- a/pkgs/development/python-modules/wfuzz/default.nix +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -13,6 +13,7 @@ pythonOlder, setuptools, six, + fetchpatch2, }: buildPythonPackage rec { @@ -29,9 +30,22 @@ buildPythonPackage rec { hash = "sha256-RM6QM/iR00ymg0FBUtaWAtxPHIX4u9U/t5N/UT/T6sc="; }; + patches = [ + # replace use of imp module for Python 3.12 + # https://github.com/xmendez/wfuzz/pull/365 + (fetchpatch2 { + url = "https://github.com/xmendez/wfuzz/commit/f4c028b9ada4c36dabf3bc752f69f6ddc110920f.patch?full_index=1"; + hash = "sha256-t7pUMcdFmwAsGUNBRdZr+Jje/yR0yzeGIgeYNEq4hFE="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "pyparsing>=2.4*" "pyparsing>=2.4" + + # fix distutils use for Python 3.12 + substituteInPlace src/wfuzz/plugin_api/base.py \ + --replace-fail "from distutils import util" "from setuptools._distutils import util" ''; propagatedBuildInputs = [ @@ -56,6 +70,8 @@ buildPythonPackage rec { # The tests are requiring a local web server "tests/test_acceptance.py" "tests/acceptance/test_saved_filter.py" + # depends on imp module removed from Python 3.12 + "tests/test_moduleman.py" ]; pythonImportsCheck = [ "wfuzz" ]; diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 1db5e385768c5..c4ad9ca8d0ec2 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whatthepatch"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cscorley"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1+OIs77Vyx56pgf7VSmi4UsPgkv8qZXFm8L2jK2CTMk="; + hash = "sha256-NjlQL+zgN9WKUMxMCl97eXTdM8Prrg3iiY8/zwQ8jyY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/wheezy-template/default.nix b/pkgs/development/python-modules/wheezy-template/default.nix index fd88225ee69af..fcdaf64d802ca 100644 --- a/pkgs/development/python-modules/wheezy-template/default.nix +++ b/pkgs/development/python-modules/wheezy-template/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Lightweight template library"; mainProgram = "wheezy.template"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 00fbeb703bf6e..184d987f63a79 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -1,11 +1,15 @@ { lib, + stdenv, fetchFromGitHub, pythonOlder, + rustPlatform, + cargo, + rustc, + libiconv, buildPythonPackage, - poetry-core, - backports-zoneinfo, - tzdata, + setuptools, + setuptools-rust, pytestCheckHook, pytest-mypy-plugins, hypothesis, @@ -14,38 +18,54 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.5.2"; + version = "0.6.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-bG8LV+r5MjA1JwBHWy9/Io4daldAlyEGYNLW+5ITuOw="; + hash = "sha256-uUjQtaqPO/Ie7vVddQhc3dxORX2PxNRaDJzCr+vieUo="; }; - postPatch = '' - # unrecognized arguments since we don't use pytest-benchmark in nixpkgs - substituteInPlace pytest.ini \ - --replace-fail '--benchmark-disable' '#--benchmark-disable' - ''; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-8U3pGKY9UQ0JpzUn3Ny6YSD3wzXPDi1pupD5fpEJFvw="; + }; - build-system = [ poetry-core ]; + build-system = [ + setuptools + setuptools-rust + rustPlatform.cargoSetupHook + cargo + rustc + ]; - dependencies = [ tzdata ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins + # pytest-benchmark # developer sanity check, should not block distribution hypothesis freezegun ]; + disabledTestPaths = [ + # benchmarks + "benchmarks/python/test_date.py" + "benchmarks/python/test_instant.py" + "benchmarks/python/test_local_datetime.py" + "benchmarks/python/test_zoned_datetime.py" + ]; + pythonImportsCheck = [ "whenever" ]; - # early TDD, many tests are failing + # a bunch of failures, including an assumption of what the timezone on the host is # TODO: try enabling on bump doCheck = false; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index a47c58b1adffa..88b7df53a52d8 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "6.6.0"; + version = "6.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "evansd"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Z59GjrOL+BPHqBCirg9T4qBOrjiuBng6Q5lTuLQx9ac="; + hash = "sha256-4SrTiTqBrfFuQ/8mqQL+YiehFWW+ZzKiAF0h2XyYuSs="; }; nativeBuildInputs = [ setuptools ]; @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://whitenoise.readthedocs.io/"; changelog = "https://github.com/evansd/whitenoise/blob/${version}/docs/changelog.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/whois-api/default.nix b/pkgs/development/python-modules/whois-api/default.nix index 0623b4297fb70..f3a40dcc9a1a4 100644 --- a/pkgs/development/python-modules/whois-api/default.nix +++ b/pkgs/development/python-modules/whois-api/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, requests, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix new file mode 100644 index 0000000000000..1697e319a171e --- /dev/null +++ b/pkgs/development/python-modules/whool/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + fetchFromGitHub, + git, + hatch-vcs, + lib, + manifestoo-core, + pytestCheckHook, + pythonOlder, + tomli, + wheel, +}: + +buildPythonPackage rec { + pname = "whool"; + version = "1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sbidoul"; + repo = "whool"; + rev = "refs/tags/v${version}"; + hash = "sha256-uIHtygDeFbtIZLn0YwGzAHD7B+EZQ3JAovuNMZ5YMxc="; + }; + + build-system = [ hatch-vcs ]; + + dependencies = [ + manifestoo-core + wheel + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + pythonImportsCheck = [ "whool" ]; + + nativeCheckInputs = [ + pytestCheckHook + git + ]; + + setupHook = ./setup-hook.sh; + + meta = { + description = "Standards-compliant Python build backend to package Odoo addons"; + homepage = "https://github.com/sbidoul/whool"; + changelog = "https://github.com/sbidoul/whool/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.yajo ]; + }; +} diff --git a/pkgs/development/python-modules/whool/setup-hook.sh b/pkgs/development/python-modules/whool/setup-hook.sh new file mode 100644 index 0000000000000..1c8ecdf2c6630 --- /dev/null +++ b/pkgs/development/python-modules/whool/setup-hook.sh @@ -0,0 +1,16 @@ +# Avoid using git to auto-bump the addon version +# DOCS https://github.com/sbidoul/whool/?tab=readme-ov-file#configuration +whool-post-version-strategy-hook() { + # DOCS https://stackoverflow.com/a/13864829/1468388 + if [ -z ${WHOOL_POST_VERSION_STRATEGY_OVERRIDE+x} ]; then + echo Setting WHOOL_POST_VERSION_STRATEGY_OVERRIDE to none + export WHOOL_POST_VERSION_STRATEGY_OVERRIDE=none + fi + + # Make sure you can import the built addon + for manifest in $(find -L . -name __manifest__.py); do + export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $(realpath $manifest)))" + done +} + +preBuildHooks+=(whool-post-version-strategy-hook) diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index fbe8528c0cf28..b56a590a3fa6d 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "Fast, pure-Python full text indexing, search, and spell checking library"; homepage = "https://github.com/mchaput/whoosh"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index c0a6665a41ce7..6cf9a308b8202 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, fetchPypi, jupyter-packaging, diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix index 76d4e7f8190c9..b99d4782f47ba 100644 --- a/pkgs/development/python-modules/wifi/default.nix +++ b/pkgs/development/python-modules/wifi/default.nix @@ -5,7 +5,6 @@ pbkdf2, pytestCheckHook, pythonOlder, - substituteAll, wirelesstools, }: diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index caaa6d1c995ab..b4c636923b963 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "Module for decorators, wrappers and monkey patching"; homepage = "https://github.com/GrahamDumpleton/wrapt"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index fb53253c8c63c..4cb6bacc3c932 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://ws4py.readthedocs.org"; changelog = "https://github.com/Lawouach/WebSocket-for-Python/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 92d7f79082a24..880e10b59d7fc 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Pure Python, pure state-machine WebSocket implementation"; homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index d71ba1adca232..ea46539a5db5e 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/minrk/wurlitzer"; changelog = "https://github.com/minrk/wurlitzer/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/x11-hash/default.nix b/pkgs/development/python-modules/x11-hash/default.nix index 907c70080dd33..92af43fad444d 100644 --- a/pkgs/development/python-modules/x11-hash/default.nix +++ b/pkgs/development/python-modules/x11-hash/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - pytestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 58981027b3e8c..743e7b068bc5f 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-bindings-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xarray-datatree/default.nix b/pkgs/development/python-modules/xarray-datatree/default.nix new file mode 100644 index 0000000000000..1d99f300cb7bb --- /dev/null +++ b/pkgs/development/python-modules/xarray-datatree/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + check-manifest, + setuptools, + setuptools-scm, + packaging, + pytestCheckHook, + xarray, + zarr, +}: + +buildPythonPackage rec { + pname = "datatree"; + version = "0.0.14"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "xarray-contrib"; + repo = "datatree"; + rev = "refs/tags/v${version}"; + hash = "sha256-C6+WcHc2+sftJ5Yyh/9TTIHhAEwhAqSsSkaDwtq7J90="; + }; + + build-system = [ + check-manifest + setuptools + setuptools-scm + ]; + + dependencies = [ + packaging + xarray + ]; + + nativeCheckInputs = [ + pytestCheckHook + zarr + ]; + + pythonImportsCheck = [ "datatree" ]; + + disabledTests = [ + # output formatting issue, likely due to underlying library version difference: + "test_diff_node_data" + ]; + + meta = with lib; { + description = "Tree-like hierarchical data structure for xarray"; + homepage = "https://xarray-datatree.readthedocs.io"; + changelog = "https://github.com/xarray-contrib/datatree/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index 5d5486dbffed4..b82a8a8cd79f4 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -6,7 +6,6 @@ flit-core, numba, numpy, - pandas, pytestCheckHook, pythonOlder, scipy, diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index e700a0a80d64b..84a9d63536e00 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/xattr/xattr"; changelog = "https://github.com/xattr/xattr/blob/v${version}/CHANGES.txt"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index 87eeec7902ea8..4a2efae3a8fb8 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "XDG Base Directory Specification for Python"; homepage = "https://github.com/srstevenson/xdg"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix index 686c6e8b765e5..7965d1db3efad 100644 --- a/pkgs/development/python-modules/xdoctest/default.nix +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.1.5"; + version = "1.1.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "xdoctest"; rev = "refs/tags/v${version}"; - hash = "sha256-lC4xX5V5iasQdR4tkLEvtMe/OjSp6+A7D2QGX6TFY4E="; + hash = "sha256-L/RtD/e0ubW3j4623HQGfowXQYZjl7dDfwwbfxm3ll8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 9a7b7bbef2b15..530f002110867 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -18,7 +18,7 @@ fairscale, scipy, cmake, - openai-triton, + triton, networkx, #, apex einops, @@ -103,7 +103,7 @@ buildPythonPackage { scipy cmake networkx - openai-triton + triton # apex einops transformers diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 320b1d1d6ab1e..bf2c8908d2868 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, pythonOlder, cmake, diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 1ab72c73a81be..eeb1b6ce33738 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "xhtml2pdf"; }; } diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 531a5ad6299e5..e08491788c9ac 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.30.1"; + version = "0.30.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-1YeT525L6SsybiA+k5vPx5D2yvYdcuxfhpUMlZCX2Jo="; + hash = "sha256-x+i5zC0WTWO+F1uIliAzyc+48X3njwTNz5ss5KK6xuQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index a7db6ea5fe523..5d5ce94309598 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xkbcommon"; - version = "1.0"; + version = "1.5.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NTEafcAU/PU1/2n3pb3m8dbZptI9j9nnmVG4iFqHHe8="; + hash = "sha256-rBdICNv2HTXZ2oBL8zuqx0vG8r4MEIWUrpPHnNFd3DY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index a4c05c70f0c31..6d9a4004da3e6 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, cryptography, ifaddr, - pytest-asyncio_0_21, + pytest-asyncio, pytestCheckHook, pythonOlder, setuptools, @@ -25,17 +25,15 @@ buildPythonPackage rec { hash = "sha256-gajxXIR3lmHsW7258v4z20RilzGfm5KGVrXZwRm74Mk="; }; - patches = [ ./pytest-asyncio-0.22-compat.patch ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ cryptography ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; nativeCheckInputs = [ - pytest-asyncio_0_21 + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/xknx/pytest-asyncio-0.22-compat.patch b/pkgs/development/python-modules/xknx/pytest-asyncio-0.22-compat.patch deleted file mode 100644 index 2688ceb1fdd62..0000000000000 --- a/pkgs/development/python-modules/xknx/pytest-asyncio-0.22-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/test/devices_tests/datetime_test.py b/test/devices_tests/datetime_test.py -index af06abc6..2145fcc1 100644 ---- a/test/devices_tests/datetime_test.py -+++ b/test/devices_tests/datetime_test.py -@@ -12,11 +12,6 @@ from xknx.telegram.apci import GroupValueRead, GroupValueResponse, GroupValueWri - class TestDateTime: - """Test class for DateTime object.""" - -- # pylint: disable=attribute-defined-outside-init -- def teardown_method(self): -- """Cancel broadcast_task.""" -- self.datetime.__del__() -- - # - # SET Time - # -diff --git a/test/io_tests/secure_session_test.py b/test/io_tests/secure_session_test.py -index cd2dc1d0..ca90e2d9 100644 ---- a/test/io_tests/secure_session_test.py -+++ b/test/io_tests/secure_session_test.py -@@ -65,7 +65,6 @@ class TestSecureSession: - - def teardown_method(self): - """Cancel keepalive task.""" -- self.session.stop() - self.patch_serial_number.stop() - self.patch_message_tag.stop() - diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 28e18a01dce72..a24b9fe21a6a4 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -4,11 +4,10 @@ buildPythonPackage, fetchFromGitHub, six, + setuptools, setuptools-scm, xorg, - python, mock, - nose, pytestCheckHook, util-linux, }: @@ -16,7 +15,9 @@ buildPythonPackage rec { pname = "xlib"; version = "0.33"; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; src = fetchFromGitHub { owner = "python-xlib"; @@ -36,7 +37,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook mock - nose util-linux xorg.xauth xorg.xvfb @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Fully functional X client library for Python programs"; homepage = "https://github.com/python-xlib/python-xlib"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 272fe740981ee..5748b788e1a4f 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.8.2"; + version = "0.8.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-zdJyyC+LMvHO52rq74ey7jVJZh/d+Q9+zyMQlnoW/IQ="; + hash = "sha256-bGXVmJ6NPxTdcpbUJdaTpn9RiZ0Mjh7XvL+cyxgiNzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index b47a5c4e3cddb..008566a6b2dd2 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -1,46 +1,41 @@ { lib, buildPythonPackage, - fetchPypi, - pynose, + fetchFromGitHub, setuptools, - pythonOlder, + pytestCheckHook, + six, }: -buildPythonPackage rec { +buildPythonPackage { pname = "xlwt"; - version = "1.3.0"; + version = "1.3.0-unstable-2018-09-16"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-xZkScXqbKPGjwqmP1gdBAUsGsEOTbc7LwRPqqtoVbIg="; + src = fetchFromGitHub { + owner = "python-excel"; + repo = "xlwt"; + # Use last commit before archival + rev = "5a222d0315b6d3ce52a3cedd7c3e41309587c107"; + hash = "sha256-YKbqdimX1q+d7A9BSwuKl3SndQ+0eocz+m6xMAZeMQQ="; }; build-system = [ setuptools ]; - nativeCheckInputs = [ pynose ]; - - checkPhase = '' - runHook preCheck - - nosetests -v + dependencies = [ six ]; - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xlwt" ]; - meta = with lib; { + meta = { description = "Library to create spreadsheet files compatible with MS"; homepage = "https://github.com/python-excel/xlwt"; - license = with licenses; [ + license = with lib.licenses; [ bsdOriginal bsd3 lgpl21Plus ]; - maintainers = with maintainers; [ ]; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 13829b6be86c2..927296f072f79 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-Sy70OQvKx0H8vxRFTEkg+QV9eVij5C9dlAwJ2HTFOi8="; + hash = "sha256-cZVNgY0Y9tE+ud8596Ujidc7aq+Gon9x6q/XDCuJ9oI="; }; build-system = [ setuptools ]; @@ -48,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/sissaschool/xmlschema"; changelog = "https://github.com/sissaschool/xmlschema/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 9a6142501630d..0000eea5f4058 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xmod/default.nix b/pkgs/development/python-modules/xmod/default.nix index e16652e971f5d..34b197579c3eb 100644 --- a/pkgs/development/python-modules/xmod/default.nix +++ b/pkgs/development/python-modules/xmod/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://github.com/rec/xmod"; changelog = "https://github.com/rec/xmod/blob/${src.rev}/CHANGELOG"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index a9a1ed7a5e6df..0e16d17bd348e 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.2.1"; + version = "24.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tefra"; repo = "xsdata"; rev = "refs/tags/v${version}"; - hash = "sha256-o3G0isXShwNHaOiA4TNml0IhStB3X4jB9CgrVKViBlY="; + hash = "sha256-7rROd0iKs/SuIZGUwVDbusKgp7APIlvFto43Q3QCfZk="; }; patches = [ @@ -40,12 +40,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--benchmark-skip" "" + --replace-fail "--benchmark-skip" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ typing-extensions ]; + dependencies = [ typing-extensions ]; passthru.optional-dependencies = { cli = [ diff --git a/pkgs/development/python-modules/xsdata/paths.patch b/pkgs/development/python-modules/xsdata/paths.patch index aad5223713228..162936d4df1a1 100644 --- a/pkgs/development/python-modules/xsdata/paths.patch +++ b/pkgs/development/python-modules/xsdata/paths.patch @@ -1,13 +1,21 @@ -diff --git a/xsdata/codegen/writer.py b/xsdata/codegen/writer.py -index 0301631f..3185c526 100644 ---- a/xsdata/codegen/writer.py -+++ b/xsdata/codegen/writer.py -@@ -73,7 +73,7 @@ class CodeWriter: - """Run ruff format on the src code.""" +diff --git a/xsdata/formats/dataclass/generator.py b/xsdata/formats/dataclass/generator.py +index 1c155836..43506818 100644 +--- a/xsdata/formats/dataclass/generator.py ++++ b/xsdata/formats/dataclass/generator.py +@@ -240,14 +240,14 @@ class DataclassGenerator(AbstractGenerator): + """ commands = [ [ - "ruff", + "@ruff@", "format", - "--stdin-filename", - str(file_path), + "--line-length", + str(self.config.output.max_line_length), + *file_paths, + ], + [ +- "ruff", ++ "@ruff@", + "check", + "--line-length", + str(self.config.output.max_line_length), diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix index 187a9c7baf934..4427858a8157f 100644 --- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix +++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic-asciinema-player"; inherit version; - sha256 = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; + hash = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-font-awesome/default.nix b/pkgs/development/python-modules/xstatic-font-awesome/default.nix index 1a8868a84685c..7f8d70372a3d4 100644 --- a/pkgs/development/python-modules/xstatic-font-awesome/default.nix +++ b/pkgs/development/python-modules/xstatic-font-awesome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic-Font-Awesome"; inherit version; - sha256 = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; + hash = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index 4d6fd00d221cf..fb7b2b1e90014 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic"; inherit version; - sha256 = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; + hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; # no tests implemented diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 908b4d4b50b4e..4feef1dc27ebf 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -7,20 +7,20 @@ buildPythonPackage, ciso8601, fetchFromGitHub, - pubnub, + freenub, + poetry-core, pyjwt, pytestCheckHook, python-dateutil, pythonOlder, - requests, requests-mock, - poetry-core, + requests, typing-extensions, }: buildPythonPackage rec { pname = "yalexs"; - version = "6.4.1"; + version = "6.4.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-lCRil1SeYXZeXT0SJielJg2Ma8voBXPgij+RK/oT1iU="; + hash = "sha256-vW6BMb0aaGGsXwZci5FE9VuSB/hi0pltIVH/OcL0mnw="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { aiofiles aiohttp ciso8601 - pubnub + freenub pyjwt python-dateutil requests diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index f2f2e7379b072..b8747bc3f0fc8 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -7,7 +7,6 @@ pdm-backend, pytest-freezegun, pytest-xdist, - pytest, pytestCheckHook, pythonOlder, ruyaml, diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index 89f871e50be2f..b1f4a0caa6522 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; + hash = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; }; propagatedBuildInputs = [ pyyaml ]; @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "YAML loader and dump for PyYAML allowing to keep keys order"; homepage = "https://github.com/fmenabe/python-yamlordereddictloader"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix deleted file mode 100644 index 30d0e302cd437..0000000000000 --- a/pkgs/development/python-modules/yanc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonOlder, - fetchPypi, - nose, -}: - -buildPythonPackage rec { - pname = "yanc"; - version = "0.3.3"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0z35bkk9phs40lf5061k1plhjdl5fskm0dmdikrsqi1bjihnxp8w"; - }; - - # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 - doCheck = pythonOlder "3.5"; - - nativeCheckInputs = [ nose ]; - - checkPhase = '' - nosetests . - ''; - - meta = with lib; { - description = "Yet another nose colorer"; - homepage = "https://github.com/0compute/yanc"; - license = licenses.gpl3; - maintainers = with maintainers; [ jluttine ]; - }; -} diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index c623097a6d5fa..3883e3fa54f4b 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { gpl3Plus lgpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 12ad6fc215f82..256d421f918fe 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -6,7 +6,7 @@ pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage rec { pname = "yapsy"; version = "1.12.2-unstable-2023-03-29"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage { hash = "sha256-QKZlUAhYMCCsT/jbEHb39ESZ2+2FZYnhJnc1PgsozBA="; }; - sourceRoot = "source/package"; + sourceRoot = "${src.name}/package"; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yarg/default.nix b/pkgs/development/python-modules/yarg/default.nix index 9d8bf12c77f57..e2a088c875b17 100644 --- a/pkgs/development/python-modules/yarg/default.nix +++ b/pkgs/development/python-modules/yarg/default.nix @@ -2,37 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, requests, - nose, - mock, + setuptools, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "yarg"; - version = "0.1.9"; - format = "setuptools"; + version = "0.1.9-unstable-2022-02-06"; + pyproject = true; src = fetchFromGitHub { owner = "kura"; - repo = pname; - rev = version; - sha256 = "1isq02s404fp9whkm8w2kvb2ik1sz0r258iby0q532zw81lga0d0"; + repo = "yarg"; + # Latest commit to yarg, which is more up-to-date than the latest release. + rev = "46e2371906bde6e19116664d4841abab414c54fd"; + hash = "sha256-N/NDc9GqqwqU9vD1BU6udthzewBMDji9Np/HKRffLxI="; }; - propagatedBuildInputs = [ requests ]; - - nativeCheckInputs = [ - nose - mock + patches = [ + # Python 3.12 compatibility patch + (fetchpatch2 { + url = "https://github.com/kura/yarg/commit/8d5532e4da11ab0e9a4453658cf0591dcf80a616.patch?full_index=1"; + hash = "sha256-2lbOzEfWTtoZYuRjCQJAFeYUsJoQhhEohflvYOwLXnI="; + }) ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { + dependencies = [ requests ]; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Easy to use PyPI client"; homepage = "https://yarg.readthedocs.io"; - license = licenses.mit; - maintainers = with maintainers; [ psyanticy ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psyanticy ]; }; } diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 30143e8a90fa1..c1a0a6cc900f1 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/Owez/yark"; changelog = "https://github.com/Owez/yark/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index f5a87425a0757..bbf2a0605cc26 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Library to generate HTML or XML"; homepage = "https://www.yattag.org/"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index db3bfceea9e45..e656721e855ce 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; + hash = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index eb454cd9a4dc6..2be3d381feb6b 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.40"; + version = "0.2.41"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-y3vcgPhksW8g0WpqVgJej7s+aIj9zaAjBjSm8d7yrjs="; + hash = "sha256-9Vp/z0u/Mfil1xWHvHPRFa62sLvEJMjHLBYweLfz42o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 8a567cd5a51e3..97d37c7a79428 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.4.4"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-yRxv3Itj+SkLtj5rErOzJoxj0JhsAWrdi0DucKZKKIU="; + hash = "sha256-VJqKORyAlTBIRsHaeUrLDuvVAU/EX/Zzh8u7xxmD2IE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/youtokentome/default.nix b/pkgs/development/python-modules/youtokentome/default.nix index ad39637c12b10..0d6328f13a781 100644 --- a/pkgs/development/python-modules/youtokentome/default.nix +++ b/pkgs/development/python-modules/youtokentome/default.nix @@ -5,7 +5,6 @@ setuptools, click, cython, - pytestCheckHook, pythonOlder, tabulate, }: diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index b9eeabea51fee..344427e53e168 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Search for YouTube videos, channels & playlists & get video information using link without YouTube Data API"; homepage = "https://github.com/alexmercerind/youtube-search-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index dfe6cbf51f73b..b95a996f7683f 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Python WhatsApp library"; mainProgram = "yowsup-cli"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/yt-dlp-dearrow/default.nix b/pkgs/development/python-modules/yt-dlp-dearrow/default.nix new file mode 100644 index 0000000000000..ae182ce79a47f --- /dev/null +++ b/pkgs/development/python-modules/yt-dlp-dearrow/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage { + pname = "yt-dlp-dearrow"; + version = "2023.01.01-unstable-2024-01-13"; # setup.cfg + pyproject = true; + + src = fetchFromGitHub { + owner = "QuantumWarpCode"; + repo = "yt-dlp-dearrow"; + rev = "2e46eca7b2242d8c9765bf2d12f92270b694be64"; # no tags + hash = "sha256-Ubi1kn/1FqkuwnxToBuSsAfCYWiNCTl/EUD8eeG3MSY="; + }; + + build-system = [ setuptools ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ "yt_dlp_plugins" ]; + + meta = { + description = "Post-processor plugin to use DeArrow video titles in YT-DLP"; + homepage = "https://github.com/QuantumWarpCode/yt-dlp-dearrow"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 7d442fec0af05..4d99219d05a20 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -4,28 +4,24 @@ fetchFromGitHub, pythonOlder, requests, - setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.7.4"; + version = "1.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-gD0VpT0hTymubKLRnl45/FkEZ+t9IPA7pY8eIkTnrKM="; + hash = "sha256-PuGGUyQ199Awo0Dqi6xUAAt53WZjvaLiW7bIT4zlMT0="; }; - build-system = [ - setuptools - setuptools-scm - ]; + build-system = [ setuptools-scm ]; dependencies = [ requests ]; diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index 43f3a8994b665..68da9e13b6c8d 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, @@ -13,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; + hash = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; }; propagatedBuildInputs = [ pyusb ]; diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 82e6d5bb0e91d..e057433c1789b 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -1,7 +1,6 @@ { lib, aiohttp, - aresponses, buildPythonPackage, fetchFromGitHub, poetry-core, diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 9022a3aaeb692..131aef003b2dd 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/zarr-developers/zarr"; changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index 7cbcc563280ed..ee859b099d943 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Daemon process control library and tools for Unix-based systems"; homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zc-lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix index 8cfd30c2e7100..2d7c5dc0c87ef 100644 --- a/pkgs/development/python-modules/zc-lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Inter-process locks"; homepage = "https://www.python.org/pypi/zc.lockfile"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index ee8eb919c3ebf..d31124a9ac1e0 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -49,6 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/ZConfig"; changelog = "https://github.com/zopefoundation/ZConfig/blob/${version}/CHANGES.rst"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index a66424b06ba03..794801284b346 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/zdaemon"; changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 171a725cf0e89..6d96954257ce7 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.117"; + version = "0.0.118"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-uk1G8X5TLuA4spTrd+077wggCooqvqJZh3NIwC4/BFM="; + hash = "sha256-LudwIENP1KCX7+HwyklCUdAu5mRLDcnMEZBzbRH2FM0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 740aedd89c7a4..c909669a329fa 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.15"; + version = "0.0.28"; pyproject = true; disabled = pythonOlder "3.12"; @@ -35,12 +35,12 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-k4Wqxv7WJGDDGXA80qW+RUICTUcgLsWJNiV+zsOkfuM="; + hash = "sha256-qsX62k/KeQ2ZTUHAv2ieZxOFh9dNFnLx0ZZOZCvI3ZE="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail '"setuptools-git-versioning<3"' "" \ --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; @@ -102,6 +102,12 @@ buildPythonPackage rec { "test_sinope_time" "test_siren_timed_off" "test_zha_group_light_entity" + # flaky, either due to race conditions or timeouts + "test_zha_group_switch_entity" + "test_zha_group_fan_entity" + "test_startup_concurrency_limit" + "test_fan_ikea" + "test_background" ]; disabledTestPaths = [ "tests/test_cluster_handlers.py" ]; @@ -115,7 +121,7 @@ buildPythonPackage rec { description = "Zigbee Home Automation"; homepage = "https://github.com/zigpy/zha"; changelog = "https://github.com/zigpy/zha/releases/tag/${version}"; - license = licenses.gpl3Only; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 7cd3ea92489c3..048fc2b17d105 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -3,7 +3,6 @@ asynctest, buildPythonPackage, fetchFromGitHub, - pyserial, pyserial-asyncio, pytest-asyncio, pytestCheckHook, diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index c8779020abc4d..83fae1faddba9 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.2"; + version = "0.23.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H3WsprBTfBpxMGqasWbj41Yikt/UMU0cKaROzXE2dLU="; + hash = "sha256-z/QulOkvkV/1Z+M7EfzdfGvrrtkapYcvfz+3AijR46k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 0fb84ddcad9ce..fc7d291bd2a90 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.12.1"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-17XiGeEnQ3zQ4BaQ/RzwBUU9Xpg4yjUX1pV3mcIiI+M="; + hash = "sha256-Mwccb0OQgSknH8prbFejkGRVI7ii/r9D87aRyQrGgWs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index cefa563545461..c4953c39ab0f1 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.12.2"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zfoFajRuZ06LLe8+3BUZZbKGpset24QQmqAIY949MF8="; + hash = "sha256-5DuqM7MgntV/3WquR+0Cr/vIwYL35ZVpGlNZPj92jJ4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 48455b0a6e94b..c86a79435d28a 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -11,6 +11,7 @@ cryptography, fetchFromGitHub, freezegun, + frozendict, importlib-resources, jsonschema, pycryptodome, @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.64.1"; + version = "0.65.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-9hPJZQfLevV6zl7JvLtCJSspGl87ORlWLXoVJmRcEJU="; + hash = "sha256-zE8Hqha1yv7OsaXYrKzf3o2JLO/RcDSAxixWoMj2T3M="; }; postPatch = '' @@ -53,6 +54,7 @@ buildPythonPackage rec { aiosqlite crccheck cryptography + frozendict jsonschema pyserial-asyncio typing-extensions diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index f9ecaecd95e38..07185aa568f4a 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -43,7 +43,7 @@ let description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index d14b0e1565cd3..704bbabebfc0f 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://zodb-docs.readthedocs.io/"; changelog = "https://github.com/zopefoundation/ZODB/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 55dcfb7800d96..e9d90b93e4b95 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zodbpickle"; changelog = "https://github.com/zopefoundation/zodbpickle/blob/${version}/CHANGES.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index ffe2dc672cb76..db6a96e7fd625 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Zope Component Architecture"; changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index 1717a45e7143f..c658412f6b3d9 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -53,6 +53,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.configuration"; changelog = "https://github.com/zopefoundation/zope.configuration/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix index d37de16fad17f..3d70c4dc6788a 100644 --- a/pkgs/development/python-modules/zope-contenttype/default.nix +++ b/pkgs/development/python-modules/zope-contenttype/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Utility module for content-type (MIME type) handling"; changelog = "https://github.com/zopefoundation/zope.contenttype/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 352fefbcd3737..7cc6f18d5e3d4 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; + hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; propagatedBuildInputs = [ zope-proxy ]; diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix index 44b1749d791fb..ed3dbab8d0162 100644 --- a/pkgs/development/python-modules/zope-dottedname/default.nix +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Resolver for Python dotted names"; changelog = "https://github.com/zopefoundation/zope.dottedname/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index 95a3a7f182755..805fc285e0a0d 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Event publishing system"; homepage = "https://pypi.org/project/zope.event/"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix index 835fa247410e1..186112d1138d1 100644 --- a/pkgs/development/python-modules/zope-exceptions/default.nix +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/zope.exceptions"; changelog = "https://github.com/zopefoundation/zope.exceptions/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix index b9f394f03d2f0..347b634831f49 100644 --- a/pkgs/development/python-modules/zope-filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://zopefilerepresentation.readthedocs.io/"; description = "File-system Representation Interfaces"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index df703e2c3b15d..0d1f93014fc46 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Message Identifiers for internationalization"; changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${version}/CHANGES.rst"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index c94e4a0366c56..830e4291ef4ff 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Zope.Interface"; homepage = "https://github.com/zopefoundation/zope.interface"; license = licenses.zpl20; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index d54a9225dc8c0..03f1a5cf111ed 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "Object life-cycle events"; changelog = "https://github.com/zopefoundation/zope.lifecycleevent/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-location/default.nix b/pkgs/development/python-modules/zope-location/default.nix index 3b47baea5b195..19dfb93b98c92 100644 --- a/pkgs/development/python-modules/zope-location/default.nix +++ b/pkgs/development/python-modules/zope-location/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.location/"; description = "Zope Location"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index cb5717d8abef7..958470fde845e 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Generic Transparent Proxies"; changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index 197022900efdc..a1f4a8f263f7a 100644 --- a/pkgs/development/python-modules/zope-schema/default.nix +++ b/pkgs/development/python-modules/zope-schema/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.schema"; description = "zope.interface extension for defining data schemas"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index 33838d51cc73f..d526d01e3fa0f 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.size"; description = "Interfaces and simple adapter that give the size of an object"; license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-testbrowser/default.nix b/pkgs/development/python-modules/zope-testbrowser/default.nix index b63578bb6b83f..5e08e973a1aec 100644 --- a/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, zope-interface, zope-schema, @@ -11,7 +11,6 @@ beautifulsoup4, soupsieve, wsgiproxy2, - six, mock, zope-testing, zope-testrunner, @@ -21,22 +20,24 @@ buildPythonPackage rec { pname = "zope-testbrowser"; version = "7.0"; + pyproject = true; - format = "setuptools"; - - src = fetchPypi { - pname = "zope.testbrowser"; - inherit version; - sha256 = "sha256-WTbSoNd9h4HQATWP0LEUYShbAtxuOzJLhMHtkyax/z8="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.testbrowser"; + rev = "refs/tags/${version}"; + hash = "sha256-vGx2ObHgt4hSQe/JKZkD2/GhdtbJEAfggkM209maen4="; }; postPatch = '' # remove test that requires network access substituteInPlace src/zope/testbrowser/tests/test_doctests.py \ - --replace "suite.addTests(wire)" "" + --replace-fail "suite.addTests(wire)" "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ setuptools zope-interface zope-schema @@ -46,7 +47,6 @@ buildPythonPackage rec { beautifulsoup4 soupsieve wsgiproxy2 - six ]; nativeCheckInputs = [ @@ -68,6 +68,7 @@ buildPythonPackage rec { ]; meta = { + changelog = "https://github.com/zopefoundation/zope.testbrowser/blob/${src.rev}/CHANGES.rst"; description = "Programmable browser for functional black-box tests"; homepage = "https://github.com/zopefoundation/zope.testbrowser"; license = lib.licenses.zpl21; diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index c6b4f61ef7072..8b0c7e22cfd51 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/zopefoundation/zope.testing"; changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst"; license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index 3ba806b9d1192..cc9c00fd8d245 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { mainProgram = "zope-testrunner"; homepage = "https://pypi.python.org/pypi/zope.testrunner"; license = licenses.zpl20; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index f26eb8385a6ef..93941dd579555 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; + hash = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index 9f623b01c8c69..d5bec61a0c0f5 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, setuptools, requests, - matrix-client, distro, click, typing-extensions, diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix index 511a939cf6fb8..42372a283f397 100644 --- a/pkgs/development/python-modules/zxing-cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -1,5 +1,4 @@ { - lib, buildPythonPackage, cmake, setuptools-scm, diff --git a/pkgs/development/python2-modules/attrs/default.nix b/pkgs/development/python2-modules/attrs/default.nix index f4b4b505721f5..30eb0ab17e259 100644 --- a/pkgs/development/python2-modules/attrs/default.nix +++ b/pkgs/development/python2-modules/attrs/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , fetchPypi }: @@ -36,6 +35,6 @@ buildPythonPackage rec { description = "Python attributes without boilerplate"; homepage = "https://github.com/hynek/attrs"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python2-modules/futures/default.nix b/pkgs/development/python2-modules/futures/default.nix index bc19a31927af1..d1cdb679d0d1e 100644 --- a/pkgs/development/python2-modules/futures/default.nix +++ b/pkgs/development/python2-modules/futures/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Backport of the concurrent.futures package from Python 3.2"; homepage = "https://github.com/agronholm/pythonfutures"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python2-modules/pluggy/default.nix b/pkgs/development/python2-modules/pluggy/default.nix index 30fa2e1945b21..ea362bdb5812f 100644 --- a/pkgs/development/python2-modules/pluggy/default.nix +++ b/pkgs/development/python2-modules/pluggy/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Plugin and hook calling mechanisms for Python"; homepage = "https://github.com/pytest-dev/pluggy"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix index 2a09002976b23..00c98fba39aff 100644 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ b/pkgs/development/python2-modules/pygobject/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for GLib"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python2-modules/setuptools-scm/default.nix b/pkgs/development/python2-modules/setuptools-scm/default.nix index 6b5aafcd3c4b8..48b6d3b813473 100644 --- a/pkgs/development/python2-modules/setuptools-scm/default.nix +++ b/pkgs/development/python2-modules/setuptools-scm/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { homepage = "https://github.com/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index acd9e6b2d1a91..678604f04af2e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1256,7 +1256,7 @@ let pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: { postPatch = lib.optionalString stdenv.isDarwin '' for file in R/*.{r,r.in}; do - sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file + sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.cctools}/bin/\1"#g' $file done ''; }); diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index b20b61d6c58d6..2b65bb3d82da2 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , R , rstudio , makeWrapper diff --git a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix index 65e2e93782e91..0b612cde3f80d 100644 --- a/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/5/clr/test-opencl-example.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support) "; + description = "Samples from the AMD APP SDK (with OpenCRun support)"; homepage = "https://github.com/OpenCL/AMD_APP_samples"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index 7f48c4d034cef..c1ffd01c80613 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -10,7 +10,6 @@ , opencv , ffmpeg_4 , libjpeg_turbo -, rapidjson-unstable }: let @@ -304,7 +303,6 @@ in rec { inherit (llvm) clang openmp; opencv = opencv.override { enablePython = true; }; ffmpeg = ffmpeg_4; - rapidjson = rapidjson-unstable; stdenv = llvm.rocmClangStdenv; # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 796a73e1d2c35..914b7d8275476 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation (finalAttrs: { cmake ninja git - python3Packages.python + (python3Packages.python.withPackages (p: [ p.setuptools ])) ] ++ lib.optionals (buildDocs || buildMan) [ doxygen sphinx diff --git a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list index e005d6c928c26..d5e1f675079fa 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list +++ b/pkgs/development/rocm-modules/5/llvm/stage-2/1000-libcxx-failing-tests.list @@ -169,3 +169,7 @@ ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp +../libcxx/test/std/language.support/support.dynamic/hardware_inference_size.compile.pass.cpp +../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp +../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp +../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix index 6de685ea27718..11b9ae9ab5de6 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix @@ -6,7 +6,6 @@ , vulkan-loader , glslang , shaderc -, lit }: callPackage ../base.nix rec { diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix index 342bd950b1fb1..c86a4f5b1edaf 100644 --- a/pkgs/development/rocm-modules/5/miopengemm/default.nix +++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { openblas ] ++ lib.optionals buildBenchmarks [ clblast - python3Packages.openai-triton + python3Packages.triton ]; cmakeFlags = [ diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index bd8a4ed4e35dd..187775e25a651 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -3,7 +3,6 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, runCommand , cmake , rocm-cmake , clr diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix index 940a670ff5799..d2797d1a50169 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DBUILD_CPP_CL=OFF" ]; meta = with lib; { - description = "Samples from the AMD APP SDK (with OpenCRun support) "; + description = "Samples from the AMD APP SDK (with OpenCRun support)"; homepage = "https://github.com/OpenCL/AMD_APP_samples"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/6/composable_kernel/default.nix index ac360482f4afa..e0f8daf826383 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/6/composable_kernel/default.nix @@ -9,6 +9,7 @@ , clang-tools-extra , git , gtest +, zstd , buildTests ? false , buildExamples ? false , gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { rocm-cmake clr clang-tools-extra + zstd ]; buildInputs = [ openmp ]; @@ -66,7 +68,9 @@ stdenv.mkDerivation (finalAttrs: { '' ; - postInstall = lib.optionalString buildTests '' + postInstall = '' + zstd --rm $out/lib/libdevice_operations.a + '' + lib.optionalString buildTests '' mkdir -p $test/bin mv $out/bin/test_* $test/bin '' + lib.optionalString buildExamples '' diff --git a/pkgs/development/rocm-modules/6/composable_kernel/unpack.nix b/pkgs/development/rocm-modules/6/composable_kernel/unpack.nix new file mode 100644 index 0000000000000..2572884388fa3 --- /dev/null +++ b/pkgs/development/rocm-modules/6/composable_kernel/unpack.nix @@ -0,0 +1,16 @@ +{ runCommandLocal, + composable_kernel_build, + zstd +}: +let + ck = composable_kernel_build; +in runCommandLocal "unpack-${ck.name}" { + nativeBuildInputs = [ zstd ]; + meta = ck.meta; + } '' + mkdir -p $out + cp -r --no-preserve=mode ${ck}/* $out + zstd -dv --rm $out/lib/libdevice_operations.a.zst -o $out/lib/libdevice_operations.a + substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ + --replace "${ck}" "$out" + '' diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 4d10ea2440444..6825a8bf860d5 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -10,7 +10,6 @@ , opencv , ffmpeg_4 , libjpeg_turbo -, rapidjson-unstable }: let @@ -242,10 +241,12 @@ in rec { It is still available for some time as part of rocmPackages_5. ''; # Added 2024-3-3 - composable_kernel = callPackage ./composable_kernel { - inherit rocmUpdateScript rocm-cmake clr; - inherit (llvm) openmp clang-tools-extra; - stdenv = llvm.rocmClangStdenv; + composable_kernel = callPackage ./composable_kernel/unpack.nix { + composable_kernel_build = callPackage ./composable_kernel { + inherit rocmUpdateScript rocm-cmake clr; + inherit (llvm) openmp clang-tools-extra; + stdenv = llvm.rocmClangStdenv; + }; }; half = callPackage ./half { @@ -301,7 +302,6 @@ in rec { inherit (llvm) clang openmp; opencv = opencv.override { enablePython = true; }; ffmpeg = ffmpeg_4; - rapidjson = rapidjson-unstable; stdenv = llvm.rocmClangStdenv; # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice diff --git a/pkgs/development/rocm-modules/6/llvm/base.nix b/pkgs/development/rocm-modules/6/llvm/base.nix index caa2ebe42823a..1bbf164475496 100644 --- a/pkgs/development/rocm-modules/6/llvm/base.nix +++ b/pkgs/development/rocm-modules/6/llvm/base.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation (finalAttrs: { cmake ninja git - python3Packages.python + (python3Packages.python.withPackages (p: [ p.setuptools ])) ] ++ lib.optionals (buildDocs || buildMan) [ doxygen sphinx diff --git a/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list b/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list index e005d6c928c26..d5e1f675079fa 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list +++ b/pkgs/development/rocm-modules/6/llvm/stage-2/1000-libcxx-failing-tests.list @@ -169,3 +169,7 @@ ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_overaligned_request.pass.cpp ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate_reuse_blocks.pass.cpp ../libcxx/test/std/utilities/utility/mem.res/mem.res.pool/mem.res.pool.mem/unsync_allocate.pass.cpp +../libcxx/test/std/language.support/support.dynamic/hardware_inference_size.compile.pass.cpp +../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array14.pass.cpp +../libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete14.pass.cpp +../libcxx/test/libcxx/selftest/sh.cpp/empty.sh.cpp diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix index 8b71b3fb29778..7611a30165a72 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix @@ -6,7 +6,6 @@ , vulkan-loader , glslang , shaderc -, lit , fetchpatch }: diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index f93cceddd68af..4233aa640690f 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , rocmUpdateScript -, runCommand , cmake , rocm-cmake , clr diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix deleted file mode 100644 index f324ebecda615..0000000000000 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ buildRubyGem -, fetchFromGitHub -, makeWrapper -, lib -, bundler -, nix -, nix-prefetch-git -}: - -buildRubyGem rec { - inherit (bundler) ruby; - - name = "${gemName}-${version}"; - gemName = "bundix"; - version = "2.5.2"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "bundix"; - rev = version; - sha256 = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE="; - }; - - buildInputs = [ ruby bundler ]; - nativeBuildInputs = [ makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/bundix \ - --prefix PATH : "${nix.out}/bin" \ - --prefix PATH : "${nix-prefetch-git.out}/bin" \ - --prefix PATH : "${bundler.out}/bin" \ - --set GEM_HOME "${bundler}/${bundler.ruby.gemPath}" \ - --set GEM_PATH "${bundler}/${bundler.ruby.gemPath}" - ''; - - meta = { - description = "Creates Nix packages from Gemfiles"; - longDescription = '' - This is a tool that converts Gemfile.lock files to nix expressions. - - The output is then usable by the bundlerEnv derivation to list all the - dependencies of a ruby package. - ''; - homepage = "https://github.com/nix-community/bundix"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ manveru zimbatm ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 3bb95521132b0..1cb6574839366 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -1,4 +1,8 @@ -{ stdenv, runCommand, ruby, lib, rsync +{ stdenv +, lib +, buildPackages +, runCommand +, ruby , defaultGemConfig, buildRubyGem, buildEnv , makeBinaryWrapper , bundler @@ -191,7 +195,7 @@ let runCommand name' basicEnvArgs '' mkdir -p $out for i in $paths; do - ${rsync}/bin/rsync -a $i/lib $out/ + ${buildPackages.rsync}/bin/rsync -a $i/lib $out/ done eval "$postBuild" '' diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index 57a10dadc4008..3f9e49fc53be8 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -59,8 +59,21 @@ in rec { then attrs // gemConfig.${attrs.gemName} attrs else attrs); - genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: '' - ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \ + genStubsScript = { lib, runCommand, ruby, confFiles, bundler, groups, binPaths, ... }: + let + genStubsScript = runCommand "gen-bin-stubs" + { + strictDeps = true; + nativeBuildInputs = [ ruby ]; + } + '' + cp ${./gen-bin-stubs.rb} $out + chmod +x $out + patchShebangs --build $out + ''; + in + '' + ${genStubsScript} \ "${ruby}/bin/ruby" \ "${confFiles}/Gemfile" \ "$out/${ruby.gemPath}" \ diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 822996b7cbf68..d1d4ad9544384 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -1,3 +1,4 @@ +#!/usr/bin/env ruby require 'rbconfig' require 'rubygems' require 'rubygems/specification' diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index faef3be4d911c..35fecb70c0052 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,5 +1,6 @@ { ruby, lib, callPackage, defaultGemConfig, buildEnv, runCommand -, bundler, rsync +, buildPackages +, bundler }@defs: { name ? null @@ -21,7 +22,7 @@ }@args: let - inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript; + inherit (import ../bundled-common/functions.nix { inherit lib ruby gemConfig groups; }) genStubsScript; basicEnv = (callPackage ../bundled-common { inherit bundler; }) (args // { inherit pname name; mainGemName = pname; }); @@ -51,7 +52,7 @@ in pathsToLink = [ "/lib" ]; postBuild = genStubsScript { - inherit lib ruby bundler groups; + inherit lib runCommand ruby bundler groups; confFiles = basicEnv.confFiles; binPaths = [ basicEnv.gems.${pname} ]; } + lib.optionalString (postBuild != null) postBuild; @@ -67,7 +68,7 @@ in runCommand basicEnv.name bundlerEnvArgs '' mkdir -p $out for i in $paths; do - ${rsync}/bin/rsync -a $i/lib $out/ + ${buildPackages.rsync}/bin/rsync -a $i/lib $out/ done eval "$postBuild" '' diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 581c2544a2205..c144149da2901 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.11"; - source.sha256 = "sha256-3XhL/lODSzmlbmQtvG4eyhmi5kVOTVOZTLcpgAWsTC4="; + version = "2.5.16"; + source.sha256 = "sha256-h7oDOPQNWSinmxqwZ4Z6Ns3lgTXQi2MmfvY5eVuVmDo="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 2e59b8a99cc11..a541a8ee34bde 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -17,11 +17,11 @@ # This separates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which +{ lib, fetchurl, fetchpatch2, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl -, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem +, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, lerc, buildRubyGem , cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook3, atk @@ -126,7 +126,16 @@ in }; curses = attrs: { + dontBuild = false; buildInputs = [ ncurses ]; + patches = lib.optionals (lib.versionOlder attrs.version "1.4.5") [ + # Fixes incompatible function pointer type error with clang 16. Fixed in 1.4.5 and newer. + # Upstream issue: https://github.com/ruby/curses/issues/85 + (fetchpatch2 { + url = "https://github.com/ruby/curses/commit/13e00d07c3aaed83d5f138cf268cc33c9f025d0e.patch?full_index=1"; + hash = "sha256-ZJ2egqj3Uwmi4KrF79dtwczpwUqFCp52/xQYUymYDmc="; + }) + ]; }; dep-selector-libgecode = attrs: { @@ -379,6 +388,7 @@ in gtk3 cairo harfbuzz + lerc libdatrie libthai pcre @@ -447,9 +457,20 @@ in buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; }; + hpricot = attrs: { + dontBuild = false; + patches = [ + # Fix incompatible function pointer conversion errors with clang 16 + ./hpricot-fix-incompatible-function-pointer-conversion.patch + ]; + }; + iconv = attrs: { dontBuild = false; - buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + buildFlags = lib.optionals stdenv.isDarwin [ + "--with-iconv-dir=${lib.getLib libiconv}" + "--with-iconv-include=${lib.getDev libiconv}/include" + ]; patches = [ # Fix incompatible function pointer conversion errors with clang 16 ./iconv-fix-incompatible-function-pointer-conversions.patch @@ -504,8 +525,8 @@ in "--with-xml2-lib=${libxml2.out}/lib" "--with-xml2-include=${libxml2.dev}/include/libxml2" ] ++ lib.optionals stdenv.isDarwin [ - "--with-iconv-dir=${libiconv}" - "--with-opt-include=${libiconv}/include" + "--with-iconv-dir=${lib.getLib libiconv}" + "--with-opt-include=${lib.getDev libiconv}/include" ]; }; @@ -783,10 +804,7 @@ in substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' ''; - } // (lib.optionalAttrs stdenv.isDarwin { - # https://github.com/NixOS/nixpkgs/issues/19098 - buildFlags = [ "--disable-lto" ]; - }); + }; sass-embedded = attrs: { # Patch the Rakefile to use our dart-sass and not try to fetch anything. diff --git a/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch new file mode 100644 index 0000000000000..1a4a0b55c20de --- /dev/null +++ b/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch @@ -0,0 +1,48 @@ +diff --git a/ext/fast_xs/fast_xs.c b/ext/fast_xs/fast_xs.c +index 11ef71f..d5eb8d8 100644 +--- a/ext/fast_xs/fast_xs.c ++++ b/ext/fast_xs/fast_xs.c +@@ -144,7 +144,7 @@ static VALUE unpack_utf8(VALUE self) + return rb_funcall(self, unpack_id, 1, U_fmt); + } + +-static VALUE unpack_uchar(VALUE self) ++static VALUE unpack_uchar(VALUE self, VALUE _exn) + { + return rb_funcall(self, unpack_id, 1, C_fmt); + } +diff --git a/ext/hpricot_scan/hpricot_scan.c b/ext/hpricot_scan/hpricot_scan.c +index f11cbb5..161ebd4 100644 +--- a/ext/hpricot_scan/hpricot_scan.c ++++ b/ext/hpricot_scan/hpricot_scan.c +@@ -22,7 +22,7 @@ struct hpricot_struct { + #define RSTRING_PTR(str) RSTRING(str)->ptr + #endif + +-VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE, VALUE); ++VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE); + + #define NO_WAY_SERIOUSLY "*** This should not happen, please file a bug report with the HTML you're parsing at http://github.com/hpricot/hpricot/issues. So sorry!" + +diff --git a/ext/hpricot_scan/hpricot_scan.rl b/ext/hpricot_scan/hpricot_scan.rl +index 0f17f11..8b00a38 100644 +--- a/ext/hpricot_scan/hpricot_scan.rl ++++ b/ext/hpricot_scan/hpricot_scan.rl +@@ -20,7 +20,7 @@ struct hpricot_struct { + #define RSTRING_PTR(str) RSTRING(str)->ptr + #endif + +-VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE, VALUE); ++VALUE hpricot_css(VALUE, VALUE, VALUE, VALUE); + + #define NO_WAY_SERIOUSLY "*** This should not happen, please file a bug report with the HTML you're parsing at http://github.com/hpricot/hpricot/issues. So sorry!" + +@@ -806,7 +806,7 @@ make_hpricot_struct(VALUE members, VALUE (*alloc)(VALUE klass)) + for (i = 0; i < len; i++) { + ID id = SYM2ID(rb_ary_entry(members, i)); + const char* name = rb_id2name(id); +- int len = strlen(name); ++ size_t len = strlen(name); + + memcpy(attr_set, name, strlen(name)); + attr_set[len] = '='; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 6f3245849f68c..b2bb437366571 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -251,6 +251,14 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { done ''} + # For Ruby-generated binstubs, shebang paths are already in Nix store but for + # ruby used to build the package. Update them to match the host system. Note + # that patchShebangsAuto ignores scripts where shebang line is already in Nix + # store. + if [[ -d $GEM_HOME/bin ]]; then + patchShebangs --update --host -- "$GEM_HOME"/bin + fi + runHook postInstall ''; diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/development/ruby-modules/rbenv/default.nix index ef8b4c47818ba..6c080f4f21818 100644 --- a/pkgs/development/ruby-modules/rbenv/default.nix +++ b/pkgs/development/ruby-modules/rbenv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "rbenv"; diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix index e28e779899393..25d5bc9651932 100644 --- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix +++ b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommandCC, skawarePackages, skalibs }: +{ lib, runCommandCC, skalibs }: let # From https://skarnet.org/software/misc/sdnotify-wrapper.c, diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix deleted file mode 100644 index 81af5e1958959..0000000000000 --- a/pkgs/development/tools/agda-pkg/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -}: - -with python3Packages; - -buildPythonApplication rec { - pname = "agda-pkg"; - version = "0.1.51"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "ee370889a1558caf45930d9f898dbe248048078e1e7e3ee17382bf574dc795f2"; - }; - - # Checks need internet access, so we just check the program executes - # At the moment the help page needs to write to $HOME, this can - # be removed if https://github.com/agda/agda-pkg/issues/40 is fixed - checkPhase = '' - HOME=$NIX_BUILD_TOP $out/bin/apkg --help > /dev/null - ''; - - propagatedBuildInputs = [ - click - gitpython - pony - whoosh - natsort - click-log - requests - humanize - distlib - jinja2 - pyyaml - ponywhoosh - ]; - - meta = with lib; { - homepage = "https://agda.github.io/agda-pkg/"; - description = "Package manager for Agda"; - license = licenses.mit; - maintainers = with maintainers; [ alexarice ]; - }; -} diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index b711e38364a33..2db5d880138f9 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.29.0"; + version = "2.30.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-ohcVXblnCrNs57BWmz+wUwplfIG9fOW8l08LuipNhPs="; + hash = "sha256-jYdinK7it2MDwrWZmxPHR5YqZhhVIo2vMZDCX38+igU="; }; dontConfigure = true; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index ab3edcd4cdc8a..53376e43943e8 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.2.2"; + version = "7.3.4"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-kxO6lBqZzvfFrl+A/FK7L+XXmwn9fV8G5Y6dwfhbpbU="; + sha256 = "sha256-wl5qlUhnwqqYM830m6KWNQBY2jVMh715HahLngyiL+I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index f8a88b4ce6793..53a024766576b 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -56,58 +56,169 @@ let # in here, but I'm erring on the side of flexibility # since this form will make it easier to pilot other # uses of binlore. - callback = lore: drv: overrides: '' + callback = lore: drv: '' if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then echo generating binlore for $drv by running: echo "${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}" else echo "failed to generate binlore for $drv (none of ${drv}/{bin,lib,libexec} exist)" fi - '' + - /* - Override lore for some packages. Unsure, but for now: - 1. start with the ~name (pname-version) - 2. remove characters from the end until we find a match - in overrides/ - 3. execute the override script with the list of expected - lore types - */ - '' - i=''${#identifier} - filter= - while [[ $i > 0 ]] && [[ -z "$filter" ]]; do - if [[ -f "${overrides}/''${identifier:0:$i}" ]]; then - filter="${overrides}/''${identifier:0:$i}" - echo using "${overrides}/''${identifier:0:$i}" to generate overriden binlore for $drv - break - fi - ((i--)) || true # don't break build - done # || true # don't break build + if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then - ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback} "$filter" + ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback} fi ''; }; - overrides = (src + "/overrides"); in rec { + /* + Output a directory containing lore for multiple drvs. + + This will `make` lore for drv in drvs and then combine lore + of the same type across all packages into a single file. + + When drvs are also specified in the strip argument, corresponding + lore is made relative by stripping the path of each drv from + matching entries. (This is mainly useful in a build process that + uses a chain of two or more derivations where the output of one + is the source for the next. See resholve for an example.) + */ collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } '' mkdir $out for lorefile in ${toString lore.types}; do cat ${lib.concatMapStrings (x: x + "/$lorefile ") (map (make lore) (map lib.getBin (builtins.filter lib.isDerivation drvs)))} > $out/$lorefile - substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace '${x}/' '' ") strip} + substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace-quiet '${x}/' '' ") strip} done ''); - # TODO: echo for debug, can be removed at some point + + /* + Output a directory containing lore for a single drv. + + This produces lore for the derivation (via lore.callback) and + appends any lore that the derivation itself wrote to nix-support + or which was overridden in drv.binlore.<outputName> (passthru). + + > *Note*: Since the passthru is attached to all outputs, binlore + > is an attrset namespaced by outputName to support packages with + > executables in more than one output. + + Since the last entry wins, the effective priority is: + drv.binlore.<outputName> > $drv/nix-support > lore generated here by callback + */ make = lore: drv: runCommand "${drv.name}-binlore" { - identifier = drv.name; drv = drv; } ('' mkdir $out touch $out/{${builtins.concatStringsSep "," lore.types}} - ${lore.callback lore drv overrides} + ${lore.callback lore drv} + '' + + # append lore from package's $out and drv.binlore.${drv.outputName} (last entry wins) + '' + for lore_type in ${builtins.toString lore.types}; do + if [[ -f "${drv}/nix-support/$lore_type" ]]; then + cat "${drv}/nix-support/$lore_type" >> "$out/$lore_type" + fi + '' + lib.optionalString (builtins.hasAttr "binlore" drv && builtins.hasAttr drv.outputName drv.binlore) '' + if [[ -f "${drv.binlore."${drv.outputName}"}/$lore_type" ]]; then + cat "${drv.binlore."${drv.outputName}"}/$lore_type" >> "$out/$lore_type" + fi + '' + '' + done echo binlore for $drv written to $out ''); + + /* + Utility function for creating override lore for drv. + + We normally attach this lore to `drv.passthru.binlore.<outputName>`. + + > *Notes*: + > - Since the passthru is attached to all outputs, binlore is an + > attrset namespaced by outputName to support packages with + > executables in more than one output. You'll generally just use + > `out` or `bin`. + > - We can reconsider the passthru attr name if someone adds + > a new lore provider. We settled on `.binlore` for now to make it + > easier for people to figure out what this is for. + + The lore argument should be a Shell script (string) that generates + the necessary lore. You can use arbitrary Shell, but this function + includes a shell DSL you can use to declare/generate lore in most + cases. It has the following functions: + + - `execer <verdict> [<path>...]` + - `wrapper <wrapper_path> <original_path>` + + Writing every override explicitly in a Nix list would be tedious + for large packages, but this small shell DSL enables us to express + many overrides efficiently via pathname expansion/globbing. + + Here's a very general example of both functions: + + passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage '' + execer can bin/hello bin/{a,b,c} + wrapper bin/hello bin/.hello-wrapped + ''; + + And here's a specific example of how pathname expansion enables us + to express lore for the single-binary variant of coreutils while + being both explicit and (somewhat) efficient: + + passthru = {} // optionalAttrs (singleBinary != false) { + binlore.out = binlore.synthesize coreutils '' + execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout} + execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes} + ''; + }; + + Caution: Be thoughtful about using a bare wildcard (*) glob here. + We should generally override lore only when a human understands if + the executable will exec arbitrary user-passed executables. A bare + glob can match new executables added in future package versions + before anyone can audit them. + */ + synthesize = drv: loreSynthesizingScript: runCommand "${drv.name}-lore-override" { + drv = drv; + } ('' + execer(){ + local verdict="$1" + + shift + + for path in "$@"; do + if [[ -f "$PWD/$path" ]]; then + echo "$verdict:$PWD/$path" + else + echo "error: Tried to synthesize execer lore for missing file: $PWD/$path" >&2 + exit 2 + fi + done + } >> $out/execers + + wrapper(){ + local wrapper="$1" + local original="$2" + + if [[ ! -f "$wrapper" ]]; then + echo "error: Tried to synthesize wrapper lore for missing wrapper: $PWD/$wrapper" >&2 + exit 2 + fi + + if [[ ! -f "$original" ]]; then + echo "error: Tried to synthesize wrapper lore for missing original: $PWD/$original" >&2 + exit 2 + fi + + echo "$PWD/$wrapper:$PWD/$original" + + } >> $out/wrappers + + mkdir $out + + # lore override commands are relative to the drv root + cd $drv + + '' + loreSynthesizingScript); } diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 88968be7b40e8..f5511adb78918 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-RtkW2FDey049URmr0WGNYcz5sTZXIQ7dZL/OlIaKX20="; + hash = "sha256-JD+seB8gvDFjT/O32bOba1VTzj1Kpj3zNhbN7Hstz7Q="; }; - cargoHash = "sha256-HBpEMjc2FQvFqvvcCtxHJBj2waFau77t+m+1ZfomguA="; + cargoHash = "sha256-d/MVdZWwpre5H6GHZbX9Z9jqWtAUmm8BcCFTG2m09F0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 5b31e4ae2de7b..a98cf542e9e39 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.174"; + version = "3.2.219"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-5R5WKeXmT4hMhjd+Laafqx4UXfvGf+2lMh34XpMs3vQ="; + hash = "sha256-PNWOT4vnlruRPoGSPcBy4GPxmuflVbF+UheIpBo14kE="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -33,6 +33,7 @@ python3.pkgs.buildPythonApplication rec { "packaging" "pycep-parser" "rustworkx" + "schema" "termcolor" "urllib3" ]; @@ -46,9 +47,6 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - nativeBuildInputs = with python3.pkgs; [ - ]; - dependencies = with python3.pkgs; [ aiodns aiohttp @@ -125,6 +123,8 @@ python3.pkgs.buildPythonApplication rec { "test_get_cyclonedx_report" # Test fails on Hydra "test_sast_js_filtered_files_by_ts" + # Timing sensitive + "test_non_multiline_pair_time_limit_creating_report" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix index 10c61bf888817..8f92ab15150b6 100644 --- a/pkgs/development/tools/analysis/clazy/default.nix +++ b/pkgs/development/tools/analysis/clazy/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clazy"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "KDE"; repo = "clazy"; rev = "v${version}"; - sha256 = "sha256-kcl4dUg84fNdizKUS4kpvIKFfajtTRdz+MYUbKcMFvg="; + sha256 = "sha256-Fex0BAmCZUYcNJriHHt/QPi5IgSH/yhnpGCFFZMMD/g="; }; buildInputs = [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index a71e385e0a398..27c11ffb2eaa9 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.17.6"; + version = "2.18.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-Xw/lyA4J0FkU0MTXbOanDJ+rLCEGCOP7BX9sApu+K6s="; + hash = "sha256-X/Sg5+UGl0DJ5LL42tlQt3NIfTJc4nH1AySeLJQsZkk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/development/tools/analysis/coz/default.nix deleted file mode 100644 index 2938a60b46de5..0000000000000 --- a/pkgs/development/tools/analysis/coz/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, libelfin -, ncurses -, python3 -, python3Packages -, makeWrapper -}: -stdenv.mkDerivation rec { - pname = "coz"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "plasma-umass"; - repo = "coz"; - rev = version; - sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc"; - }; - - postPatch = '' - sed -i -e '/pid_t gettid/,+2d' libcoz/ccutil/thread.h - ''; - - postConfigure = '' - # This is currently hard-coded. Will be fixed in the next release. - sed -e "s|/usr/lib/|$out/lib/|" -i ./coz - ''; - - nativeBuildInputs = [ - ncurses - makeWrapper - python3Packages.wrapPython - ]; - - buildInputs = [ - libelfin - (python3.withPackages (p: [ p.docutils ])) - ]; - - installPhase = '' - mkdir -p $out/share/man/man1 - make install prefix=$out - - # fix executable includes - chmod -x $out/include/coz.h - - wrapPythonPrograms - ''; - - meta = { - homepage = "https://github.com/plasma-umass/coz"; - description = "Profiler based on casual profiling"; - mainProgram = "coz"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch b/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch deleted file mode 100644 index 3b602421d100b..0000000000000 --- a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index aef5c4e..030ea14 100755 ---- a/setup.py -+++ b/setup.py -@@ -73,7 +73,7 @@ setup(name='cpplint', - long_description=open('README.rst').read(), - license='BSD-3-Clause', - setup_requires=[ -- "pytest-runner==5.2" -+ "pytest-runner" - ], - tests_require=test_required, - # extras_require allow pip install .[dev] --- -2.31.1 - diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index f380f7086e820..f4dcd71f0b3c7 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,49 +1,46 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "1.5.5"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - hash = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; + owner = "cpplint"; + repo = "cpplint"; + rev = "refs/tags/${version}"; + hash = "sha256-N5YrlhEXQGYxhsJ4M5dGYZUzA81GKRSI83goaqbtCkI="; }; - patches = [ - ./0001-Remove-pytest-runner-version-pin.patch - - # The patch below stops using the sre_compile module, which was deprecated - # in Python 3.11 and replaces it with re.compile. Upstream is unsure if it - # should use re.compile or re._compiler.compile, so we should monitor the - # thread for updates. - # - # https://github.com/cpplint/cpplint/pull/214 - # - (fetchpatch { - name = "python-3.11-compatibility.patch"; - url = "https://github.com/cpplint/cpplint/commit/e84e84f53915ae2a9214e756cf89c573a73bbcd3.patch"; - hash = "sha256-u57AFWaVmGFSsvSGq1x9gZmTsuZPqXvTC7mTfyb2164="; - }) - ]; - postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"pytest-runner==5.2"' "" + patchShebangs cpplint_unittest.py + + substituteInPlace cpplint_unittest.py \ + --replace-fail "assertEquals" "assertEqual" ''; - nativeCheckInputs = with python3Packages; [ pytest pytest-runner ]; + build-system = with python3Packages; [ + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + pytest + pytest-runner + ]; + checkPhase = '' ./cpplint_unittest.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/cpplint/cpplint"; description = "Static code checker for C++"; mainProgram = "cpplint"; - maintainers = [ maintainers.bhipple ]; - license = [ licenses.bsd3 ]; + maintainers = [ lib.maintainers.bhipple ]; + license = [ lib.licenses.bsd3 ]; }; } diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 75745be0148f7..603cc1d1ccbb7 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; + cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 8fcaa144ab8c1..a3ceed9c43e0e 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -3,7 +3,6 @@ , lib , autoPatchelfHook , wrapQtAppsHook -, gmpxx , gnustep , libbsd , libffi_3_3 diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 473dc9d7a4bb1..efb0bba4a1b2f 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -17,13 +17,13 @@ let self = stdenv.mkDerivation rec { pname = "kcov"; - version = "42"; + version = "43"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "sha256-8/182RjuNuyFzSyCgyyximGaveDyhStwIQg29S5U/pI="; + sha256 = "sha256-hRJYuHNSXyRoUDBF/yIPXPcBBxZoTO5cgoB2tBhKPwY="; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 08dd8d397f984..01ba9da439a48 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, qt5, git, cmake +{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake , pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { dontWrapQtApps = true; - cargoSha256 = "0vhcb3kw1zgchx3nrk8lyrz8p5071y99vsysxvi71klv7dcvn0am"; + cargoHash = "sha256-VQG7WTubznDi7trrnZIPB5SLfvYUzWxHh+z9wOdYDG4="; doCheck = false; postInstall = '' diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix index 75cdc15cdca0c..56b72c24c421e 100644 --- a/pkgs/development/tools/analysis/pev/default.nix +++ b/pkgs/development/tools/analysis/pev/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "merces"; repo = "pev"; rev = "beec2b4f09585fea919ed41ce466dee06be0b6bf"; - sha256 = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg="; + hash = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 2448556aa62cc..c562479eb0522 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -230,7 +230,7 @@ stdenv.mkDerivation (self: { description = "Retargetable machine-code decompiler based on LLVM"; homepage = "https://retdec.com"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill katrinafyi ]; + maintainers = with maintainers; [ katrinafyi ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 3a2ecc4c6d48e..3c10f4cc5716d 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config, which, makeWrapper -, libpfm, zlib, python3Packages, procps, gdb, capnproto +{ + lib, + stdenv, + fetchFromGitHub, + bash, + capnproto, + cmake, + gdb, + libpfm, + makeWrapper, + pkg-config, + procps, + python3, + which, + zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "5.8.0"; pname = "rr"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; - rev = version; + rev = finalAttrs.version; hash = "sha256-FudAAkWIe6gv4NYFoe9E0hlgTM70lymBE5Fw/vbehps="; }; - patches = [ ]; - postPatch = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' - sed '7i#include <math.h>' -i src/Scheduler.cc - sed '1i#include <ctime>' -i src/test-monitor/test-monitor.cc - patchShebangs . + patchShebangs src ''; # With LTO enabled, linking fails with the following message: @@ -31,14 +39,34 @@ stdenv.mkDerivation rec { # collect2: error: ld returned 1 exit status # # See also https://github.com/NixOS/nixpkgs/pull/110846 - preConfigure = ''substituteInPlace CMakeLists.txt --replace "-flto" ""''; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "-flto" "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + capnproto + cmake + makeWrapper + pkg-config + python3.pythonOnBuildForHost + which + ]; - nativeBuildInputs = [ cmake pkg-config which makeWrapper ]; buildInputs = [ - libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto + bash + capnproto + gdb + libpfm + procps + python3 + zlib ]; + cmakeFlags = [ - "-Ddisable32bit=ON" + (lib.cmakeBool "disable32bit" true) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # we turn on additional warnings due to hardening @@ -54,9 +82,7 @@ stdenv.mkDerivation rec { # needs GDB to replay programs at runtime preFixup = '' wrapProgram "$out/bin/rr" \ - --prefix PATH ":" "${lib.makeBinPath [ - gdb - ]}"; + --prefix PATH ":" "${lib.makeBinPath [ gdb ]}"; ''; meta = { @@ -69,8 +95,18 @@ stdenv.mkDerivation rec { time the same execution is replayed. ''; - license = with lib.licenses; [ mit bsd2 ]; - maintainers = with lib.maintainers; [ pierron thoughtpolice ]; - platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + license = with lib.licenses; [ + mit + bsd2 + ]; + maintainers = with lib.maintainers; [ + pierron + thoughtpolice + ]; + platforms = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + ]; }; -} +}) diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 93a74f2b4a6a7..b55e8c5bcfa41 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Semantic analysis tool for C"; homepage = "https://sparse.docs.kernel.org/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 870f084580b8f..706d3f6b8edb0 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { # https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc license = licenses.gpl3Plus; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 41f1af56422c3..1bbdcb9e73cf9 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1292.1"; + version = "1.1292.2"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-N54fSRYTFOlmfpommEFIqbMP5IBkhatMwx4CQ8fd5QI="; + hash = "sha256-r7yQNxmvQ2RUUTX3zxEqnf7fgYJI/0kFqoPg60jI4ns="; }; - npmDepsHash = "sha256-VHZqc111cC8AANogxXVg4BFlngdmrrt7E+tCMF5Rl7g="; + npmDepsHash = "sha256-hS1TYrqyYiixKtZoxWU10hj1ZC2RqrZ7gndU5B195/M="; postPatch = '' substituteInPlace package.json \ @@ -39,7 +39,7 @@ buildNpmPackage rec { homepage = "https://snyk.io"; changelog = "https://github.com/snyk/cli/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "snyk"; }; } diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index c2a216afea9a9..23cb2bfc5173f 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.6.1"; + version = "16.8.1"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-wt9EVE3AAnOVJsDHG+qIXSqZ1I2MSITHjGpEGLPWOBY="; + hash = "sha256-LhLA1JxaTtdoXfylaDLiyW2gi0xy2l5Rm3B67+z1Wdc="; }; - npmDepsHash = "sha256-+74oklREFCDEa8E0QDBlIzfW943AStJxfXkQDqRGFyo="; + npmDepsHash = "sha256-xi6we8XOGaLqwTLrF0Enpx7jQgbHOSItuqzlvvNNBWQ="; dontNpmBuild = true; @@ -20,6 +20,6 @@ buildNpmPackage rec { mainProgram = "stylelint"; homepage = "https://stylelint.io"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index ef859f2a66a29..b4fb2512596ae 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; + hash = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; }; cargoHash = "sha256-HBfCTOETQ1hHzLFDw12W58omRmliiWDFGSrmr3PELD8="; diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index 5fa8efd23a1c6..7dfeea873ac29 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-google"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-cflmuvILMJX7jsz6OKPcaN/KezvWiqiv20Sw4vJ/mUk="; + hash = "sha256-eE1KSfbMbNuHlzEi7+zTRdxq548+pB8p01iIWoE2NAQ="; }; - vendorHash = "sha256-xxSOjnzqESCOWtXsAGuTwVEoinvBNuJFaxDrIVc1O08="; + vendorHash = "sha256-nuucBbqS+D12JEPoS/QHHTcPKaTjsD4oxnVLDMmLwNA="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 93dbe645220a2..c3a7b65b051d5 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-f2U/DK2yaJI0t125k0N4SHjNvSUYPtqTjR91EJnimGQ="; + hash = "sha256-H27krznCX00F0EZ4ahdsMVh+wcAAUC/ErQac9Y4QaJs="; }; - vendorHash = "sha256-xx/WF/yR++oB+7az9i/JkhYuOZsPoCBgYITqBR1Gv5c="; + vendorHash = "sha256-jTwzheC/BtcuLGwtLanOccbidOPCHmqxJ4Mwhsid6jY="; doCheck = false; diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index 1df733c183b40..0a918df061a75 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -3,7 +3,6 @@ , fetchgit , jdk_headless , gradle -, perl , makeWrapper }: @@ -39,41 +38,14 @@ stdenv.mkDerivation rec { sed -i -e '/conscrypt/s/testImplementation/implementation/' build.gradle ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = "sha256-cs95YI0SpvzCo5x5trMXlVUGepNKIH9oZ95AfLErKIU="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - preBuild = '' - # Use the local packages from -deps - sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle - ''; - - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon build - - runHook postBuild - ''; + doCheck = true; nativeBuildInputs = [ gradle makeWrapper ]; @@ -83,8 +55,6 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/lib/apksigner.jar" ''; - __darwinAllowLocalNetworking = true; - meta = with lib; { description = "Command line tool to sign and verify Android APKs"; mainProgram = "apksigner"; diff --git a/pkgs/development/tools/apksigner/deps.json b/pkgs/development/tools/apksigner/deps.json new file mode 100644 index 0000000000000..a0f5ccb9c489a --- /dev/null +++ b/pkgs/development/tools/apksigner/deps.json @@ -0,0 +1,119 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "com/google#google/1": { + "pom": "sha256-zW2xehGjHt55TMvR3w5Nl1D2QCNHMfIc/4hamZcnfoE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.2.0": { + "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=", + "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU=" + }, + "com/google/errorprone#error_prone_parent/2.2.0": { + "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.6.2": { + "jar": "sha256-hFw+/OY70j2WLyELE77rqwXE1YOJihsaf/uMez7X1dQ=", + "pom": "sha256-W/T2le0Rd+gFJFJbbloECl1+pLFhlrERCILGLmmlVeg=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/27.0.1-jre": { + "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY=" + }, + "com/google/guava#guava/27.0.1-jre": { + "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=", + "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "com/google/protobuf#protobuf-bom/3.8.0": { + "pom": "sha256-WjrGCFOIDEORPNXLY7Np626WRuHtDEgGnsmpMTd700c=" + }, + "com/google/protobuf#protobuf-gradle-plugin/0.8.11": { + "jar": "sha256-gFr+/pf6AYFXpWvxQtvuStIo0RSyq3s97le5fD4teHk=", + "pom": "sha256-RBeVBVv4AjSXKcjFWdrVcmi4C4tk6KPePK2lQmo45aA=" + }, + "com/google/protobuf#protobuf-javalite/3.8.0": { + "jar": "sha256-HSWDsgkvIdvCnJCabwV+u4bYTkxU/LHXvAAmO4AaM/g=", + "pom": "sha256-4EnZCbCH/zokFi4H0KgIFE7BnnwK6Z1Ee0dZZ83361s=" + }, + "com/google/protobuf#protobuf-parent/3.8.0": { + "pom": "sha256-cGPoFu/yyZcFW9KmbuLJtObNEvhcj8lW5UhweQmAHEU=" + }, + "com/google/protobuf#protoc/3.8.0": { + "pom": "sha256-0bqQU0Wx2o1GXQ0DCkzgiuVX0nz8krZiMvEN3ks4V9I=" + }, + "com/google/protobuf/protoc/3.8.0/protoc-3.8.0-linux-x86_64": { + "exe": "sha256-eeGGIvawJqOETt7d5Fzw4M98+8emLCho2dgtvtYSZeQ=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "junit#junit/4.13": { + "jar": "sha256-S4Uy9jvcDgZhUH+UfrMkqVTR26xjGtGciqmgD+7R2GM=", + "pom": "sha256-mg3Ew/orCG5wgiZzfvS7N4R8PLHOTiA1F8CfYwWyJn4=" + }, + "kr/motd/maven#os-maven-plugin/1.6.2": { + "jar": "sha256-OgxJXeHOvIP2e+qhd2p5NvAvEfKt3Th5WWp4sqhryqM=", + "pom": "sha256-bXDR8vJydzDXedMqH9L7seoI51pnpQotjn0P2zoqSvM=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/bouncycastle#bcprov-jdk15on/1.68": { + "jar": "sha256-9zKkbI3n4iMvIAfGgqIdH0zIqKAUm2t71qoa/cZaD40=", + "pom": "sha256-2QfezWhfnNlx5xvfbOWXzzqVt8j/ajSCNRv9irwXz+A=" + }, + "org/checkerframework#checker-qual/2.5.2": { + "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", + "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.17": { + "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", + "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.17": { + "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + }, + "org/codehaus/mojo#mojo-parent/40": { + "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.1": { + "jar": "sha256-AfnHQstZKhUeLmK9U5eomAYoqWcAH82s1KpHRGeGhfM=", + "pom": "sha256-XivA41GARnUwxVpnqvq+XvmOBg7raY6a9tCw3N26lc0=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index ba844a6250dd7..8c9127296b177 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, nix-update-script , cargo , meson , ninja @@ -13,8 +12,6 @@ , gst_all_1 , gtk4 , libadwaita -, llvmPackages -, glibc , pipewire , wayland , wrapGAppsHook4 diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 9300534209d8d..79ec94d7e3f88 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { owner = "arpa2"; repo = "quick-der"; rev = "v${version}"; - sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; + hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; postPatch = '' diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix index ae5a1d8256756..dd2ea5205335c 100644 --- a/pkgs/development/tools/async/default.nix +++ b/pkgs/development/tools/async/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx"; }; - cargoSha256 = "0y2q46i838gha58p95vcv5r5i14il1kv86k35s30ncfibijgp0lc"; + cargoHash = "sha256-jIL7ZFzRMQuGLmMatGegkYRYctlsl3RRUfChgaIhWHg="; meta = with lib; { description = "Tool to parallelize shell commands"; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 7ee16a2972e13..9615d4574cdb2 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { mainProgram = "avro-tools"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index e94a98a6a96a8..2c667b8b5d6d8 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.119.0"; + version = "1.120.0"; pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,17 +19,13 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-0H1C2z01nwJtlSNjTCi2bH6ExBnmn8xNXD/jzYFxvCs="; + hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns="; }; build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "aws-lambda-builders" "aws-sam-translator" @@ -122,6 +118,9 @@ python3.pkgs.buildPythonApplication rec { "tests/regression" "tests/smoke" "tests/unit/lib/telemetry" + "tests/unit/hook_packages/terraform/hooks/prepare/" + "tests/unit/lib/observability/cw_logs/" + "tests/unit/lib/build_module/" # Disable flaky tests "tests/unit/lib/samconfig/test_samconfig.py" ]; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 2ca6ed71c2730..773648fe2a4f0 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,23 +1,22 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.25.0"; + version = "10.25.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "refs/tags/v${version}"; - hash = "sha256-OjNezXjC9SyRV+8CDkKtIm7Mzks+Quuj92M7tR0LZX0="; + hash = "sha256-ELxTe1+wfQ813ah2ZHLojVYSRgQ4kW97gEfjEK0Ipkc="; }; subPackages = [ "." ]; - vendorHash = "sha256-/SNQl80szkOZwtRHVxyAmapCFxDwQBM0Go6p0ILrKRM="; + vendorHash = "sha256-96lyOX7v453A24ZO4xl9jA0pNuNavB0ibEEoS6x9ha0="; doCheck = false; diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index 288bcecd3b8d7..17c3a181ec9af 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, - callPackage, fetchFromGitHub, buildDotnetModule, buildGoModule, diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 14336fc91dc38..8298ff4c25576 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KaMo0aZhwv9F4aya5ViTBwPxK6RLPZgfRJ9g6O48SUk="; + hash = "sha256-ZJ1TxkvOZWQWQrtQvAIN0G9cLXRH89GcrTuIbaIKgDE="; }; # tests make dns requests and fails diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index d3341c19e167f..75c4988a5616e 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.18.2"; + version = "2.19.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hW37pz7iLkBspnQ0ckfVdZUKppXUPrgjHgwmlhsanlI="; + hash = "sha256-SAlw1TMl8V31wS/nkW3tPrLPV/FlmQtp+beIjtkQ204="; }; - cargoHash = "sha256-5o7TtqJh2CRwTrBU2Xbdh7qae5iWVlUfg4ddzxYepmU="; + cargoHash = "sha256-iK59VumYh1k/IAWBh7lXfNQ67xuapw4LuFxi1uo15Uw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 69538a923d140..fd4161499c725 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; + hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index 030b02b1b5265..f521ccf4f2204 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-YtgqhwPpkw+lPgsBDCDxkcNsSu1/ZoIhXMuQeZgLXNU="; + hash = "sha256-0FOKLBu1eZMK1nXOmXN4achrZgNUqzzcuC6sH0RLtbc="; }; vendorHash = null; diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 735c7383f720d..6799602b29621 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.45.0"; + version = "1.46.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-6q9mUv1S44shGr3ScqLNTw1AiFS2sQmAMionsEdfOOw="; + hash = "sha256-3zazf7dAw0dt+eZHirpKBQrB1BrOLCJokkvL3RxAdnw="; }; - vendorHash = "sha256-q3JnxFSnMePBfwFdrj69uh65UXqeL0+QUvGjzkS2lGs="; + vendorHash = "sha256-wlo8HZqbrBEcCzNms6PKNV7JjmwlL2vJ3bly12RrcB4="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index 3cf1402c556ed..aa8a2855882f8 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-RR4yHrLeEHNLe0Nr8FHm+u+DFJihbibRax41Ss9HDV8="; + hash = "sha256-6/RYuaR4HBXLI7eKysyRcSOxONFlChpQuhzWHAlx2CM="; }; - cargoHash = "sha256-xCA1kxt70lrCrPygMe98eF8RC/l47EnJPjLaXBccBRE="; + cargoHash = "sha256-ytGbiDamxkTCPjNTBMsW1YjK+qMZfktGG5mVUVdKV5I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index f9b133f2aaa79..1393a7ca54e99 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/bloaty"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix index 1b977e33027b2..e870371c0ebe4 100644 --- a/pkgs/development/tools/bloom/default.nix +++ b/pkgs/development/tools/bloom/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "Debug interface for AVR-based embedded systems development on GNU/Linux"; homepage = "https://bloom.oscillate.io/"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; mainProgram = "bloom"; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index e0e6823b0a27f..99421a2bd6c50 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -33,6 +33,6 @@ mkDerivation rec { homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; description = "General, open source, retargetable decompiler"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/sshs/Cargo.lock b/pkgs/development/tools/bpf-linker/Cargo.lock index 1b4c04235ee70..a896116a9d1c4 100644 --- a/pkgs/development/tools/sshs/Cargo.lock +++ b/pkgs/development/tools/bpf-linker/Cargo.lock @@ -3,37 +3,19 @@ version = 3 [[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] name = "anstream" -version = "0.6.13" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -45,49 +27,67 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] -name = "autocfg" -version = "1.1.0" +name = "ar" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "d67af77d68a931ecd5cbd8a3b5987d63a1d1d1278f7f6a60ae33db485cdebb69" + +[[package]] +name = "aya-rustc-llvm-proxy" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09de71afbd6668d1e10f1895f967d5a2c02b2e6db01ea4ac9677c29e22dac548" +dependencies = [ + "anyhow", + "cargo_metadata", + "libc", + "libloading", + "llvm-sys", + "once_cell", + "prettyplease", + "quote", + "rustversion", + "syn", +] [[package]] name = "bitflags" @@ -97,32 +97,71 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "bpf-linker" +version = "0.9.12" +dependencies = [ + "ar", + "aya-rustc-llvm-proxy", + "clap", + "compiletest_rs", + "gimli", + "libc", + "llvm-sys", + "log", + "regex", + "rustc-build-sysroot", + "thiserror", + "tracing", + "tracing-appender", + "tracing-subscriber", + "tracing-tree", + "which", +] [[package]] -name = "block-buffer" -version = "0.10.4" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ - "generic-array", + "serde", ] [[package]] -name = "cassowary" -version = "0.3.0" +name = "cargo-platform" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +dependencies = [ + "serde", +] [[package]] -name = "castaway" -version = "0.2.2" +name = "cargo_metadata" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" dependencies = [ - "rustversion", + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", ] [[package]] @@ -133,9 +172,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.1" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -143,9 +182,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -155,14 +194,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -178,123 +217,134 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +name = "compiletest_rs" +version = "0.10.2" +source = "git+https://github.com/Manishearth/compiletest-rs.git#6e418275b9c5a631e76f11ab0e05186e7eca45e6" dependencies = [ - "castaway", - "cfg-if", - "itoa", - "ryu", - "static_assertions", + "diff", + "filetime", + "getopts", + "lazy_static", + "libc", + "log", + "miow", + "regex", + "rustfix", + "serde", + "serde_derive", + "serde_json", + "tester", + "winapi", ] [[package]] -name = "cpufeatures" -version = "0.2.12" +name = "crossbeam-channel" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "libc", + "crossbeam-utils", ] [[package]] -name = "crossterm" -version = "0.27.0" +name = "crossbeam-utils" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.4.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] -name = "crossterm_winapi" -version = "0.9.1" +name = "deranged" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "diff" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] -name = "digest" -version = "0.10.7" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "block-buffer", - "crypto-common", + "cfg-if", + "dirs-sys-next", ] [[package]] -name = "dirs" -version = "5.0.1" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ - "dirs-sys", + "libc", + "redox_users", + "winapi", ] [[package]] -name = "dirs-sys" -version = "0.4.1" +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "either" -version = "1.10.0" +name = "fallible-iterator" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] -name = "fuzzy-matcher" -version = "0.3.7" +name = "fastrand" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ - "thread_local", + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] -name = "generic-array" -version = "0.14.7" +name = "getopts" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "typenum", - "version_check", + "unicode-width", ] [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -302,61 +352,64 @@ dependencies = [ ] [[package]] -name = "glob" -version = "0.3.1" +name = "gimli" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "handlebars" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", + "fallible-iterator", + "indexmap", + "stable_deref_trait", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] -name = "indoc" -version = "2.0.4" +name = "hermit-abi" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "itertools" -version = "0.12.1" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "either", + "windows-sys 0.52.0", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" @@ -365,24 +418,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] -name = "libredox" -version = "0.0.1" +name = "libloading" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] -name = "lock_api" -version = "0.4.11" +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "llvm-sys" +version = "180.0.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "f7ab441c1c1753fc9a3a939da2589b750a16c6d6e616c6a24ac3dbb38969a7e4" dependencies = [ - "autocfg", - "scopeguard", + "anyhow", + "cc", + "lazy_static", + "libc", + "regex-lite", + "semver", ] [[package]] @@ -392,123 +454,91 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "lru" -version = "0.12.3" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "hashbrown", + "regex-automata 0.1.10", ] [[package]] name = "memchr" -version = "2.7.1" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] -name = "mio" -version = "0.8.11" +name = "miow" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", + "windows-sys 0.42.0", ] [[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "option-ext" -version = "0.2.0" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] [[package]] -name = "parking_lot" -version = "0.12.1" +name = "nu-ansi-term" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" dependencies = [ - "lock_api", - "parking_lot_core", + "windows-sys 0.48.0", ] [[package]] -name = "parking_lot_core" -version = "0.9.9" +name = "num_cpus" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "cfg-if", + "hermit-abi", "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", ] [[package]] -name = "paste" -version = "1.0.14" +name = "once_cell" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "pest" -version = "2.7.8" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "pest_derive" -version = "2.7.8" +name = "pin-project-lite" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" -dependencies = [ - "pest", - "pest_generator", -] +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] -name = "pest_generator" -version = "2.7.8" +name = "prettyplease" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "pest", - "pest_meta", "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "pest_meta" -version = "2.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" -dependencies = [ - "once_cell", - "pest", - "sha2", + "syn", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -523,42 +553,31 @@ dependencies = [ ] [[package]] -name = "ratatui" -version = "0.26.1" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 2.4.2", - "cassowary", - "compact_str", - "crossterm", - "indoc", - "itertools", - "lru", - "paste", - "stability", - "strum", - "unicode-segmentation", - "unicode-width", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "libredox", + "redox_syscall 0.2.16", "thiserror", ] @@ -570,28 +589,95 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.4", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] +name = "rustc-build-sysroot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26170e1d79ea32f7ccec3188dd13cfc1f18c82764a9cbc1071667c0f865a4ea" +dependencies = [ + "anyhow", + "rustc_version", + "tempfile", + "walkdir", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfix" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481" +dependencies = [ + "anyhow", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -599,41 +685,53 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] -name = "scopeguard" -version = "1.2.0" +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "semver" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -641,206 +739,222 @@ dependencies = [ ] [[package]] -name = "sha2" -version = "0.10.8" +name = "sharded-slab" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ - "cfg-if", - "cpufeatures", - "digest", + "lazy_static", ] [[package]] -name = "shellexpand" -version = "3.1.0" +name = "smallvec" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs", -] +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] -name = "shlex" -version = "1.3.0" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "signal-hook" -version = "0.3.17" +name = "strsim" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] -name = "signal-hook-mio" -version = "0.2.3" +name = "syn" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ - "libc", - "mio", - "signal-hook", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "signal-hook-registry" -version = "1.4.1" +name = "tempfile" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "libc", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", ] [[package]] -name = "smallvec" -version = "1.13.1" +name = "term" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "sshs" -version = "4.2.1" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "anyhow", - "clap", - "crossterm", - "fuzzy-matcher", - "glob", - "handlebars", - "itertools", - "ratatui", - "regex", - "serde", - "shellexpand", - "shlex", - "strum", - "strum_macros", - "tui-input", - "unicode-width", + "dirs-next", + "rustversion", + "winapi", ] [[package]] -name = "stability" -version = "0.1.1" +name = "tester" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" dependencies = [ - "quote", - "syn 1.0.109", + "cfg-if", + "getopts", + "libc", + "num_cpus", + "term", ] [[package]] -name = "static_assertions" -version = "1.1.0" +name = "thiserror" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] [[package]] -name = "strsim" -version = "0.11.0" +name = "thiserror-impl" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "strum" -version = "0.26.1" +name = "thread_local" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "strum_macros", + "cfg-if", + "once_cell", ] [[package]] -name = "strum_macros" -version = "0.26.1" +name = "time" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.52", + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", ] [[package]] -name = "syn" -version = "1.0.109" +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "time-core", ] [[package]] -name = "syn" -version = "2.0.52" +name = "tracing" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "pin-project-lite", + "tracing-attributes", + "tracing-core", ] [[package]] -name = "thiserror" -version = "1.0.57" +name = "tracing-appender" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ - "thiserror-impl", + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", ] [[package]] -name = "thiserror-impl" -version = "1.0.57" +name = "tracing-attributes" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] -name = "thread_local" -version = "1.1.8" +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "cfg-if", "once_cell", + "valuable", ] [[package]] -name = "tui-input" -version = "0.8.0" +name = "tracing-log" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e785f863a3af4c800a2a669d0b64c879b538738e352607e2624d03f868dc01" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "crossterm", - "unicode-width", + "log", + "once_cell", + "tracing-core", ] [[package]] -name = "typenum" -version = "1.17.0" +name = "tracing-subscriber" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term 0.46.0", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] [[package]] -name = "ucd-trie" -version = "0.1.6" +name = "tracing-tree" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" +dependencies = [ + "nu-ansi-term 0.49.0", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] [[package]] name = "unicode-ident" @@ -849,12 +963,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -867,10 +975,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "version_check" -version = "0.9.4" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] [[package]] name = "wasi" @@ -879,6 +997,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "which" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" +dependencies = [ + "either", + "home", + "once_cell", + "regex", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -895,6 +1027,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -902,6 +1043,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" @@ -915,7 +1071,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.0", ] [[package]] @@ -935,30 +1091,42 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -968,9 +1136,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -980,9 +1154,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -992,9 +1172,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -1004,50 +1190,42 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "zerocopy" -version = "0.7.32" +name = "windows_x86_64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "zerocopy-derive" -version = "0.7.32" +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/development/tools/bpf-linker/default.nix index 5f594deba7c95..a9a6fed278685 100644 --- a/pkgs/development/tools/bpf-linker/default.nix +++ b/pkgs/development/tools/bpf-linker/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, llvmPackages_15 +, llvmPackages_18 , zlib , ncurses , libxml2 @@ -10,21 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "bpf-linker"; - version = "0.9.5"; + version = "0.9.12"; src = fetchFromGitHub { owner = "aya-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-LEZ2to1bzJ/H/XYytuh/7NT7+04aI8chpKIFxxVzM+4="; + hash = "sha256-HMLbNAB6Ze2x8OeAwVXMMn5P9GYK9hCa61Ic5yqblUA="; }; - cargoHash = "sha256-s8cW7lXtvgemuQueTtAywewnDVJ/WDcz8SBqsC/tO80="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "compiletest_rs-0.10.2" = "sha256-n1OxKal1B+WNshfMgtiA5Th+FQyDalOdB4PAo6mUzwQ="; + }; + }; buildNoDefaultFeatures = true; - buildFeatures = [ "system-llvm" ]; - nativeBuildInputs = [ llvmPackages_15.llvm ]; + nativeBuildInputs = [ llvmPackages_18.llvm ]; buildInputs = [ zlib ncurses libxml2 ]; # fails with: couldn't find crate `core` with expected target triple bpfel-unknown-none diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 47b1d502842b5..7951c70134743 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; + hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 2e1459c16bea9..c2210358344c2 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -1,8 +1,8 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +, runCommand, runCommandCC, makeWrapper # this package (through the fixpoint glass) , bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils +, lr, xe, zip, unzip, bash, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater , python3, writeScript @@ -14,8 +14,6 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook , file , substituteAll , writeTextFile diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 5521fcf0d53df..a49530ecfc693 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -2,7 +2,7 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils +, lr, xe, zip, unzip, bash, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils , diffutils, gnupatch # updater @@ -15,8 +15,6 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook , file , substituteAll , writeTextFile diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix index 8f5592b5e897b..5722d26ea1ed1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix @@ -3,6 +3,7 @@ , bazel-examples , bazelTest , callPackage +, cctools , darwin , distDir , extraBazelArgs ? "" @@ -37,8 +38,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix index 2b231dc52a6e7..51fea3e32dc35 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix @@ -4,7 +4,7 @@ , stdenv , symlinkJoin , callPackage -, darwin +, cctools , extraBazelArgs ? "" , lib , openjdk8 @@ -38,8 +38,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix index 4d188ed414544..ebe4f13346bc0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix @@ -2,6 +2,7 @@ , Foundation , bazelTest , callPackage +, cctools , darwin , distDir , extraBazelArgs ? "" @@ -97,8 +98,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 7b0e2a5d01bf3..6759bf14de100 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -3,6 +3,7 @@ , bazelTest , bazel-examples , stdenv +, cctools , darwin , extraBazelArgs ? "" , lib @@ -20,8 +21,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index ed4711f4027f9..3890d45d2b946 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -2,7 +2,7 @@ , bazelTest , bazel-examples , stdenv -, darwin +, cctools , extraBazelArgs ? "" , lib , openjdk8 @@ -20,8 +20,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index 963bad679c50c..0466404ced965 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , fetchurl , stdenv -, darwin +, cctools , lib , openjdk8 , jdk11_headless @@ -134,8 +134,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index 2538a2ae074ad..e0e59fb8891d4 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -2,7 +2,7 @@ bazel , bazelTest , stdenv -, darwin +, cctools , extraBazelArgs ? "" , lib , runLocal @@ -17,8 +17,8 @@ let #! ${runtimeShell} export CXX='${stdenv.cc}/bin/clang++' - export LD='${darwin.cctools}/bin/ld' - export LIBTOOL='${darwin.cctools}/bin/libtool' + export LD='${cctools}/bin/ld' + export LIBTOOL='${cctools}/bin/libtool' export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 1f3929620f1fc..6a47218ae33fe 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.5.18"; + version = "1.6.0"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-gfmsroHyr/xrbQ72x6LNRvIYaxgUjBOxYsyKqc0c9Oo=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-fluOkbpVy895YyWisfTaDP2yXbqF+gToc1KbVL8Mon8=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-f7ZmjDO8L3hcYkaxiwf5BBD44hBiBhNovylM4B308bI=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-xXkWQ9dMZrSXZHrU1YxTxfDwGEj9y8/ARlypUNLnloo=" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 39d974e0f3b8e..5e7a0e866cff4 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "conan"; - version = "2.0.17"; + version = "2.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = "refs/tags/${version}"; - hash = "sha256-liCeGe0WBW+tOjW81cqrFUiOEWYhlqsBVgns6SxjPNM="; + hash = "sha256-4GCLmPEoCX1Cw+H6Bo1KA4+9GX35HgONAmMF/WNX6ag="; }; nativeBuildInputs = with python3.pkgs; [ @@ -88,20 +88,25 @@ python3.pkgs.buildPythonApplication rec { disabledTestPaths = [ # Requires cmake, meson, autotools, apt-get, etc. - "conans/test/functional/command/new_test.py" - "conans/test/functional/command/test_install_deploy.py" - "conans/test/functional/graph/test_transitive_build_scripts.py" - "conans/test/functional/layout/test_editable_cmake_components.py" - "conans/test/functional/layout/test_editable_cmake.py" - "conans/test/functional/layout/test_in_subfolder.py" - "conans/test/functional/layout/test_source_folder.py" - "conans/test/functional/toolchains/" - "conans/test/functional/tools_versions_test.py" - "conans/test/functional/tools/scm/test_git.py" - "conans/test/functional/tools/system/package_manager_test.py" - "conans/test/functional/util/test_cmd_args_to_string.py" - "conans/test/integration/command_v2/list_test.py" - "conans/test/unittests/tools/env/test_env_files.py" + "test/functional/command/new_test.py" + "test/functional/command/test_install_deploy.py" + "test/functional/graph/test_transitive_build_scripts.py" + "test/functional/layout/test_editable_cmake.py" + "test/functional/layout/test_editable_cmake_components.py" + "test/functional/layout/test_in_subfolder.py" + "test/functional/layout/test_source_folder.py" + "test/functional/test_local_recipes_index.py" + "test/functional/test_profile_detect_api.py" + "test/functional/toolchains/" + "test/functional/tools/scm/test_git.py" + "test/functional/tools/system/package_manager_test.py" + "test/functional/tools_versions_test.py" + "test/functional/util/test_cmd_args_to_string.py" + "test/integration/command/runner_test.py" + "test/integration/command/user_test.py" + "test/integration/command_v2/list_test.py" + "test/performance/test_large_graph.py" + "test/unittests/tools/env/test_env_files.py" ]; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index c5253edb53e95..d4748ecf98a04 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -7,12 +7,12 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "fac"; - sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; + hash = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; + cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's # running in a git repo. Nix's sandbox runs cargo build outside git, diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix index c890caa5da9f8..fe74486ccfaad 100644 --- a/pkgs/development/tools/build-managers/gn/generic.nix +++ b/pkgs/development/tools/build-managers/gn/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, darwin, writeText +{ stdenv, lib, fetchgit, cctools, darwin, writeText , ninja, python3 , ... }: diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 8e29846e91c77..ac22eee7e2061 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/make/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "make"; platforms = platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 55b73888bc069..4f6bc99fbf015 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/make/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "make"; platforms = platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gradle/README.md b/pkgs/development/tools/build-managers/gradle/README.md new file mode 100644 index 0000000000000..bdfca72f61f37 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/README.md @@ -0,0 +1,245 @@ +# Gradle Setup Hook + +## Introduction + +Gradle build scripts are written in a DSL, computing the list of Gradle +dependencies is a turing-complete task, not just in theory but in +practice. Fetching all of the dependencies often requires building some +native code, running some commands to check the host platform, or just +fetching some files using either JVM code or commands like `curl` or +`wget`. + +This practice is widespread and isn't considered a bad practice in the +Java world, so all we can do is run Gradle to check what dependencies +end up being fetched, and allow derivation authors to apply workarounds +so they can run the code necessary for fetching the dependencies our +script doesn't fetch. + +"Run Gradle to check what dependencies end up being fetched" isn't a +straightforward task. For example, Gradle usually uses Maven +repositories, which have features such as "snapshots", a way to always +use the latest version of a dependency as opposed to a fixed version. +Obviously, this is horrible for reproducibility. Additionally, Gradle +doesn't offer a way to export the list of dependency URLs and hashes (it +does in a way, but it's far from being complete, and as such is useless +for nixpkgs). Even if did, it would be annoying to use considering +fetching non-Gradle dependencies in Gradle scripts is commonplace. + +That's why the setup hook uses mitm-cache, a program designed for +intercepting all HTTP requests, recording all the files that were +accessed, creating a Nix derivation with all of them, and then allowing +the Gradle derivation to access these files. + +## Maven Repositories + +(Reference: [Repository +Layout](https://cwiki.apache.org/confluence/display/MAVENOLD/Repository+Layout+-+Final)) + +Most of Gradle dependencies are fetched from Maven repositories. For +each dependency, Gradle finds the first repo where it can successfully +fetch that dependency, and uses that repo for it. Different repos might +actually return different files for the same artifact because of e.g. +pom normalization. Different repos may be used for the same artifact +even across a single package (for example, if two build scripts define +repositories in a different order). + +The artifact metadata is specified in a .pom file, and the artifacts +themselves are typically .jar files. The URL format is as follows: + +`<repo>/<group-id>/<artifact-id>/<base-version>/<artifact-id>-<version>[-<classifier>].<ext>` + +For example: + +- `https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.pom` +- `https://oss.sonatype.org/content/groups/public/com/tobiasdiez/easybind/2.2.1-SNAPSHOT/easybind-2.2.1-20230117.075740-16.pom` + +Where: + +- `<repo>` is the repo base (`https://repo.maven.apache.org/maven2`) +- `<group-id>` is the group ID with dots replaced with slashes + (`org.slf4j` -> `org/slf4j`) +- `<artifact-id>` is the artifact ID (`slf4j-api`) +- `<base-version>` is the artifact version (`2.0.9` for normal + artifacts, `2.2.1-SNAPSHOT` for snapshots) +- `<version>` is the artifact version - can be either `<base-version>` + or `<version-base>-<timestamp>-<build-num>` (`2.0.9` for normal + artifacts, and either `2.2.1-SNAPSHOT` or `2.2.1-20230117.075740-16` + for snapshots) + - `<version-base>` - `<base-version>` without the `-SNAPSHOT` suffix + - `<timestamp>` - artifact build timestamp in the `YYYYMMDD.HHMMSS` + format (UTC) + - `<build-num>` - a counter that's incremented by 1 for each new + snapshot build +- `<classifier>` is an optional classifier for allowing a single .pom to + refer to multiple .jar files. .pom files don't have classifiers, as + they describe metadata. +- `<ext>` is the extension. .pom + +Note that the artifact ID can contain `-`, so you can't extract the +artifact ID and version from just the file name. + +Additionally, the files in the repository may have associated signature +files, formed by appending `.asc` to the filename, and hashsum files, +formed by appending `.md5` or `.sha1` to the filename. The signatures +are harmless, but the `.md5`/`.sha1` files are rejected. + +The reasoning is as follows - consider two files `a.jar` and `b.jar`, +that have the same hash. Gradle will fetch `a.jar.sha1`, find out that +it hasn't yet downloaded a file with this hash, and then fetch `a.jar`, +and finally download `b.jar.sha1`, locate it in its cache, and then +*not* download `b.jar`. This means `b.jar` won't be stored in the MITM +cache. Then, consider that on a later invocation, the fetching order +changed, whether it was because of a running on different system, +changed behavior after a Gradle update, or any other source of +nondeterminism - `b.jar` is fetched before `a.jar`. Gradle will first +fetch `b.jar.sha1`, not find it in its cache, attempt to fetch `b.jar`, +and fail, as the cache doesn't have that file. + +For the same reason, the proxy strips all checksum/etag headers. An +alternative would be to make the proxy remember previous checksums and +etags, but that would complicate the implementation - however, such a +feature can be implemented if necessary. Note that checksum/etag header +stripping is hardcoded, but `.md5/.sha1` file rejection is configured +via CLI arguments. + +**Caveat**: Gradle .module files also contain file hashes, in md5, sha1, +sha256, sha512 formats. It posed no problem as of yet, but it might in +the future. If it does pose problems, the deps derivation code can be +extended to find all checksums in .module files and copy existing files +there if their hash matches. + +## Snapshots + +Snapshots are a way to publish the very latest, unstable version of a +dependency that constantly changes. Any project that depends on a +snapshot will depend on this rolling version, rather than a fixed +version. It's easy to understand why this is a bad idea for reproducible +builds. Still, they can be dealt with by the logic in `gradle.fetchDeps` +and `gradle.updateDeps`. + +First, as you can see above, while normal artifacts have the same +`base-version` and `version`, for snapshots it usually (but not +necessarily) differs. + +Second, for figuring out where to download the snapshot, Gradle consults +`maven-metadata.xml`. With that in mind... + +## Maven Metadata + +(Reference: [Maven +Metadata](https://maven.apache.org/repositories/metadata.html), +[Metadata](https://maven.apache.org/ref/3.9.8/maven-repository-metadata/repository-metadata.html) + +Maven metadata files are called `maven-metadata.xml`. + +There are three levels of metadata: "G level", "A level", "V level", +representing group, artifact, or version metadata. + +G level metadata is currently unsupported. It's only used for Maven +plugins, which Gradle presumably doesn't use. + +A level metadata is used for getting the version list for an artifact. +It's an xml with the following items: + +- `<groupId>` - group ID +- `<artifactId>` - artifact ID +- `<versioning>` + - `<latest>` - the very latest base version (e.g. `2.2.1-SNAPSHOT`) + - `<release>` - the latest non-snapshot version + - `<versions>` - the version list, each in a `<version>` tag + - `<lastUpdated>` - the metadata update timestamp (UTC, + `YYYYMMDDHHMMSS`) + +V level metadata is used for listing the snapshot versions. It has the +following items: + +- `<groupId>` - group ID +- `<artifactId>` - artifact ID +- `<versioning>` + - `<lastUpdated>` - the metadata update timestamp (UTC, + `YYYYMMDDHHMMSS`) + - `<snapshot>` - info about the latest snapshot version + - `<timestamp>` - build timestamp (UTC, `YYYYMMDD.HHMMSS`) + - `<buildNumber>` - build number + - `<snapshotVersions>` - the list of all available snapshot file info, + each info is enclosed in a `<snapshotVersion>` + - `<classifier>` - classifier (optional) + - `<extension>` - file extension + - `<value>` - snapshot version (as opposed to base version) + - `<updated>` - snapshot build timestamp (UTC, `YYYYMMDDHHMMSS`) + +## Lockfile Format + +The mitm-cache lockfile format is described in the [mitm-cache +README](https://github.com/chayleaf/mitm-cache#readme). + +The nixpkgs Gradle lockfile format is more complicated: + +```json +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames/gdx-controllers": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + } + } +} +``` + +`!comment` is a human-readable description explaining what the file is, +`!version` is the lockfile version (note that while it shares the name +with mitm-cache's `!version`, they don't actually have to be in sync and +can be bumped separately). + +The other keys are parts of a URL. Each URL is split into three parts. +They are joined like this: `<part1>/<part2>.<part3>`. + +Some URLs may have a `#` in them. In that case, the part after `#` is +parsed as `#<artifact-id>/<version>[/SNAPSHOT][/<classifier>].<ext>` and +expanded into +`<artifact-id>/<base-version>/<artifact-id>-<version>[-<classifier>].<ext>`. + +Each URL has a value associated with it. The value may be: + +- an SRI hash (string) +- for `maven-metadata.xml` - an attrset containing the parts of the + metadata that can't be generated in Nix code (e.g. `groupId`, which is + challenging to parse from a URL because it's not always possible to + discern where the repo base ends and the group ID begins). + +`compress-deps-json.py` converts the JSON from mitm-cache format into +nixpkgs Gradle lockfile format. `fetch.nix` does the opposite. + +## Security Considerations + +Lockfiles won't be human-reviewed. They must be tampering-resistant. +That's why it's imperative that nobody can inject their own contents +into the lockfiles. + +This is achieved in a very simple way - the `deps.json` only contains +the following: + +- `maven-metadata.xml` URLs and small pieces of the contained metadata + (most of it will be generated in Nix, i.e. the area of injection is + minimal, and the parts that aren't generated in Nix are validated). +- artifact/other file URLs and associated hashes (Nix will complain if + the hash doesn't match, and Gradle won't even access the URL if it + doesn't match) + +Please be mindful of the above when working on Gradle support for +nixpkgs. diff --git a/pkgs/development/tools/build-managers/gradle/compress-deps-json.py b/pkgs/development/tools/build-managers/gradle/compress-deps-json.py new file mode 100644 index 0000000000000..6397892835adf --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/compress-deps-json.py @@ -0,0 +1,163 @@ +import json +import sys + +from typing import Dict, Set + +# this compresses MITM URL lists with Gradle-specific optimizations +# specifically, it splits each url into up to 3 parts - they will be +# concatenated like part1/part2.part3 or part1.part2 +# part3 is simply always the file extension, but part1 and part2 is +# optimized using special heuristics +# additionally, if part2 ends with /a/b/{a}-{b}, the all occurences of +# /{a}/{b}/ are replaced with # +# finally, anything that ends with = is considered SHA256, anything that +# starts with http is considered a redirect URL, anything else is +# considered text + +with open(sys.argv[1], "rt") as f: + data: dict = json.load(f) + +new_data: Dict[str, Dict[str, Dict[str, dict]]] = {} + +for url, info in data.items(): + if url == "!version": + continue + ext, base = map(lambda x: x[::-1], url[::-1].split(".", 1)) + if base.endswith(".tar"): + base = base[:-4] + ext = "tar." + ext + # special logic for Maven repos + if ext in ["jar", "pom", "module"]: + comps = base.split("/") + if "-" in comps[-1]: + # convert base/name/ver/name-ver into base#name/ver + + filename = comps[-1] + name = comps[-3] + basever = comps[-2] + ver = basever + is_snapshot = ver.endswith("-SNAPSHOT") + if is_snapshot: + ver = ver.removesuffix("-SNAPSHOT") + if filename.startswith(f"{name}-{ver}"): + if is_snapshot: + if filename.startswith(f"{name}-{ver}-SNAPSHOT"): + ver += "-SNAPSHOT" + else: + ver += "-".join( + filename.removeprefix(f"{name}-{ver}").split("-")[:3] + ) + comp_end = comps[-1].removeprefix(f"{name}-{ver}") + else: + ver, name, comp_end = None, None, None + if name and ver and (not comp_end or comp_end.startswith("-")): + base = "/".join(comps[:-1]) + "/" + base = base.replace(f"/{name}/{basever}/", "#") + base += f"{name}/{ver}" + if is_snapshot: + base += "/SNAPSHOT" + if comp_end: + base += "/" + comp_end[1:] + scheme, rest = base.split("/", 1) + if scheme not in new_data.keys(): + new_data[scheme] = {} + if rest not in new_data[scheme].keys(): + new_data[scheme][rest] = {} + if "hash" in info.keys(): + new_data[scheme][rest][ext] = info["hash"] + elif "text" in info.keys() and ext == "xml": + # nix code in fetch-deps.nix will autogenerate metadata xml files groupId + # is part of the URL, but it can be tricky to parse as we don't know the + # exact repo base, so take it from the xml and pass it to nix + xml = "".join(info["text"].split()) + new_data[scheme][rest][ext] = { + "groupId": xml.split("<groupId>")[1].split("</groupId>")[0], + } + if "<release>" in xml: + new_data[scheme][rest][ext]["release"] = xml.split("<release>")[1].split( + "</release>" + )[0] + if "<latest>" in xml: + latest = xml.split("<latest>")[1].split("</latest>")[0] + if latest != new_data[scheme][rest][ext].get("release"): + new_data[scheme][rest][ext]["latest"] = latest + if "<lastUpdated>" in xml: + new_data[scheme][rest][ext]["lastUpdated"] = xml.split("<lastUpdated>")[ + 1 + ].split("</lastUpdated>")[0] + else: + raise Exception("Unsupported key: " + repr(info)) + +# At this point, we have a map by part1 (initially the scheme), part2 (initially a +# slash-separated string without the scheme and with potential # substitution as +# seen above), extension. +# Now, push some segments from "part2" into "part1" like this: +# https # part1 +# domain1/b # part2 +# domain1/c +# domain2/a +# domain2/c +# -> +# https/domain1 # part1 +# b # part2 +# c +# https/domain2 # part1 +# a # part2 +# c +# This helps reduce the lockfile size because a Gradle project will usually use lots +# of files from a single Maven repo + +data = new_data +changed = True +while changed: + changed = False + new_data = {} + for part1, info1 in data.items(): + starts: Set[str] = set() + # by how many bytes the file size will be increased (roughly) + lose = 0 + # by how many bytes the file size will be reduced (roughly) + win = 0 + # how many different initial part2 segments there are + count = 0 + for part2, info2 in info1.items(): + if "/" not in part2: + # can't push a segment from part2 into part1 + count = 0 + break + st = part2.split("/", 1)[0] + if st not in starts: + lose += len(st) + 1 + count += 1 + starts.add(st) + win += len(st) + 1 + if count == 0: + new_data[part1] = info1 + continue + # only allow pushing part2 segments into path1 if *either*: + # - the domain isn't yet part of part1 + # - the initial part2 segment is always the same + if count != 1 and "." in part1: + new_data[part1] = info1 + continue + # some heuristics that may or may not work well (originally this was + # used when the above if wasn't here, but perhaps it's useless now) + lose += (count - 1) * max(0, len(part1) - 4) + if win > lose or ("." not in part1 and win >= lose): + changed = True + for part2, info2 in info1.items(): + st, part3 = part2.split("/", 1) + new_part1 = part1 + "/" + st + if new_part1 not in new_data.keys(): + new_data[new_part1] = {} + new_data[new_part1][part3] = info2 + else: + new_data[part1] = info1 + data = new_data + +new_data["!comment"] = "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual." # type: ignore +new_data["!version"] = 1 # type: ignore + +with open(sys.argv[2], "wt") as f: + json.dump(new_data, f, sort_keys=True, indent=1) + f.write("\n") diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 32bd64d2f0e3e..1522411656cd4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -130,6 +130,7 @@ rec { ''; }; }; + passthru.jdk = defaultJava; meta = with lib; { inherit platforms; @@ -179,4 +180,44 @@ rec { hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; defaultJava = jdk11; }; + + wrapGradle = { + lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook + }: + gradle-unwrapped: + lib.makeOverridable (args: + let + gradle = gradle-unwrapped.override args; + in symlinkJoin { + name = "gradle-${gradle.version}"; + + paths = [ + (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { + name = "setup-hook.sh"; + files = [ + (mitm-cache.setupHook) + (substituteAll { + src = ./setup-hook.sh; + # jdk used for keytool + inherit (gradle) jdk; + init_script = ./init-build.gradle; + }) + ]; + })) + gradle + mitm-cache + ]; + + passthru = { + fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; }; + inherit (gradle) jdk; + unwrapped = gradle; + }; + + meta = gradle.meta // { + # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook + # and passthru + priority = (gradle.meta.priority or 0) + 1; + }; + }) { }; } diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix new file mode 100644 index 0000000000000..304898c0131c6 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -0,0 +1,221 @@ +{ mitm-cache +, lib +, pkgs +, stdenv +, callPackage +}: + +let + getPkg = attrPath: + lib.getAttrFromPath + (lib.splitString "." (toString attrPath)) + pkgs; +in +# the derivation to fetch/update deps for +{ pkg ? getPkg attrPath +, pname ? null +, attrPath ? pname +# bwrap flags for the update script (this will be put in bash as-is) +# this is relevant for downstream users +, bwrapFlags ? "--ro-bind \"$PWD\" \"$PWD\"" +# deps path (relative to the package directory, or absolute) +, data +# redirect stdout to stderr to allow the update script to be used with update script combinators +, silent ? true +, useBwrap ? stdenv.isLinux +} @ attrs: + +let + data' = builtins.removeAttrs + (if builtins.isPath data then lib.importJSON data + else if builtins.isString data then lib.importJSON "${dirOf pkg.meta.position}/${data}" + else data) + [ "!comment" "!version" ]; + + parseArtifactUrl = url: let + extension = lib.last (lib.splitString "." url); + splitUrl = lib.splitString "/" url; + artifactId = builtins.elemAt splitUrl (builtins.length splitUrl - 3); + baseVer = builtins.elemAt splitUrl (builtins.length splitUrl - 2); + filename = builtins.elemAt splitUrl (builtins.length splitUrl - 1); + filenameNoExt = lib.removeSuffix ".${extension}" filename; + verCls = lib.removePrefix "${artifactId}-" filenameNoExt; + in rec { + inherit artifactId baseVer filename extension; + isSnapshot = lib.hasSuffix "-SNAPSHOT" baseVer; + version = + if isSnapshot && !lib.hasPrefix "SNAPSHOT" verCls + then builtins.concatStringsSep "-" (lib.take 3 (lib.splitString "-" verCls)) + else baseVer; + classifier = + if verCls == version then null + else lib.removePrefix "${version}-" verCls; + # for snapshots + timestamp = builtins.elemAt (lib.splitString "-" version) 1; + buildNum = builtins.elemAt (lib.splitString "-" version) 2; + }; + + parseMetadataUrl = url: let + xmlBase = lib.removeSuffix "/maven-metadata.xml" url; + vMeta = lib.hasSuffix "-SNAPSHOT" xmlBase; + splitBase = lib.splitString "/" xmlBase; + in + if vMeta then { + vMeta = true; + baseVer = builtins.elemAt splitBase (builtins.length splitBase - 1); + artifactId = builtins.elemAt splitBase (builtins.length splitBase - 2); + } else { + vMeta = false; + baseVer = null; + artifactId = builtins.elemAt splitBase (builtins.length splitBase - 1); + }; + + extractHashArtifact = afterHash: let + nameVer = builtins.match "([^/]*)/([^/]*)(/SNAPSHOT)?(/.*)?" afterHash; + artifactId = builtins.elemAt nameVer 0; + version = builtins.elemAt nameVer 1; + isSnapshot = builtins.elemAt nameVer 2 != null; + cls = builtins.elemAt nameVer 3; + in rec { + inherit artifactId version isSnapshot; + baseVer = + if !isSnapshot then version + else builtins.head (builtins.match "(.*)-([^-]*)-([^-]*)" version) + "-SNAPSHOT"; + classifier = + if cls == null then null + else lib.removePrefix "/" cls; + clsSuf = + if classifier == null then "" + else "-${classifier}"; + }; + + # replace base#name/ver with base/name/ver/name-ver + decompressNameVer = prefix: let + splitHash = lib.splitString "#" (builtins.concatStringsSep "/" prefix); + inherit (extractHashArtifact (lib.last splitHash)) artifactId baseVer version clsSuf; + in + if builtins.length splitHash == 1 then builtins.head splitHash + else builtins.concatStringsSep "/${artifactId}/${baseVer}/" (lib.init splitHash ++ [ "${artifactId}-${version}${clsSuf}" ]); + + # `visit` all elements in attrs and merge into a set + # attrs will be passed as parent1, parent1 will be passed as parent2 + visitAttrs = parent1: prefix: attrs: + builtins.foldl' + (a: b: a // b) + {} + (lib.mapAttrsToList (visit parent1 attrs prefix) attrs); + + # convert a compressed deps.json into an uncompressed json used for mitm-cache.fetch + visit = parent2: parent1: prefix: k: v: + # groupId being present means this is a metadata xml "leaf" and we shouldn't descend further + if builtins.isAttrs v && !v?groupId + then visitAttrs parent1 (prefix ++ [k]) v + else let + url = "${decompressNameVer prefix}.${k}"; + in { + ${url} = + if builtins.isString v then { hash = v; } + else { + text = let + xmlBase = lib.removeSuffix "/maven-metadata.xml" url; + meta = parseMetadataUrl url // v; + inherit (meta) groupId vMeta artifactId baseVer; + + fileList = builtins.filter (x: lib.hasPrefix xmlBase x && x != url) (builtins.attrNames finalData); + jarPomList = map parseArtifactUrl fileList; + + sortByVersion = a: b: (builtins.compareVersions a.version b.version) < 0; + sortedJarPomList = lib.sort sortByVersion jarPomList; + + uniqueVersionFiles = + builtins.map ({ i, x }: x) + (builtins.filter ({ i, x }: i == 0 || (builtins.elemAt sortedJarPomList (i - 1)).version != x.version) + (lib.imap0 (i: x: { inherit i x; }) sortedJarPomList)); + uniqueVersions' = map (x: x.version) uniqueVersionFiles; + releaseVersions = map (x: x.version) (builtins.filter (x: !x.isSnapshot) uniqueVersionFiles); + latestVer = v.latest or v.release or (lib.last uniqueVersions'); + releaseVer = v.release or (lib.last releaseVersions); + + # The very latest version isn't necessarily used by Gradle, so it may not be present in the MITM data. + # In order to generate better metadata xml, if the latest version is known but wasn't fetched by Gradle, + # add it anyway. + uniqueVersions = + uniqueVersions' + ++ lib.optional (!builtins.elem releaseVer uniqueVersions') releaseVer + ++ lib.optional (!builtins.elem latestVer uniqueVersions' && releaseVer != latestVer) latestVer; + + lastUpdated = v.lastUpdated or + (if vMeta then builtins.replaceStrings ["."] [""] snapshotTs + else "20240101123456"); + + # the following are only used for snapshots + snapshotTsAndNum = lib.splitString "-" latestVer; + snapshotTs = builtins.elemAt snapshotTsAndNum 1; + snapshotNum = lib.last snapshotTsAndNum; + + indent = x: s: builtins.concatStringsSep "\n" (map (s: x + s) (lib.splitString "\n" s)); + containsSpecialXmlChars = s: builtins.match ''.*[<>"'&].*'' s != null; + in + # make sure all user-provided data is safe + assert lib.hasInfix "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}" url; + assert !containsSpecialXmlChars groupId; + assert !containsSpecialXmlChars lastUpdated; + if vMeta then '' + <?xml version="1.0" encoding="UTF-8"?> + <metadata modelVersion="1.1.0"> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${baseVer}</version> + <versioning> + <snapshot> + <timestamp>${snapshotTs}</timestamp> + <buildNumber>${snapshotNum}</buildNumber> + </snapshot> + <lastUpdated>${lastUpdated}</lastUpdated> + <snapshotVersions> + ${builtins.concatStringsSep "\n" (map (x: indent " " '' + <snapshotVersion>${ + lib.optionalString + (x.classifier != null) + "\n <classifier>${x.classifier}</classifier>" + } + <extension>${x.extension}</extension> + <value>${x.version}</value> + <updated>${builtins.replaceStrings ["."] [""] x.timestamp}</updated> + </snapshotVersion>'') sortedJarPomList)} + </snapshotVersions> + </versioning> + </metadata> + '' + else + assert !containsSpecialXmlChars latestVer; + assert !containsSpecialXmlChars releaseVer; + '' + <?xml version="1.0" encoding="UTF-8"?> + <metadata modelVersion="1.1.0"> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <versioning> + <latest>${latestVer}</latest> + <release>${releaseVer}</release> + <versions> + ${builtins.concatStringsSep "\n" (map (x: " <version>${x}</version>") uniqueVersions)} + </versions> + <lastUpdated>${lastUpdated}</lastUpdated> + </versioning> + </metadata> + ''; + }; + }; + + finalData = visitAttrs {} [] data'; +in + mitm-cache.fetch { + name = "${pkg.pname or pkg.name}-deps"; + data = finalData // { "!version" = 1; }; + passthru = lib.optionalAttrs (!builtins.isAttrs data) { + updateScript = callPackage ./update-deps.nix { } { + inherit pkg pname attrPath bwrapFlags data silent useBwrap; + }; + }; + } diff --git a/pkgs/development/tools/build-managers/gradle/init-build.gradle b/pkgs/development/tools/build-managers/gradle/init-build.gradle new file mode 100644 index 0000000000000..3c3ee81624495 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/init-build.gradle @@ -0,0 +1,8 @@ +gradle.projectsLoaded { + rootProject.allprojects { + tasks.withType(AbstractArchiveTask) { + preserveFileTimestamps = false + reproducibleFileOrder = true + } + } +} diff --git a/pkgs/development/tools/build-managers/gradle/init-deps.gradle b/pkgs/development/tools/build-managers/gradle/init-deps.gradle new file mode 100644 index 0000000000000..2cb577efaec9a --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/init-deps.gradle @@ -0,0 +1,10 @@ +gradle.projectsLoaded { + rootProject.allprojects { + task nixDownloadDeps { + doLast { + configurations.findAll{it.canBeResolved}.each{it.resolve()} + buildscript.configurations.findAll{it.canBeResolved}.each{it.resolve()} + } + } + } +} diff --git a/pkgs/development/tools/build-managers/gradle/setup-hook.sh b/pkgs/development/tools/build-managers/gradle/setup-hook.sh new file mode 100644 index 0000000000000..a16742414b12d --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/setup-hook.sh @@ -0,0 +1,70 @@ +gradleConfigureHook() { + if [ -z "${GRADLE_USER_HOME-}" ]; then + GRADLE_USER_HOME="$(mktemp -d)" + fi + export GRADLE_USER_HOME + export TERM=dumb + gradleFlagsArray+=(--no-daemon --console plain --init-script "${gradleInitScript:-@init_script@}") + if [ -n "${MITM_CACHE_CA-}" ]; then + if [ -z "${MITM_CACHE_KEYSTORE-}" ]; then + MITM_CACHE_KEYSTORE="$MITM_CACHE_CERT_DIR/keystore" + MITM_CACHE_KS_PWD="$(head -c10 /dev/random | base32)" + echo y | @jdk@/bin/keytool -importcert -file "$MITM_CACHE_CA" -alias alias -keystore "$MITM_CACHE_KEYSTORE" -storepass "$MITM_CACHE_KS_PWD" + fi + gradleFlagsArray+=(-Dhttp.proxyHost="$MITM_CACHE_HOST" -Dhttp.proxyPort="$MITM_CACHE_PORT") + gradleFlagsArray+=(-Dhttps.proxyHost="$MITM_CACHE_HOST" -Dhttps.proxyPort="$MITM_CACHE_PORT") + gradleFlagsArray+=(-Djavax.net.ssl.trustStore="$MITM_CACHE_KEYSTORE" -Djavax.net.ssl.trustStorePassword="$MITM_CACHE_KS_PWD") + else + gradleFlagsArray+=(--offline) + fi + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + fi + if ! [[ -v enableParallelChecking ]]; then + enableParallelChecking=1 + fi + if ! [[ -v enableParallelUpdating ]]; then + enableParallelUpdating=1 + fi +} + +gradle() { + command gradle $gradleFlags "${gradleFlagsArray[@]}" "$@" +} + +gradleBuildPhase() { + runHook preBuild + + gradle ${enableParallelBuilding:+--parallel} ${gradleBuildTask:-assemble} + + runHook postBuild +} + +gradleCheckPhase() { + runHook preCheck + + gradle ${enableParallelChecking:+--parallel} ${gradleCheckTask:-test} + + runHook postCheck +} + +gradleUpdateScript() { + runHook preBuild + runHook preGradleUpdate + + gradle ${enableParallelUpdating:+--parallel} ${gradleUpdateTask:-nixDownloadDeps} + + runHook postGradleUpdate +} + +if [ -z "${dontUseGradleConfigure-}" ]; then + preConfigureHooks+=(gradleConfigureHook) +fi + +if [ -z "${dontUseGradleBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=gradleBuildPhase +fi + +if [ -z "${dontUseGradleCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=gradleCheckPhase +fi diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix new file mode 100644 index 0000000000000..96e46a0d98fd6 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix @@ -0,0 +1,122 @@ +{ lib +, runtimeShell +, srcOnly +, writeTextFile +, writeShellScript +, path +, bubblewrap +, coreutils +, curl +, jq +, mitm-cache +, nix +, openssl +, procps +, python3 +}: + +lib.makeOverridable +({ pkg, pname, attrPath, bwrapFlags, data, silent, useBwrap }: +let + keep = [ "MITM_CACHE_HOST" "MITM_CACHE_PORT" "MITM_CACHE_ADDRESS" "MITM_CACHE_CA" "MITM_CACHE_CERT_DIR" ]; + gradleScript = writeShellScript "gradle-commands.sh" '' + set -eo pipefail + export http_proxy="$MITM_CACHE_ADDRESS" + export https_proxy="$MITM_CACHE_ADDRESS" + export SSL_CERT_FILE="$MITM_CACHE_CA" + export NIX_SSL_CERT_FILE="$MITM_CACHE_CA" + export GRADLE_USER_HOME="$(${coreutils}/bin/mktemp -d)" + export IN_GRADLE_UPDATE_DEPS=1 + trap "${coreutils}/bin/rm -rf '$GRADLE_USER_HOME'" SIGINT SIGTERM ERR EXIT + cd "$(${coreutils}/bin/mktemp -d)" + ${coreutils}/bin/mkdir out + export out="$PWD/out" + trap "${coreutils}/bin/rm -rf '$PWD'" SIGINT SIGTERM ERR EXIT + source "$stdenv/setup" + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} configurePhase gradleUpdateScript" genericBuild + ''; + source = srcOnly (pkg.overrideAttrs (old: { + mitmCache = ""; + gradleInitScript = ./init-deps.gradle; + })); + sourceDrvPath = builtins.unsafeDiscardOutputDependency source.drvPath; + nixShellKeep = lib.concatMapStringsSep " " (x: "--keep ${x}") keep; +in +writeTextFile { + name = "fetch-deps.sh"; + executable = true; + # see pkgs/common-updater/combinators.nix + derivationArgs.passthru = + { supportedFeatures = lib.optional silent "silent"; } + // lib.optionalAttrs (attrPath != null) { inherit attrPath; }; + text = '' + #!${runtimeShell} + set -eo pipefail + export PATH="${lib.makeBinPath ([ + coreutils curl jq mitm-cache openssl + procps python3.pkgs.ephemeral-port-reserve + ] ++ lib.optional useBwrap bubblewrap)}:$PATH" + outPath="${ + # if this is an absolute path in nix store, use path relative to the store path + if lib.hasPrefix "${builtins.storeDir}/" (toString data) + then builtins.concatStringsSep "/" (lib.drop 1 (lib.splitString "/" (lib.removePrefix "${builtins.storeDir}/" (toString data)))) + # if this is an absolute path anywhere else, just use that path + else if lib.hasPrefix "/" (toString data) + then toString data + # otherwise, use a path relative to the package + else "${dirOf pkg.meta.position}/${data}" + }" + + pushd "$(mktemp -d)" >/dev/null + MITM_CACHE_DIR="$PWD" + trap "rm -rf '$MITM_CACHE_DIR'" SIGINT SIGTERM ERR EXIT + openssl genrsa -out ca.key 2048 + openssl req -x509 -new -nodes -key ca.key -sha256 -days 1 -out ca.cer -subj "/C=AL/ST=a/L=a/O=a/OU=a/CN=example.org" + export MITM_CACHE_HOST=127.0.0.1 + export MITM_CACHE_PORT="''${mitmCachePort:-$(ephemeral-port-reserve "$MITM_CACHE_HOST")}" + export MITM_CACHE_ADDRESS="$MITM_CACHE_HOST:$MITM_CACHE_PORT" + # forget all redirects - this makes the lockfiles predictable + # not only does this strip CDN URLs, but it also improves security - since the redirects aren't + # stored in the lockfile, a malicious actor can't change the redirect URL stored in the lockfile + mitm-cache \ + -l"$MITM_CACHE_ADDRESS" \ + record \ + --reject '\.(md5|sha(1|256|512:?):?)$' \ + --forget-redirects-from '.*' \ + --record-text '/maven-metadata\.xml$' >/dev/null 2>/dev/null & + MITM_CACHE_PID="$!" + # wait for mitm-cache to fully start + for i in {0..20}; do + ps -p "$MITM_CACHE_PID" >/dev/null || (echo "Failed to start mitm-cache" && exit 1) + curl -so/dev/null "$MITM_CACHE_ADDRESS" && break + [[ "$i" -eq 20 ]] && (echo "Failed to start mitm-cache" && exit 1) + sleep 0.5 + done + trap "kill '$MITM_CACHE_PID'" SIGINT SIGTERM ERR EXIT + export MITM_CACHE_CERT_DIR="$PWD" + export MITM_CACHE_CA="$MITM_CACHE_CERT_DIR/ca.cer" + popd >/dev/null + useBwrap="''${USE_BWRAP:-${toString useBwrap}}" + if [ -n "$useBwrap" ]; then + # bwrap isn't necessary, it's only used to prevent messy build scripts from touching ~ + bwrap \ + --unshare-all --share-net --clearenv --chdir / --setenv HOME /homeless-shelter \ + --tmpfs /home --bind /tmp /tmp --ro-bind /nix /nix --ro-bind /run /run --proc /proc --dev /dev \ + --ro-bind ${toString path} ${toString path} --bind "$MITM_CACHE_CERT_DIR" "$MITM_CACHE_CERT_DIR" \ + ${builtins.concatStringsSep " " (map (x: "--setenv ${x} \"\$${x}\"") keep)} \ + --setenv NIX_BUILD_SHELL ${runtimeShell} ${bwrapFlags} ''${BWRAP_FLAGS:-} \ + -- ${nix}/bin/nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath} + else + NIX_BUILD_SHELL=${runtimeShell} nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath} + fi${lib.optionalString silent " >&2"} + kill -s SIGINT "$MITM_CACHE_PID" + for i in {0..20}; do + # check for valid json + if jq -e 1 "$MITM_CACHE_DIR/out.json" >/dev/null 2>/dev/null; then + exec ${python3.interpreter} ${./compress-deps-json.py} "$MITM_CACHE_DIR/out.json" "$outPath" + fi + sleep 1 + done + exit 1 + ''; +}) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 4c10652d678fa..efbce0bcd3391 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; platforms = jdk.meta.platforms; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; mainProgram = "lein"; }; } diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 0aa0609ed2c7f..6be113496ae6c 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.11.8"; + version = "0.11.11"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly"; - hash = "sha256-HORTexIzrxbWjcGrS59JqZboxGCzk8wKf3eKMoYGqrI="; + hash = "sha256-tTLLY/4rTnV/Mj6/InK7Pfl/49feeWivEWURusRT6Bk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 173c87ca0a6a5..87804dd7f7207 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.26.4"; + version = "1.27.5"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-+vgP8Nu/t7pxU/YGIIi8zd0zuAzZFdpcZLGnjZgqYGM="; + hash = "sha256-FckWn8tHSuowhVSq1B/KqzXB4KlWMOWfmuVfKr/y7Hk="; }; - cargoHash = "sha256-WDBAuzUCjZxayXeEdxvWAHZyYRQLDMz3QkNO9QT/DyI="; + cargoHash = "sha256-rES9cHwOH/Zw0fYhYplQb8FJ/iOndFgskg5zRTMeMDI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index c9d6c19c450e9..bf62dec69310e 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + unset NUGET_PACKAGES # nuget would otherwise try to base itself in /homeless-shelter export HOME=$(pwd)/fake-home diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 08910725104ae..e6a68c4215c37 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://jdebp.eu./Softwares/redo/"; description = "System for building target files from source files"; license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.vrthra ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index f3cbd6091ca18..7c44671a3b440 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "7208170046457c70a67e4b86c833a074be9de958"; - version = "2024-05-06"; + rev = "ed4bce34420650fbc06cc161f1960b539f19289d"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "Ci4V1GHKzGux5qU33Z6+NC+YApqlQfgjekGb+WHtLaQ="; + sha256 = "lsYFupTSZQe2id0wuy+E7lszG4IT3R6fuo+Yql91MkM="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 42b9a493d3e85..3977d5b184410 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-FUt95sGSB8c9CjBPkByMS26tmpw6mamKnXKsGUGdJkA="; + hash = "sha256-R/6YzpSY7kbmnyJnLzwSI0y+fnGedkQQoT5YtyXWWfM="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 676c8eebb07bf..8956544340cd6 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.4.0", + "version": "1.4.3", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1k9yc868lh7yjvxf81pg9n1sdyb2c566i6qwrf7kxczn0s9sa12h" + "sha256": "1hb0n97z5f1h2fcxiygi72ljc20lmlymhm6kcff2azfnjr2sdc48" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "08chhm364m5lbl1wr5xiww3mmm8d31hfw07s4jdsrmpjvxx0yrhg" + "sha256": "1267cvhfmkxhxhq4ypqx4v24w19i1p8bx36hm2mbwi7aqz1m32ms" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1a1ng800aaydvp83wrvxdxw3x6zcdgl2g7fa3zz5h2ba208xjv62" + "sha256": "190kwxr93m2i8azrlahq41xhkpx0pkadiak1wbdzalgfxd7q36n6" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1cav0c0bhag64mic1c37l9zb21zyasshcyl3r12y939fmc9icnww" + "sha256": "0fhydw1axm2xj8qwsl43y3bbbhm95h4yag055py1mxkqsq6f4vw4" } } } diff --git a/pkgs/development/tools/build-managers/scons/3.1.2.nix b/pkgs/development/tools/build-managers/scons/3.1.2.nix deleted file mode 100644 index a9d55f59ee0de..0000000000000 --- a/pkgs/development/tools/build-managers/scons/3.1.2.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, fetchFromGitHub, python3 }: - -let - pname = "scons"; - version = "3.1.2"; - src = fetchFromGitHub { - owner = "Scons"; - repo = "scons"; - rev = version; - hash = "sha256-C3U4N7+9vplzoJoevQe5Zeuz0TDmB6/miMwBJLzA3WA="; - }; -in -python3.pkgs.buildPythonApplication { - inherit pname version src; - - outputs = [ "out" "man" ]; - - preConfigure = '' - python bootstrap.py - cd build/scons - ''; - - setupHook = ./setup-hook.sh; - - doCheck = true; - - passthru = { - # expose the used python version so tools using this (and extensing scos - # with other python modules) can use the exact same python version. - inherit python3; - python = python3; - }; - - meta = { - description = "Improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of SCons as an - improved, cross-platform substitute for the classic Make utility with - integrated functionality similar to autoconf/automake and compiler caches - such as ccache. In short, SCons is an easier, more reliable and faster way - to build software. - ''; - homepage = "https://scons.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} -# TODO: patch to get rid of distutils and other deprecations diff --git a/pkgs/development/tools/build-managers/scons/4.1.0.nix b/pkgs/development/tools/build-managers/scons/4.1.0.nix deleted file mode 100644 index 13357dfb99a95..0000000000000 --- a/pkgs/development/tools/build-managers/scons/4.1.0.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, fetchFromGitHub, python3 }: - -let - pname = "scons"; - version = "4.1.0"; - src = fetchFromGitHub { - owner = "Scons"; - repo = "scons"; - rev = version; - hash = "sha256-ldus/9ghqAMB7A+NrHiCQm7saCdIpqzufGCLxWRhYKU="; - }; -in -python3.pkgs.buildPythonApplication { - inherit pname version src; - - outputs = [ "out" "man" ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "build/dist" "dist" - ''; - - preConfigure = '' - python scripts/scons.py - ''; - - postInstall = '' - mkdir -pv "$man/share/man/man1" - mv -v "$out/"*.1 "$man/share/man/man1/" - ''; - - setupHook = ./setup-hook.sh; - - # The release tarballs don't contain any tests (runtest.py and test/*): - doCheck = false; - - passthru = { - # expose the used python version so tools using this (and extensing scos - # with other python modules) can use the exact same python version. - inherit python3; - python = python3; - }; - - meta = { - description = "Improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of SCons as an - improved, cross-platform substitute for the classic Make utility with - integrated functionality similar to autoconf/automake and compiler caches - such as ccache. In short, SCons is an easier, more reliable and faster way - to build software. - ''; - homepage = "https://scons.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/development/tools/build-managers/scons/4.5.2.nix b/pkgs/development/tools/build-managers/scons/4.5.2.nix deleted file mode 100644 index 6b5720c86ee62..0000000000000 --- a/pkgs/development/tools/build-managers/scons/4.5.2.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, fetchFromGitHub, python3 }: - -let - pname = "scons"; - version = "4.5.2"; - src = fetchFromGitHub { - owner = "Scons"; - repo = "scons"; - rev = version; - hash = "sha256-vxJsz24jDsPcttwPXq9+ztc/N7W4Gkydgykk/FLgZLo="; - }; -in -python3.pkgs.buildPythonApplication { - inherit pname version src; - - outputs = [ "out" "man" ]; - - patches = [ - ./env.patch - ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "build/dist" "dist" \ - --replace "build/doc/man/" "" - ''; - - preConfigure = '' - python scripts/scons.py - ''; - - postInstall = '' - mkdir -p "$man/share/man/man1" - mv "$out/"*.1 "$man/share/man/man1/" - ''; - - setupHook = ./setup-hook.sh; - - # The release tarballs don't contain any tests (runtest.py and test/*): - doCheck = false; - - passthru = { - # expose the used python version so tools using this (and extensing scos - # with other python modules) can use the exact same python version. - inherit python3; - python = python3; - }; - - meta = { - description = "Improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of SCons as an - improved, cross-platform substitute for the classic Make utility with - integrated functionality similar to autoconf/automake and compiler caches - such as ccache. In short, SCons is an easier, more reliable and faster way - to build software. - ''; - homepage = "https://scons.org/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/development/tools/build-managers/scons/env.patch b/pkgs/development/tools/build-managers/scons/env.patch deleted file mode 100644 index 95615016aed95..0000000000000 --- a/pkgs/development/tools/build-managers/scons/env.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py -index 4c9f8f9ba..d68da1b08 100644 ---- a/SCons/Platform/posix.py -+++ b/SCons/Platform/posix.py -@@ -30,0 +31 @@ selection method. -+import os -@@ -87 +88 @@ def generate(env): -- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' -+ env['ENV']['PATH'] = os.environ["PATH"] diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/pkgs/development/tools/build-managers/scons/setup-hook.sh deleted file mode 100644 index bfd8f3cc07b92..0000000000000 --- a/pkgs/development/tools/build-managers/scons/setup-hook.sh +++ /dev/null @@ -1,87 +0,0 @@ -# shellcheck shell=bash disable=SC2206 - -sconsBuildPhase() { - runHook preBuild - - if [ -n "$prefix" ]; then - mkdir -p "$prefix" - fi - - if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - buildFlags="${prefixKey:-prefix=}$prefix $buildFlags" - fi - - local flagsArray=( - ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - $buildFlags ${buildFlagsArray[@]} - ) - - echoCmd 'scons build flags' "${flagsArray[@]}" - scons "${flagsArray[@]}" - - runHook postBuild -} - -sconsInstallPhase() { - runHook preInstall - - if [ -n "$prefix" ]; then - mkdir -p "$prefix" - fi - - if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - installFlags="${prefixKey:-prefix=}$prefix $installFlags" - fi - - local flagsArray=( - ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - $installFlags ${installFlagsArray[@]} - ${installTargets:-install} - ) - - echoCmd 'scons install flags' "${flagsArray[@]}" - scons "${flagsArray[@]}" - - runHook postInstall -} - -sconsCheckPhase() { - runHook preCheck - - if [ -z "${checkTarget:-}" ]; then - if scons -n check >/dev/null 2>&1; then - checkTarget="check" - elif scons -n test >/dev/null 2>&1; then - checkTarget="test" - fi - fi - - if [ -z "${checkTarget:-}" ]; then - echo "no check/test target found, doing nothing" - else - local flagsArray=( - ${enableParallelChecking:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - ${checkFlagsArray[@]} - ) - - echoCmd 'scons check flags' "${flagsArray[@]}" - scons "${flagsArray[@]}" - fi - - runHook postCheck -} - -if [ -z "${dontUseSconsBuild-}" ] && [ -z "${buildPhase-}" ]; then - buildPhase=sconsBuildPhase -fi - -if [ -z "${dontUseSconsCheck-}" ] && [ -z "${checkPhase-}" ]; then - checkPhase=sconsCheckPhase -fi - -if [ -z "${dontUseSconsInstall-}" ] && [ -z "${installPhase-}" ]; then - installPhase=sconsInstallPhase -fi diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 9b745264eb9c5..184c038beae4a 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-gqm7aWGjm+qPKAwUE9VIVEI/j5Li/0PuHA/q16O17dg="; + hash = "sha256-deLd4r0qSKMymJuAGuZQd8RS1JH+xRep2yeoHIcTzcU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 531e87df84bcd..ff31e38d56a8a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-Ttz1D/jFbxFfpbT2VAkcao2AFwFRD8PLrH8yDSYt3AI="; + hash = "sha256-WT1ij2jDEKavYREYYYKl6H27QOuGDAxnWSz+mbvJ5UA="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index b5042ae1b8273..60670791827d2 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -32,7 +32,7 @@ let helpersBin = symlinkJoin { name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}"; - # this only works for some binaries, others may need to be be added to `binPath` or in the modules + # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ ] ++ lib.optionals stdenv.isLinux [ aardvark-dns diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 89a1ea0e09867..807753068b472 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-I0r9ovydRmGdg5EB+b69Iv2BuvVy82Ydz40UWmStumc="; + hash = "sha256-RIFRfzvVUI52LK45noaiZQfUjwKEOf04dTaSRsKmHbs="; }; vendorHash = null; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 1acea5abc6ef0..31a4c70bd68f0 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.34.2"; + version = "0.35.1"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-1s/0eBRnir2MyrDALcOi5drCIJVkrPBB4RXKX08mxKs="; + hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA="; }; - vendorHash = "sha256-jhgTHhiQUDf9738Zusk1SxEae9G6MQapBRq7DBN5Tuc="; + vendorHash = "sha256-gp6Hd0MZxtUX0yYshFIGwrm6yY2pdSOtUs6xmzXBqc4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index d524da13cfac9..43279049ea0df 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://developer.android.com/studio/command-line/bundletool"; changelog = "https://github.com/google/bundletool/releases/tag/${version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = jre_headless.meta.platforms; license = licenses.asl20; }; diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/development/tools/bunyan-rs/default.nix index 314af560ca87b..35fc322b05679 100644 --- a/pkgs/development/tools/bunyan-rs/default.nix +++ b/pkgs/development/tools/bunyan-rs/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; }; - cargoSha256 = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; + cargoHash = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; meta = with lib; { description = "CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index 66ee1edbd1d5e..6af8672e03e34 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitLab , python3 , meson @@ -22,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.90.2"; + version = "0.90.4"; format = "other"; @@ -32,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jpu"; repo = "cambalache"; rev = version; - hash = "sha256-m3rearoCFQUzdZMXY2xyKf4dgdq7G4QlUbetrIqW83U="; + hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/development/tools/cbfmt/default.nix index 6b13d852b201d..099a2a7f9f87d 100644 --- a/pkgs/development/tools/cbfmt/default.nix +++ b/pkgs/development/tools/cbfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, testers, cbfmt }: +{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }: rustPlatform.buildRustPackage rec { pname = "cbfmt"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE="; }; - cargoSha256 = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo="; + cargoHash = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo="; passthru.tests.version = testers.testVersion { package = cbfmt; diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/development/tools/cddl/Gemfile deleted file mode 100644 index 2ba729084f1a7..0000000000000 --- a/pkgs/development/tools/cddl/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'cddl' diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock deleted file mode 100644 index 24afe0d41838f..0000000000000 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ /dev/null @@ -1,40 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - abnc (0.1.1) - abnftt (0.2.4) - base32 (0.3.4) - cbor-canonical (0.1.2) - cbor-deterministic (0.1.3) - cbor-diag (0.8.7) - cbor-canonical - cbor-deterministic - cbor-packed - json_pure - neatjson - treetop (~> 1) - cbor-packed (0.1.5) - cddl (0.10.3) - abnc - abnftt - base32 (~> 0.3) - cbor-diag - colorize - json_pure - regexp-examples - colorize (1.1.0) - json_pure (2.7.1) - neatjson (0.10.5) - polyglot (0.3.5) - regexp-examples (1.5.1) - treetop (1.6.12) - polyglot (~> 0.3) - -PLATFORMS - ruby - -DEPENDENCIES - cddl - -BUNDLED WITH - 2.3.25 diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix deleted file mode 100644 index 3192a1d4ffbec..0000000000000 --- a/pkgs/development/tools/cddl/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, bundlerApp -, bundlerUpdateScript -, makeBinaryWrapper -}: - -bundlerApp rec { - pname = "cddl"; - - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - - gemset = lib.recursiveUpdate (import ./gemset.nix) ({ - "cddl" = { - dontBuild = false; - # setting env vars is not supported by patchShebangs - postPatch = '' - sed -i 's\#!/usr/bin/env RUBY_THREAD_VM_STACK_SIZE=5000000\#!/usr/bin/env\' bin/cddl - ''; - }; - }); - - exes = [ "cddl" ]; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - postBuild = '' - wrapProgram $out/bin/cddl \ - --set RUBY_THREAD_VM_STACK_SIZE 5000000 - ''; - - passthru.updateScript = bundlerUpdateScript "cddl"; - - meta = with lib; { - description = "Parser, generator, and validator for CDDL"; - homepage = "https://rubygems.org/gems/cddl"; - license = with licenses; mit; - maintainers = with maintainers; [ fdns nicknovitski amesgen ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/development/tools/cddl/gemset.nix deleted file mode 100644 index 1f19c3920bdf1..0000000000000 --- a/pkgs/development/tools/cddl/gemset.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ - abnc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yj09gc9w208wsy0d45vzha4zfwxdpsqvkm9vms0chm4lxdwdg9x"; - type = "gem"; - }; - version = "0.1.1"; - }; - abnftt = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z7ibh0xv9mqk61rvvmz9fnfk6hffvnppqd8fx61vazjhisi9bcs"; - type = "gem"; - }; - version = "0.2.4"; - }; - base32 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fjs0l3c5g9qxwp43kcnhc45slx29yjb6m6jxbb2x1krgjmi166b"; - type = "gem"; - }; - version = "0.3.4"; - }; - cbor-canonical = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fhj51s5d9b9spw096sb0p92bgilw9hrsay383563dh913j2jn11"; - type = "gem"; - }; - version = "0.1.2"; - }; - cbor-deterministic = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w1mg4mn1dhlxlbijxpzja8m8ggrjs0hzkzvnaazw9zm1ji6dpba"; - type = "gem"; - }; - version = "0.1.3"; - }; - cbor-diag = { - dependencies = ["cbor-canonical" "cbor-deterministic" "cbor-packed" "json_pure" "neatjson" "treetop"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rwd88xngbjamgydj9rg3wvgl53pfzhal2n702s9afa1yp8mjm51"; - type = "gem"; - }; - version = "0.8.7"; - }; - cbor-packed = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l"; - type = "gem"; - }; - version = "0.1.5"; - }; - cddl = { - dependencies = ["abnc" "abnftt" "base32" "cbor-diag" "colorize" "json_pure" "regexp-examples"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qll1qvn3g75r742kr4da7240zdk2qj4vh325965rrjqp8brz23q"; - type = "gem"; - }; - version = "0.10.3"; - }; - colorize = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dy8ryhcdzgmbvj7jpa1qq3bhhk1m7a2pz6ip0m6dxh30rzj7d9h"; - type = "gem"; - }; - version = "1.1.0"; - }; - json_pure = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09w7f7xlcas9irlaavhz0rnh17cjvjmmqm07drgghx5gwjcrar31"; - type = "gem"; - }; - version = "2.7.1"; - }; - neatjson = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; - type = "gem"; - }; - version = "0.10.5"; - }; - polyglot = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; - type = "gem"; - }; - version = "0.3.5"; - }; - regexp-examples = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wfkwczjn62qq3z96dxk43m0gh6d5cajx9pxkanvk88d3yqnx29v"; - type = "gem"; - }; - version = "1.5.1"; - }; - treetop = { - dependencies = ["polyglot"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; - type = "gem"; - }; - version = "1.6.12"; - }; -} diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index e7bb571cb199c..1de7a49f3180e 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "opennota"; repo = "check"; inherit rev; - sha256 = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; + hash = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; }; vendorHash = "sha256-DyysiVYFpncmyCzlHIOEtWlCMpm90AC3gdItI9WinSo="; diff --git a/pkgs/development/tools/clean-css-cli/default.nix b/pkgs/development/tools/clean-css-cli/default.nix index 2f0cd241ecbe9..62782c311d629 100644 --- a/pkgs/development/tools/clean-css-cli/default.nix +++ b/pkgs/development/tools/clean-css-cli/default.nix @@ -24,6 +24,6 @@ buildNpmPackage rec { homepage = "https://github.com/clean-css/clean-css-cli"; license = lib.licenses.mit; mainProgram = "cleancss"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix index 7c6bb5ba6c3f3..3508b4cddbcef 100644 --- a/pkgs/development/tools/click/default.nix +++ b/pkgs/development/tools/click/default.nix @@ -25,7 +25,7 @@ buildPythonApplication { owner = "ubports"; repo = "development/core/click"; rev = "aaf2735e8e6cbeaf2e429c70136733513a81718a"; - sha256 = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw="; + hash = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw="; }; postPatch = '' diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index f1d67bddc66fe..6f4fa62cb5335 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - cargoSha256 = "0xcgzlcmlk5ycw4kklprm8lzs72j2zp8xm3dcpy606z4r9qn0c6a"; + cargoHash = "sha256-yjBgccrkG2D8ZW3Uju4XUhz9Kar50jkJZ75MWhn9j3U="; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 12471d9d47981..9d516ebe4eb45 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5kQGUO0TBoqeQNc2gmaLDju7cE3wOz/DOO34vB405SA="; + hash = "sha256-+iDcUgyTt4AXDPh4S6YhXuWwvrbyvjXnyRmN3hm6hTc="; }; vendorHash = "sha256-4ZPLscZWF9GfNMU70TjR5+Hi/rvm43n+GvqxFUu13JU="; @@ -39,6 +39,6 @@ buildGoModule rec { mainProgram = "cloud-nuke"; changelog = "https://github.com/gruntwork-io/cloud-nuke/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 0131a5029060f..ed4cde502a5c8 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { description = "Cloudsmith Command Line Interface"; mainProgram = "cloudsmith"; changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index aae8fb39722c3..6760b4754203e 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, libgit2 }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cog \ --bash <($out/bin/cog generate-completions bash) \ --fish <($out/bin/cog generate-completions fish) \ @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "cog"; homepage = "https://github.com/oknozor/cocogitto"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index bef9cdaa6cc89..0c040a7cdd900 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.11.4"; + version = "2.13.4"; hash = { - x86_64-linux = "sha256-um7bwlHzPh6dF2KspGLQfzSVywWdImUc0U/HTkWT2jA="; - x86_64-darwin = "sha256-AiT63c47obiGnf9Vo0C2F3YoVLWdbH/+pkgFT0Tvzew="; - aarch64-linux = "sha256-7tl58GmO5pBsjSkiF/Oy1r3a+Giko/+2Ir7r4V6vy4c="; - aarch64-darwin = "sha256-e86dqZptcQeGlCclLRfNW3Ku9UucW0vXHBGC7r/0Apc="; + x86_64-linux = "sha256-vIqqVVJxKlxiKWsb9soy6yZQ9NQ8ZCjUqzu6k8m9MJE="; + x86_64-darwin = "sha256-m7ZMVEaqIvmutTaQk3r8/p8h5zt4k/s34IdKjv89awA="; + aarch64-linux = "sha256-fBHZijXeqRNr9zvmgaFhMaIIF9kgP7J32CwJgBvf9/0="; + aarch64-darwin = "sha256-3QnxGDV4VRlxw3BayYD4akC6ZRjaUhEkptTGt3Zzecg="; }; }; mainline = { - version = "2.12.3"; + version = "2.14.1"; hash = { - x86_64-linux = "sha256-cg2Xr4yZXVFl081fGYztDa35TnaQYmS/uMqc1z5UAmc="; - x86_64-darwin = "sha256-zK/I/D5N5hcFMrBxebaA5WSRml0RaKrSX1FI/+YSXxI="; - aarch64-linux = "sha256-KRIdyQFTBmhEm0hkdoilYNlQhcpagilc5fZ6k18Riu4="; - aarch64-darwin = "sha256-4q6Sz+ZguMxznPuwf0Ip+KWTDKPPZ/ICdvltVLmQinE="; + x86_64-linux = "sha256-zOMcngzhG6SxN/Hjamf5g0Cb/nhrD3NcVKC8MdL2L80="; + x86_64-darwin = "sha256-FzFrE3moll8D0of0Chs47XI9baAjFDzpcPJdpwteMpE="; + aarch64-linux = "sha256-RsQ3sv5t+o6gObdG81hZ8dHng39qjlynENH30oAhZqM="; + aarch64-darwin = "sha256-MPIm/d6fOe6DjVIewDeoxMs2OKz9urWgKMW6vmM9RGs="; }; }; }; @@ -83,11 +83,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; postInstall = '' - installShellCompletion --cmd coder \ - --bash <($out/bin/coder completion bash) \ - --fish <($out/bin/coder completion fish) \ - --zsh <($out/bin/coder completion zsh) - wrapProgram $out/bin/coder \ --prefix PATH : ${lib.makeBinPath [ terraform ]} ''; diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix index f18865a7cee52..65ae92d90479a 100644 --- a/pkgs/development/tools/compile-daemon/default.nix +++ b/pkgs/development/tools/compile-daemon/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Very simple compile daemon for Go"; homepage = "https://github.com/githubnemo/CompileDaemon"; license = licenses.bsd2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "CompileDaemon"; }; } diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 76974e0fd25a5..98051df100a71 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.53.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-Fg9U6xCOivolwpH4C63HAhSEcfkTJYrNRzwr0OLtLqs="; + hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A="; }; - vendorHash = "sha256-tFJf0wYai1Nc8zbTXE/FSM0K7IkGQjsrMCwpi3rcwzg="; + vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/development/tools/continuous-integration/agola/default.nix index f13f6ec2164c7..e5f59a784910b 100644 --- a/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/pkgs/development/tools/continuous-integration/agola/default.nix @@ -34,7 +34,7 @@ buildGoModule { doCheck = false; meta = with lib; { - description = "Agola: CI/CD Redefined "; + description = "Agola: CI/CD Redefined"; homepage = "https://agola.io"; maintainers = with maintainers; [ happysalada ]; license = licenses.mit; diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix index b2ec827f7526e..daffa9165162f 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -6,6 +6,7 @@ # Take packages from self first, then python.pkgs (and secondarily pkgs) lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { python = python3.override { + self = self.python; packageOverrides = self: super: { sqlalchemy = super.sqlalchemy_1_4; moto = super.moto.overridePythonAttrs (oldAttrs: { diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 66d347a058d6b..d0a2efb32b57a 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -71,7 +71,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "4.0.0"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -80,7 +80,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-uJj7bSRGdYkA7Jl0qe/DncexWXNfQEEPcqGI7AbwX1w="; + hash = "sha256-0ctOInVRJqjmcqy67PTriRmqo3fz1qMEVV+K5lXvZ6k="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 45c4d56308945..530b46d263378 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-OzH7ckNL09s4r3f6PIc3q9lLT3NgCdIf0IMwJtwlKiY="; + hash = "sha256-TU5/0KQQbNDpxuntIwQvxGp/7PvBb+iMiAOJA3EAAAA="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-lfurzhNJ5DvuPCD/WJ3k+ajuZzhNF6zGOgSuuD0/+Ys="; + hash = "sha256-EtG4vlsoyIDcfKWvkL7ei/BGVItF5wkWPhq4aHfmJ24="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-uKNqnqUkNkd14/6QcquyWp1v59bNWcTB4s8lRO9hkUc="; + hash = "sha256-gNei1LZXV7G+8u0AtNDSsj98LprsbyIFR94N4+AXO54="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-wUrhPbd71F3OfXI5Re1xPnc1/vZxYXxdxX58fnWKjYE="; + hash = "sha256-CJ14Se4Wlpb7jt5u1VVmd0MnUdO2l7KfQyVQbO7hMhA="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-qc5mP7V2cOR3SOt224i8HVoAyWHvVYbsqfIQvPjesmE="; + hash = "sha256-lY8ljjGaZ0i7aY1rR//7M7H83ZTSQj9CnTafWXner94="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-s6L4oF/wTOfM9uKFEJ/mjnQWE6oPRcd32lM1p2ox9+I="; + hash = "sha256-XZAInGgM/hm4Rxk0usH0NRiCuq19XJeYuwJNF2gtn3M="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-tZRwDqWYjBwguqA6T3ZoY38+QFogXKiTzbg1qjs/spE="; + hash = "sha256-RRdHvlm+98Cu+qiIhDMx6W65bQ30ULTKZrz05Xm32gg="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-t++yXEgM4l40grSVccjx399TM/vUTmQOSInfH+Wqi50="; + hash = "sha256-sg/40zP3YMF8e3GsL+A9gtCUlhoqKqHNeFUycQrQNJc="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-MkrMcaf2UeUYjkwcdhj4rhBwEtVESJEMtGa7RArNLz0="; + hash = "sha256-pE6wDMLYGtDgaRjqv/SS9bm6F58molO9oQI3XklcWfg="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-iCAtKOl/8sfCwa3tsK2oQ+ybs0TVF5uWg4Jv/r7oPWg="; + hash = "sha256-ZgnfiQtKCs1Ui9KiUMaSbtaMnCgSgH+IzJTXWYcG/fE="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-28vj6wUZEnVUSUWrveJ5tdIjN+l4RDewPnm3IVQPXn4="; + hash = "sha256-yxbLY3LiT0qmRiz7+/F/TuODiSnteq0891fxAGSU7yY="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix deleted file mode 100644 index 9189c59638246..0000000000000 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ fetchFromGitHub -, lib -, buildGoModule -, makeWrapper -, coreutils -, git -, openssh -, bash -, gnused -, gnugrep -, gitUpdater -, nixosTests -}: -buildGoModule rec { - pname = "buildkite-agent"; - version = "3.59.0"; - - src = fetchFromGitHub { - owner = "buildkite"; - repo = "agent"; - rev = "v${version}"; - sha256 = "sha256-pYaxjXoNn6MOE2oHUSKrBzP5oKhtfJwSHFCkcpkyzas="; - }; - - vendorHash = "sha256-JSuam9Tn+ZekfLrj78tBncH7Q2aP4CaUgaaDkJ/azEw="; - - postPatch = '' - substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash - ''; - - nativeBuildInputs = [ makeWrapper ]; - - doCheck = false; - - postInstall = '' - # Fix binary name - mv $out/bin/{agent,buildkite-agent} - - # These are runtime dependencies - wrapProgram $out/bin/buildkite-agent \ - --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' - ''; - - passthru = { - tests.smoke-test = nixosTests.buildkite-agents; - updateScript = gitUpdater { - rev-prefix = "v"; - }; - }; - - meta = with lib; { - description = "Build runner for buildkite.com"; - longDescription = '' - The buildkite-agent is a small, reliable, and cross-platform build runner - that makes it easy to run automated builds on your own infrastructure. - It’s main responsibilities are polling buildkite.com for work, running - build jobs, reporting back the status code and output log of the job, - and uploading the job's artifacts. - ''; - homepage = "https://buildkite.com/docs/agent"; - license = licenses.mit; - maintainers = with maintainers; [ pawelpacana zimbatm jsoo1 techknowlogick ]; - platforms = with platforms; unix ++ darwin; - }; -} diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 709cd3e87fc70..28630e43b766e 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoSha256 = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU="; + cargoHash = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 31299c031e8fe..e6a18cfc87442 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.120.2"; + version = "0.121.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-IVhO8F5KhwCDJ4cm/Iu9vSuAKAF3l1vIjIqSzfYn9Ck="; + hash = "sha256-ec7HUYeBgoAtTxHIlW3dgC38z15pplWL/RhcZyxmIsE="; }; vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o="; diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix index 63324531f8e2f..db7463c9e15dc 100644 --- a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix +++ b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchFromGitea, buildGoModule }: +{ lib, fetchFromGitea, buildGoModule, nix-update-script }: buildGoModule rec { pname = "codeberg-pages"; - version = "5.0"; + version = "5.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Codeberg"; repo = "pages-server"; - rev = "ea68a82cd22a8a8c1f265260af22b9406f13e3a9"; - hash = "sha256-TSXRB0oq1CtHC9ooO+Y3ICS5YE+q+ivZAcYBSd1oWi0="; + rev = "v${version}"; + hash = "sha256-txWRYQnJCGVZ0/6pZdKkRFsdUe2B+A0Fy0/WJCiBVa0="; }; - vendorHash = "sha256-vTYB3ka34VooN2Wh/Rcj+2S1qAsA2a/VtXlILn1W7oU="; + vendorHash = "sha256-0JPnBf4NA4t+63cNMZYnB56y93nOc8Wn7TstRiHgvhk="; postPatch = '' # disable httptest @@ -23,11 +23,14 @@ buildGoModule rec { tags = [ "sqlite" "sqlite_unlock_notify" "netgo" ]; + passthru.updateScript = nix-update-script {}; + meta = with lib; { - mainProgram = "codeberg-pages"; - maintainers = with maintainers; [ laurent-f1z1 ]; + mainProgram = "pages"; + maintainers = with maintainers; [ laurent-f1z1 christoph-heiss ]; license = licenses.eupl12; homepage = "https://codeberg.org/Codeberg/pages-server"; description = "Static websites hosting from Gitea repositories"; + changelog = "https://codeberg.org/Codeberg/pages-server/releases/tag/v${version}"; }; } diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index e77aecde510f3..05347f153c7a4 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 227f03bf8770c..c859e7415e138 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -22,13 +22,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.317.0"; + version = "2.319.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-+VwEH4hmEjeYFWm7TOndD5SOJwsyPZEhKkCSyl7x8cE="; + hash = "sha256-02vIMuaeU5CsdwmJzUdfa6BFKewsKGFsEWKza3CqRtQ="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 4c05dc60a162e..0254781e5813e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -2,269 +2,269 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; }) - (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; sha256 = "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k"; }) - (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; sha256 = "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Runtime"; version = "1.0.2-rc2-24027"; sha256 = "0ippdn16381l8i2iy63i45nk0p303fjbd4amh7biwvqxgagfbvhh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2-rc2-24027"; sha256 = "05y0jz6vfl9zs0lmmwsz6arf7r0mg2dm93ymizrzmqn706krz45x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Runtime.Native"; version = "1.0.2-rc2-24027"; sha256 = "11hpbbmnjbskw7s6sx32l6qzz63kshx0gyp3sawyxk82nbqrissl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; sha256 = "1j1458jska7540ng7fdf5i06k2vy71mxl5dld4x5s8gfndxpdzdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1rvb076s4ksvmbvnxi4sv2f9f22izqp2rca0scjqya5x1qhcgkp0"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; sha256 = "088j2anh1rnkxdcycw5kgp97ahk7cj741y6kask84880835arsb6"; }) - (fetchNuGet { pname = "Minimatch"; version = "2.0.0"; sha256 = "1k84q1bz1qq2nh35nip8vmi65wixsh5y7piln5b4n172xzhfqvx0"; }) - (fetchNuGet { pname = "Moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0-rc2-24027"; sha256 = "1qnd05bsrz88cr4wnkq7haf2bwml2zzjcscjk94v8ka4isi1i89b"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; sha256 = "0c0x3sg12a5zwiamvxs9c4bhdwmmm9by6x5da58fbrzz7afbaaag"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; sha256 = "1mqnay87pkxih73984jf5fm14d0m6yjq4cv4cqbj37nmgm54ssjp"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12-rc2-24027"; sha256 = "0yhc5q74vb9vb9cmyrr9p4dfql62dr7c8ajbaxnzzs917v2z68q4"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0-rc2-24027"; sha256 = "072m313av0s5cfpr2rpq07p7c13dy4rh1ngigv3dnr1yyvab9081"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0-rc2-24027"; sha256 = "0a0c24lm8yn0hbvd5m64lv7xhs2bmhm5fdpk89xvxj14zdarqhm6"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; sha256 = "0yl161lr85smzdfzb7fbk0lfrqk5ns71hcnws6vm3sn2aqvfmhpn"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1-rc2-24027"; sha256 = "0whr2qird567iyc137s10qs0xi6607kjii9wi8a8g1f9lybzlz5k"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.2.1"; sha256 = "08n1z9ngsi26qlhwpjzxafhwl3p279widfci64l2ahxf1gprfqsx"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; sha256 = "0rwqmn743gl21xnb3rwqkdacshd5l86pn23mc4bviva3pbncbjs4"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0-rc2-24027"; sha256 = "07s5zxdw3ihxdv0mjxb2ywzg9phcp4bayrhkadzm95l4kcv0xaij"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1-rc2-24027"; sha256 = "0np6vf9rnfasz0sqys56kpryc84qcqi1a1rfskmycdlxk182p3s2"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1-rc2-24027"; sha256 = "0hpw3ssnbcv9l1lnlcym2bv3h3sf2znif4brys2i3868s6h946k6"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.4.0"; sha256 = "11sna2bv5ai4sivrs7g2gp7g0yjp02s0kasl01j3fa1cvnwwvgkv"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11-rc2-24027"; sha256 = "16wv24cb39639i7fcw005hh1rggyz2bgn51dpkdc67aq9lz76ivm"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; sha256 = "062kbbvm17nhwmcxjnakfv3i23vrk6c9gmz6x8q79kcr5hxr40qs"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; sha256 = "0717y8iqcw19g2zkcs0hkalvjhnpaq5mapd82kxkhiq1djgjhhi2"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1-rc2-24027"; sha256 = "0lgz7wwdb02vapa17hgdkf1jnq1mcsbq8gwy6a9iqd04d2mfanv7"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1xjbwji89s69f9lq8wcjfkz8y9ym9zffgj2mg9bv0rxwyqcynpz8"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.4.0"; sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1-rc2-24027"; sha256 = "06lkqk5hjkcna19inpda5fqbxvd9pq5cs61di7kmhrd2sgzbs6xj"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1-rc2-24027"; sha256 = "0lw4amgaryahvija5xxb2vmybq7ks4b4ir7g7nc1xw6x9x58jf2q"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0-rc2-24027"; sha256 = "0v5phdy7yr6d1q13fvb6hhd32k89l93z6x4hlkh5qhm1zlavaabl"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.PInvoke"; version = "4.0.0-rc2-24027"; sha256 = "0qsgwvr6ppvllblb64p5plr7ssbmwfxxc4qf6l1xfincza8np34r"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0-rc2-24027"; sha256 = "03pgqbgahfgvigyrsd08snzsryg90shfjlbdv4jk6yzfr27va3n2"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1-rc2-24027"; sha256 = "1gkkc7njymmb12dd952q89x2h2jdrhp171vszsjqzh5q2ryj25gh"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; sha256 = "0ixqw47krkazsw0ycm22ivkv7dpg6cjz8z8g0ii44bsx4l8gcx17"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; sha256 = "1grg9id80m358crr5y4q4rhhbrm122yw8jrlcl1ybi7nkmmck40n"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.4.0"; sha256 = "1bn7d2czpc994qzdph4drv7p1cv4x55j2dhbmr113p0gs4hx33zh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; sha256 = "11rr16fp68apc0arsymgj18w8ajs9a4366wgx9iqwny4glrl20wp"; }) - (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "4.4.0"; sha256 = "0hyijvysbcjh20mbbgajg9wh04nkjd6y5lqxgm0a6m28zjcjshl6"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11-rc2-24027"; sha256 = "0qkaldb06dwmi8gb940h75n9cs5rgy6sqcpa6f443mhahmagmsbd"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.4.0"; sha256 = "07bzjnflxjk9vgpljfybrpqmvsr9qr2f20nq5wf11imwa5pbhgfc"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11-rc2-24027"; sha256 = "0aa4zaqma4yagjd44m2j13gr9qzn8rv8dbz3p9mjdk0dx1zpi4iq"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11-rc2-24027"; sha256 = "0fsgdzdxm3yj1cym421ymn8x8anhyzgzc1529q5xd1vq4yknwfq0"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1-rc2-24027"; sha256 = "06kwi42lgf3zw3b5yw668ammbjl6208y182wyqaaqrxgn5gs4yh7"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; sha256 = "0vywggi6mqkbr6g1a1fh821hqfnyq1k829vlhfw908l7mj75k34d"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11-rc2-24027"; sha256 = "1rvglifac6xq1lawm78w49fq9cl8zvs1g4vrsd2hhf0vb4i85p1z"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) - (fetchNuGet { pname = "xunit"; version = "2.7.1"; sha256 = "18bvbmqzkyia862x0jaj3ax5zlnlgsdpl52ai53g0fn8hcnnzzvi"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; sha256 = "1shs5afb00r3ipnq7wnyvxyp4hnfcmbbf89qcpn4awhd355cv9k6"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; sha256 = "1nz05bh78d6ilz2g2vqp3jgxag5p3h1cnidwr9qxzgr89nj2fas6"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; sha256 = "1lr7dm4f9i6xcjq1d8sj3a11y1kj50z43wmr84m8aj6lkwqkbv6z"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; sha256 = "00pjk2i95kzjqm6j86i589vf265cmczk748xl4qcqalwrzhhc1g8"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; sha256 = "1s90pc6fm3i5r3wjip9jkk2m5giyimik9f05b77yylknl9yipcfw"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.1"; sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; }) - (fetchNuGet { pname = "YamlDotNet.Signed"; version = "5.3.0"; sha256 = "1gnp5aa2zzg7v61bbn2ra1npy0p07szp5w8vqk44fdj3fcvrdxib"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; hash = "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; hash = "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U="; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; hash = "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I="; }) + (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; hash = "sha256-7hLBAHnB+drr2yU4w3o05eMX2ADy/rXN3XRPBn1d7GY="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; hash = "sha256-CCytWp0v8C6NZa+o4cRXvA2u/ZOEA3TiG9+luszAwes="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; hash = "sha256-ckbeFz5ArvZUE7w3EYiciBIGlmbmjwpxqWeAOEKgHgU="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; hash = "sha256-b1wK8yssiKQxsFO7FFNQAffEu9r8c3YPcIY+UWVS874="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; hash = "sha256-APBQ+v+2RvfE98sHXzEIjujGYvMzut4RtpGHvAsJZg8="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; hash = "sha256-IXyc+oc7EwalDaq+UkkWx3bhZC/H+SZ8rTHMi87Allk="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; hash = "sha256-qNPzjQvYz+X3OGuN/cn3vHGVFkUH1lEPJtlRjbYrHKg="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Runtime"; version = "1.0.2-rc2-24027"; hash = "sha256-EO7lnnodbx7XgVWRtqQbYFwwbSFxGB9FRDSgYYJt90Y="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2-rc2-24027"; hash = "sha256-vZCfpwHH4vrzj9WPVJt4FeTjsjJf81op0D9Rt82XwBc="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Runtime.Native"; version = "1.0.2-rc2-24027"; hash = "sha256-VOuY8bICze650uP6BzrUc5j/saFidG304VMvaetaF4Y="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; hash = "sha256-sv12e7PuIV06abQV2ms4fotpQCyuufMsIOWoqSUqJMg="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; hash = "sha256-HezmYiv8wL03Ok3FFBtAULe2yOUjjXfj9wPHE8hNlQw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; hash = "sha256-OwtuyH4rBS2S2mp1rlUQcVxFPS04OWBcUa59+VjVBVA="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; hash = "sha256-ty2fxo3mQESh+cpsGfhSpMCEqmvPdzZE0EK8BkeHaIg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1-rc2-24027"; hash = "sha256-4M7HIA69KI8l00CxLC7+UQiXnNiaxG73qltPos0Ba+c="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; hash = "sha256-ZumsykAAIYKmVtP4QI5kZ0J10n2zcOZZ69PmAK0SEiE="; }) + (fetchNuGet { pname = "Minimatch"; version = "2.0.0"; hash = "sha256-oG/s4O/iBEtWsTTe4wvUPfJiYt3oRlsGtALj8FfABM0="; }) + (fetchNuGet { pname = "Moq"; version = "4.11.0"; hash = "sha256-/JzL3LDxMGV/hKaU85PcWfCMWX6oKrnatFhKpgGadiE="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; hash = "sha256-lddIyqj8Y3IexOm5I1hsE5w1/dOoOaNDHoUPI1vkX80="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0-rc2-24027"; hash = "sha256-K6EYoo5ETbRJmpJpJv8XtPIlnIIHT8tJZgj9rFcBzeI="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; hash = "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; hash = "sha256-Tym1nDr/5+VQUa1041eqtfIGF2FJ911V5L8oEZ4eHTA="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; hash = "sha256-V2pNSn3VniEXZmQzgqU3FTQSqitOEpTGgbHPe5BXFtc="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; hash = "sha256-GCoP5iuHXa1T8fJjqfK1X1OwdFeZHTFS3qwOH497V0Y="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12-rc2-24027"; hash = "sha256-BCPzxT4h6f9tV0sqxE5uwlDsGrkpZ19ZWjutTQ4uDHo="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; }) + (fetchNuGet { pname = "System.Console"; version = "4.0.0-rc2-24027"; hash = "sha256-AYG01PY+ZNvGfvHZADPxbQR27gH4ZpGvY0WDrUYYVRw="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; hash = "sha256-CiEy6bAdvVz9/rgpOoPRK8SjaJ+6yoKYT3yR+dsEP4c="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; hash = "sha256-ZbujsDeNv/Vj9EqqLxB01AjC+p9Xx2P+n27ewAxqDyA="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0-rc2-24027"; hash = "sha256-pkKcVfskyL57QvM2VyqsS2jYz6bE1NL2gsB6VCkRDCg="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; hash = "sha256-9sLqNlbC6lG30dwyGI62ZeLsKJjLnfVd+1UXlGkwgXo="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1-rc2-24027"; hash = "sha256-s3z6l6fJhYcUijzFKOcBxsQONAZBnxGYj8eUliMWGXI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.2.1"; hash = "sha256-XWOX7wuuQyUoMZG5Fnk64g7KoVP9y8shxUZE/Wz6wSI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; hash = "sha256-RMvF7LpD7bgXYXUIew2ipUHNVJuY57FsD4K+QY6tmGc="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0-rc2-24027"; hash = "sha256-MqoONpuEllR/UxNmrxa5DN70PvdidVnBbh3GwVv/RR8="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1-rc2-24027"; hash = "sha256-Qo8rUJidNubr1C4HFSJmmCDm852maI81+Fo5m5Pb5lo="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1-rc2-24027"; hash = "sha256-ZhqSoNHIoBGF9nkRF+0XTg849hLVM2ppoGmzZbUe/EI="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.4.0"; hash = "sha256-e77Nud0sKDdkAFSrCbQAV3rwzn3iHZ131CSqspdQVoc="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; hash = "sha256-rLcU9Nc9AhGvEX7RMsq+3hlrFu109cp0evHh7nLXAxM="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; hash = "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; hash = "sha256-RFhAtAGpWDdUfsdIqal/E7LmrN1SjE8ZZOoAvIHXi0U="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; hash = "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11-rc2-24027"; hash = "sha256-dUdzPk1YHcPavC0U+5b4/r0cICwAcOZOTMOksRgRm5s="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; hash = "sha256-GgOSOyyZzXQw6ubXl5iZeQ8Rx3ZTWdlZ5dCeUPdaUxg="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; hash = "sha256-clMUSdm6joAqjATtOdNPbfrrJj8aQwLGmulHx1VCtxg="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; hash = "sha256-vNlHUKkaFvhiVnTY0JNsNT5E6TW9CFRzTqVcufGN0hk="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; hash = "sha256-IkIon2wBRzj7FKhdVQtW10K5qZoQaDa/eClwhiPyJxw="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1-rc2-24027"; hash = "sha256-Z1vlqmgENByTMp4/hJdmNWArg5vtwRPUVVuA1Tg//1E="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1-rc2-24027"; hash = "sha256-6F/rGfa8Z7BXelXI59xP1SeP/nSScYRpcsnohKLkS/Y="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.4.0"; hash = "sha256-sGgfV4pG9Kr+PLAR/DyRGiTP09Tkvol9U/WLSwkPOVk="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1-rc2-24027"; hash = "sha256-shu9/tOiZVjniS0YzQq+qe2+sCuqXRtTUJZNCcvEkxo="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; hash = "sha256-z1c95ZkPupGWen++eWisSr2+5I9cszS++9Ki5XyEr7w="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; hash = "sha256-14jHFNeSD1ldMvMqmwlaoClRSwGJnPU4Y7eFoaNhZCY="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1-rc2-24027"; hash = "sha256-WDiJSk/d8B6YPe/kSBbR8+Dl6xar96Jk3FD5rF5VhFM="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0-rc2-24027"; hash = "sha256-dCm1Ff2hQlzgpJB080eiCU0xGoRmbTcCDs1kf3yDt2w="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.PInvoke"; version = "4.0.0-rc2-24027"; hash = "sha256-mYxrkfrMRtcDNQ4T1rvjdWl9Mr3lErPoonTfa/LmT2M="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0-rc2-24027"; hash = "sha256-wg61j8juezMl2W1R6aAG6fmsv9UINJ39i/s5qN7C7w4="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1-rc2-24027"; hash = "sha256-8BUhfRa4wI+l/nqHEy7MTQooekJYlNSaCKtWL+1hc74="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; hash = "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; hash = "sha256-0bp8xtv2cP/IuxaBF8xkyYYD8N6w1wVX8wzpAwXtTKw="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; hash = "sha256-J3T2ECVdL0JiBA999CUz77az545CVOYB11/NPA/huEc="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; hash = "sha256-FpDJap32xOUDZTRLxL0QoeYFYSaY+JIzQ2VUgFpML78="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.4.0"; hash = "sha256-8I/RIdEP3BFCrgs2IUvpZLNwz86NwNs+Jimx+5lox64="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; hash = "sha256-lwNBM33EW45j6o8bM4hKWirEUZCvep0VYFchc50JOYc="; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "4.4.0"; hash = "sha256-hkItmfxIVKNAfR3T4k2T0xIAeXpSvbUqEFCypf2W0UM="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11-rc2-24027"; hash = "sha256-ben6VIUK1kGIM+oyrI1/uWiWbDkQkLQeipU3A1ajamI="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.4.0"; hash = "sha256-zD24blG8xhAcL9gC4UTGKetd8c3LO0nv22nKTp2Vfx0="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; hash = "sha256-RuPjac8RkzhLsw53CvNzauxEg1ZFwL5A0Yh4B+FgsQs="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; hash = "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11-rc2-24027"; hash = "sha256-OJJ4f+gNzCZruuOvhnZG9uOU3whSVEKafMoTVbH6RCk="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; hash = "sha256-34I/eRNA/R8tazesCaE0yzYf80n3iEN3UQIeFSUf31g="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11-rc2-24027"; hash = "sha256-ADtupyd4h9YLTqIE9t/30CrUka0+CFI9C9KP2ttvTzs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; hash = "sha256-z9+gWBZBjNoG7P5F0RHMVA4VxAw8Farnf0a94S9uGoE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; hash = "sha256-3NeBC+r7eTVz3f+cEm1NkVhxSr7LrYGX/NdUwje9ecY="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1-rc2-24027"; hash = "sha256-B3qiX7GvZ6wU9lyg4BEQhspVq0LGcF/W4H+4RwWJfBo="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; hash = "sha256-jYxZjqyHIpC4g3QngWbA3joMg0DQBRWeyWviauJ73G8="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11-rc2-24027"; hash = "sha256-P9yCIlkbOAhF03mTF/T+iLKEXSIcncoVDbgbplykb+c="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; hash = "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4="; }) + (fetchNuGet { pname = "xunit"; version = "2.7.1"; hash = "sha256-cf9vLYPIOvBGiUoUept+1NJfuhpSSdCFQSr6+XFde6E="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; hash = "sha256-ZqbNShkNckXsZTght1ZlzkJyfd/e8oPtjSMDsJwqGuo="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; hash = "sha256-RisnpE0ov99xyrxFywIctzzVnxwXb/HEp9E0dOAq4Ns="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; hash = "sha256-3+w1MZ/USIUqQbnyQT4ocgYfghpSoxawZN3E5EhtJ9M="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; hash = "sha256-6AUG4c+cKswwoR2RMz+rrBjhdkIlGiRNxfLPkqKY8gI="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; hash = "sha256-3LEbfaJ2Uu/PWQW4NGONPr5SxZwy3Sj5yCWO6gy7IOk="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.1"; hash = "sha256-Fm5DjFXZJzTJuApib0thPGUD0w0eavfBfSh9FOYtljo="; }) + (fetchNuGet { pname = "YamlDotNet.Signed"; version = "5.3.0"; hash = "sha256-K/aWN3NDNkfIxBvxcr8+4AJ/bVBZ2LWC2ef9L5Qq174="; }) ] diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix deleted file mode 100644 index 6f6a8fd68259c..0000000000000 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, buildGoModule, fetchFromGitLab, bash }: - -let - version = "17.1.0"; -in -buildGoModule rec { - inherit version; - pname = "gitlab-runner"; - - commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common"; - ldflags = [ - "-X ${commonPackagePath}.NAME=gitlab-runner" - "-X ${commonPackagePath}.VERSION=${version}" - "-X ${commonPackagePath}.REVISION=v${version}" - ]; - - # For patchShebangs - buildInputs = [ bash ]; - - vendorHash = "sha256-Rk5/h8wqVwGzovtAjjNkvexG71Dj36mFxU8OsLJzpUo="; - - src = fetchFromGitLab { - owner = "gitlab-org"; - repo = "gitlab-runner"; - rev = "v${version}"; - sha256 = "sha256-mRL62PIAkPK0aLA7uYpGlUvaJfbD354RDOD4P8MLzx8="; - }; - - patches = [ - ./fix-shell-path.patch - ./remove-bash-test.patch - ]; - - prePatch = '' - # Remove some tests that can't work during a nix build - - # Requires to run in a git repo - sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go - sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go - - # No writable developer environment - rm common/build_test.go - rm common/build_settings_test.go - rm executors/custom/custom_test.go - - # No docker during build - rm executors/docker/terminal_test.go - rm executors/docker/docker_test.go - rm helpers/docker/auth/auth_test.go - rm executors/docker/services_test.go - ''; - - excludedPackages = [ - # CI helper script for pushing images to Docker and ECR registries - # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139 - "./scripts/sync-docker-images" - ]; - - postInstall = '' - install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin - ''; - - preCheck = '' - # Make the tests pass outside of GitLab CI - export CI=0 - ''; - - meta = with lib; { - description = "GitLab Runner the continuous integration executor of GitLab"; - license = licenses.mit; - homepage = "https://docs.gitlab.com/runner/"; - platforms = platforms.unix ++ platforms.darwin; - maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members; - }; -} diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch deleted file mode 100644 index b70b95e7be0b9..0000000000000 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/shells/bash.go b/shells/bash.go -index 18d608445..f158ffc0b 100644 ---- a/shells/bash.go -+++ b/shells/bash.go -@@ -3,6 +3,7 @@ package shells - import ( - "bytes" - "fmt" -+ "os/exec" - "path" - "runtime" - "strconv" -@@ -307,7 +308,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell - - script.Command = "su" - if runtime.GOOS == OSLinux { -- script.Arguments = []string{"-s", "/bin/" + b.Shell, info.User, "-c", script.CmdLine} -+ shellPath, err := exec.LookPath(b.Shell) -+ if err != nil { -+ shellPath = "/bin/" + b.Shell -+ } -+ script.Arguments = []string{"-s", shellPath, info.User, "-c", script.CmdLine} - } else { - script.Arguments = []string{info.User, "-c", script.CmdLine} - } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch deleted file mode 100644 index 6f27ef71c9574..0000000000000 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/shells/bash_test.go b/shells/bash_test.go -index 9ed9e65ff..02b6e6d5f 100644 ---- a/shells/bash_test.go -+++ b/shells/bash_test.go -@@ -4,11 +4,9 @@ package shells - - import ( - "path" -- "runtime" - "testing" - - "github.com/stretchr/testify/assert" -- "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitlab-runner/common" - ) - -@@ -90,65 +88,6 @@ func TestBash_CheckForErrors(t *testing.T) { - } - } - --func TestBash_GetConfiguration(t *testing.T) { -- tests := map[string]struct { -- info common.ShellScriptInfo -- cmd string -- args []string -- os string -- }{ -- `bash`: { -- info: common.ShellScriptInfo{Shell: "bash", Type: common.NormalShell}, -- cmd: "bash", -- }, -- `bash -l`: { -- info: common.ShellScriptInfo{Shell: "bash", Type: common.LoginShell}, -- cmd: "bash", -- args: []string{"-l"}, -- }, -- `su -s /bin/bash foobar -c bash`: { -- info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.NormalShell}, -- cmd: "su", -- args: []string{"-s", "/bin/bash", "foobar", "-c", "bash"}, -- os: OSLinux, -- }, -- `su -s /bin/bash foobar -c $'bash -l'`: { -- info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.LoginShell}, -- cmd: "su", -- args: []string{"-s", "/bin/bash", "foobar", "-c", "bash -l"}, -- os: OSLinux, -- }, -- `su -s /bin/sh foobar -c $'sh -l'`: { -- info: common.ShellScriptInfo{Shell: "sh", User: "foobar", Type: common.LoginShell}, -- cmd: "su", -- args: []string{"-s", "/bin/sh", "foobar", "-c", "sh -l"}, -- os: OSLinux, -- }, -- `su foobar -c $'bash -l'`: { -- info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.LoginShell}, -- cmd: "su", -- args: []string{"foobar", "-c", "bash -l"}, -- os: "darwin", -- }, -- } -- -- for tn, tc := range tests { -- t.Run(tn, func(t *testing.T) { -- if tc.os != "" && tc.os != runtime.GOOS { -- t.Skipf("test only runs on %s", tc.os) -- } -- -- sh := BashShell{Shell: tc.info.Shell} -- config, err := sh.GetConfiguration(tc.info) -- require.NoError(t, err) -- -- assert.Equal(t, tc.cmd, config.Command) -- assert.Equal(t, tc.args, config.Arguments) -- assert.Equal(t, tn, config.CmdLine) -- }) -- } --} -- - func Test_BashWriter_isTmpFile(t *testing.T) { - tmpDir := "/foo/bar" - bw := BashWriter{TemporaryPath: tmpDir} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 875d065d02935..6bf019819afdb 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.452.2"; + version = "2.452.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-Ng78hDjbmkuiB3KYHUJXz+aDe/DD+4yOmyJT2M5rozk="; + hash = "sha256-Rf0rh3+XCaUrmE2cfW9DW8Bfat7mEpHSLTC18ej9jFk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 37596774bbdec..6c6fe743896a2 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-vQcHEsOJFMbrt5KpoHB59g5gIxwXQuJpudhu2qbgCY8="; + hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI="; }; - vendorHash = "sha256-nPeF6Z+d69o1JwCUlzVREx8DyIqokHIfTRC1/S5XG6A="; + vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg="; CGO_ENABLED = "0"; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 53aac9d5d4df9..1bb8d45f7c44c 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.6.0"; - srcHash = "sha256-SuTizOHsj1t4WovbOX5MuMZixbPo7TyCnD6nnf62/H4="; + version = "2.7.0"; + srcHash = "sha256-A9F+kKR4oM4IEA5qLqMaQiW9KAjuQgyvv3peXos3gX8="; # The tarball contains vendored dependencies vendorHash = null; in @@ -21,8 +21,8 @@ in mv -- "$f" "woodpecker" # Issue a warning to the user if they call the deprecated executable cat >woodpecker-cli << EOF - #/bin/sh - echo 'WARNING: calling `woodpecker-cli` is deprecated, use `woodpecker` instead.' >&2 + #!/bin/sh + echo 'WARNING: calling \`woodpecker-cli\` is deprecated, use \`woodpecker\` instead.' >&2 $out/bin/woodpecker "\$@" EOF chmod +x woodpecker-cli diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index f0b45f8a50f65..83d2019493c06 100644 --- a/pkgs/development/tools/cpm-cmake/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.40.0"; + version = "0.40.2"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-307U/7gO8Ps5UvslYGOrVKHRjO9TYJrYsnAzu0Kljt8="; + hash = "sha256-KIRVztkE72juIgXquZlC6AYo78QKHBD7iCvCa+ri66k="; }; dontConfigure = true; @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { simple API and more. ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; }) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index f7dca069d483f..682e9f52e35f4 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.29"; + version = "0.8.31"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-4drk8mqFVGXUktPiWuVNzWVBQr4TRcutZgGsF3vpRIE="; + hash = "sha256-UzQm5WrLU79Fiwnd5da0CwkoDQylZZAFqEhiF76FS40="; }; - vendorHash = "sha256-rf/4xyridcsSlGOVQ91Wr8bHnm7wfuXs6HSPKW2J8hM="; + vendorHash = "sha256-9NIswLwcfTQoHLGPhOaW2RT4jKR4Re3XVl0nNJ8cTKw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 3901c068d0985..b4431c688a559 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-kmsDTHnYSkCRdLXPzE5g2qzzb8EuGunrM9SDfaul8Xo="; + hash = "sha256-QSm8KfpygHkXulwBrTG18l3pVEB32xj3HwezjZzJFl8="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-z2+u6jPTP6MOs7PTF6UzPwhnofQOhRll0zrmsLrN+PQ="; + vendorHash = "sha256-9K4zsly00dis3pYR++vXy0E8buKR6uOAmqw8IVYGXGM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index ae72eae909421..3a794b5f0e696 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.16"; + version = "2.5.21"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-FvL7LGgSMxflr7X9Z1qe9qPmDcqEr7ZGM36mtOhlTWY="; + hash = "sha256-DjmhDUHC7278J9ByUlzXUF2s1GxRVNbRaYdlyy+5D/w="; }; - vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; + vendorHash = "sha256-w3bfCn8A2ETJ6i1hm1FTNpTDXPFXF4vvkFAZCO/y7HE="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index a797f18be70c6..8cc1f8c5566a8 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dblab"; - version = "0.24.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-p579rxv8ntNLfunKl6JGYE7eFZc51p2OGWGhQmAuADY="; + hash = "sha256-3v9L1mV+DZ6FlrBoGSg8tewKJVyeqqacVj3yGVtYVHc="; }; - vendorHash = "sha256-RmZkSlA6KU1wXKFHPLYVhRjwxsDjO1XNoGBdNCmeGSw="; + vendorHash = "sha256-3vtk4pJE/zRLCbIN+UFvxF/KdH4J5IiCsQ0Wu585wnM="; ldflags = [ "-s -w -X main.version=${version}" ]; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index f04c55d03fbbc..3cd32aa168282 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-74pbcY8qAFUOuj/1LCIQ4DHAcxubQcnWDS/oCa2MN3c="; + hash = "sha256-LNA66Uz/cgwx3Bq2FXpW7+3vh2VXWPyyrlAcRK5MlGU="; }; - vendorHash = "sha256-3gNyB2xwdYNXhWru7smIbNoyM+bqiXvash8NJ7O8pQQ="; + vendorHash = "sha256-ypGPVJ0cfHMGDqOV2xt5MQs9X3YtCW8+sChQ9SPOZAY="; doCheck = false; diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index 0df697b8df9d9..29f665d1e1210 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -14,7 +14,7 @@ let }; meta = with lib; { - description = "Graph database written in rust "; + description = "Graph database written in rust"; homepage = "https://github.com/indradb/indradb"; license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; @@ -27,7 +27,7 @@ in version = "unstable-2021-01-05"; inherit src meta; - cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; + cargoHash = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; buildAndTestSubdir = "server"; @@ -45,7 +45,7 @@ in version = "unstable-2021-01-05"; inherit src meta; - cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; + cargoHash = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 69004289f528e..9a20f12c0f607 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; + hash = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index d838995c6f95a..5ca5fe497c4f4 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom 0.2.11", "once_cell", @@ -476,6 +476,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] +name = "cbindgen" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" +dependencies = [ + "clap 3.2.25", + "heck 0.4.1", + "indexmap 1.9.3", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", + "tempfile", + "toml", +] + +[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -500,6 +519,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + +[[package]] name = "chrono" version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -574,9 +605,12 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ + "atty", "bitflags 1.3.2", "clap_lex", "indexmap 1.9.3", + "strsim 0.10.0", + "termcolor", "textwrap 0.16.0", ] @@ -986,6 +1020,7 @@ dependencies = [ "base64 0.13.1", "expect-test", "indoc 2.0.3", + "itertools 0.12.0", "once_cell", "psl", "regex", @@ -1583,9 +1618,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1612,7 +1647,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] @@ -1621,7 +1656,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", ] [[package]] @@ -2096,9 +2131,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" @@ -2276,7 +2311,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", "metrics-macros", ] @@ -2286,7 +2321,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.8", "metrics-macros", ] @@ -2511,6 +2546,7 @@ dependencies = [ "expect-test", "futures", "indoc 2.0.3", + "itertools 0.12.0", "mongodb", "mongodb-client", "mongodb-schema-describer", @@ -3105,19 +3141,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -3125,9 +3162,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", @@ -3138,9 +3175,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.2" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -3556,6 +3593,7 @@ dependencies = [ "bit-vec", "byteorder", "bytes", + "cfg_aliases 0.1.1", "chrono", "connection-string", "crosstarget-utils", @@ -3725,6 +3763,41 @@ dependencies = [ ] [[package]] +name = "query-engine-c-abi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cbindgen", + "chrono", + "connection-string", + "futures", + "indoc 2.0.3", + "once_cell", + "opentelemetry", + "psl", + "quaint", + "query-connector", + "query-core", + "query-engine-common", + "query-structure", + "request-handlers", + "rusqlite", + "serde", + "serde_json", + "sql-query-connector", + "thiserror", + "tokio", + "tracing", + "tracing-futures", + "tracing-opentelemetry", + "tracing-subscriber", + "url", + "user-facing-errors", + "uuid", +] + +[[package]] name = "query-engine-common" version = "0.1.0" dependencies = [ @@ -4185,6 +4258,7 @@ name = "request-handlers" version = "0.1.0" dependencies = [ "bigdecimal", + "cfg_aliases 0.2.0", "codspeed-criterion-compat", "connection-string", "dmmf", @@ -4502,6 +4576,8 @@ dependencies = [ "diagnostics", "pest", "pest_derive", + "serde", + "serde_json", ] [[package]] @@ -4949,6 +5025,7 @@ dependencies = [ "enumflags2", "expect-test", "indoc 2.0.3", + "itertools 0.12.0", "pretty_assertions", "psl", "quaint", @@ -5035,6 +5112,7 @@ dependencies = [ "datamodel-renderer", "either", "enumflags2", + "indexmap 2.2.2", "indoc 2.0.3", "once_cell", "prisma-value", @@ -5246,6 +5324,15 @@ dependencies = [ ] [[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] name = "test-cli" version = "0.1.0" dependencies = [ @@ -5845,7 +5932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -6101,9 +6188,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6111,9 +6198,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -6138,9 +6225,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6148,9 +6235,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -6161,9 +6248,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-logger" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 57c91c1719b91..1471771f65c64 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.12.1"; + version = "5.16.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-emy2Qvx05D8omSc3Ivx66EnThW/tr77UGQu3qhat/fc="; + hash = "sha256-uJJX5lI0YFXygWLeaOuYxjgyswJcjSujPcqHn1aKn8M="; }; # Use system openssl. @@ -74,7 +74,8 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pimeys tomhoule ivan aqrln ]; + mainProgram = "prisma"; + maintainers = with maintainers; [ pimeys tomhoule aqrln ]; }; } diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index f929704d3dd45..2eac6f4a20739 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-nD3B4R2eBX52wekBrBT3jiIYdE/p6xgnHrvDFFofl/s="; + hash = "sha256-XW0LnBt4gSuLQ8AjNTh6Rsd11x/dh45CQe818EZKRRs="; }; - cargoHash = "sha256-Rhvl9rqtJyEpZZYUaN+ih6KXgEVKZCyovf34l883bZM="; + cargoHash = "sha256-BecxuAOW+znKNe0s+UDPiqJ84BZU1P+f16Q53I4eXkI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index 3e7e640c88b59..797ee27eeeb2b 100644 --- a/pkgs/development/tools/database/shmig/default.nix +++ b/pkgs/development/tools/database/shmig/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { mainProgram = "shmig"; homepage = "https://github.com/mbucc/shmig"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 85be37cb19bc5..0673061c486d9 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/pkgs/development/tools/database/sqlcheck/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jarulraj"; repo = "sqlcheck"; rev = "v${version}"; - sha256 = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY="; + hash = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index 204f0f4e5a7a9..9bd1cca620e91 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "24.1.0.087.0929"; + version = "24.2.0.180.1721"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-DHp3Wrwro1oaBEw1O7cyRGJKbhD2z86MeY2Xq2vzo1Q="; + hash = "sha256-22cLWfeEqJm48KeUDDIMOnPu/R8oEAtBNBn3slfMGAE="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index f636092ec5c97..15c0542de0967 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-69vSRwRl6Ep+lBpy31PkDdEV58yEhtqQBeisaih43CU="; + sha256 = "sha256-QW8cDGXaj/10Y9UsU3WLalnFkf1+2ZBrFpf0Y5eTPUQ="; }; - vendorHash = "sha256-boMvZf8+o1JDaxiyttbW/7hcuTN9wAeTUWT89N0FsSU="; + vendorHash = "sha256-DgIn01nUIX1+JigC1Jr5ZqG3tAYiOPUm6md/TdcD2U4="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 9d2d4a36b453b..fc81551f3eb55 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.0.7"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-nq+c9NHtQ6pMouJEI7YUhgb9+ljlJECP8REL4Gm4B10="; + hash = "sha256-QzrIf9DVrQGgtOcHGbxLMz7bG/lkU2Cu0n4jSKJ8c8g="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index dc5960fd9ee2c..610e872da187f 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "sqlite-web"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE="; + hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU="; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index b13255f57a725..96d9c035be304 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "sqlitebrowser"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-33iVic0kxemWld+SiHOWGlKFSi5fpk1RtLUiNDr7WNI="; + sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw="; }; # We should be using qscintilla from nixpkgs instead of the vendored version, diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 22c39698dfed7..00d172072f080 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -22,9 +22,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x5WyaVHLVFCHWPqyEuaVSbeIaGXDB0o7h776udcC4DM="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-wANIaEvHtFzAAsly2aqHlYwiKnxHkqH3/0rYs05AkXI="; buildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 121ccee544ad0..32458926bd00e 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "timescaledb-tune"; homepage = "https://github.com/timescale/timescaledb-tune"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/development/tools/dazel/default.nix index f19d469697835..119cbaca9c706 100644 --- a/pkgs/development/tools/dazel/default.nix +++ b/pkgs/development/tools/dazel/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; + hash = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; }; meta = { diff --git a/pkgs/development/tools/dbus-test-runner/default.nix b/pkgs/development/tools/dbus-test-runner/default.nix index 15f219ac9b1d6..93b1860959234 100644 --- a/pkgs/development/tools/dbus-test-runner/default.nix +++ b/pkgs/development/tools/dbus-test-runner/default.nix @@ -4,7 +4,6 @@ , testers , autoreconfHook , bash -, coreutils , dbus , dbus-glib , glib diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index fb0c6cbaf7446..4552539bb76e9 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-rR84muba8nMrPZAhH+8xXOOxBvKIsU8Xju8tG7BjqBo="; + hash = "sha256-LtrPcYyuobHq6O3/vBKLTOMZfpYL7P3mtGfVqCMV9iM="; }; vendorHash = null; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix deleted file mode 100644 index fc15ecff7c9ac..0000000000000 --- a/pkgs/development/tools/dep2nix/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage -, makeWrapper, nix-prefetch-scripts }: - -buildGoPackage rec { - pname = "dep2nix"; - version = "unstable-2019-04-02"; - - goPackagePath = "github.com/nixcloud/dep2nix"; - - src = fetchFromGitHub { - owner = "nixcloud"; - repo = pname; - rev = "830684f920333b8ff0946d6b807e8be642eec3ef"; - sha256 = "17sjxhzhmz4893x3x054anp4xvqd1px15nv3fj2m7i6r0vbgpm0j"; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - postFixup = '' - wrapProgram $out/bin/dep2nix \ - --prefix PATH : ${nix-prefetch-scripts}/bin - ''; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; - mainProgram = "dep2nix"; - license = licenses.bsd3; - homepage = "https://github.com/nixcloud/dep2nix"; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix deleted file mode 100644 index ceedc50fc8874..0000000000000 --- a/pkgs/development/tools/dep2nix/deps.nix +++ /dev/null @@ -1,129 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/carolynvs/semver.git"; - rev = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"; - sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik"; - }; - } - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "6f1c6d150500e452704e9863f68c2559f58616bf"; - sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "1fca145dffbcaa8fe914309b1ec0cfc67500fe61"; - sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - { - goPackagePath = "github.com/golang/dep"; - fetch = { - type = "git"; - url = "https://github.com/CrushedPixel/dep"; - rev = "fa9f32339c8855ebe7e7bc66e549036a7e06d37a"; - sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175"; - sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4"; - }; - } - { - goPackagePath = "github.com/jmank88/nuts"; - fetch = { - type = "git"; - url = "https://github.com/jmank88/nuts"; - rev = "8b28145dffc87104e66d074f62ea8080edfad7c8"; - sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k"; - }; - } - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "6a197d5ea61168f2ac821de2b7f011b250904900"; - sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/sdboyer/constext"; - fetch = { - type = "git"; - url = "https://github.com/sdboyer/constext"; - rev = "836a144573533ea4da4e6929c235fd348aed1c80"; - sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "dc948dff8834a7fe1ca525f8d04e261c2b56e70d"; - sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; - sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; - }; - } -] diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 7680bb1d1ff7a..59200d18b2595 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-v2EBN9zp6ssY0hWJQnhsIlRU3L7oOad46bvDUILGIv0="; + hash = "sha256-+bnFaopmK8Yz2XSkN3wPiipoO5TsRD0IuAKUlx1KvKM="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-efXYFVs+W6jkShWrU21WCiQqfaNX/9HLD8CxesbkR0s="; + vendorHash = "sha256-fuLKo6m/n06W4jyCc4Ki0GLlSIYZNdGFOhpasTd95x0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index eb45a4b82e7a7..c894793fa237a 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.5.15"; + version = "0.5.16"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fGCCPLj7C5yn8DPJdx6ixUFz9KXhBRAUOrFeTsQkXEM="; + sha256 = "sha256-J9Qu9flp7l3BnQGHkDBSWTsNdDQSJUwp0W9GhOJehKo="; }; meta = with lib; { diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix deleted file mode 100644 index 458f0ea329510..0000000000000 --- a/pkgs/development/tools/diesel-cli/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, sqliteSupport ? true -, postgresqlSupport ? true -, mysqlSupport ? true -, rustPlatform -, fetchCrate -, installShellFiles -, pkg-config -, openssl -, stdenv -, Security -, libiconv -, sqlite -, postgresql -, libmysqlclient -, zlib -}: - -assert lib.assertMsg (sqliteSupport == true || postgresqlSupport == true || mysqlSupport == true) - "support for at least one database must be enabled"; - -let - inherit (lib) optional optionals optionalString; -in - -rustPlatform.buildRustPackage rec { - pname = "diesel-cli"; - version = "2.1.1"; - - src = fetchCrate { - inherit version; - crateName = "diesel_cli"; - hash = "sha256-fpvC9C30DJy5ih+sFTTMoiykUHqG6OzDhF9jvix1Ctg="; - }; - - cargoHash = "sha256-nPmUCww8sOJwnG7+uIflLPgT87xPX0s7g0AcuDKhY2I="; - - nativeBuildInputs = [ installShellFiles pkg-config ]; - - buildInputs = [ openssl ] - ++ optional stdenv.isDarwin Security - ++ optional (stdenv.isDarwin && mysqlSupport) libiconv - ++ optional sqliteSupport sqlite - ++ optional postgresqlSupport postgresql - ++ optionals mysqlSupport [ libmysqlclient zlib ]; - - buildNoDefaultFeatures = true; - buildFeatures = optional sqliteSupport "sqlite" - ++ optional postgresqlSupport "postgres" - ++ optional mysqlSupport "mysql"; - - checkPhase = '' - runHook preCheck - '' + optionalString sqliteSupport '' - cargo check --features sqlite - '' + optionalString postgresqlSupport '' - cargo check --features postgres - '' + optionalString mysqlSupport '' - cargo check --features mysql - '' + '' - runHook postCheck - ''; - - postInstall = '' - installShellCompletion --cmd diesel \ - --bash <($out/bin/diesel completions bash) \ - --fish <($out/bin/diesel completions fish) \ - --zsh <($out/bin/diesel completions zsh) - ''; - - # Fix the build with mariadb, which otherwise shows "error adding symbols: - # DSO missing from command line" errors for libz and libssl. - NIX_LDFLAGS = optionalString mysqlSupport "-lz -lssl -lcrypto"; - - meta = with lib; { - description = "Database tool for working with Rust projects that use Diesel"; - homepage = "https://github.com/diesel-rs/diesel/tree/master/diesel_cli"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ]; - mainProgram = "diesel"; - }; -} diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index c405aa3fd354e..a9d13d9730009 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Md6R1thUtPQ7BFZsWmTDuNdD7UHMMFlEVksIJZAyjk4="; + hash = "sha256-Md6R1thUtPQ7BFZsWmTDuNdD7UHMMFlEVksIJZAyjk4="; }; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix index 5d654b58a1ef6..0d30fc4f38002 100644 --- a/pkgs/development/tools/djhtml/default.nix +++ b/pkgs/development/tools/djhtml/default.nix @@ -23,6 +23,6 @@ buildPythonApplication rec { homepage = "https://github.com/rtts/djhtml"; description = "Django/Jinja template indenter"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index 07af36e98ceed..1929175c956a6 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -15,15 +15,16 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-p9RIzX9zoZxBrhiNaIeCX9OgfQm/lXNwYsh6IcsnIVk="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; pythonRelaxDeps = [ "pathspec" + "regex" ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ click colorama cssbeautifier @@ -40,11 +41,11 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "djlint" ]; - meta = with lib; { + meta = { description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang"; mainProgram = "djlint"; homepage = "https://github.com/Riverside-Healthcare/djlint"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ traxys ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ traxys ]; }; } diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 0db8f1f4fbfcc..0ab4b2a4a2f3d 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.108.0"; + version = "1.109.1"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-7qfzayuCpjOY8n+bixvm1OcS+BumkZJ0Oyn1xfNezX4="; + sha256 = "sha256-K27K79OAQERREu5doQGhy87XV5Fz4uZWctsZj+GiON0="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/antora/default.nix b/pkgs/development/tools/documentation/antora/default.nix index de28518259c86..afd694d4d7dee 100644 --- a/pkgs/development/tools/documentation/antora/default.nix +++ b/pkgs/development/tools/documentation/antora/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "antora"; - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-uGXXp6boS5yYsInSmkI9S0Tn85QGVp/5Fsh1u3G4oPk="; + hash = "sha256-hkavYC2LO8NRIRwHNWIJLRDkVnhAB4Di3IqL8uGt+U8="; }; - npmDepsHash = "sha256-oWLRAuvWDk7w18qlDH14EE4elX5nhLKHSQANa/kXKvw="; + npmDepsHash = "sha256-ngreuitwUcIDVF6vW7fZA1OaVxr9fv7s0IjCErXlcxg="; # This is to stop tests from being ran, as some of them fail due to trying to query remote repositories postPatch = '' diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index e2d35dd403d55..fbd8ea3708660 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.46.3"; + version = "0.47.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-IyhKxCqLyboEZINalI6bd///sUxWvmWlQVrzMA2sNdU="; + hash = "sha256-zafRwiXfRACT6G408pXLCk7t6akabOs1VFLRF9SeNWI="; }; - cargoHash = "sha256-46t6Y2UuRCAnvOhEPLgYN+fHHtJYxuflRT3DClLTDQk="; + cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index d2b69af76ed13..e14437b08b24e 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mainProgram = "drm_info"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index 5736d301b32d4..c1a16d729bb6b 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -3,6 +3,7 @@ }: let python = python3.override { + self = python; packageOverrides = self: super: { # see https://github.com/devicetree-org/dt-schema/issues/108 jsonschema = super.jsonschema.overridePythonAttrs (old: rec { @@ -27,4 +28,3 @@ let python = python3.override { }); }; }; in python.pkgs.toPythonApplication python.pkgs.dtschema - diff --git a/pkgs/development/tools/dum/default.nix b/pkgs/development/tools/dum/default.nix index 6a68c502d9680..201c81f3fd6ca 100644 --- a/pkgs/development/tools/dum/default.nix +++ b/pkgs/development/tools/dum/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0rnm59zhpaa8nbbh6rh53svnlb484q1k6s4wc4w9516b18xhmkca"; }; - cargoSha256 = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto="; + cargoHash = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto="; meta = with lib; { description = "Npm scripts runner written in Rust"; diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index f29473ef85e77..631051ee3a2d1 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { hash = "sha256-pZlWA7LZeMb+ZhnfQh9MzvDDlre1kkPc6aSVNZcVi/w="; }; - cargoSha256 = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg="; + cargoHash = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index a4d29757aea51..8ee17a2e382de 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-RRLIogNOvbXylmdR59anMVSYCILdVr0Xeot21HqXlXU="; + sha256 = "sha256-y5gep3v+totupFbsAuGhySUbcESmQeGHWteQFFXj2Kw="; }; - vendorHash = "sha256-BLwdNBthYTMSNDcT5Cf8IcAr4uUmpewLdZRgIvq5htE="; + vendorHash = "sha256-cRPAjFVvjCgT+m8ceAQJt5ZE8ax7jefzdVWPGM45LpY="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 8dabbd7dfade2..576c3edd405c6 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.14"; + version = "0.8.15"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-G9AvJMrgb71KxOaYScYOVuYSwubLlSd6a9KhzA8DKlA="; + hash = "sha256-7yw2SmwWsPBCH0LOaZSruYeZ5qL+njGuExy8+11Ni78="; }; - vendorHash = "sha256-Uy/h6TBmDYHSewq3TbchLe+AtdvO2xNSp9pVDglRKVc="; + vendorHash = "sha256-bwNuQPGjAQ9Afa2GuPWrW8ytfIvhsOYFKPt0zyfdZhU="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index d5760841b2e24..0c7b5efaf7fbb 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,24 +34,24 @@ }, "29": { "hashes": { - "aarch64-darwin": "e9934a8eaecaab05dcc572b47576cdba78491c144c19348c9c9e9524c8c5917b", - "aarch64-linux": "a5c2bc148d3f6c3ee2bd15289243a1b75093afde3753d0aa1125d2cb621f5b59", - "armv7l-linux": "a75e2487ea1a1b292fbc160618167c204f161c602780f2b997b75d6ef5bbe539", - "headers": "0z4n8c95z48n54d1fph2p2i6cb43gk202zg09vmv168ajpspi2rr", - "x86_64-darwin": "b875c884efe86eb2e1922781f55193d82520e923510f19af87a58dfe07d21562", - "x86_64-linux": "eb07a8137fde970450242c51e0c2f8ef6556f377a21c357584aa2632ee9e1d3f" + "aarch64-darwin": "c4b1024ef77d3a6380541b3ae3b6cc60748ebdbeed17277cc2dc4b72944c1ddc", + "aarch64-linux": "b27d87b8d0da41cab3c683ac7fa71af84492fe5f9bcd5970da0c73901d18c5f8", + "armv7l-linux": "1f8681870ffda20a4f45afffd850619a55e711b3f6a033a5ac4a659540f7b339", + "headers": "0yzwc2d8hfrsrpg4m7234cyvcx9ch3psx9rsywbli1avzb8rkjdi", + "x86_64-darwin": "e3cf8e623049f18a0d7a7871fb5f14a9150352d7b1c5d59dca8388b3a9b42cb1", + "x86_64-linux": "b81bac1ffa3b0d82837d05212e988854ca9db0350c571857e0851f34443a5ecd" }, - "version": "29.4.2" + "version": "29.4.5" }, "30": { "hashes": { - "aarch64-darwin": "7497d7926a094d6e1bf34f70ef206c4f2d9df072b1f9fa8cd431f6ea4fab680c", - "aarch64-linux": "bdb3485cd87861bb1d99f6b417f979ac899974a4322191a648efc311af9f8c5c", - "armv7l-linux": "3941ab1f23576d8f55fdf525e40387f97c2c9809173a8a933402b62ec95a592f", - "headers": "1jz8grs7sjncg68s34hf7rhd830414avxs1xg5lng5n7wmwfiw8i", - "x86_64-darwin": "bdadef26dac934416b17fa2af6bcd55424eb8b1ceb5f6fae068dbd5fd8b0d357", - "x86_64-linux": "4d00e8cd5f37962dc8fbefe2941d89dcb1c180f1568bb32122c7eb40d21f39c4" + "aarch64-darwin": "9d7b31185ef61628e6f3abda32517953518f68d9f71a8fa29f2a0a17b9d3b9bb", + "aarch64-linux": "5f2326631080cc4a5f6231a83e492d8d75d9ccdd3bd41f56f6a1090e790d2a2a", + "armv7l-linux": "ef7be229a610cee357cba2f790618b239aab82fc2b26e0645c4cf4600dffb1c4", + "headers": "1s6cl0am8rv262s7ycixv3rjwry0s1ssimm109fh5xn2m808swn9", + "x86_64-darwin": "a66dbe01006fee9319f19c16ef08d4d72ecbb79bd35fffece32b36b8afe2ea47", + "x86_64-linux": "94d7470d9dae2dd2376612c804068ea6514e5efe342de8946f49f93bf0ed50de" }, - "version": "30.1.1" + "version": "30.3.1" } } diff --git a/pkgs/development/tools/electron/chromedriver/default.nix b/pkgs/development/tools/electron/chromedriver/default.nix new file mode 100644 index 0000000000000..87c45f5d566a3 --- /dev/null +++ b/pkgs/development/tools/electron/chromedriver/default.nix @@ -0,0 +1,14 @@ +let + infoJson = builtins.fromJSON (builtins.readFile ./info.json); +in + +{ lib, callPackage }: + +let + mkElectronChromedriver = callPackage ./generic.nix { }; +in +lib.mapAttrs' (majorVersion: info: + lib.nameValuePair + "electron-chromedriver_${majorVersion}" + (mkElectronChromedriver info.version info.hashes) +) infoJson diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix new file mode 100644 index 0000000000000..edd648713e27a --- /dev/null +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchurl +, glib +, xorg +, nspr +, nss +, autoPatchelfHook +, unzip +}: + +version: hashes: +let + pname = "electron-chromedriver"; + + meta = with lib; { + homepage = "https://www.electronjs.org/"; + description = "WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. This is + an unofficial build of ChromeDriver compiled by the Electronjs + project. + ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.mit; + maintainers = with maintainers; [ liammurphy14 yayayayaka ]; + platforms = ["x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" "aarch64-darwin"]; + mainProgram = "chromedriver"; + }; + + fetcher = vers: tag: hash: fetchurl { + url = "https://github.com/electron/electron/releases/download/v${vers}/chromedriver-v${vers}-${tag}.zip"; + sha256 = hash; + }; + + tags = { + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armv7l"; + x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; + }; + + get = as: platform: as.${platform.system} or (throw "Unsupported system: ${platform.system}"); + + common = platform: { + inherit pname version meta; + src = fetcher version (get tags platform) (get hashes platform); + + buildInputs = [ + stdenv.cc.cc.lib + glib + xorg.libxcb + nspr + nss + ]; + }; + + linux = { + nativeBuildInputs = [ autoPatchelfHook unzip ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + unzip $src + install -m777 -D chromedriver $out/bin/chromedriver + runHook postInstall + ''; + }; + + darwin = { + nativeBuildInputs = [ unzip ]; + + dontUnpack = true; + dontBuild = true; + + # darwin distributions come with libffmpeg dependecy + icudtl.dat file + installPhase = '' + runHook preInstall + unzip $src + install -m777 -D chromedriver $out/bin/chromedriver + cp libffmpeg.dylib $out/bin/libffmpeg.dylib + cp icudtl.dat $out/bin/icudtl.dat + runHook postInstall + ''; + }; +in + stdenv.mkDerivation ( + (common stdenv.hostPlatform) // + (if stdenv.isDarwin then darwin else linux) + ) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json new file mode 100644 index 0000000000000..2a5d1f400cda5 --- /dev/null +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -0,0 +1,35 @@ +{ + "29": { + "hashes": { + "aarch64-darwin": "d2d4874957d6cf5b27168d9d1c96ef15cf333799b010dbee3bb6f64c16c228fb", + "aarch64-linux": "5bef9d44e32b853c31a11140c46304cfe2ba821e403beb55f14b9aa875ae1488", + "armv7l-linux": "128b6312f8677da8e133fc7878c7a476bd80f89d7002968e5f3d5946979c33a9", + "headers": "0yzwc2d8hfrsrpg4m7234cyvcx9ch3psx9rsywbli1avzb8rkjdi", + "x86_64-darwin": "f01ce2d13f6d3cdd957c06c90fc81ff1deb24b5d9084864bc0147acecaba2ea1", + "x86_64-linux": "4b305c3b0ce7b67316143162ba78bf217a95aa255c0cc847b2553551b0296790" + }, + "version": "29.4.5" + }, + "30": { + "hashes": { + "aarch64-darwin": "65621c6968832b604d1b81b65c2a4fdc56baafe167e76d22c55afa4c67c840f1", + "aarch64-linux": "c7767da210b8d4f084576e308570fcf15268c7f6a1182a621ce90788fe45d458", + "armv7l-linux": "509197b47830f31b715f3ab8940279c5b2c7f473c2059148efd86dffb58b895d", + "headers": "1s6cl0am8rv262s7ycixv3rjwry0s1ssimm109fh5xn2m808swn9", + "x86_64-darwin": "28001491af5805d8975f59edcee644f93e425b7e59f1fe94915ce9a286f7cd9e", + "x86_64-linux": "f4f6a66323b1180045321c779eacb88b48c8969e3ddf95d1d0aab92eb26ff071" + }, + "version": "30.3.1" + }, + "31": { + "hashes": { + "aarch64-darwin": "b2e85d41607d09d7645ca58c0243c8f00e15dcbe32f4ceeab9566235eadc7143", + "aarch64-linux": "8ab96b6db830746a026b9eb4233ff51577b1880f5595a65aa38edd593e700f7e", + "armv7l-linux": "e9cdc7e9d055a90932c2c739112bf89f85afe3125f72b8ae1ddb0eab3edcace2", + "headers": "0bjhrhv9310kwl7q2klr7awwgjiwfhiycm59c5kzgh7wj221ll1v", + "x86_64-darwin": "5b2b7426c735a4979acb4e341256ab2342b85e3bf42b9da0ba9780d21f0bda6b", + "x86_64-linux": "9feeaac10629f79334ef14a668f653b2fda09fbf0fa1019c3a58d7e1d79c1d1a" + }, + "version": "31.3.0" + } +} diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 36cecd7ce6a63..dbd97b8982491 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -16,7 +16,7 @@ , pipewire , libsecret , libpulseaudio -, speechd +, speechd-minimal , info }: @@ -199,7 +199,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { stdenv.cc.cc.lib libsecret libpulseaudio - speechd + speechd-minimal ]; in base.postFixup + '' diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 26349f02fa60c..12c24e175e317 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-hyk8RsG2hIsAZRiJuYRF6HC+K7TyA76qiYsc2sH0Apw=", + "hash": "sha256-CKDvVP0S2g4CIPzMXPLe5C8rqeWvF/0gaXam8bDynuw=", "owner": "electron", "repo": "electron", - "rev": "v29.4.2" + "rev": "v29.4.5" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -899,10 +899,10 @@ "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", "modules": "121", "node": "20.9.0", - "version": "29.4.2" + "version": "29.4.5" }, "30": { "chrome": "124.0.6367.243", @@ -952,10 +952,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-VWc9I5wpQYv13I1xgLQVqDg6IfXMinrzJmkMaIsEY90=", + "hash": "sha256-C0PIpx72aRo/SVD17axkAVA36DICGjbzD++ns3KSUYo=", "owner": "electron", "repo": "electron", - "rev": "v30.1.1" + "rev": "v30.3.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -1181,10 +1181,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-15RUrS+zjp0nOveBnZB3bvEv36noZr2ergtNL7ky8iQ=", + "hash": "sha256-FJVFKLhVCoOdM6dbuu/DQxw0hXjg+C8a2WfF0u3Qndw=", "owner": "nodejs", "repo": "node", - "rev": "v20.14.0" + "rev": "v20.15.1" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1816,9 +1816,9 @@ "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", + "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c", "modules": "123", - "node": "20.14.0", - "version": "30.1.1" + "node": "20.15.1", + "version": "30.3.1" } } diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py index bf0f7a3a4758f..962ca0e340733 100755 --- a/pkgs/development/tools/electron/update.py +++ b/pkgs/development/tools/electron/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git nix-universal-prefetch prefetch-yarn-deps prefetch-npm-deps +#! nix-shell -i python -p python3.pkgs.joblib python3.pkgs.click python3.pkgs.click-log nix nix-prefetch-git nurl prefetch-yarn-deps prefetch-npm-deps """ electron updater @@ -73,6 +73,9 @@ SOURCE_INFO_JSON = "info.json" # Relatice path to the electron-bin info.json BINARY_INFO_JSON = "binary/info.json" +# Relative path the the electron-chromedriver info.json +CHROMEDRIVER_INFO_JSON = "chromedriver/info.json" + # Number of spaces used for each indentation level JSON_INDENT = 4 @@ -83,6 +86,8 @@ memory: Memory = Memory("cache", verbose=0) logger = logging.getLogger(__name__) click_log.basic_config(logger) +nixpkgs_path = os.path.dirname(os.path.realpath(__file__)) + "/../../../.." + class Repo: fetcher: str @@ -276,6 +281,42 @@ class ElectronBinRepo(GitHubRepo): return out +class ElectronChromedriverRepo(ElectronBinRepo): + def __init__(self, rev: str) -> None: + super().__init__("electron", "electron", rev) + self.systems = { + "i686-linux": "linux-ia32", + "x86_64-linux": "linux-x64", + "armv7l-linux": "linux-armv7l", + "aarch64-linux": "linux-arm64", + "x86_64-darwin": "darwin-x64", + "aarch64-darwin": "darwin-arm64", + } + + def get_hashes(self, major_version: str) -> dict: + """Returns a dictionary of hashes for a given major version""" + m, _ = get_latest_version(major_version) + version: str = m["version"] + + out = {} + out[major_version] = { + "hashes": {}, + "version": version, + } + + hashes: list = self.get_shasums256(version) + + for nix_system, electron_system in self.systems.items(): + filename = f"*chromedriver-v{version}-{electron_system}.zip" + if any([x.endswith(filename) for x in hashes]): + out[major_version]["hashes"][nix_system] = [ + x.split(" ")[0] for x in hashes if x.endswith(filename) + ][0] + out[major_version]["hashes"]["headers"] = self.get_headers(version) + + return out + + # Releases that have reached end-of-life no longer receive any updates # and it is rather pointless trying to update those. # @@ -304,11 +345,11 @@ def supported_version_range() -> range: @memory.cache def get_repo_hash(fetcher: str, args: dict) -> str: - cmd = ["nix-universal-prefetch", fetcher] - for arg_name, arg in args.items(): - cmd.append(f"--{arg_name}") - cmd.append(arg) - + expr = f"with import {nixpkgs_path} {{}};{fetcher}{{" + for key, val in args.items(): + expr += f'{key}="{val}";' + expr += "}" + cmd = ["nurl", "-H", "--expr", expr] print(" ".join(cmd), file=sys.stderr) out = subprocess.check_output(cmd) return out.decode("utf-8").strip() @@ -411,6 +452,15 @@ def get_electron_bin_info(major_version: str) -> Tuple[str, str, ElectronBinRepo return (major_version, m, electron_repo) +def get_electron_chromedriver_info( + major_version: str, +) -> Tuple[str, str, ElectronChromedriverRepo]: + m, rev = get_latest_version(major_version) + + electron_repo: ElectronChromedriverRepo = ElectronChromedriverRepo(rev) + return (major_version, m, electron_repo) + + def get_electron_info(major_version: str) -> Tuple[str, str, GitHubRepo]: m, rev = get_latest_version(major_version) @@ -522,6 +572,36 @@ def update_bin(major_version: str, commit: bool) -> None: commit_result(package_name, old_version, new_version, BINARY_INFO_JSON) +def update_chromedriver(major_version: str, commit: bool) -> None: + """Update a given electron-chromedriver release + + Args: + major_version: The major version number, e.g. '27' + commit: Whether the updater should commit the result + """ + package_name = f"electron-chromedriver_{major_version}" + print(f"Updating {package_name}") + + electron_chromedriver_info = get_electron_chromedriver_info(major_version) + (_major_version, _version, repo) = electron_chromedriver_info + + old_info = load_info_json(CHROMEDRIVER_INFO_JSON) + new_info = repo.get_hashes(major_version) + + out = old_info | new_info + + save_info_json(CHROMEDRIVER_INFO_JSON, out) + + old_version = ( + old_info[major_version]["version"] if major_version in old_info else None + ) + new_version = new_info[major_version]["version"] + if old_version == new_version: + print(f"{package_name} is up-to-date") + elif commit: + commit_result(package_name, old_version, new_version, CHROMEDRIVER_INFO_JSON) + + def update_source(major_version: str, commit: bool) -> None: """Update a given electron-source release @@ -642,7 +722,11 @@ def commit_result( ) init_msg = f"init at {new_version}" update_msg = f"{old_version} -> {new_version}" - diff = f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n" if old_version != None else "" + diff = ( + f"- Diff: https://github.com/electron/electron/compare/refs/tags/v{old_version}...v{new_version}\n" + if old_version != None + else "" + ) commit_message = f"""{package_name}: {update_msg if old_version != None else init_msg} - Changelog: https://github.com/electron/electron/releases/tag/v{new_version} @@ -681,6 +765,13 @@ def eval(version): print(json.dumps(tree, indent=JSON_INDENT, default=vars, sort_keys=True)) +@cli.command("update-chromedriver", help="Update a single major release") +@click.option("-v", "--version", help="The major version, e.g. '23'") +@click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result") +def update_chromedriver_cmd(version: str, commit: bool) -> None: + update_chromedriver(version, commit) + + @cli.command("update", help="Update a single major release") @click.option("-v", "--version", help="The major version, e.g. '23'") @click.option( @@ -718,6 +809,8 @@ def update(version: str, bin_only: bool, source_only: bool, commit: bool) -> Non update_bin(version, commit) update_source(version, commit) + update_chromedriver(version, commit) + @cli.command("update-all", help="Update all releases at once") @click.option( @@ -764,6 +857,9 @@ def update_all(bin_only: bool, source_only: bool, commit: bool) -> None: update_all_source(commit) + for major_version, _ in filtered_bin_info.items(): + update_chromedriver(major_version, commit) + if __name__ == "__main__": cli() diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index 9a1a8978598b8..3a8c809f933ca 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -1,39 +1,54 @@ -{ lib, python3Packages, fetchPypi }: +{ + lib, + python3Packages, + fetchPypi, +}: python3Packages.buildPythonApplication rec { pname = "eliot-tree"; version = "21.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; + hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; }; - nativeCheckInputs = with python3Packages; [ - testtools - pytest - ]; + # Patch Python 3.12 incompatibilities in versioneer.py. + postPatch = '' + substituteInPlace versioneer.py \ + --replace-fail SafeConfigParser ConfigParser \ + --replace-fail readfp read_file + ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ colored eliot iso8601 jmespath - setuptools toolz ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + testtools + ]; + # Tests run eliot-tree in out/bin. - checkPhase = '' + preCheck = '' export PATH=$out/bin:$PATH - pytest ''; - meta = with lib; { + pythonImportsCheck = [ "eliottree" ]; + + meta = { homepage = "https://github.com/jonathanj/eliottree"; + changelog = "https://github.com/jonathanj/eliottree/blob/${version}/NEWS.rst"; description = "Render Eliot logs as an ASCII tree"; mainProgram = "eliot-tree"; - license = licenses.mit; - maintainers = [ maintainers.dpausp ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dpausp ]; }; } diff --git a/pkgs/development/tools/eltclsh/default.nix b/pkgs/development/tools/eltclsh/default.nix index 8b6b7678ecbea..ec54952406cf5 100644 --- a/pkgs/development/tools/eltclsh/default.nix +++ b/pkgs/development/tools/eltclsh/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchgit , automake , autoconf diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index b405a22d8a64b..60aec66919d1a 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.21.5"; + version = "0.23.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-FpvXWIlt67G8w3pBKZo/mcp57LunxDmRUaCU/Ne89B8="; + hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix index 33155c58557cb..6cd40d882f3bb 100644 --- a/pkgs/development/tools/eslint_d/default.nix +++ b/pkgs/development/tools/eslint_d/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "eslint_d"; - version = "13.1.2"; + version = "14.0.3"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-2G6I6Tx6LqgZ5EpVw4ux/JXv+Iky6Coenbh51JoFg7Q="; + hash = "sha256-r0pb9qbWfyVUHuHrNhiYm+0zlF5WId3dH7QCubzZDts="; }; - npmDepsHash = "sha256-L6abWbSnxY6gGMXBjxobEg8cpl0p3lMST9T42QGk4yM="; + npmDepsHash = "sha256-0Db18y7MUnnnr8v+bBOUhGBCsZcZ9OGtGqSVH7/wYQc="; dontNpmBuild = true; diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index f3624575f8f9a..ca650be0e386f 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-ofC9pBKZEKGNNirshhfcCkzWN4CvD7IfArZaikkfnmI="; + hash = "sha256-7rxT3Stbfec7oxZOBN87lICmq+V8OZMCXb5F6Ca6jS4="; }; - cargoHash = "sha256-fM1If/RnPzLDYjUImNkMViWkjXBc5YRIJHthypcJfmc="; + cargoHash = "sha256-GfoM2ngwnovQdbiEUQrkrrMpq4fo37VVOmnkK/5l+C8="; nativeBuildInputs = [ pkg-config @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd espup \ --bash <($out/bin/espup completions bash) \ --fish <($out/bin/espup completions fish) \ diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 66f45af3a5ba4..3ff99faa600fd 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.30"; + version = "0.16.32"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-tk0ZptDT4qxJLv5sMAh1oF8yXiTsKbv3UiQM8f4ywMA="; + sha256 = "sha256-EqP1YStp8sUJq0zel9mTmi8SWHvObciUetRzAbo3rK8="; }; vendorHash = null; @@ -57,7 +57,7 @@ buildGoModule rec { }; meta = with lib; { - description = "Official CLI for OpenFaaS "; + description = "Official CLI for OpenFaaS"; mainProgram = "faas-cli"; homepage = "https://github.com/openfaas/faas-cli"; license = licenses.mit; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 2b4d1d505db30..3bc1217a80dae 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fable"; - version = "4.18.0"; + version = "4.19.3"; - nugetHash = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY="; + nugetHash = "sha256-+ZauUmFVDxnlSfYtNWaq5oCK2odTuBfFjKTo/POp0SQ="; passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index ec4523e270c28..1a38ca3050ceb 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,8 +1,14 @@ -{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, gradle_7, openjdk17 }: let pname = "fastddsgen"; version = "3.3.0"; + gradle = gradle_7; + +in +stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; @@ -11,65 +17,21 @@ let hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU="; }; - gradle = gradle_7; - - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradle openjdk17 perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon -x submodulesUpdate assemble - ''; - - # perl code mavenizes paths (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - dontStrip = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-YkVRp6TXI7/5O+u0DDYiCq7DITfGJ4lT/L4hT90JOL8="; - }; -in -stdenv.mkDerivation { - inherit pname src version; - nativeBuildInputs = [ gradle openjdk17 ]; - # use our offline deps - postPatch = '' - sed -ie '1i\ - pluginManagement {\ - repositories {\ - maven { url "${deps}" }\ - }\ - }' thirdparty/idl-parser/settings.gradle - sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" build.gradle - sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" thirdparty/idl-parser/build.gradle - ''; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - # Run gradle with daemon to make installPhase faster - gradle --offline -x submodulesUpdate assemble + __darwinAllowLocalNetworking = true; - runHook postBuild - ''; + gradleFlags = [ "-x" "submodulesUpdate" ]; installPhase = '' runHook preInstall - gradle --offline -x submodulesUpdate install --install_path=$out + gradle install --install_path=$out # Override the default start script to use absolute java path cat <<EOF >$out/bin/fastddsgen @@ -81,6 +43,13 @@ stdenv.mkDerivation { runHook postInstall ''; + postGradleUpdate = '' + cd thirdparty/idl-parser + # fix "Task 'submodulesUpdate' not found" + gradleFlags= + gradle nixDownloadDeps + ''; + meta = with lib; { description = "Fast-DDS IDL code generator tool"; mainProgram = "fastddsgen"; diff --git a/pkgs/development/tools/fastddsgen/deps.json b/pkgs/development/tools/fastddsgen/deps.json new file mode 100644 index 0000000000000..c749fd049ad9e --- /dev/null +++ b/pkgs/development/tools/fastddsgen/deps.json @@ -0,0 +1,93 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.13.0": { + "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8=" + }, + "org/antlr#antlr4-runtime/4.13.0": { + "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", + "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" + }, + "org/antlr#antlr4/4.13.0": { + "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=", + "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/junit/jupiter#junit-jupiter-api/5.5.2": { + "jar": "sha256-JJov29OTGYfAKY0AygjtJISW4PwR4EY8CMT4LgzHmxw=", + "pom": "sha256-dqFdgNhYehpaOlsULSzrNzBPvZEZi6QlSG5X920IiGA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.5.2": { + "jar": "sha256-bXd9qYduLvegM26PCY+NdKWmT4EKo6Si9fO3Zs6Xg3s=", + "pom": "sha256-Ay/vTiVjCE05fq5IGjiAEPRDQBr2JSv9N312MH9vi/4=" + }, + "org/junit/platform#junit-platform-commons/1.5.2": { + "jar": "sha256-/ESv38DyDIXnGmbnlDKBrvO8Hg/WLS1po2y2kB5oLBA=", + "pom": "sha256-O9DU3tYyqK+MpYf7Z2QBnedxsda8uJrNViQ1oQCfqto=" + }, + "org/junit/platform#junit-platform-engine/1.5.2": { + "jar": "sha256-/yC6StjADvF7rvnFVRL5wC2aaHQPfxrAGppqoCOZMfg=", + "pom": "sha256-LUuVVVwh4IXrwd299C156x1VZA3Bk7G35hACQP0vGJ8=" + }, + "org/openjdk/nashorn#nashorn-core/15.4": { + "jar": "sha256-b4FuhN/WOoHU6qeCnAgze7r/PsaD/zv2u9kNAXoA3G8=", + "pom": "sha256-aan3ueR+zPR7vO5yGtT7A5yn2bZQF05thgKq23flrCM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/7.3.1": { + "jar": "sha256-Rrio79S5T6y1q0s1r+MO4FRq56Q9LGTm3vVsLxaP76U=", + "pom": "sha256-be7rsjbIAyhFrcO3XuWrEiPr1T5M8+hTQsMTvaBtVH8=" + }, + "org/ow2/asm#asm-commons/7.3.1": { + "jar": "sha256-h82Ls8a/a8uzP8pIBgxQZfZuv2o9fem/GL/1G88Vbrw=", + "pom": "sha256-2jEe/3FqEUJ8JCS1iFvR+0lC2QNml2zW1aVae6DfWkA=" + }, + "org/ow2/asm#asm-tree/7.3.1": { + "jar": "sha256-+RpKiqhoxcRmW7T9E0AZqR+fi5IWUn+6KV48i1Qit4s=", + "pom": "sha256-yrFmzVNdMJgzasVcG2du7WYxZbWG+gPXmWBSO+0f8Ew=" + }, + "org/ow2/asm#asm-util/7.3.1": { + "jar": "sha256-GCEoWSdC7UiDrIK/IF8Te2v74SNMaOb+sTdZ51qFtyk=", + "pom": "sha256-DzYMMOEoeTfh1C/txvrWmCT9Vl5P//7RQS7I2HMD+8o=" + }, + "org/ow2/asm#asm/7.3.1": { + "jar": "sha256-L2fhHO7IGevYjd7lMAq6aZscurLiDCLpfPAn076TlZs=", + "pom": "sha256-6s3NUA1lJ+ljiI2u2jGSPkvCQaJUJNzDisyi5gHn/eI=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index e8790999e1530..dd3f45769a50f 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,49 +1,58 @@ -{ lib -, fetchFromGitLab -, fetchPypi -, apksigner -, buildPythonApplication -, python3 -, installShellFiles -, androguard -, babel -, clint -, defusedxml -, gitpython -, libcloud -, mwclient -, paramiko -, pillow -, pyasn1 -, pyasn1-modules -, python-vagrant -, pyyaml -, qrcode -, requests -, ruamel-yaml -, yamllint +{ + lib, + fetchFromGitLab, + fetchPypi, + apksigner, + appdirs, + buildPythonApplication, + python3, + installShellFiles, + androguard, + babel, + clint, + defusedxml, + gitpython, + libcloud, + mwclient, + oscrypto, + paramiko, + pillow, + pyasn1, + pyasn1-modules, + python-vagrant, + pyyaml, + qrcode, + requests, + ruamel-yaml, + sdkmanager, + yamllint, }: -buildPythonApplication rec { +let + version = "2.3a1"; +in +buildPythonApplication { pname = "fdroidserver"; - version = "unstable-2023-10-23"; - format = "setuptools"; + inherit version; + + pyproject = true; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; - rev = "f4b10cf83935432d19948dac669964384bef0728"; - hash = "sha256-GmR6Td5pScwEKK9W6m26xQV4XxBdZ7frN2UvwUGY4Dw="; + rev = "2.3a1"; + hash = "sha256-K6P5yGx2ZXHJZ/VyHTbQAObsvcfnOatrpwiW+ixLTuA="; }; pythonRelaxDeps = [ + "androguard" "pyasn1" "pyasn1-modules" ]; postPatch = '' substituteInPlace fdroidserver/common.py \ - --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" + --replace-fail "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" ''; preConfigure = '' @@ -57,21 +66,19 @@ buildPythonApplication rec { --bash completion/bash-completion ''; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ - babel - ]; + buildInputs = [ babel ]; propagatedBuildInputs = [ androguard + appdirs clint defusedxml gitpython libcloud mwclient + oscrypto paramiko pillow pyasn1 @@ -87,6 +94,7 @@ buildPythonApplication rec { hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; })) + sdkmanager yamllint ]; @@ -100,16 +108,17 @@ buildPythonApplication rec { # no tests doCheck = false; - pythonImportsCheck = [ - "fdroidserver" - ]; + pythonImportsCheck = [ "fdroidserver" ]; - meta = with lib; { + meta = { homepage = "https://gitlab.com/fdroid/fdroidserver"; changelog = "https://gitlab.com/fdroid/fdroidserver/-/blob/${version}/CHANGELOG.md"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ linsui jugendhacker ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + linsui + jugendhacker + ]; mainProgram = "fdroid"; }; } diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index c1fd0b4598f1a..1a26b9f02191b 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.12.0"; + version = "13.14.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-w6tzqbNma7gTnUXOkPtcENO2XcchTXqueZlg08C8vF8="; + hash = "sha256-Y5PoiBX/ql7gbNpCklZieFsoIzxhyau40MTGXDYyxYs="; }; - npmDepsHash = "sha256-7/5cZOYMQ3b77aRZkBA5jTDm+PnepzdW6I8RyBNr7oo="; + npmDepsHash = "sha256-Z83Llre5ajVuGNt7LBr0tjWxRXTajne2U3fZuBwPjIg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json @@ -39,6 +39,6 @@ buildNpmPackage rec { homepage = "https://github.com/firebase/firebase-tools"; license = lib.licenses.mit; mainProgram = "firebase"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 04342eb1473cb..a95667282676e 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fission"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = "v${version}"; - hash = "sha256-DkSilNn98m7E9qTRpf+g2cmo3SHeJkW4eJ5T6XQM3S8="; + hash = "sha256-q1wyyzkqEMEYmgmj11YaZYl3lTtJKfPM8fxjTmh7cT4="; }; - vendorHash = "sha256-IChr8jC21yI5zOkHF2v9lQoqXT95FSMXJdWj7HqikB4="; + vendorHash = "sha256-Vi6eEQR3DQupn3CnasKxknaSk7Hs7C7v2yUGtxhsovQ="; ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 5752925e1451c..8d01cbeb5db8d 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -41,19 +41,16 @@ , attr }: -let - installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder"; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "flatpak-builder"; - version = "1.4.2"; + version = "1.4.4"; outputs = [ "out" "doc" "man" "installedTests" ]; # fetchFromGitHub fetches an archive which does not contain the full source (https://github.com/flatpak/flatpak-builder/issues/558) src = fetchurl { - # TODO: remove the '-fixed-libglnx' in the next release - url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}-fixed-libglnx.tar.xz"; - hash = "sha256-wEG5dOA6LC082oig7+Hs9p+a30KhdY6sNB1VXnedBZY="; + url = "https://github.com/flatpak/flatpak-builder/releases/download/${finalAttrs.version}/flatpak-builder-${finalAttrs.version}.tar.xz"; + hash = "sha256-3CcVk5S6qiy1I/Uvh0Ry/1DRYZgyMyZMoqIuhQdB7Ho="; }; patches = [ @@ -124,7 +121,9 @@ in stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; # Installed tests - postFixup = '' + postFixup = let + installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder"; + in '' for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh,test-builder-deprecated.sh}; do patchShebangs $file done diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 7b521856a3e8b..9aafdb4e02c16 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd fnm \ --bash <($out/bin/fnm completions --shell bash) \ --fish <($out/bin/fnm completions --shell fish) \ diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/development/tools/frece/default.nix index c8b6a3a85f9c5..c8bc63e3dcb72 100644 --- a/pkgs/development/tools/frece/default.nix +++ b/pkgs/development/tools/frece/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w="; }; - cargoSha256 = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU="; + cargoHash = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU="; meta = with lib; { description = "Maintain a database sorted by frecency (frequency + recency)"; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/YodaEmbedding/frece"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index b4b381c369d86..3ff029699e5fb 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages }: +{ lib, buildDotnetModule, fetchFromGitHub, fetchpatch, dotnetCorePackages }: buildDotnetModule rec { pname = "fsautocomplete"; @@ -11,6 +11,13 @@ buildDotnetModule rec { hash = "sha256-iiV/Tw3gOteARrOEbLjPA/jGawoxJVBZg6GvF9p9HHA="; }; + patches = [ + (fetchpatch { + url = "https://github.com/ionide/FsAutoComplete/pull/1311/commits/e258ba3db47daec9d5befcdc1ae79484c2804cf4.patch"; + hash = "sha256-bKTk5gszyVZObvq78emAtqE6bBg+1doseoxjUnrjOH4="; + }) + ]; + nugetDeps = ./deps.nix; postPatch = '' @@ -20,8 +27,8 @@ buildDotnetModule rec { --replace TargetFrameworks TargetFramework \ ''; - dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0_2xx ]; - dotnet-runtime = dotnetCorePackages.sdk_8_0_2xx; + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 ]; + dotnet-runtime = dotnetCorePackages.sdk_8_0; projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj"; executables = [ "fsautocomplete" ]; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 8dea1747aa97e..82fbac5603089 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -2,213 +2,213 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "altcover"; version = "8.3.838"; sha256 = "0l8b5rwpxxxqn6fj3irxx5lsl18wdm2nlg831lg9anyms91lfifn"; }) - (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.5"; sha256 = "12z5l6naa711g5a7lsyl3rqc59ybxfphnw74jaz99mc327pzfn0c"; }) - (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.5"; sha256 = "15zxj6h6v0a3cl9zc3ywj1q2l83j3f6sagp9vcbrfvlw332z2vy2"; }) - (fetchNuGet { pname = "CliWrap"; version = "3.4.4"; sha256 = "1g67sbhqxfl15ilazj64jc0z60ig1x03p2d4jwk6iw64smkp24x8"; }) - (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; }) - (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "7.0.1"; sha256 = "18xw7fn0nm8aqcah1n2dkx4m45pz464s4p8bpbvnhdbbri62467r"; }) - (fetchNuGet { pname = "Destructurama.FSharp"; version = "1.2.0"; sha256 = "0zbk88akz2k49zi5f62klz4h193zb4dfasjdcz4k4wr87chi06nv"; }) - (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) - (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.0.2"; sha256 = "0grzjd6h82f3whx8iax23v9dvq5c5qvqraadnrpkxsfc8p1z0ynh"; }) - (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; sha256 = "0wa0xwbwv1lzjmqwg1vq06vrpb9kkbv3xw5nq50savj0dzhqakzq"; }) - (fetchNuGet { pname = "Expecto"; version = "10.1.0"; sha256 = "127yy5i0p2lybhm5xcy2wa6j1rcahk61mb1nbym687b23pgizrq9"; }) - (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; sha256 = "06g6nbr5kdr7hyayh24ry6xfghxpcfkqc8kma5qa5lcvhmy56f7j"; }) - (fetchNuGet { pname = "fantomas"; version = "6.3.1"; sha256 = "0kkhdwcw0l7pa1hjil2hjpizjbp618ig32wgni5sfaqmxkc9iywq"; }) - (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) - (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; }) - (fetchNuGet { pname = "fsharp-analyzers"; version = "0.26.0"; sha256 = "0xgv5kvbwfdvcp6s8x7xagbbi4s3mqa4ixni6pazqvyflbgnah7b"; }) - (fetchNuGet { pname = "FSharp.Analyzers.Build"; version = "0.3.0"; sha256 = "1c9ijc9lvyw4lfnd3m9260c8lwnh6ca91zslr29dpn525z9zgdif"; }) - (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.26.0"; sha256 = "0kvqjm8qk8g8iv1f3jv5ac5jj9y1d4mwsia2zydj5lcdczg3g3p1"; }) - (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.300"; sha256 = "0qhs4zg0yxy3b82jvm2m41b9fd8ybfbf7bcdn7097sdly0nd9ywb"; }) - (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; sha256 = "02c8d8snd529rrcj6lsmab3wdq2sjh90j8sanx50ck9acfn9jd3v"; }) - (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; sha256 = "0ahvd3s5wfv610ks3b00ya5r71cqm34ap8ywx0pyrzhlsbk1ybqg"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "8.0.300"; sha256 = "158xxr9hnhz2ibyzzp2d249angvxfc58ifflm4g3hz8qx9zxaq04"; }) - (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; sha256 = "16l1h718h110yl2q83hzy1rpalyqlicdaxln7g0bf8kzq9b2v6rz"; }) - (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; sha256 = "0sx4jlxzmrdcmc937arc9v0r90qkpf2gd1m9ngkpg88qvqcx4xsa"; }) - (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; sha256 = "1rzf5m38fcpphfhcv359plk2sval16kj00gdfwzpm9gi8wjw8j8k"; }) - (fetchNuGet { pname = "FSharpLint.Core"; version = "0.21.2"; sha256 = "10wzcgrzmdpj00wb84yaclp5pgwk9h05cbrcwf99h81sjgkmczh0"; }) - (fetchNuGet { pname = "FSharpx.Async"; version = "1.14.1"; sha256 = "1m0f4pv8sdm7iy7zbrmywc3j20pb6akld9y7yd5xvw26kbz5ndkc"; }) - (fetchNuGet { pname = "FsToolkit.ErrorHandling"; version = "4.4.0"; sha256 = "0a5mii50a025ijmpvzh10zdqrgj7r87b75rswjmq6y03kk703iay"; }) - (fetchNuGet { pname = "FsToolkit.ErrorHandling.TaskResult"; version = "4.4.0"; sha256 = "1qgw4mivfsdai30ldan7lqj8hhq6gbbdq4qdl63hm88q60bh34rq"; }) - (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; sha256 = "119yll2zpc9m176i17lcan31zcvww47zsvw573vbwb0jbzy17mn1"; }) - (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.1"; sha256 = "155d1fmnxlq7p7wk4v74b8v8h36nq0i6bq1vhdjf8sbq7f95fj0f"; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.0"; sha256 = "1wjxxlqdrjjb0f3py8sbgsivqms8d22m7xk1zx68gfmyih671in7"; }) - (fetchNuGet { pname = "Grpc"; version = "2.46.6"; sha256 = "1zj2j7h97qdns14z3ilfgqx3kir9p5a05kwsvyz3hpnx2z6j3ysj"; }) - (fetchNuGet { pname = "Grpc.Core"; version = "2.46.6"; sha256 = "1lyy2l8xxjnfvrf9jxdffms70qqjlz41s0k3y53w637n5qif7hgz"; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.51.0"; sha256 = "1bz9dqkxwwjkdsh9lmqgc0ysdhysjs45xjcmffbs3hffnzd8jhrz"; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.51.0"; sha256 = "1l4qaa51i8pqjh6kz9w3zv9iqxxvk2gdd3yxg5w54904nl0jsanh"; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.51.0"; sha256 = "1b7iwf5qk4c449mi5lsnf6j99pwwrj79y8zkinzf5j2rslc97r0z"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "Iced"; version = "1.17.0"; sha256 = "1999xavgpy2h83rh4indiq5mx5l509swqdi1raxj3ab6zvk49zpb"; }) - (fetchNuGet { pname = "IcedTasks"; version = "0.11.5"; sha256 = "0l7wzns5dg5jq8ppzvi13cr7nh1kjc0qyj80npy8lr3x86hiz51q"; }) - (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) - (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.11.0"; sha256 = "1wsx7gbr4macmim5z1iz9clgq9xfmg423snb589bvaiyg5k6ha00"; }) - (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.6.0"; sha256 = "15wjmm91qdvhdpjjggqqsqgwlsi0wwsdzqarvdx9l1h2681hq9g0"; }) - (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.65.0"; sha256 = "0aka78yaj7h3apbr9ia7rdikr2hhyizl1xakks90h47nax00kscz"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.65.0"; sha256 = "0kjrn6r6nwd5m5wlb8jpyzaicjcw64dg7w7vqndrwv7nw0wd4di0"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.65.0"; sha256 = "15080y3f0zqvdzi6ks9v6jhih5xsrgi08ji5zym88qvmp81g1m8q"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.65.0"; sha256 = "1f2xys28vjx22wgjnlk2jy4zsy7hkjvw692r2pqmki6fb5a5pjql"; }) - (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; sha256 = "0lgh4yjnim9qbqkmkgpx5fi2lha1cgcdbddvbsiw9jzp18fndxly"; }) - (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) - (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.6.3"; sha256 = "0gj182wih2rr90c045a7x1cy04szv83zr21c725h70s7dcshdvn6"; }) - (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.5.3"; sha256 = "0km0zafgbm4qjg0azv40aanfn38fplkz057gqhyd76h4zgvwpxg4"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.4.0"; sha256 = "12d3jg8qpf4k5gknxv728270faiwzb0qb6m8cfjwsqy990v54z2c"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.4.0"; sha256 = "1lzswq96gi3si61n6i3ddla05gpn8myhn4kkfc0wx2bw7y6308y7"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis"; version = "4.5.0"; sha256 = "1v1lk33wvrqh0k1ymyilfs3ic7ag40qkldqszv1pvlf2cg5mcqfx"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; sha256 = "0skg5a8i4fq6cndxcjwciai808p0zpqz9kbvck94mcywfzassv1a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic"; version = "4.5.0"; sha256 = "0jx8c3fg7m0k98b1xhcvl212cz97x7g6dfni6mwwqlp1zvzacdsb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic.Workspaces"; version = "4.5.0"; sha256 = "1wiizv47fxzy22dg2vy746nyq6l10zhh3avw8jzznlyasm0qnj47"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; sha256 = "1wjwsrnn5frahqciwaxsgalv80fs6xhqy6kcqy7hcsh7jrfc1kjq"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; sha256 = "0h4mc6gx95l1mwcxhj7m7drsfgbhp0ssr6l8wr7k42y0nypgi4gm"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; sha256 = "1n64ya4fq6305xv8ybk7f22v0f39rylkqap7n9blhr1h98mp27z5"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; sha256 = "14swfz2myqv4zxznf5450b3485q629pk0zc483yszvq0956a4yq4"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; sha256 = "0wg6ilgm0vkhgh8jkvpna7kqiix47zpcgzdvh6c237bi8h0lz7mz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; sha256 = "0kl5ypidmzllyxb91gwy3z950dc416p1y8wikzbdbp0l7aaaxq2p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; sha256 = "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.1"; sha256 = "059c8i2vybprn63sw2jr7xma4yyl2syx6hzygfdpr0zd5jlgy9rz"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Bitbucket.Git"; version = "1.1.1"; sha256 = "1p7di7lihraqisd4yfslvhpwlb9zf2casssjhyad1a0hcqmgw7n9"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) - (fetchNuGet { pname = "Microsoft.SourceLink.GitLab"; version = "1.1.1"; sha256 = "0fm50cc05fmkz77xnl6qvawkx43asdklzxhz65jnbkjp633zvx41"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) - (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; sha256 = "04p4vd2v3mj1g315jj0fcb9ajwdr6clnbnl80mn6nyj3wmjb56nz"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0"; sha256 = "05mqbfgkif9qa5hg1sjmcvx69ifdhiqs2xjplqjrvrj9ybmd5i0c"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; sha256 = "1v9ipc75ipwjhhz4mkyjygw85i6ba5flcbhyspmf90vfi2nk7b79"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; sha256 = "0fgl99k6nm3n47vv9mx6y36pnljj2b5g641cs2zsw6l86n57qwv1"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; sha256 = "14p6rn68mqrch3ani17vwyl4ggjz680nxkw1nf65xmf1ljlkb4iq"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.0.0"; sha256 = "02s1g7nizf9dglfgff2fcncigbyplfbwhif7naj1wh7gx5dnig1l"; }) - (fetchNuGet { pname = "Paket"; version = "8.0.3"; sha256 = "12xm100rg82p5fvkn63mmjc8i38q8yvk5327snwzqijlfh3k60n0"; }) - (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) - (fetchNuGet { pname = "SemanticVersioning"; version = "2.0.2"; sha256 = "025l5akirkd9g7d5g5wydvkn1wabglcyvbfshkmly7j3r0k596vp"; }) - (fetchNuGet { pname = "Serilog"; version = "2.11.0"; sha256 = "1nvd3hm615xlcdmw1i7llkd3xvwvpv66c4y4s28npv47v3yci3lh"; }) - (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; sha256 = "1bwbbzd8rg1mjsig046ihs53gn8ywf5j9mjfy32axfziisqr1c2w"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Management"; version = "6.0.0"; sha256 = "0ra1g75ykapg6i5y0za721kpjd6xcq6dalijkdm6fsxxmz8iz4dr"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.1"; sha256 = "1bzkwqm1yhvm70yq2bx2s3mqfx2lr01sqsay8cl5n5xcbq07ynf6"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) - (fetchNuGet { pname = "telplin"; version = "0.9.6"; sha256 = "0wlg6nsy4icf7k0vm32m0466hz5bs97fhx2czfqr0alx14z8n64h"; }) - (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.2"; sha256 = "1877gr3f8wl1x3njhgss9psxm21xpqv6cpg625f2mvvak79fzrra"; }) + (fetchNuGet { pname = "altcover"; version = "8.3.838"; hash = "sha256-1kVHQ9LVW5UeDQM9akVtHAWqaek9xyGdsbj3fnkuC1E="; }) + (fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.5"; hash = "sha256-DFj37xGD1ZS+kuRwC6/ry6fCcB7Ua3pUeSEcpayh5Ys="; }) + (fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.5"; hash = "sha256-wm/xxRicbpcX2+k+pY0bciAqcJDcD/YTZUOBbaCR/Zc="; }) + (fetchNuGet { pname = "CliWrap"; version = "3.4.4"; hash = "sha256-qBNxZ9XE8Ggml6SJO0APLwLzAZPEyK9oLIG6juHSx7w="; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; hash = "sha256-pTyYP26uXXLe6ejCb/yVYpb23ad/Dkl2Ka8NWwQeiqk="; }) + (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "7.0.1"; hash = "sha256-+RgiTMxrNWj3ugtdookh/xZSSZ9N2AAVwwpVC6w7vKM="; }) + (fetchNuGet { pname = "Destructurama.FSharp"; version = "1.2.0"; hash = "sha256-2xoQITsoczLJZ01q5RpZf6QAyadTGFfiT2SKPxVCc30="; }) + (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; hash = "sha256-0kDBRvlMALkuE0G86ACEkZ4hNCeFwMmLPOvleMHJ6OA="; }) + (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.0.2"; hash = "sha256-0Hrww0XM6T5vtk2pjDcurODd0h6iq4g65MMJBE2TPz8="; }) + (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; hash = "sha256-+E+F4W9AbqVBwbbwPvaaM62btwF4h8dxlZ+GzRfvQHE="; }) + (fetchNuGet { pname = "Expecto"; version = "10.1.0"; hash = "sha256-Cecf3x1iHWSqXzasGsyEiuUgjeLCs14qXJ6KC2Lx/og="; }) + (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; hash = "sha256-8jhTfIWb0aJwUXUihqdjt8PnuvGZCOiVhye3WfKy5hk="; }) + (fetchNuGet { pname = "fantomas"; version = "6.3.1"; hash = "sha256-mPuY2OwVK6dLtI+L8SIK5i7545VQ0ChhUPdQwBlvcE4="; }) + (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; hash = "sha256-LUnFBYZ7LYhPcTRcXx3KfpnY+TRGIGdw8md6F8zkPf4="; }) + (fetchNuGet { pname = "FParsec"; version = "1.1.1"; hash = "sha256-BFTUFsdUDtPf3Y7YYsIHGnR3SykVeE6MAN3NRHv+Qwc="; }) + (fetchNuGet { pname = "fsharp-analyzers"; version = "0.26.0"; hash = "sha256-60Bl36LOb/zVNdH2SBSuQ5O41lP9dKTNZbs5vvYs+3U="; }) + (fetchNuGet { pname = "FSharp.Analyzers.Build"; version = "0.3.0"; hash = "sha256-Lrb30y+i2NuSyFT/kBQz0HKKGDAi1dGso4T7TROTMbE="; }) + (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.26.0"; hash = "sha256-4Y433meN0SKb/0JFzStpwScpC1Nly+HCjuihiVGVeE8="; }) + (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.300"; hash = "sha256-i/vULPC06ZPAsY2t45ZbHjWXViBV1C0FWsN3D94nGmI="; }) + (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; hash = "sha256-ezSZrGMqTQZKt0ojCRKUWuDGx1JVUyNZzkmUZjVqiAk="; }) + (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; hash = "sha256-Dy8f5tIU/uwv6Nyjq8iomIWTi/IArKEnCGY7XvRoGyo="; }) + (fetchNuGet { pname = "FSharp.Core"; version = "8.0.300"; hash = "sha256-BGDVf+oYfTgeqdS5iApzfT+rEhFN3P/9iuJDC1PuHZU="; }) + (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; hash = "sha256-P5stVsJ/IrfAO5Z21Vik2FN1c/AfDoQF9SAEiMKBgZo="; }) + (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; hash = "sha256-SnfSGd4YoXfns6mG9oS7E4OUwU4sqzMSq6zl+juVpGs="; }) + (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; hash = "sha256-E0nEJUfxpXo/d+0BIKcJVG0tJr2pjM2gg/cyh0Yt7uc="; }) + (fetchNuGet { pname = "FSharpLint.Core"; version = "0.21.2"; hash = "sha256-AH5W55M6IJiS4ywvVgBMk79bLmXKE7Q4APK2+vNjn4M="; }) + (fetchNuGet { pname = "FSharpx.Async"; version = "1.14.1"; hash = "sha256-bDZb/ppG8N1L88enRqcy6wIhB+O+5vWPj6c2jfYlDtQ="; }) + (fetchNuGet { pname = "FsToolkit.ErrorHandling"; version = "4.4.0"; hash = "sha256-XsUBzpwDeIOr5DqXsw7KR76M2wcB/n2rjEUABUqMtSg="; }) + (fetchNuGet { pname = "FsToolkit.ErrorHandling.TaskResult"; version = "4.4.0"; hash = "sha256-OJMBFzAYoQqHoQ0T3NZ6BkOIJKbHqkbBiKppt2Ml/OE="; }) + (fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.1"; hash = "sha256-DkhXkjt4aeRkgzvgZSLA1gyINlrkbDL5uQfTbqsLrZQ="; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.0"; hash = "sha256-x8ZwDIy+uodM/2H2U4VoSFe8o35LI3+HA0vK3DDtXfI="; }) + (fetchNuGet { pname = "Grpc"; version = "2.46.6"; hash = "sha256-UvshzRfdXji+35rPAlS5Kcc5On6OxvFJ0Lbhk+CRQv4="; }) + (fetchNuGet { pname = "Grpc.Core"; version = "2.46.6"; hash = "sha256-/8HjIi72DMNH8WMCHcinEmNwdHWudZlc3s7K3hEV3tM="; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.51.0"; hash = "sha256-P0OJ2rfOwaGXc5XJXoiW2sOmPWAPV5qgblNy3idu6a8="; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.51.0"; hash = "sha256-0CotAbUEJFJ4ed2P1p6Yu3cc0/6Dpz8NlPiiGIpSmNA="; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.51.0"; hash = "sha256-H+STGNVZyOK+jfMjn47MnN+UpHFW0xJrIoSRiYvj8aw="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "Iced"; version = "1.17.0"; hash = "sha256-6/5E5v5mqSG7yiE2zHUChZZeC47NRgLzQFD4+7bqKaU="; }) + (fetchNuGet { pname = "IcedTasks"; version = "0.11.5"; hash = "sha256-OJQfoUF9ZIr8tQBJjwGTM0B7Mhsh7n8vwrK8VrT9/FA="; }) + (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; hash = "sha256-ap3Uq6AwYjO7FbhAm/JjG9YUAv9vWYVggHQk+l9G5qc="; }) + (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.11.0"; hash = "sha256-AChoZnk+qr0SKsvqIcirrif8KEs/hl9qrExVktc7XfM="; }) + (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; hash = "sha256-yyg8Az7VG4rK/AsMC9cUZc67onl6wOGXoUqHm4Wi3xg="; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.6.0"; hash = "sha256-4CUMAzICBpp621nh3zTnIGrKH9YYvyflbXA3HFKtkpc="; }) + (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.65.0"; hash = "sha256-n+kJQFf2EAiSnlP1QH/0EIo8Y8tHxZTXVQMeqTw6aio="; }) + (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.65.0"; hash = "sha256-IDbSOOD2bJ6bxfvw8xoxnEkW1fdXokV5qaVxa7KxWU4="; }) + (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.65.0"; hash = "sha256-GNXwArp1Y4Sq/yVKBOLLuhcYoTQ76Wnibxt/4IYHCJQ="; }) + (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.65.0"; hash = "sha256-FMtbVFnOxFnxFVkkw7ec8Hj9iZdiUisfF6LLjYT2Xbg="; }) + (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; hash = "sha256-nvZmHQr3y8SjXru11dhjQUEqoiv9vlknXjjVaKUn8FE="; }) + (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; hash = "sha256-PtpD8S74UXyoA80YRDlrp8qR/I7Ws7+4m2EJZzH4WMw="; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; hash = "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI="; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; hash = "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) + (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; hash = "sha256-IFvXCMV2joahytylQ2BGSpZd2tdX0Rss++ZcClVT+r0="; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; hash = "sha256-JzPqbxFyotNhSr5tokVevdqB9+nJKx4YH2hPkC05GiY="; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.6.3"; hash = "sha256-xu4GNWtHgwOLOCyI/AfaXxPgWehHFQIYSDkLGLlAQT4="; }) + (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.5.3"; hash = "sha256-5PXL9/sEmtM8xO8U8Ce9Dg3rrFKA7K/Ak5jU9Zz6oE4="; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.4.0"; hash = "sha256-THxSNkjJY82lY6iahcH6PCoHjkDi7G7nK5O4i9GTo4k="; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; hash = "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.4.0"; hash = "sha256-xyMwjD98ic4Bc3MSC31F9r4CFG1tRGODiXrEZxLm+tM="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis"; version = "4.5.0"; hash = "sha256-3WFWy2PC0X3D/ho3OjEgTx0Wh3Y0+urDBBDnzceYNOw="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; hash = "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic"; version = "4.5.0"; hash = "sha256-Szem/v7hUsx5NdG6Zt7pJ30mgqCbwR4WShPU89xgqEs="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic.Workspaces"; version = "4.5.0"; hash = "sha256-h0iLQdXKU/u/RHyrAeEHgRrsrSHHb/GaEP53d8j+MfI="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; hash = "sha256-MauJBMP1gySvvAsuNB7m+KvcAWsexU9i/tOwavBDxi0="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.251802"; hash = "sha256-9ZH4rrfACzJP5oiarDW4cD2nczv1SNgZr4GW1J9hlUA="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.2.332302"; hash = "sha256-5R9xK0owZEhXsucqPKnPaTiwhXBnLo92L2AY7IjyxNg="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.0.2"; hash = "sha256-BHuiTEkA76/9QIR9MG8SBhdExgKFFGd//2RjX8V3XJM="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; hash = "sha256-aGp1qcL1hVmb+HqCWrao3YVXOpGyiDJFDz2Td0cDw2I="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; hash = "sha256-8xXb65hiKNlCeTCpuZ2yAEFB4FgXYre/BCQn8FajQGU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.1"; hash = "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; hash = "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.1"; hash = "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; hash = "sha256-vUwAWMxXiMW+JOiQE5fcJycOfJJzO87ESYAsEPsPqtY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; hash = "sha256-VRyyMGCMBh25vIIzbLapMAqY8UffqJRvkF/kcYcjZfM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; hash = "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; hash = "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; hash = "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; hash = "sha256-Kl8ZAWCMFZcYEfPDr/YG4zfQEuEzlOuhWI40Zl2S4Qo="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; hash = "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; hash = "sha256-vVIonl+4dlCQuxibOZoGR3o1DAhjAYpFW15dnkUpjMk="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.1"; hash = "sha256-Pyf/qCztg3ybe/5D070W1Huiaj9ZCq6Hsfkuv0VELBU="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Bitbucket.Git"; version = "1.1.1"; hash = "sha256-yR7+KmYQqNCUh1JrrZhwPy3KL9xUO0+ajlhlGOmJ7dw="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; hash = "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; hash = "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitLab"; version = "1.1.1"; hash = "sha256-gfT9xzBXzmVlMR/2T2fTapA+udrYUNvP+bO6AhgDpTo="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; hash = "sha256-Qa059jbu0zIXHknnCYkrqFFZwXR8mpuihaTC65PjyGg="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; hash = "sha256-RIt6iAlpq52zaLy1X1dDAQkIVp/SGhAz6x7mYhGmMdk="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; hash = "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; hash = "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; hash = "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64="; }) + (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; hash = "sha256-HrnRgFsOzfqAWw0fUxi/vkzZd8dMn5zueUeLQWA9qvs="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; hash = "sha256-35qyZOVDemtsBYjaZSkzuXGp0mIOSFnCeEHWsUXb5BI="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; hash = "sha256-ESyjt/R7y9dDvvz5Sftozk+e/3Otn38bOcLGGh69Ot0="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0"; hash = "sha256-DMTS6vJJ5p0lpld2oXGEzcVk+mZV6vBgUTi5OJ9buBY="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; hash = "sha256-6awzrYhug+Tq1R4uRl1Ry8SC+PPSz0o+hJLfWA67Me0="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; hash = "sha256-YXN8ijWIGq6/0CwQ88oSUlJ7zfCm17T3IXZUa2ZK9Dk="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; hash = "sha256-OJI1qaTB1V6Ms4HPbgEyX75HqOf7hGjVgCzjiozN5pI="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.0.0"; hash = "sha256-NLxoW+nvQB6kssdFyJej168XmWVOOPccfS25H+15QQs="; }) + (fetchNuGet { pname = "Paket"; version = "8.0.3"; hash = "sha256-wAIzB3RURvy51UeMMrdHGI2ImKx1GDu3K1eglwEItYs="; }) + (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; hash = "sha256-nllshKuHU+1jSBfcTz8BTJTGr1TeCFvxjM4OPyLGSgQ="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; }) + (fetchNuGet { pname = "SemanticVersioning"; version = "2.0.2"; hash = "sha256-d5tUJshDHk/rhNqt7Rl9S/Fg526el1faeanNHKcqtAg="; }) + (fetchNuGet { pname = "Serilog"; version = "2.11.0"; hash = "sha256-kI7I/NiH7GuR0MQTZsy+m+8+2qT0xMBrY7SXYCocbds="; }) + (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; hash = "sha256-z78CCkdeV+C4HnrH/HX0D61V3fLxVwOQdLy8So0diy0="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; hash = "sha256-n0LQOEsUg9M/T1aWryiG2690pyGBjHsk6TRZz2aCGyA="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; hash = "sha256-XLCQsY7xu67E8E7WJIvjHtk3iobREPCiljW8jNpfi68="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; hash = "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Management"; version = "6.0.0"; hash = "sha256-uZEf0a+9a2dqmzJS1Qxm3TR5ZxBHfeBLNO+q6ct5QWU="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; hash = "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; hash = "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; hash = "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; hash = "sha256-/EEdeNvp9FrLeVnmowzHk6nn0KmPf6L9Poc7l/R948A="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.1"; hash = "sha256-xll/AF6sF1soQ15prAPIVHSH69CiL4E9OHVDHyrm868="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; hash = "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; hash = "sha256-DOFoX+AKRmrkllykHheR8FfUXYx/Ph+I/HYuReQydXI="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; hash = "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; hash = "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; hash = "sha256-KTeMhCWcyYEwG7EkA0VkVvHwo0B2FBs5FpjW3BFNVUE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; hash = "sha256-yRivIiENFKMxbSh8SZ/fmKjshwBdFXzbKmZcfDZwKYc="; }) + (fetchNuGet { pname = "telplin"; version = "0.9.6"; hash = "sha256-kBiLPgmdKpCx+0x06E7Sq3xoDAFVjLrBPI5F4rU1j3I="; }) + (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.2"; hash = "sha256-Kufv0plq7ypcEeZdZja+PYja9U1aPyjt6IFy5EZ+56A="; }) ] diff --git a/pkgs/development/tools/gammaray/default.nix b/pkgs/development/tools/gammaray/default.nix index f2f24bcf2e6a9..a7c16674973ac 100644 --- a/pkgs/development/tools/gammaray/default.nix +++ b/pkgs/development/tools/gammaray/default.nix @@ -1,11 +1,20 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config +, qttools , wrapQtAppsHook , qtbase +, qtwayland +, qtsvg +, qt3d +, qtdeclarative +, qtconnectivity +, qtlocation +, qtscxml +, qtwebengine +, kdePackages , wayland , elfutils , libbfd @@ -13,49 +22,43 @@ stdenv.mkDerivation rec { pname = "gammaray"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - hash = "sha256-C8bej0q4p8F27hiJUye9G+sZbkAYaV8hW1GKWZyHAis="; + hash = "sha256-mJw9yckbkFVYZlcakai/hH/gAD0xOQir5JqGMNnB/dE="; }; - patches = [ - # Qt 6.7 temp fix, change to Qt needed to fully fix - # https://github.com/KDAB/GammaRay/pull/921 - (fetchpatch { - url = "https://github.com/KDAB/GammaRay/commit/d76e73696800bbeda1273e04c6ec42d081fd55e4.patch"; - hash = "sha256-BEbNVfP6TDX07RHD5wo1O6na0ku3E04Bzo2z2bUBvuc="; - }) - # Fix build on 6.7 for after QDeferredDeleteEvent export reversion - # https://github.com/KDAB/GammaRay/pull/957 - (fetchpatch { - url = "https://github.com/KDAB/GammaRay/commit/cf8f77f0d5e881368240a0647368757abdd6334e.patch"; - hash = "sha256-qbaB9eTJiogpszj6KY1PgfZtp5leUaQemmKGGhLxZb4="; - }) - # Fix Qt 6.6+ build - # https://github.com/KDAB/GammaRay/issues/827 - (fetchpatch { - url = "https://github.com/KDAB/GammaRay/commit/9978a0a7c4f4d122477f4f14755e55196365d8ce.patch"; - hash = "sha256-l7GsHNDcT2gAL5zCSLSuLD+Pkr72VnKtiC1WOvTlxqU="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config + qttools wrapQtAppsHook ]; buildInputs = [ qtbase + qtwayland + qtsvg + qt3d + qtdeclarative + qtconnectivity + qtlocation + qtscxml + qtwebengine + kdePackages.kcoreaddons wayland elfutils libbfd ]; + cmakeFlags = [ + # FIXME: build failed when enable BUILD_DOCS with qtwayland in buildInputs + "-DGAMMARAY_BUILD_DOCS=OFF" + ]; + meta = with lib; { description = "Software introspection tool for Qt applications developed by KDAB"; homepage = "https://github.com/KDAB/GammaRay"; diff --git a/pkgs/development/tools/gauge/plugins/dotnet/default.nix b/pkgs/development/tools/gauge/plugins/dotnet/default.nix index 7cf99f2e7b4f0..2b79004073eca 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/default.nix +++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix @@ -1,6 +1,7 @@ { lib , makeGaugePlugin , gauge-unwrapped +, stdenv }: makeGaugePlugin { @@ -11,6 +12,8 @@ makeGaugePlugin { releasePrefix = "gauge-dotnet-"; isCrossArch = true; + buildInputs = [ stdenv.cc.cc.lib ]; + meta = { description = "Gauge plugin that lets you write tests in C#"; homepage = "https://github.com/getgauge/gauge-dotnet/"; diff --git a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix index 116effa45b14f..81fbff823802d 100644 --- a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix @@ -2,6 +2,7 @@ , fetchzip , lib , writeScript +, autoPatchelfHook }: { pname @@ -33,6 +34,8 @@ stdenvNoCC.mkDerivation (finalAttrs: (lib.recursiveUpdate { stripRoot = false; }; + nativeBuildInputs = [ autoPatchelfHook ]; + installPhase = '' mkdir -p "$out/share/gauge-plugins/${pname}/${finalAttrs.version}" cp -r . "$out/share/gauge-plugins/${pname}/${finalAttrs.version}" diff --git a/pkgs/development/tools/gdm/deps.nix b/pkgs/development/tools/gdm/deps.nix deleted file mode 100644 index 62a3df65e3aae..0000000000000 --- a/pkgs/development/tools/gdm/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "0d047c8d5a8c3a1c89d9d78511f4ed7aef49ea0c"; - sha256 = "0ahyxvqy25zpyppmrb7vsad332gmq2cdi7hb0si6ni0cmrlqcfwr"; - }; - } -] diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index a6b899e9f2f98..f62ab97c1beec 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - version = "0.34.0"; + version = "0.35.0"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jrF55j3/WKpGl7sJzRmPyaNMbxPqAoXWiuQJsxfIYgc="; + sha256 = "sha256-3EJP+y+Egz0kj5e+1FRHPGWfneB/tCCVggmgmylMyDE="; }; - cargoHash = "sha256-4on4aBkRI9PiPgNcxVktTDX28qRy3hvV9+glNB6hT1k="; + cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/gen-license/default.nix b/pkgs/development/tools/gen-license/default.nix index fda5322d4cca3..d875574ab04ae 100644 --- a/pkgs/development/tools/gen-license/default.nix +++ b/pkgs/development/tools/gen-license/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; + hash = "sha256-YZcycLQ436cjr2YTT7TEyMdeLTOl9oEfa5x3lgnnYyo="; }; cargoHash = "sha256-2PT20eoXxBPhGsmHlEEGE2ZDyhyrD7tFdwnn3khjKNo="; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index aefcaec12e17a..2cd8c9a0fc10a 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-+Kh+Pn0oEq/eDXE+vsYrSOqhSoeQoIueb6mVpT2bljc="; + sha256 = "sha256-18j9eBqFz2D3eK1uQPQgAUilJZmFbyS+0DqOjno9LTE="; }; - vendorHash = "sha256-ccqhuUL99dtIeiEM4hRdi0479I0cyf8pxSZz0G6Vm+w="; + vendorHash = "sha256-RfIkiASUEK1TBSBx/rx9UWVE8NuZssYmoTKggkj/kQE="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index af4b52a9fad0c..667cafdf67a57 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "git-ps-rs"; - version = "7.2.0"; + version = "7.3.1"; src = fetchFromGitHub { owner = "uptech"; repo = "git-ps-rs"; rev = version; - hash = "sha256-OkQLuTZ4CFxA8Ezpo7ChVDR3BzLzlF/EOkZjTIbjJl4="; + hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac="; }; - cargoHash = "sha256-9SmUGSHPhByBkSyuyNSBCsYsWxF7e13i00Jbf4COOj4="; + cargoHash = "sha256-GS/RRPzULUla4XY4tO+eM2NAy2nG0qDxqcSq292ivgU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index 6960c6dada55b..e2480451e98d1 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -1,34 +1,19 @@ -{ buildGoModule, fetchFromGitHub, fetchpatch, lib, testers, github-release }: +{ buildGoModule, fetchFromGitHub, lib, testers, github-release }: buildGoModule rec { pname = "github-release"; - version = "0.10.0"; + version = "0.10.1-unstable-2024-06-25"; src = fetchFromGitHub { owner = "github-release"; repo = "github-release"; - rev = "v${version}"; - hash = "sha256-J5Y0Kvon7DstTueCsoYvw6x4cOH/C1IaVArE0bXtZts="; + rev = "d250e89a7bf00d54e823b169c3a4722a55ac67b0"; + hash = "sha256-QDImy9VNJ3hfGVCpMoJ72Za3CiM3SVNH1D9RFHVM+4I="; }; vendorHash = null; - patches = [ - # Update version info - (fetchpatch { - url = "https://github.com/github-release/github-release/commit/ee13bb17b74135bfe646d9be1807a6bc577ba7c6.patch"; - hash = "sha256-9ZcHwai0HOgapDcpvn3xssrVP9cuNAz9rTgrR4Jfdfg="; - }) - - # Add Go Modules support. - # See https://github.com/Homebrew/homebrew-core/pull/162414. - (fetchpatch { - url = "https://github.com/github-release/github-release/pull/129/commits/074f4e8e1688642f50a7a3cc92b5777c7b484139.patch"; - hash = "sha256-OBFbOvNhqcNiuSCP0AfClntj7y5habn+r2eBkmClsgI="; - }) - ]; - - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" ]; passthru.tests.version = testers.testVersion { package = github-release; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 14b24d91dac53..3b754db80fd89 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/SRI-CSL/gllvm"; description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 94186dc643c6c..b35cc4998f67c 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,10 +1,6 @@ { lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }: let - mavenJdk8 = maven.override { - jdk = jdk8; - }; - defineMvnWrapper = '' mvn() { @@ -16,7 +12,7 @@ let } ''; in -mavenJdk8.buildMavenPackage rec { +maven.buildMavenPackage rec { pname = "global-platform-pro"; version = "20.01.23"; GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty @@ -28,6 +24,7 @@ mavenJdk8.buildMavenPackage rec { sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; }; + mvnJdk = jdk8; mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; nativeBuildInputs = [ jdk8 makeWrapper ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fd84492da6aee..809a674a36a94 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { repo = "glslViewer"; fetchSubmodules = true; rev = version; - sha256 = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; + hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; }; nativeBuildInputs = [cmake ninja pkg-config]; buildInputs = diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index be6719c3512ca..1a5f173317d11 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromSavannah, python3 }: +{ lib, stdenv, fetchFromSavannah, python3, perl }: stdenv.mkDerivation rec { pname = "gnulib"; @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs gnulib-tool.py + substituteInPlace build-aux/{prefix-gnulib-mk,useless-if-before-free,update-copyright,gitlog-to-changelog,announce-gen} \ + --replace-fail 'exec perl' 'exec ${lib.getExe perl}' ''; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 3b0bd53e4867d..7877313b9d50c 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "Small utility which generates Go code from any file, useful for embedding binary data in a Go program"; mainProgram = "go-bindata"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.cc0; }; } diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index e3660c66048e0..a849eed9d2985 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.19.2"; + version = "0.20.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YxUw30gjpBO/dXSTcNa4F91u3F9pg/IQuVWjKDV5mLs="; + sha256 = "sha256-tuczn/tfCNnli3J6RlGV1ITfLV60Il8UG1lplX/zLmM="; }; vendorHash = null; diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index c3a47019486ab..eb370a22914a2 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "go-minimock"; - version = "3.3.13"; + version = "3.3.14"; src = fetchFromGitHub { owner = "gojuno"; repo = "minimock"; rev = "v${version}"; - hash = "sha256-YLGZJMBe5wKI9RccJ1ps48A3ZiPWMrzjZH4Fpy8K9yM="; + hash = "sha256-J4clMn65l7L+qSHbJBMDDRoEfgGHKllRu8nvTGlbgaw="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - vendorHash = "sha256-O1Bp+zuSq3/UULpej4rXxeHcDiNAhECqj9Yh9aGeA0E="; + vendorHash = "sha256-60mOX0N8q9Q4Cb1G3hxQgykkDgvrVLYaZElptsW1PPI="; doCheck = true; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index b43c635145cc6..551934001bda8 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.43.2"; + version = "2.44.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-qOiWWyhNNxjaIuFTzhJwog9wPNWa82/JYc0ST6s0OkA="; + sha256 = "sha256-FaQzGkMUgf3QRM3gjlvUEDmnb1mZ8Yd85E4ONB5yCm4="; }; preCheck = '' diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index c744f2ee43186..96ca709a4e438 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch , installShellFiles , testers , go-task @@ -8,16 +9,26 @@ buildGoModule rec { pname = "go-task"; - version = "3.37.2"; + version = "3.38.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-yVQR7D3zpReBlYyuZNMBVs3lgWBR54doMUjRMhfgUJw="; + hash = "sha256-mz/07DONaO3kCxOXEnvWglY0b9JXxCXjTrVIEbsbl98="; }; - vendorHash = "sha256-iugFWBIKt/Rm5ccQnIFR75P1AVZbbFhWN97dvr8DoBs="; + vendorHash = "sha256-2M/FrXip0Tz0wguCd81qbBDW3XIJlAWwVzD+hIFm6sw="; + + patches = [ + # fix version resolution when passed in though ldflags + # remove on next release + (fetchpatch { + name = "fix-ldflags-version.patch"; + url = "https://github.com/go-task/task/commit/9ee4f21d62382714ac829df6f9bbf1637406eb5b.patch?full_index=1"; + hash = "sha256-wu5//aZ/vzuObb03AjUUlVFjPr175mn1vVAZgqSGIZ0="; + }) + ]; doCheck = false; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 646c48f6b4815..4f294564772f5 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.16.2"; + version = "3.18.2"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-HDGopedI0kI6S7/EqHHyBUJKx25M+0tN/kIBC6Z4NYU="; + hash = "sha256-TBGCykHW++o2t4NFbWS3IK+UpXbyGgaJZ/6aoCrqi2Q="; }; - vendorHash = "sha256-H1hGZsDitamDDO0BNYjkLR4eIL0NFmpQHvMblNVLBho="; + vendorHash = "sha256-AwpPuj/nX8MD//JL/oF+RGGQi1fdUo28KII2+y5Ptso="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/godot/3/mono/default.nix b/pkgs/development/tools/godot/3/mono/default.nix index 199965df0cfde..eafe05691c1e0 100644 --- a/pkgs/development/tools/godot/3/mono/default.nix +++ b/pkgs/development/tools/godot/3/mono/default.nix @@ -1,13 +1,17 @@ { godot3 , callPackage , mkNugetDeps -, mkNugetSource , mono , dotnet-sdk -, writeText +, scons +, python311Packages }: -godot3.overrideAttrs (self: base: { +(godot3.override { + scons = scons.override { + python3Packages = python311Packages; + }; +}).overrideAttrs (self: base: { pname = "godot3-mono"; godotBuildDescription = "mono build"; @@ -16,31 +20,15 @@ godot3.overrideAttrs (self: base: { glue = callPackage ./glue.nix {}; - nugetDeps = mkNugetDeps { name = "deps"; nugetDeps = import ./deps.nix; }; - - nugetSource = - mkNugetSource { - name = "${self.pname}-nuget-source"; - description = "Nuget source with dependencies for ${self.pname}"; - deps = [ self.nugetDeps ]; - }; - - nugetConfig = writeText "NuGet.Config" '' - <?xml version="1.0" encoding="utf-8"?> - <configuration> - <packageSources> - <add key="${self.pname}-deps" value="${self.nugetSource}/lib" /> - </packageSources> - </configuration> - ''; + buildInputs = base.buildInputs ++ [ + (mkNugetDeps { name = "deps"; nugetDeps = import ./deps.nix; }) + ]; sconsFlags = base.sconsFlags ++ [ "module_mono_enabled=true" "mono_prefix=${mono}" ]; - shouldConfigureNuget = true; - postConfigure = '' echo "Setting up buildhome." mkdir buildhome @@ -48,12 +36,6 @@ godot3.overrideAttrs (self: base: { echo "Overlaying godot glue." cp -R --no-preserve=mode "$glue"/. . - - if [ -n "$shouldConfigureNuget" ]; then - echo "Configuring NuGet." - mkdir -p ~/.nuget/NuGet - ln -s "$nugetConfig" ~/.nuget/NuGet/NuGet.Config - fi ''; installedGodotShortcutFileName = "org.godotengine.GodotMono3.desktop"; diff --git a/pkgs/development/tools/godot/3/mono/glue.nix b/pkgs/development/tools/godot/3/mono/glue.nix index bbd046b4af0ff..09659d0ab48d6 100644 --- a/pkgs/development/tools/godot/3/mono/glue.nix +++ b/pkgs/development/tools/godot/3/mono/glue.nix @@ -1,6 +1,10 @@ -{ godot3, mono }: +{ godot3, mono, scons, python311Packages }: -godot3.overrideAttrs (self: base: { +(godot3.override { + scons = scons.override { + python3Packages = python311Packages; + }; +}).overrideAttrs (self: base: { pname = "godot3-mono-glue"; godotBuildDescription = "mono glue"; godotBuildPlatform = "server"; diff --git a/pkgs/development/tools/godot/3/mono/make-deps.nix b/pkgs/development/tools/godot/3/mono/make-deps.nix index e47a5a68d64ba..553b125dc6356 100644 --- a/pkgs/development/tools/godot/3/mono/make-deps.nix +++ b/pkgs/development/tools/godot/3/mono/make-deps.nix @@ -9,7 +9,7 @@ godot3-mono.overrideAttrs (self: base: { nugetSource = null; nugetConfig = null; - shouldConfigureNuget = false; + keepNugetConfig = true; outputs = [ "out" ]; buildPhase = " "; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 111cf9e0a187b..9c183ec79fffd 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -19,7 +19,7 @@ , alsa-lib , libpulseaudio , dbus -, speechd +, speechd-minimal , fontconfig , udev , withDebug ? false @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ++ lib.optional withPulseaudio libpulseaudio ++ lib.optional withDbus dbus ++ lib.optional withDbus dbus.lib - ++ lib.optional withSpeechd speechd + ++ lib.optional withSpeechd speechd-minimal ++ lib.optional withFontconfig fontconfig ++ lib.optional withFontconfig fontconfig.lib ++ lib.optional withUdev udev; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 2d256bbf72800..c66137a82899c 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gomodifytags"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "fatih"; repo = "gomodifytags"; rev = "v${version}"; - sha256 = "1yhkn9mdvsn9i5v03c5smz32zlhkylnxhkcbjb7llafxzbhzgfm6"; + sha256 = "sha256-XVjSRW7FzXbGmGT+xH4tNg9PVXvgmhQXTIrYYZ346/M="; }; - vendorHash = "sha256-8efqJfu+gtoFbhdlDZfb8NsXV9hBDI2pvAQNH18VVhU="; + vendorHash = "sha256-0eWrkOcaow+W2Daaw2rzugfS+jqhN6RE2iCdpui9aQg="; meta = { description = "Go tool to modify struct field tags"; diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index b5196f01e5a4a..cbecd3d59816b 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-FrKh7pOGhsix2Iq/GeuD39DWI87p3m/G0JmAIU+BbT8="; + sha256 = "sha256-fGN1rCS0glvmu+YZAOi1ixo+iUShNnqDYyEPntLQhXA="; }; dontUnpack = true; diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index f49859dd0db29..9342cf8a41ab3 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-07-07"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "3b48cf0e01640b30e676c2d0ffe23b85992be961"; - hash = "sha256-QOTTBc0pxVU2wf1BJt2GiTs28AuMlrjJ50J47EmQt+U="; + rev = "dc66afd55b77cd4e555203ff2c0d3e4d219a1410"; + hash = "sha256-necbttrRRVcbe4JOFBFNvAl2CPOXe8bC7qPLb8qXJSE="; }; - vendorHash = "sha256-O1FxOtRcg4zM2X1YcVFBsy1OsRMZXmAT0ZmGWmCn81g="; + vendorHash = "sha256-LJ8eNjOufTvLj1939nYkQOi84ZlT8zSGnTztcEKigfY="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/development/tools/gotest/default.nix index 172d2eb12edfe..2f54241d651d3 100644 --- a/pkgs/development/tools/gotest/default.nix +++ b/pkgs/development/tools/gotest/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { mainProgram = "gotest"; homepage = "https://github.com/rakyll/gotest"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/development/tools/gotraceui/default.nix index 30236dd5e2254..3f162f2462881 100644 --- a/pkgs/development/tools/gotraceui/default.nix +++ b/pkgs/development/tools/gotraceui/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, pkg-config, buildGoModule, + lib, fetchFromGitHub, pkg-config, buildGoModule, libGL, libX11, libXcursor, libXfixes, libxkbcommon, vulkan-headers, wayland, }: diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 5da71c7bc1c9b..f1bd3376e160d 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3. "; + description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3."; mainProgram = "gptcommit"; homepage = "https://github.com/zurawiki/gptcommit"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index 2dbd3fdf70876..ae8359101b2b9 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.23.2"; + version = "0.24.0"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-a+/X2q9Rii/8odXGICNOB7uWXd6vfqquP+wGvT/tRUo="; + sha256 = "sha256-tKEHqo7drOwHIRCgKEXbELi0u9uRpXSwB9R1fPhv/PE="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 05b49c7a03ff6..241e1ef95faa6 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -7,10 +7,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; crateName = "graphql_client_cli"; - sha256 = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; + hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; }; - cargoSha256 = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; + cargoHash = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 39621abf85ebe..040bad3269b9e 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-CnnJRgEGarwIaE2LkphN3gogzIhwQ5hAaUZFpLR/HxU="; + sha256 = "sha256-vdKGHcJazT6aVPMdUpvaheGPb50DNhj+DyzXhaJE63I="; }; - vendorHash = "sha256-aNOWu+TXbXn3jZ29BwU+x+vWMtL76NZoPElFuUwcHiI="; + vendorHash = "sha256-3x85PA6QAChHkjAohHWjFwrDGjacKRFzg/cJfoDqP3A="; ldflags = [ "-X=main.version=${version}" diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index b5ea07dde147a..a2d73ae7c8165 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: +{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix deleted file mode 100644 index 730d44272b325..0000000000000 --- a/pkgs/development/tools/hclfmt/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "hclfmt"; - version = "2.21.0"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "hcl"; - rev = "v${version}"; - hash = "sha256-izbctn5OqaDunQLovgCGTgqMzC9i227zXlXUNCEExvA="; - }; - - vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY="; - - # The code repository includes other tools which are not useful. Only build - # hclfmt. - subPackages = [ "cmd/hclfmt" ]; - - meta = with lib; { - description = "Code formatter for the Hashicorp Configuration Language (HCL) format"; - homepage = "https://github.com/hashicorp/hcl/tree/main/cmd/hclfmt"; - license = licenses.mpl20; - mainProgram = "hclfmt"; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2cf429e6a09dd..66dfe5e70e83a 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.44.2"; + version = "1.46.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ZslnJr5VJ6eHjBm1azaANGj9hHXKo+sRJXmW4xjRMhg="; + hash = "sha256-xW0M4ppbW6yD5+JpJZnDVf2mPiBzNFotP1IPTbnJoC4="; }; - vendorHash = "sha256-pDBuuHuG2Xk1R3BP1Ds2uY5I7brXWg1ULKQgmuuQVP4="; + vendorHash = "sha256-XocfpUmq/w/gqhCaT4Y33uQaggx3Bm16QuG/bGdxmg4="; ldflags = [ "-s" diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 43be538a612ef..7ced9fdda509c 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "8.11.5"; + version = "9.0.0"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/8.11.5/df5cd30/heroku-v8.11.5-df5cd30-linux-x64.tar.xz"; - hash = "sha256-in6VuJmoItXGL85XqN1oItGPkUmDb4n+LzxE5q4ycYc="; + url = "https://cli-assets.heroku.com/versions/9.0.0/4da724b/heroku-v9.0.0-4da724b-linux-x64.tar.xz"; + hash = "sha256-wkwQ2IAsYqKxeNBZ3ASHipLUa7wU4Z53Dx6BnNKE3H8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix index 39710ad74acdb..4ecea68c18ec4 100644 --- a/pkgs/development/tools/hors/default.nix +++ b/pkgs/development/tools/hors/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0"; }; - cargoSha256 = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; + cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 342cc4009edf4..11d9cf11b1525 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -121,6 +121,6 @@ buildPythonApplication rec { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; license = [ licenses.lgpl21Plus ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix index 86630d33cea36..b661adaac136b 100644 --- a/pkgs/development/tools/hover/default.nix +++ b/pkgs/development/tools/hover/default.nix @@ -6,10 +6,9 @@ , pkg-config , fetchFromGitHub , roboto -, writeScript , xorg , libglvnd -, addOpenGLRunpath +, addDriverRunpath , makeWrapper , gcc , go @@ -55,7 +54,7 @@ let sha256 = "sha256-ch59Wx4g72u7x99807ppURI4I+5aJ/W8Zr35q8X68v4="; }; - nativeBuildInputs = [ addOpenGLRunpath makeWrapper ]; + nativeBuildInputs = [ addDriverRunpath makeWrapper ]; buildInputs = libs; @@ -79,7 +78,7 @@ let ''; postFixup = '' - addOpenGLRunpath $out/bin/hover + addDriverRunpath $out/bin/hover ''; }; diff --git a/pkgs/development/tools/htmlhint/default.nix b/pkgs/development/tools/htmlhint/default.nix index 162bb82b28cfc..6d70819515d14 100644 --- a/pkgs/development/tools/htmlhint/default.nix +++ b/pkgs/development/tools/htmlhint/default.nix @@ -22,6 +22,6 @@ buildNpmPackage rec { homepage = "https://github.com/htmlhint/HTMLHint"; license = lib.licenses.mit; mainProgram = "htmlhint"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 6a5015c600fc2..7e55740d03ba8 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0="; }; - cargoSha256 = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; + cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index b04bb86f4443f..7ddd12299b817 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -32,6 +32,9 @@ buildDotnetModule rec { projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj"; nugetDeps = ./deps.nix; + # see: https://github.com/tunnelvisionlabs/ReferenceAssemblyAnnotator/issues/94 + linkNugetPackages = true; + meta = with lib; { description = "Tool for decompiling .NET assemblies and generating portable PDBs"; mainProgram = "ilspycmd"; diff --git a/pkgs/development/tools/img/default.nix b/pkgs/development/tools/img/default.nix index 0dab6b28dc741..f7c751cf0ea3f 100644 --- a/pkgs/development/tools/img/default.nix +++ b/pkgs/development/tools/img/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder. "; + description = "Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder."; mainProgram = "img"; license = licenses.mit; homepage = "https://github.com/genuinetools/img"; diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 4e8351cb4ddfa..9657129fd0cb3 100644 --- a/pkgs/development/tools/inferno/default.nix +++ b/pkgs/development/tools/inferno/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.18"; + version = "0.11.20"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-JP0n1sepH9kFOdrKTmt7Q79pe4GQInYKQH3xi2/G59s="; + hash = "sha256-+A27B50hRAQvk0QrcCP0QQe6zJkVUIX7qggL8kjJmQY="; fetchSubmodules = true; }; - cargoHash = "sha256-YCa4WL2sgdITKfdfH3PGdiRHbSkE6JSJRHipaN00GwA="; + cargoHash = "sha256-XmxB18IQh2Bvbez6BowoV+P0qghmOcHpC0ZH4PgsIZo="; # skip flaky tests checkFlags = [ diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index be072c60d5cd8..0c548eb22060f 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.22.6"; + version = "0.26.1"; # the platform-specific, statically linked binary src = @@ -76,7 +76,7 @@ stdenv.mkDerivation { changelog = "https://github.com/infisical/infisical/releases/tag/infisical-cli%2Fv${version}"; license = licenses.mit; mainProgram = "infisical"; - maintainers = teams.infisical.members; + maintainers = teams.infisical.members ++ (with maintainers; [ hausken ]); platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 3906ce44cb599..d167f6c7bfb0c 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-wCOlCz8gh9icdiatzQY8Wm5Bf6JQoAZzKuSqo/QmOFY=" -, "x86_64-darwin": "sha256-v9DKsFQhf4wRw60xAEo8bXPN0/0r7YWhMSHoijuGzwI=" -, "aarch64-linux": "sha256-hoCBuR14nY8s+hQ+1bdhox0MhR0m60dH7JLCOlKmFvY=" -, "aarch64-darwin": "sha256-QGgVsQQLOKspk3NBiVIjTO6J+p2+H0+zAVYu/Pl8sMI=" +, "x86_64-linux": "sha256-53Nk24THJ16elOTuPkXohxvLeSn1cXyI8PIogpg7b2g=" +, "x86_64-darwin": "sha256-iO/WPfLSmYQJRuuPSfXbrb1p75czP4FQkc3ryQ/PWF4=" +, "aarch64-linux": "sha256-7FCxF6M9J6NYTeXw98uu3GjWsXsTZ+eQdKgbutGKDtI=" +, "aarch64-darwin": "sha256-lV2jye63ZWlMIa41+xbfe39kBHKwnXtNsBlM+WZvWhQ=" } diff --git a/pkgs/development/tools/infisical/update.sh b/pkgs/development/tools/infisical/update.sh index 5810d2ee48b40..d0ad2342f415d 100755 --- a/pkgs/development/tools/infisical/update.sh +++ b/pkgs/development/tools/infisical/update.sh @@ -6,7 +6,7 @@ set -euo pipefail RELEASE_NAME=$(curl -s https://api.github.com/repos/infisical/infisical/releases \ | jq -r 'sort_by(.created_at) | reverse | (map - (select ((.prerelease == false) and (.draft == false))) | + (select ((.prerelease == false) and (.draft == false) and (.name | contains("infisical-cli")))) | first ) | .name') VERSION=$(echo "$RELEASE_NAME" | sed -E 's/^infisical-cli\/v//') diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index c9e6f1221efa0..8304303d301fa 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-Lk8lss9ZwyN7fuWwHm7e7HvYNIUSNelswoYhZ+Dr6iw="; + hash = "sha256-VD10BO7bxTmD1A1AZsiEiYBsVhAKlXxdHNMmXqpvpKM="; }; - cargoHash = "sha256-0YPzPRBqO9otX9kSxufeW/M0TggKAoSTsChbOhMjv74="; + cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 94b771dc53cb0..723937f8f5356 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -23,6 +23,7 @@ maven.buildMavenPackage rec { }; mvnFetchExtraArgs.dontConfigure = true; + mvnJdk = jdk_headless; mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w="; nativeBuildInputs = [ jdk_headless makeWrapper ]; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index c7207a686ca7a..2de6e6618d292 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk }: stdenv.mkDerivation rec { version = "2.1.8"; diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 9f6050001ccd8..0392ca77724d8 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -1,26 +1,31 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (4.2.11.3) - i18n (~> 0.7) + CFPropertyList (3.0.7) + base64 + nkf + rexml + activesupport (5.2.8.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - claide (1.0.3) - cocoapods (1.9.3) - activesupport (>= 4.0.2, < 5) + base64 (0.2.0) + claide (1.1.0) + cocoapods (1.10.2) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.3) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -30,69 +35,78 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.3) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.2) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) + public_suffix typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.3.3) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.13.1) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.17.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jazzy (0.13.5) + jazzy (0.15.1) cocoapods (~> 1.5) mustache (~> 1.1) - open4 + open4 (~> 1.3) redcarpet (~> 3.4) - rouge (>= 2.0.6, < 4.0) + rexml (>= 3.2.7, < 4.0) + rouge (>= 2.0.6, < 5.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.3.1) + json (2.7.2) liferaft (0.0.6) - minitest (5.14.1) + mini_portile2 (2.8.7) + minitest (5.24.1) molinillo (0.6.6) mustache (1.1.1) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) + nkf (0.2.0) open4 (1.3.4) - redcarpet (3.5.0) - rouge (3.21.0) + public_suffix (6.0.0) + redcarpet (3.6.0) + rexml (3.3.2) + strscan + rouge (4.3.0) ruby-macho (1.4.0) sassc (2.4.0) ffi (~> 1.9) - sqlite3 (1.4.2) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) + strscan (3.1.0) thread_safe (0.3.6) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.11) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.17.1) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -106,4 +120,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 2.1.4 + 2.5.15 diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index 6e2b873d4fd3c..1514943d1eb74 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -1,14 +1,25 @@ { activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; + sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.8.1"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + type = "gem"; + }; + version = "2.8.7"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z94dnx0rljsfa3k24i1nc0vf1nfk3bbk89nqc6n1ax25h4fs5sw"; + sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; type = "gem"; }; - version = "1.27.3"; + version = "1.27.5"; }; atomos = { groups = ["default"]; @@ -31,67 +42,78 @@ }; version = "0.1.3"; }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; CFPropertyList = { + dependencies = ["base64" "nkf" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.7"; }; claide = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; cocoapods = { - dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60"; + sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.2"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; + dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13"; + sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; + sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.3"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -103,22 +125,14 @@ version = "1.0.0"; }; cocoapods-search = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; - type = "gem"; - }; - version = "1.0.0"; - }; - cocoapods-stats = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.1.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -126,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; + sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; cocoapods-try = { groups = ["default"]; @@ -154,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.1.6"; + version = "1.3.3"; }; escape = { source = { @@ -173,20 +187,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.12.0"; + version = "0.16.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.13.1"; + version = "1.17.0"; }; fourflusher = { groups = ["default"]; @@ -232,31 +246,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "0.9.5"; + version = "1.14.5"; }; jazzy = { - dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sassc" "sqlite3" "xcinvoke"]; + dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rexml" "rouge" "sassc" "sqlite3" "xcinvoke"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysx3zq069mi1w69z0dqck9ss9iv18w8a2f6j663vqq6kn1b69dm"; + sha256 = "04gm9p7qlac46ml7fz5gd0b6f43hl3ib4w9vvxnq9k9fg9qqs88v"; type = "gem"; }; - version = "0.13.5"; + version = "0.15.1"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.3.1"; + version = "2.7.2"; }; liferaft = { source = { @@ -266,15 +280,25 @@ }; version = "0.0.6"; }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + type = "gem"; + }; + version = "2.8.7"; + }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; type = "gem"; }; - version = "5.14.1"; + version = "5.24.1"; }; molinillo = { groups = ["default"]; @@ -322,6 +346,16 @@ }; version = "0.11.0"; }; + nkf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; + type = "gem"; + }; + version = "0.2.0"; + }; open4 = { source = { remotes = ["https://rubygems.org"]; @@ -330,25 +364,46 @@ }; version = "1.3.4"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; + type = "gem"; + }; + version = "6.0.0"; + }; redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; + }; + rexml = { + dependencies = ["strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; + type = "gem"; + }; + version = "3.3.2"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "3.21.0"; + version = "4.3.0"; }; ruby-macho = { groups = ["default"]; @@ -372,14 +427,25 @@ version = "2.4.0"; }; sqlite3 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; - version = "1.4.2"; + version = "1.7.3"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; }; thread_safe = { source = { @@ -395,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -406,10 +472,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "1dk1cfnhgl14l580b650qyp8m5xpqb3zg0wb251h5jkm46hzc0b5"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; xcinvoke = { dependencies = ["liferaft"]; @@ -426,9 +492,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mv5rsbgwq4vzri31w2f1474arrsr5j69rdhklrci6jnjps8dmx9"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.17.1"; + version = "1.19.0"; }; } diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index e76caa4c58d8b..a344e31c320b9 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.116.0"; + version = "0.117.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-EyyTokVvhIMWOq4dLCi2wynoX++5DoJP20irPdfD58A="; + sha256 = "sha256-LQ9xXTutKhAnAt51mglP/zc7k1v2X/QLwEY31M8SmzM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jf/default.nix b/pkgs/development/tools/jf/default.nix index 71d0d806337ee..8184883218f22 100644 --- a/pkgs/development/tools/jf/default.nix +++ b/pkgs/development/tools/jf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "jf"; diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index f9ba57b10e8bd..f5c3bf79842c0 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpexs"; - version = "18.4.1"; + version = "20.1.0"; src = fetchzip { url = "https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${version}/ffdec_${version}.zip"; - sha256 = "sha256-aaEL3xJZkFw78zo3IyauWJM9kOo0rJTUSKmWsv9xQZ8="; + hash = "sha256-ytGtylhyNSdKfuPclZRJasOb/cskW65hMd4NM/q+/Ko="; stripRoot = false; }; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 82d25feaa4fb2..8bb3b03a6fcc4 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.12"; + version = "7.1.13"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-k8BHmZe7cXUJV6OJlcFdabFiZwg4aEGnpyv5xeM3pH4="; + hash = "sha256-JJV/r64TQecj2Sa/sjxaddiVFCGmtjEn+wfobUbN1OU="; }; - cargoHash = "sha256-G/t9R9WObZNj5AsF0rjNuTf10snIhJE/LFUvXk3KoBQ="; + cargoHash = "sha256-w3MF4FcBCq5gQnhVVlcXOeGH4r2cA6kWwIzGVeLY5zg="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/json2tsv/default.nix b/pkgs/development/tools/json2tsv/default.nix deleted file mode 100644 index 49d0812eba444..0000000000000 --- a/pkgs/development/tools/json2tsv/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "json2tsv"; - version = "1.1"; - - src = fetchurl { - url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz"; - hash = "sha256-7r5+YoZVivCqDbfFUqTB/x41DrZi7GZRVcJhGZCpw0o="; - }; - - postPatch = '' - substituteInPlace jaq --replace "json2tsv" "$out/bin/json2tsv" - ''; - - makeFlags = [ "RANLIB:=$(RANLIB)" ]; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "JSON to TSV converter"; - homepage = "https://codemadness.org/json2tsv.html"; - license = licenses.isc; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/development/tools/kafka-delta-ingest/default.nix index cffc417d7cb98..8dd3cf1299cb7 100644 --- a/pkgs/development/tools/kafka-delta-ingest/default.nix +++ b/pkgs/development/tools/kafka-delta-ingest/default.nix @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "kafka-delta-ingest"; homepage = "https://github.com/delta-io/kafka-delta-ingest"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/karma-runner/default.nix b/pkgs/development/tools/karma-runner/default.nix index d05d0e7e3969a..514d789ac6787 100644 --- a/pkgs/development/tools/karma-runner/default.nix +++ b/pkgs/development/tools/karma-runner/default.nix @@ -27,6 +27,6 @@ buildNpmPackage rec { homepage = "http://karma-runner.github.io/"; license = lib.licenses.mit; mainProgram = "karma"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/kdoctor/default.nix b/pkgs/development/tools/kdoctor/default.nix index 6c6969482609f..7054be1b08c9d 100644 --- a/pkgs/development/tools/kdoctor/default.nix +++ b/pkgs/development/tools/kdoctor/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.1.0"; src = fetchurl { - url = "https://github.com/Kotlin/${finalAttrs.pname}/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+97.zip"; + url = "https://github.com/Kotlin/kdoctor/releases/download/v${finalAttrs.version}/kdoctor_${finalAttrs.version}+97.zip"; hash = "sha256-H4lpdMf1AIU8BC+6DlvcwM1wLuEl+Hd9xBli/TGFMV4="; }; diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/development/tools/knightos/regenkfs/default.nix index c50b10527f52f..b8d4ed3b15545 100644 --- a/pkgs/development/tools/knightos/regenkfs/default.nix +++ b/pkgs/development/tools/knightos/regenkfs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y="; }; - cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; + cargoHash = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; buildFeatures = [ "c-undef" ]; diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/development/tools/knightos/remkrom/default.nix index bfc01c469b59d..c7a8fb21241e6 100644 --- a/pkgs/development/tools/knightos/remkrom/default.nix +++ b/pkgs/development/tools/knightos/remkrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { pname = "remkrom"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI="; }; - cargoSha256 = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; + cargoHash = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; meta = with lib; { description = "Reimplementation of mkrom in Rust"; diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix deleted file mode 100644 index dcba4474f0d32..0000000000000 --- a/pkgs/development/tools/konf/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "konf"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "SimonTheLeg"; - repo = "konf-go"; - rev = "v${version}"; - hash = "sha256-GSrR2uLeGodmE1egRtvTyWhJckYUnI97n7dnmjPvu3k="; - }; - - vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; - mainProgram = "konf-go"; - homepage = "https://github.com/SimonTheLeg/konf-go"; - license = licenses.asl20; - maintainers = with maintainers; [ arikgrahl ]; - }; -} diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index f2f9e03404819..5ef27e0979766 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-poIXY4++nv2bCkcHdZHb0dRa5NVxsw9Vmg7nMVh1ocI="; + sha256 = "sha256-02vmIsYGX6HB7k1HArMpNY+UxVX24IyraNPu13ht2qQ="; }; - vendorHash = "sha256-0V8B/w4K3r23tINDfjLAKe5wMpJ+8uiF4nCMr062pb0="; + vendorHash = "sha256-eD0K2te9+9x0fUYMVZ6SreV2AhkYwBzQHUTyeNwuEHc="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix index bad8a84717906..51d0e5e634b9d 100644 --- a/pkgs/development/tools/krankerl/default.nix +++ b/pkgs/development/tools/krankerl/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg="; }; - cargoSha256 = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ="; + cargoHash = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 904b3a78f10e4..1dc7b205e0d96 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-AbLg74kzg6UNvrE5cP5/o742yj6DJZ4BZJlFsJ1zaYU="; + sha256 = "sha256-qfkjvlj70yZwoX8Lcpsd+ASviC+ldAIWV0HLJuVEDKE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix index 975905f5588f6..b7103c18a2230 100644 --- a/pkgs/development/tools/kubedock/default.nix +++ b/pkgs/development/tools/kubedock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubedock"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-nShiBTkUNBshDDNuDvl0nnGy4BoFrn8hmtFKYOWjfpU="; + hash = "sha256-UfOFehpN9Qj4LKH61akSidikPytZS4QSFOUzDDw3OCI="; }; - vendorHash = "sha256-BYd45oaJjAr2xctp1Ew8xdwtiTASNElXzQg47xUI7yU="; + vendorHash = "sha256-qPBqKDn6NFa35+f+s2iCeHKdLI7ihK1DUMlq2mldNEI="; # config.Build not defined as it would break r-ryantm ldflags = [ diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 8d364f2d58c5d..e7e9a8d0b0133 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.4.2"; + version = "5.4.3"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-cNmDhKRi4pk26vADFMXN6SocdPF1EIYf4wT4fQYgPVc="; + hash = "sha256-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-Nbc3zdVD8KIL80TqdcVNFMowfFsKKIPsEpkwq5fvWAI="; + vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix index 32e6ec7a35b2f..cc52d2622f557 100644 --- a/pkgs/development/tools/lalrpop/default.nix +++ b/pkgs/development/tools/lalrpop/default.nix @@ -7,18 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lalrpop"; - version = "0.20.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "lalrpop"; repo = "lalrpop"; - # there's no tag for 0.20.0 - rev = "1584ddb243726195b540fdd2b3ccf693876288e0"; - # rev = version; - hash = "sha256-aYlSR8XqJnj76Hm3MFqfA5d9L3SO/iCCKpzOES5YQGY="; + rev = version; + hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA="; }; - cargoHash = "sha256-JaU5ZJbmlV/HfFT/ODpB3xFjZc2XiljhEVz/dql8o/c="; + cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA="; patches = [ (substituteAll { diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index 6fa51c782e6ec..d01732da1212f 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -1,21 +1,20 @@ { lib , fetchFromGitHub , rustPlatform -, stdenv }: rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - hash = "sha256-C44Z8JaEZvwgocaGjWT3rUAgIBtCRo0xZappMsydR7g="; + hash = "sha256-Z8Gc3QbnFGzF1mNjlbazz7OiDpQxY3HcaBKd32XjQCY="; }; - cargoHash = "sha256-NMSNCURSO1iIWHH27FI5Y0q7+Ghds8VSxRGBOp+fH6A="; + cargoHash = "sha256-WMrh4toFqd+G30ZZxC+kT/Q07gn+3p80oKECASD48wc="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index f7fef66761024..5faa408ecff2e 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { checkPhase = "$out/bin/fortls --help 1>/dev/null"; meta = with lib; { - description = "Fortran Language Server "; + description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; license = [ licenses.mit ]; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix deleted file mode 100644 index 655a6a8c1ff4e..0000000000000 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "gopls"; - version = "0.16.1"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "tools"; - rev = "gopls/v${version}"; - hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY="; - }; - - modRoot = "gopls"; - vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY="; - - # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 - ldflags = [ "-X main.version=v${version}" ]; - - doCheck = false; - - # Only build gopls, and not the integration tests or documentation generator. - subPackages = [ "." ]; - - meta = with lib; { - description = "Official language server for the Go language"; - homepage = "https://github.com/golang/tools/tree/master/gopls"; - changelog = "https://github.com/golang/tools/releases/tag/${src.rev}"; - license = licenses.bsd3; - maintainers = with maintainers; [ mic92 rski SuperSandro2000 zimbatm ]; - mainProgram = "gopls"; - }; -} diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 92929511e9766..0a671ed2bac87 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.18"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-nOb7hoUOQfmpCYqui+hw5hcL/pURvsMXlksa8KUBjSY="; + hash = "sha256-E2I4gEcJQ1NJqpN5rJGyFuj/KfjJC4bG/5Ei9gjIKCY="; }; vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index 5e3759aba06b8..5da093b61bea5 100644 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix index af7775f57246f..19ff79c332aba 100644 --- a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix +++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "kotlin-language-server"; - version = "1.3.9"; + version = "1.3.12"; src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - hash = "sha256-4piXggWK/BXDXrgkvJisaO5nOs72cvU1F47rKy4z+rc="; + hash = "sha256-poWaU0vZS1cpMbbvN7/s1RRUKhekdfTi08fF/IZsVGs="; }; dontBuild = true; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 8bdcd20cdb53b..56d01b585bf3a 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.9.3"; + version = "3.10.1"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-o3NRiJF9Cl420TYOZXC3JplKW5MYo/6nc0XPdukaly4="; + hash = "sha256-05b/NUpM6LASihZuMEduMCvh6ss44yHcA20gOQDMPAQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 42ca82fea0bcc..708d62d2ec7bb 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.3.2"; + version = "1.3.5"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-hRESY7TFxUjEkNf0vhCG30mIHZHXoAyZl3nTQ3OvQ0E="; + outputHash = "sha256-86/zeoOO5kSAwh7uQTV7nGUGQoIux1rlH5eUgvn3kvY="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 6ff7bb4c11ec6..36e78863deb6c 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/azdavis/millet"; changelog = "https://github.com/azdavis/millet/blob/v${version}/docs/CHANGELOG.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "millet-ls"; }; } diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 41d5b50891e52..9bab7acfc809c 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,23 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-IfseZsHCSuF1zGq8u3mPju0gxVtR0a7ibHV+tEK6wh0="; + hash = "sha256-vxdXW74XRZONmLURGEHnyg4Z71uvD6/JzxVqkNqyxdo="; }; - cargoHash = "sha256-QaoyaeFfoxVoTh4Sg/6EXYPsUD1nNG7MPSH2EeYMLn0="; + cargoHash = "sha256-otEpfykVTJ0DH9n3kO4G/BO2VD6RGp9N6/UX6UAs2jU="; meta = with lib; { - description = "Cmake lsp based on tower-lsp and treesitter"; + description = "CMake lsp based on tower-lsp and treesitter"; homepage = "https://github.com/Decodetalkers/neocmakelsp"; license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ rewine ]; + platforms = platforms.unix; + maintainers = with maintainers; [ rewine multivac61 ]; mainProgram = "neocmakelsp"; }; } diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix deleted file mode 100644 index 88d4a6fd36686..0000000000000 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, nixVersions, nix-update-script }: - -rustPlatform.buildRustPackage rec { - pname = "nil"; - version = "2023-08-09"; - - src = fetchFromGitHub { - owner = "oxalica"; - repo = pname; - rev = version; - hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068="; - }; - - cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo="; - - nativeBuildInputs = [ - (lib.getBin nixVersions.latest) - ]; - - env.CFG_RELEASE = version; - - # might be related to https://github.com/NixOS/nix/issues/5884 - preBuild = '' - export NIX_STATE_DIR=$(mktemp -d) - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Yet another language server for Nix"; - homepage = "https://github.com/oxalica/nil"; - changelog = "https://github.com/oxalica/nil/releases/tag/${version}"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda oxalica ]; - mainProgram = "nil"; - }; -} diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 6bbc46a1aadde..71e9133fcea0f 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -16,22 +16,24 @@ nlohmann_json, pkg-config, testers, + python3, }: let common = rec { - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-Yr/+03ealYQHjxtCLNCz/EYypwMPgiaTvCE55BEUk2c="; + hash = "sha256-iB6Hc3kgtsZ360JlAhPqCRWFTf3tawHEKYAeYt7DM4E="; }; nativeBuildInputs = [ meson ninja + python3 pkg-config ]; @@ -49,6 +51,7 @@ let inclyc Ruixi-rebirth aleksana + redyf ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock index 9e1987bba3e7a..a7e1a0dafa29c 100644 --- a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock +++ b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock @@ -86,10 +86,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] name = "cc" -version = "1.0.104" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" [[package]] name = "cfg-if" @@ -119,7 +125,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -130,9 +136,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.52-nightly.0" +version = "0.1.54-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd0a3c0bfdf681ff58dde3d15efc100f712df1ae1d7d9388cbd8107cb7e3c79" +checksum = "4fb27dc0754e2490b8984d95f4fe6368258de544eedd37798a314acfeb5ccfc6" dependencies = [ "erg_common", "erg_compiler", @@ -144,9 +150,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.40-nightly.0" +version = "0.6.42-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c80f1574b5268d421f2067bdde5776f9363512706d011587432d2a0886eba56" +checksum = "415899164e7873f66eecad5ad37683c5fa31c038802033f35ad08f3fa38882dc" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -156,9 +162,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.40-nightly.0" +version = "0.6.42-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efdec52061fad5d2238053cb15105d125e55cf116863e1b5337b8d286941ae3" +checksum = "048b3d74d5ca2c5279e18f15fd5997fe0cdfcad0a8d6ff2e4e238a8b76d86b36" dependencies = [ "erg_common", "erg_parser", @@ -166,9 +172,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.40-nightly.0" +version = "0.6.42-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d6768a062c5851b20eda7f77aed41e7f326b8589ae4b8703b13c49364eab5" +checksum = "ca774922a3555cb1973ead24f9ad27056057480bbcfff2ccab0b8b3637517054" dependencies = [ "erg_common", "erg_proc_macros", @@ -177,9 +183,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.40-nightly.0" +version = "0.6.42-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da422e93bd4346cf04fadf410bc6b63881cda0842c1d976ee5a7f2b8ae29927e" +checksum = "a7500b1a02978ccf36cef9eecb31f99911a0b56753589e375f0a51b6ff57b750" dependencies = [ "quote", "syn 1.0.109", @@ -248,7 +254,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -439,9 +445,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -527,9 +533,12 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" @@ -542,7 +551,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.55" +version = "0.0.58" dependencies = [ "erg_common", "erg_compiler", @@ -552,7 +561,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.55" +version = "0.0.58" dependencies = [ "els", "erg_common", @@ -603,9 +612,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -633,8 +642,8 @@ dependencies = [ [[package]] name = "rustpython-ast" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" +version = "0.4.0" +source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b" dependencies = [ "is-macro", "malachite-bigint", @@ -644,8 +653,8 @@ dependencies = [ [[package]] name = "rustpython-parser" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" +version = "0.4.0" +source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b" dependencies = [ "anyhow", "is-macro", @@ -667,8 +676,8 @@ dependencies = [ [[package]] name = "rustpython-parser-core" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" +version = "0.4.0" +source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b" dependencies = [ "is-macro", "memchr", @@ -677,8 +686,8 @@ dependencies = [ [[package]] name = "rustpython-parser-vendored" -version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" +version = "0.4.0" +source = "git+https://github.com/RustPython/Parser#a5b08096a0b77e8f39cd6abdc998bb770dd0c79b" dependencies = [ "memchr", "once_cell", @@ -704,31 +713,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -741,7 +751,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -775,9 +785,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -805,9 +815,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -939,9 +949,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" @@ -1019,6 +1029,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -1030,5 +1041,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 3dd2e90ead0bb..2af6720cd7edc 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -15,19 +15,19 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.55"; + version = "0.0.58"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-19SkaTDZK05o5OTPGe4AAEx3mJHOtCrknlJgrf4+oq0="; + hash = "sha256-IhfWl8Txhlddrr/Rny5ZyJaOKLft6R4ghYlwu6iOJsk="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rustpython-ast-0.3.1" = "sha256-KjglE3KvA9F7eg9pPTV6+PrLxiWnCgtkMOsFsoPC5N8="; + "rustpython-ast-0.4.0" = "sha256-kMUuqOVFSvvSHOeiYMjWdsLnDu12RyQld3qtTyd5tAM="; }; }; diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix deleted file mode 100644 index 6e6c7d621cbd0..0000000000000 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, buildBazelPackage -, fetchFromGitHub -, bazel_5 -, jdk -, bison -, flex -, python3 -}: - -let - system = stdenv.hostPlatform.system; -in -buildBazelPackage rec { - pname = "verible"; - - # These environment variables are read in bazel/build-version.py to create - # a build string shown in the tools --version output. - # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2024-02-01"; - GIT_VERSION = "v0.0-3515-g2d841599"; - - # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" - version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); - - src = fetchFromGitHub { - owner = "chipsalliance"; - repo = "verible"; - rev = "${GIT_VERSION}"; - hash = "sha256-D/blcex/St1nLKvjzuKnmAJE8HVlGy8ampmXIxKK11M="; - }; - - bazel = bazel_5; - bazelFlags = [ - "--//bazel:use_local_flex_bison" - "--java_runtime_version=local_jdk" - "--tool_java_runtime_version=local_jdk" - ]; - - fetchAttrs = { - sha256 = "sha256-2YruKvU7OZQ7mKNrqYITat+cmf/DEytDElYw7CvkxJk="; - }; - - nativeBuildInputs = [ - jdk # bazel uses that. - bison # We use local flex and bison as WORKSPACE sources fail - flex # .. to compile with newer glibc - python3 - ]; - - postPatch = '' - patchShebangs\ - bazel/build-version.py \ - bazel/sh_test_with_runfiles_lib.sh \ - common/lsp/dummy-ls_test.sh \ - common/tools/patch_tool_test.sh \ - common/tools/verible-transform-interactive.sh \ - common/tools/verible-transform-interactive-test.sh \ - kythe-browse.sh \ - verilog/tools - ''; - - removeRulesCC = false; - bazelTargets = [ ":install-binaries" ]; - bazelTestTargets = [ "//..." ]; - bazelBuildFlags = [ - "-c opt" - ]; - buildAttrs = { - installPhase = '' - mkdir -p "$out/bin" - - install bazel-bin/common/tools/verible-patch-tool "$out/bin" - - V_TOOLS_DIR=bazel-bin/verilog/tools - install $V_TOOLS_DIR/diff/verible-verilog-diff "$out/bin" - install $V_TOOLS_DIR/formatter/verible-verilog-format "$out/bin" - install $V_TOOLS_DIR/kythe/verible-verilog-kythe-extractor "$out/bin" - install $V_TOOLS_DIR/lint/verible-verilog-lint "$out/bin" - install $V_TOOLS_DIR/ls/verible-verilog-ls "$out/bin" - install $V_TOOLS_DIR/obfuscator/verible-verilog-obfuscate "$out/bin" - install $V_TOOLS_DIR/preprocessor/verible-verilog-preprocessor "$out/bin" - install $V_TOOLS_DIR/project/verible-verilog-project "$out/bin" - install $V_TOOLS_DIR/syntax/verible-verilog-syntax "$out/bin" - ''; - }; - - meta = with lib; { - description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server"; - homepage = "https://github.com/chipsalliance/verible"; - license = licenses.asl20; - maintainers = with maintainers; [ hzeller newam ]; - # Platforms linux only currently; some LIBTOOL issue on Darwin w/ bazel - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 9046d75880114..063fa93c9646e 100644 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -1,24 +1,31 @@ -{ lib, stdenv, buildNpmPackage, fetchFromGitHub, vscodium, vscode-extensions }: +{ lib, stdenv, buildNpmPackage, fetchFromGitHub, unzip, vscodium, vscode-extensions }: buildNpmPackage rec { pname = "vscode-langservers-extracted"; version = "4.10.0"; - src = fetchFromGitHub { - owner = "hrsh7th"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk="; - }; + srcs = [ + (fetchFromGitHub { + owner = "hrsh7th"; + repo = "vscode-langservers-extracted"; + rev = "v${version}"; + hash = "sha256-3m9+HZY24xdlLcFKY/5DfvftqprwLJk0vve2ZO1aEWk="; + }) + vscodium.src + ]; + + sourceRoot = "source"; npmDepsHash = "sha256-XGlFtmikUrnnWXsAYzTqw2K7Y2O0bUtYug0xXFIASBQ="; + nativeBuildInputs = [ unzip ]; + buildPhase = let extensions = if stdenv.isDarwin - then "${vscodium}/Applications/VSCodium.app/Contents/Resources/app/extensions" - else "${vscodium}/lib/vscode/resources/app/extensions"; + then "../VSCodium.app/Contents/Resources/app/extensions" + else "../resources/app/extensions"; in '' npx babel ${extensions}/css-language-features/server/dist/node \ diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 1642d495b1d88..408bb69f64b6e 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -1,28 +1,28 @@ { lib , stdenv , fetchFromGitHub -, zig_0_12 +, zig_0_13 , callPackage }: stdenv.mkDerivation (finalAttrs: { pname = "zls"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "zigtools"; repo = "zls"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-2iVDPUj9ExgTooDQmCCtZs3wxBe2be9xjzAk9HedPNY="; + hash = "sha256-vkFGoKCYUk6B40XW2T/pdhir2wzN1kpFmlLcoLwJx1U="; }; zigBuildFlags = [ - "-Dversion_data_path=${zig_0_12.src}/doc/langref.html.in" + "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in" ]; nativeBuildInputs = [ - zig_0_12.hook + zig_0_13.hook ]; postPatch = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/zigtools/zls"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ figsoda moni ]; + maintainers = with lib.maintainers; [ figsoda moni _0x5a4 ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/development/tools/language-servers/zls/deps.nix index 4de50620ef9c7..1c6b2cd25f8c7 100644 --- a/pkgs/development/tools/language-servers/zls/deps.nix +++ b/pkgs/development/tools/language-servers/zls/deps.nix @@ -4,17 +4,17 @@ linkFarm "zig-packages" [ { - name = "12201314cffeb40c5e4e3da166217d2c74628c74486414aaf97422bcd2279915b9fd"; + name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147"; path = fetchzip { - url = "https://github.com/ziglibs/known-folders/archive/bf79988adcfce166f848e4b11e718c1966365329.tar.gz"; - hash = "sha256-Q7eMdyScqj8qEiAHg1BnGRTsWSQOKWWTc6hUYHNlgGg="; + url = "https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz"; + hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g="; }; } { - name = "12200d71e4b7029ea56a429e24260c6c0e85a3069b0d4ba85eace21a0fd75910aa64"; + name = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d"; path = fetchzip { - url = "https://github.com/ziglibs/diffz/archive/e10bf15962e45affb3fcd7d9a950977a69c901b3.tar.gz"; - hash = "sha256-yVFPVn4jGfcoE2V4xdTqdThYPutshL6U4feDzetWgFw="; + url = "https://github.com/ziglibs/diffz/archive/ef45c00d655e5e40faf35afbbde81a1fa5ed7ffb.tar.gz"; + hash = "sha256-5/3W0Xt9RjsvCb8Q4cdaM8dkJP7CdFro14JJLCuqASo="; }; } ] diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix deleted file mode 100644 index b5f1d5d4a64eb..0000000000000 --- a/pkgs/development/tools/lazygit/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, lazygit, testers }: - -buildGoModule rec { - pname = "lazygit"; - version = "0.42.0"; - - src = fetchFromGitHub { - owner = "jesseduffield"; - repo = pname; - rev = "v${version}"; - hash = "sha256-w5QL+CuMYyTTnNAfWF8jQuQWfjxaw7bANK69Dc+onGk="; - }; - - vendorHash = null; - subPackages = [ "." ]; - - ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; - - passthru.tests.version = testers.testVersion { - package = lazygit; - }; - - meta = with lib; { - description = "Simple terminal UI for git commands"; - homepage = "https://github.com/jesseduffield/lazygit"; - changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne equirosa paveloom starsep ]; - mainProgram = "lazygit"; - }; -} diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix index 40cfc1e53ff58..38b252781c7e6 100644 --- a/pkgs/development/tools/ldid/default.nix +++ b/pkgs/development/tools/ldid/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, callPackage , fetchgit , libplist , libxml2 @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.saurik.com/ldid.git"; rev = "v${version}"; - sha256 = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; + hash = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; }; strictDeps = true; diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/development/tools/legitify/default.nix index 24ef9d6a6dc05..4759f9f19967c 100644 --- a/pkgs/development/tools/legitify/default.nix +++ b/pkgs/development/tools/legitify/default.nix @@ -5,29 +5,33 @@ buildGoModule rec { pname = "legitify"; - version = "0.1.5"; + version = "1.0.11"; src = fetchFromGitHub { owner = "Legit-Labs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Sr6P5S5+DqbP0ihCj97l84739/NRAlYJLnXp4B5gHNE="; + repo = "legitify"; + rev = "refs/tags/v${version}"; + hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc="; }; - vendorHash = "sha256-EJMXzWrOXFl7JFYBp/XAcHLcNyWCKbOBAyo/Yf2mh5s="; + vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU="; ldflags = [ "-w" "-s" - "-X github.com/Legit-Labs/legitify/internal/version.Version=${version}" + "-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}" ]; + preCheck = '' + rm e2e/e2e_test.go # tests requires network + ''; + meta = with lib; { description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets"; - mainProgram = "legitify"; homepage = "https://github.com/Legit-Labs/legitify"; changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "legitify"; }; } diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/development/tools/lurk/default.nix index 2393f9336ca43..e82445b8a7f4f 100644 --- a/pkgs/development/tools/lurk/default.nix +++ b/pkgs/development/tools/lurk/default.nix @@ -1,20 +1,26 @@ -{ lib -, rustPlatform -, fetchFromGitHub +{ + lib, + rustPlatform, + fetchFromGitHub, }: rustPlatform.buildRustPackage rec { pname = "lurk"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "jakwai01"; repo = pname; rev = "v${version}"; - hash = "sha256-7Yi77IsP/tmzrTvBVgIj2+fOXYKCT59pILeEuGuk4Y4="; + hash = "sha256-u37q5AJe6zsPNe5L+k3uVP7r92X4v3qhApPKYndZif4="; }; - cargoHash = "sha256-Cvtg9msoYkIIlaUw4hxWy2wSrE1uORR/2R2Geq4SI4w="; + cargoHash = "sha256-1hKyrlCDsOe+F88lg4+I5JMxG44CN2MOLi4GlaDBctk="; + + postPatch = '' + substituteInPlace src/lib.rs \ + --replace-fail '/usr/bin/ls' 'ls' + ''; meta = with lib; { description = "Simple and pretty alternative to strace"; @@ -23,6 +29,9 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/jakwai01/lurk/releases/tag/${src.rev}"; license = licenses.agpl3Only; maintainers = with maintainers; [ figsoda ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; }; } diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 0cc85cf91bc7a..4a0f4ca10a7ab 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -20,6 +20,8 @@ buildDotnetModule rec { projectFile = "Marksman/Marksman.fsproj"; dotnetBuildFlags = [ "-p:VersionString=${version}" ]; + __darwinAllowLocalNetworking = true; + doCheck = true; testProjectFile = "Tests/Tests.fsproj"; diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index f5d55ce10dfbf..3434e4771b3a3 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; + hash = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; }; nativeCheckInputs = [ @@ -28,7 +28,7 @@ buildPythonApplication rec { homepage = "https://github.com/ARMmbed/mbed-cli"; description = "Arm Mbed Command Line Interface"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix index 4d70efbbc50e2..0b6ec3252ef5e 100644 --- a/pkgs/development/tools/mblock-mlink/default.nix +++ b/pkgs/development/tools/mblock-mlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper, autoPatchelfHook }: +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "mblock-mlink"; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 8e0b2689984ef..8dabb8a239690 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -1,58 +1,71 @@ -{ lib -, fetchFromGitHub -, libunwind -, lz4 -, pkg-config -, python3 +{ + lib, + elfutils, + fetchFromGitHub, + libunwind, + lz4, + pkg-config, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "memray"; - version = "1.11.0"; - format = "setuptools"; + version = "1.13.4"; + pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; rev = "refs/tags/v${version}"; - hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; + hash = "sha256-8ztnXNdsthoMvooWoJLKrB9yGHjkYhQ2jiwF3KujAnw="; }; - nativeBuildInputs = [ - pkg-config + build-system = with python3Packages; [ + distutils + setuptools ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libunwind lz4 - ] ++ (with python3.pkgs; [ - cython - ]); + elfutils # for `-ldebuginfod` + ] ++ (with python3Packages; [ cython ]); - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ + pkgconfig + textual jinja2 rich ]; - nativeCheckInputs = with python3.pkgs; [ - ipython - pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.12") [ - greenlet - ]; + nativeCheckInputs = + with python3Packages; + [ + ipython + pytestCheckHook + pytest-cov # fix Unknown pytest.mark.no_cover + ] + ++ lib.optionals (pythonOlder "3.12") [ greenlet ]; - pythonImportsCheck = [ - "memray" - ]; + pythonImportsCheck = [ "memray" ]; - pytestFlagsArray = [ - "tests" - ]; + pytestFlagsArray = [ "tests" ]; disabledTests = [ # Import issue "test_header_allocator" "test_hybrid_stack_of_allocations_inside_ceval" + + # snapshot-based tests are too fragile + # see https://github.com/bloomberg/memray/issues/654 + "TestTUILooks" + "test_tui_basic" + "test_tui_pause" + "test_tui_gradient" + "test_merge_threads" + "test_unmerge_threads" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 4702615564d04..f395e177d0ccb 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-6bdDxxY5HwYXer8R1C5b7UIXy0wdBVDYYNtTR6eHv10="; + hash = "sha256-EuwLsrLwTM3FsUt1oa4N9y5Vq8TjTXQW+5UArXZHxuc="; }; - vendorHash = "sha256-fNpfcBHxjPdWpfM9/OVdZ+ng13+Z/qdZE/MITTCjeC0="; + vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo="; ldflags = [ "-s" diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 35dfd3efac54c..099e56ce47e42 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.5.0"; + version = "4.5.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-zmXBP0lCviqlMhKdbmZeko9XR0AJY9R+YkkKXAA2NW8="; + sha256 = "sha256-7l/SMJ+sTfz7/73ufQIB3q607yBHkUkHcFo9OkmCiwo="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 1c91797b9dd98..e9877d257e62c 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.64"; + version = "0.2.65"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r/d961IQVZgKh1eT7tFE1KFVwMhp7E8z+jV1AaqBtiQ="; + hash = "sha256-b2CJMjQr6Eez1xijGpXNkKeYeO87o1a13rB9bA2ShV0="; }; - vendorHash = "sha256-FveFo78LuTFKEch/5uqdwksS6c7MLbl+xQvZGSVmTko="; + vendorHash = "sha256-AqzhDEan0tdjfbP/nmpfa2e842zR6RyymllNR02zjlM="; doCheck = false; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 9912736cf31ad..606518ebf143e 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-dHoVlcvZeX2+r4SgKDaUHOiNYpSNMFG/WNdL4N10ojQ="; + hash = "sha256-2wwKctQOZAwgHjnmRni2/jFvN+fvBfZ84rItVVwKbRI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 308ac9d5913fb..491bfc19ae0fc 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -14,7 +14,6 @@ in , lib , noSysDirs , perl -, substitute , zlib , CoreServices @@ -58,10 +57,7 @@ stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; - # HACK: Ensure that we preserve source from bootstrap binutils to not rebuild LLVM - src = stdenv.__bootPackages.binutils-unwrapped.src - or srcs.${targetPlatform.system} - or srcs.normal; + src = srcs.${targetPlatform.system} or srcs.normal; # WARN: this package is used for bootstrapping fetchurl, and thus cannot use # fetchpatch! All mutable patches (generated by GitHub or cgit) that are diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 4460d3dd8b200..c279635dcc748 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.7"; + version = "2.28.10"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "XovtaEOUy67KyfYsF0KmzDNef7Jt01gkWrAq+xPS3uQ="; + sha256 = "HWSIffGVZYu9xTBM2uajkhBX7kzH17fepyZxMVQTOp8="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "C4LutO/wGjFOIOsulCoAmeHSkLCPgNGVd5vRclwoP9g="; + sha256 = "wbqhEOw7tM3ekHCQUZpy6DiiEtYssoNFNdlzW8SkXgQ="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "FBuwu1EYjDTMSW/slt94kxsXzSqhqPdUspM5XYNzHsw="; + sha256 = "LiN2qnhWhLWSMG/9G6Zf4rwCjksvvYWsDhHSPx+Bsjk="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "g7fsG6sWdRmXvL1S9vI3yNHDKSWOdzLrp7Ydpw1jNss="; + sha256 = "lNIGtc7gU1jtkfCqJRnGWu6RXMcVDM/ayKTsUMq9j+M="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "Ht3K297MExglKmtws/RvhQHFPhf1bTkIoNRvT/yJ+CM="; + sha256 = "2gmAVjjTzFx36MxB8yyUTjXyH8oeyUXVhJby3rvV1Ek="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index fb2bf3964bdbc..e31984a2c28f9 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.18"; + version = "1.92.21"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-5PVYDcyjarTG8RZaqEMvS8FK4DOw9goSaz9WZQtjvFo="; - "8.2" = "sha256-2E+LmM0ZAkE4iIyo6Mxu8jJjX1aLHelsJRzM9Yo9D4g="; - "8.3" = "sha256-Rm1E+ouUz50Wq4bjGnBwDpVN9C3JXu9zF6jmcrn6Xzg="; + "8.1" = "sha256-sEpoykSzgGGubXMUFrmxmYp1dNMfG6PfBb/tiMl/Tgs="; + "8.2" = "sha256-ivF1SlzhnxpJEdTcia1GFsXd0etF5ItK13WzRIrf9n0="; + "8.3" = "sha256-wonpCcbrvwo5xqKObZsr6eFNumv7E8vxvujXh7gSjtM="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-iJucmU/ytes45VJAhsJHsvovbZ/mHtj+ChVv1vsL/XU="; - "8.2" = "sha256-0Xc6d6ibfnkHEwwkseNWj52DesxVmBRD9oRZRS36XOI="; - "8.3" = "sha256-x89Ub3LDstdzqdMDcF0mMpwDGufNDNRAp2yeZLNXnoQ="; + "8.1" = "sha256-a6jkXJFHtsV0f8NC3ljeyQOjIASFBMuJA2hscX7j+QI="; + "8.2" = "sha256-ASgWrfd0My4B3O0InOuMRaLPfVw4dgoqV4EJM1aEr2I="; + "8.3" = "sha256-VRPEODt94DEwvrem7vNhpPt9i82HxB1UHup93GYcD5U="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-wESvg1iqPMvT9EjTNLJk5GtzgW80UigmR0m4Rr8VVaQ="; - "8.2" = "sha256-/1hlgAVITlLM2i7aa3cIF/eci/q68rDT+wsB+zBxIzg="; - "8.3" = "sha256-oABuQk6uZxC/Ry1DcpKbULso5CzEZEIod0GECxbLROk="; + "8.1" = "sha256-tSK+fhDQwSCTcrKQuvAe+JfHdCZIuneShvkz0rGunwM="; + "8.2" = "sha256-38oZCy2BrcQ6Hg/q40iw+PdQ2p2QKyb08A3ZT9L6Ots="; + "8.3" = "sha256-xEOV3dXu9AcDvm0qiUYVUySBTx7rTE0XFQdiSpDLY74="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-hLPM07WVu1jPaaxR8YPeGcL05nrDG8LTVUJ9IoMKLWE="; - "8.2" = "sha256-2gUmMr55r2FBMlmd/dyXQaXMEfod9tG8/QY0fo0NJxc="; - "8.3" = "sha256-H+y1+671+V60GHHKP/0ss+A8t/h2HdGkRgARsqyJJ3M="; + "8.1" = "sha256-gRdtxGv3C30ZtYv7s8wspd/z21HWtMS+gw7MRt/77DA="; + "8.2" = "sha256-jxEs6kGHHgswOHPmUM4UlYfJmH9f58zj6G19o00xQiQ="; + "8.3" = "sha256-IFS/quwCWJkTogAK+GUzFNZYBkFupp06vskkueJA+Us="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-Mm+CiC6dBb1JOs+Z/3dPSJNdKqvRLruYEFihsY52bpI="; - "8.2" = "sha256-OXemTJV4exlTQj6MGBxMOA8TuXw3e6iXTD2i/gott2A="; - "8.3" = "sha256-VtGUwhKAXr+P6+sn65Hyo8Dxh+Iyd/K3dwlqQmH0ElI="; + "8.1" = "sha256-5Mbu0ppvpzC64zJ7MWFrOJeG33z4/f8SobLMywYiIOg="; + "8.2" = "sha256-PDvGidy+Qjo+woeaWkTCJmEVymR9vTKCSoSb1YgSqCE="; + "8.3" = "sha256-iwg+CMly70k8RWTPnJ7KPkIRKumxPlDjDZDzzElcruA="; }; }; }; diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix index 56dbcb06a12ce..d83381080a5fe 100644 --- a/pkgs/development/tools/misc/c2ffi/default.nix +++ b/pkgs/development/tools/misc/c2ffi/default.nix @@ -55,6 +55,6 @@ llvmPackages.stdenv.mkDerivation { description = "LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces"; mainProgram = "c2ffi"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 3bd4d3fc721c1..72a177a17f934 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/cbrowser/"; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 9cdd8595a4218..a1a116b46d07a 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/cflow/"; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index b44c8e90f45e6..bb5a792fa4dc3 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index a9840a7cf2771..1890b21d7cf1b 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, fetchurl, perl, installShellFiles }: -stdenv.mkDerivation rec { - version = "2.22.1"; +{ + lib, + stdenv, + fetchurl, + installShellFiles, + perl, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + version = "2.23.7"; pname = "checkbashisms"; src = fetchurl { - url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - hash = "sha256-Nd1eYCnSe+NblujG44uKpvunkaITcdrC3g+M3uX+M9U="; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; + hash = "sha256-nOnlE1Ry2GR+L/tWZV4AOR6Omap6SormBc8OH/2fNgk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -29,12 +37,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + meta = { homepage = "https://sourceforge.net/projects/checkbaskisms/"; + changelog = "https://salsa.debian.org/debian/devscripts/-/blob/v${finalAttrs.version}/debian/changelog"; description = "Check shell scripts for non-portable syntax"; mainProgram = "checkbashisms"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ kaction ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index 31e7134e7e87d..10d6d2e7d020c 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { description = "Changes the current Ruby"; homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "chruby-exec"; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index e41d8d3379fea..7adc78013f479 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { property. It is intended for use by people who discover and report bugs in compilers and other tools that process C/C++ code. ''; - maintainers = [ maintainers.dtzWill ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 05e61e1afb764..f306478948bc1 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://cscope.sourceforge.net/"; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 529339c38c113..52955577ee7fb 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Csmith has found bugs in every tool that it has tested, and has been used to find and report more than 400 previously unknown compiler bugs. ''; - maintainers = [ maintainers.dtzWill ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 129b534339eef..228f8ed98a67b 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, bash , cmake , colordiff , flex diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index a5ed3e222aaae..fc07a523ff0b5 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Literate Programming in C/C++"; platforms = with platforms; unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; license = licenses.abstyles; }; } diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/development/tools/misc/deheader/default.nix index 5c2fdb20376f4..d562ec98b6d14 100644 --- a/pkgs/development/tools/misc/deheader/default.nix +++ b/pkgs/development/tools/misc/deheader/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "esr"; repo = "deheader"; rev = version; - sha256 = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs="; + hash = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs="; }; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 55581aedce607..015e7ff991d12 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index c2b4b4206dc25..34b5127e118ec 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM="; }; - cargoSha256 = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48="; + cargoHash = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index aa9bed97069d1..ad61dcded73df 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "v${version}"; - hash = "sha256-HgWfR0kOtP2cSSRGMPuy1qGqcS/4QAWPeBU+lwHnYqI="; + hash = "sha256-lU7YGn3W3KGrvOUH/v++jHii4q3hSo9X8BAjDNJ7y3A="; }; vendorHash = "sha256-P5lOx9CH37Z7mkDshbwS+XJZQdQiqNKl71wR1iUvpm8="; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 6b0c5b21af414..93636e1675d86 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://elfinfo.roboticoverlords.org/"; changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index fa2ed6e395348..9a612593d06f7 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Collection of programs that access and manipulate ELF files"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index a5a812aa034af..9f5a4bfa3a47b 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -73,7 +73,11 @@ stdenv.mkDerivation rec { "--enable-deterministic-archives" (lib.enableFeature enableDebuginfod "libdebuginfod") (lib.enableFeature enableDebuginfod "debuginfod") - ]; + ] ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler" + ++ lib.optionals stdenv.cc.isClang [ + "CFLAGS=-Wno-unused-private-field" + "CXXFLAGS=-Wno-unused-private-field" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 263196dab5efa..21dafb9bbce74 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -30,11 +30,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "14.2"; + version = "15.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-LU3YBh2N7RK2xj9V5FNEiB6CJhBfTSqbI0BA76XOd3I="; + hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index cc5b0fde7219b..33d9da9f636e4 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; + hash = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; }; postPatch = '' diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index cbef7ae0d9da8..a59b55be975d8 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { description = "Reliable project licenses detector"; homepage = "https://github.com/go-enry/go-license-detector"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "license-detector"; }; } diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index a478306cad67d..0d3da390847a7 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { mainProgram = "gtkperf"; homepage = "https://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/development/tools/misc/highlight-assertions/default.nix index 5dd965d6c0962..b2f595cb01ba0 100644 --- a/pkgs/development/tools/misc/highlight-assertions/default.nix +++ b/pkgs/development/tools/misc/highlight-assertions/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg="; }; - cargoSha256 = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo="; + cargoHash = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo="; # requires nightly features RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/development/tools/misc/hydra-cli/Cargo.lock b/pkgs/development/tools/misc/hydra-cli/Cargo.lock deleted file mode 100644 index 62112e07a7d93..0000000000000 --- a/pkgs/development/tools/misc/hydra-cli/Cargo.lock +++ /dev/null @@ -1,1995 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "assert-json-diff" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" -dependencies = [ - "extend", - "serde", - "serde_json", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bumpalo" -version = "3.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "percent-encoding", - "time 0.2.27", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" -dependencies = [ - "cookie", - "idna 0.2.3", - "log", - "publicsuffix", - "serde", - "serde_json", - "time 0.2.27", - "url", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "csv" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" -dependencies = [ - "csv-core", - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "extend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-core", - "futures-io", - "futures-task", - "memchr", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", - "tracing-futures", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes 1.4.0", - "fnv", - "itoa 1.0.6", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "hydra-cli" -version = "0.2.0" -dependencies = [ - "chrono", - "clap", - "log", - "mockito", - "prettytable-rs", - "reqwest", - "serde", - "serde_json", -] - -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 0.4.8", - "pin-project", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper", - "native-tls", - "tokio", - "tokio-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnet" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "mockito" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a634720d366bcbce30fb05871a35da229cef101ad0b2ea4e46cf5abf031a273" -dependencies = [ - "assert-json-diff", - "colored", - "difference", - "httparse", - "lazy_static", - "log", - "rand", - "regex", - "serde_json", - "serde_urlencoded 0.6.1", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "openssl" -version = "0.10.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "publicsuffix" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -dependencies = [ - "idna 0.2.3", - "url", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - -[[package]] -name = "reqwest" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -dependencies = [ - "base64", - "bytes 0.5.6", - "cookie", - "cookie_store", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "mime_guess", - "native-tls", - "percent-encoding", - "pin-project-lite 0.2.9", - "serde", - "serde_json", - "serde_urlencoded 0.7.1", - "time 0.2.27", - "tokio", - "tokio-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs", - "winapi 0.3.9", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi 0.3.9", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "memchr", - "mio", - "num_cpus", - "pin-project-lite 0.1.12", - "slab", -] - -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite 0.2.9", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna 0.3.0", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" -dependencies = [ - "cfg-if 1.0.0", - "serde", - "serde_json", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.15", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" - -[[package]] -name = "web-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 46c0c9088a18e..5273621148510 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -1,49 +1,49 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + darwin, + testers, + hydra-cli, }: rustPlatform.buildRustPackage rec { pname = "hydra-cli"; - version = "0.3.0"; + version = "0.3.0-unstable-2023-12-20"; src = fetchFromGitHub { owner = "nlewo"; - repo = pname; - rev = "v${version}"; - sha256 = "1fd3swdjx249971ak1bgndm5kh6rlzbfywmydn122lhfi6ry6a03"; + repo = "hydra-cli"; + rev = "dbb6eaa45c362969382bae7142085be769fa14e6"; + hash = "sha256-6L+5rkXzjXH9JtLsrJkuV8ZMsm64Q+kcb+2pr1coBK4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + sourceRoot = "${src.name}/hydra-cli"; - nativeBuildInputs = [ - pkg-config - ]; + cargoHash = "sha256-WokdTMNA7MrbFcKNeFIRU2Tw6LyM80plDoZPX1v/hrc="; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + nativeBuildInputs = [ pkg-config ]; - # build fails due to outdated socket2 dependency - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + passthru.tests.version = testers.testVersion { + package = hydra-cli; + version = "0.3.0"; + }; + + meta = { description = "Client for the Hydra CI"; mainProgram = "hydra-cli"; homepage = "https://github.com/nlewo/hydra-cli"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ lewo ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + lewo + aleksana + ]; }; } diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index ce9a45b1f049b..8c6f089099f24 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,7 +43,6 @@ , cacert , glibcLocales , fetchFromGitHub -, fetchpatch2 , nixosTests }: @@ -122,15 +121,15 @@ let ]; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "2024-03-08"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "8f56209bd6f3b9ec53d50a23812a800dee7a1969"; - hash = "sha256-mhEj02VruXPmxz3jsKHMov2ERNXk9DwaTAunWEO1iIQ="; + rev = "d7986226f0666d5aa0032fdcdb9f38eef6a91dd3"; + hash = "sha256-9DW0tAiAOfglua76t3viSvIw1gR1EETf0HTAmZklc3I="; }; buildInputs = [ @@ -206,19 +205,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - # https://github.com/NixOS/hydra/security/advisories/GHSA-2p75-6g9f-pqgx - (fetchpatch2 { - name = "CVE-2024-32657.patch"; - url = "https://github.com/NixOS/hydra/commit/b72528be5074f3e62e9ae2c2ae8ef9c07a0b4dd3.patch"; - hash = "sha256-+y27N8AIaHj13mj0LwW7dkpzfzZ4xfjN8Ld23c5mzuU="; - }) - ]; - postPatch = '' # Change 5s timeout for init to 30s substituteInPlace t/lib/HydraTestContext.pm \ - --replace 'expectOkay(5, ("hydra-init"));' 'expectOkay(30, ("hydra-init"));' + --replace-fail 'expectOkay(5, ("hydra-init"));' 'expectOkay(30, ("hydra-init"));' ''; preCheck = '' @@ -238,7 +228,7 @@ stdenv.mkDerivation rec { wrapProgram $i \ --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ --prefix PATH ':' $out/bin:$hydraPath \ - --set-default HYDRA_RELEASE ${version} \ + --set-default HYDRA_RELEASE ${finalAttrs.version} \ --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} done @@ -258,4 +248,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mindavi ] ++ teams.helsinki-systems.members; }; -} +}) diff --git a/pkgs/development/tools/misc/jcli/default.nix b/pkgs/development/tools/misc/jcli/default.nix deleted file mode 100644 index 2b7f14284f164..0000000000000 --- a/pkgs/development/tools/misc/jcli/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "jcli"; - version = "0.0.42"; - - src = fetchFromGitHub { - owner = "jenkins-zh"; - repo = "jenkins-cli"; - rev = "v${version}"; - hash = "sha256-t9NE911TjAvoCsmf9F989DNQ+s9GhgUF7cwuyHefWts="; - }; - - vendorHash = "sha256-bmPnxFvdKU5zuMsCDboSOxP5f7NnMRwS/gN0sW7eTRA="; - - doCheck = false; - - postInstall = '' - mv $out/bin/{jenkins-cli,jcli} - ''; - - meta = with lib; { - description = "Jenkins CLI allows you to manage your Jenkins in an easy way"; - mainProgram = "jcli"; - homepage = "https://jcli.jenkins-zh.cn/"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix index 34177e142d1cd..ed07a8d3c3447 100644 --- a/pkgs/development/tools/misc/jiq/default.nix +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { license = licenses.mit; description = "jid on jq - interactive JSON query tool using jq expressions"; mainProgram = "jiq"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 83dbfb93c86df..a082614aece36 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: +{ fetchurl, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { pname = "jscoverage"; diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index 915e1018c561b..e8d919cfabe02 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { mainProgram = "libwhich"; homepage = "https://github.com/vtjnash/libwhich"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 87ca62ac5f480..0f4ed45996ca0 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "linuxkit"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "sha256-PrHGIP74mDt+mJDRaCsroiJ4QEW4/tzgsZI2JlZ8TEA="; + sha256 = "sha256-MUZMBqbwudvzZ5uoiBIm54HS1CwqHyTbFkHMKSIvvYs="; }; vendorHash = null; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 189f389587842..594828e259542 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://www.ltrace.org/"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix index acd6d39e97f6b..2307cc54facbf 100644 --- a/pkgs/development/tools/misc/mdctags/default.nix +++ b/pkgs/development/tools/misc/mdctags/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; }; - cargoSha256 = "1kdbrcpvxiq91m5vq33vzjhsp4j3flzrpbj5hmxf0k3al1a7qk1g"; + cargoHash = "sha256-L0x8VKBqTOB6hUWumz91Q5Krofx7DLxLDQnHvi/Lq80="; meta = { description = "tags for markdown file"; diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index b16c4718914e3..d3c08025108e4 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -1,20 +1,20 @@ { lib, clangStdenv, stdenv, cmake, autoPatchelfHook, fetchFromGitHub, dotnetCorePackages, buildDotnetModule, netcoredbg, testers }: let pname = "netcoredbg"; - build = "1018"; - release = "3.0.0"; + build = "1031"; + release = "3.1.0"; version = "${release}-${build}"; - hash = "sha256-9Rd0of1psQTVLaTOCPWsYgvIXN7apZKDQNxuZGj4vXw="; + hash = "sha256-/ScV6NPGOun47D88e7BLisSOipeQWdUbYaEryrlPbHg="; - coreclr-version = "v7.0.14"; + coreclr-version = "v8.0.7"; coreclr-src = fetchFromGitHub { owner = "dotnet"; repo = "runtime"; rev = coreclr-version; - sha256 = "sha256-n7ySUTB4XOXxeeVomySdZIYepdp0PNNGW9pU/2wwVGM="; + hash = "sha256-vxyhZ1Z5TB/2jpF4qiXTpUj1hKeqV7xPgG1BJYOLIko="; }; - dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; src = fetchFromGitHub { owner = "Samsung"; diff --git a/pkgs/development/tools/misc/netcoredbg/deps.nix b/pkgs/development/tools/misc/netcoredbg/deps.nix index 0b3f3e4e628ed..12e4c86a157f1 100644 --- a/pkgs/development/tools/misc/netcoredbg/deps.nix +++ b/pkgs/development/tools/misc/netcoredbg/deps.nix @@ -2,121 +2,121 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.3.0"; sha256 = "1p29v4499qpyh7k7fv1li2y3c688zg95ic8gq9if1nqmjciz5w7p"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.3.0"; sha256 = "1g893rqc8hmd59hdigq0fwm3w261i7cm1h2wciqp7406f0gz67x5"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "2.3.0"; sha256 = "121dhnfjd5jzm410dk79s8xk5jvd09xa0w5q3lbpqc7bs4wxmq4p"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "2.3.0"; sha256 = "11f11kvgrdgs86ykz4104jx1iw78v6af48hpdrhmr7y7h5334ziq"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.0"; sha256 = "1niyzqqfyhvh4zpxn8bcyyldynqlw0rfr1apwry4b3yrdnjh1hhh"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim"; version = "8.0.452401"; sha256 = "1s9mpv6z36dkdskdls6igpgrcn2kxxdmwwpn4cag9pp5nb7fs99d"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-arm"; version = "8.0.452401"; sha256 = "10xg2acijf8b0n306lqqc5g2bj4a91qn5hjz3nbmc5k968l96lmi"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-arm64"; version = "8.0.452401"; sha256 = "18l54q5znkn5qq9afbhrxkjh2q3vlkv6h4jk7zbwaixr627q1lxr"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-arm"; version = "8.0.452401"; sha256 = "0i8zn5k0a3chv689fdqz9sqf35k2k6vlnnvbcd42g5vd69cc05h0"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-arm64"; version = "8.0.452401"; sha256 = "10vw93fn1qw9ygk7k4wnhs2db3jvaa5q9qn30dwvsx0mgf764567"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-x64"; version = "8.0.452401"; sha256 = "0m3rjdsri1n5z3ck99482715bsp9kbv7dm174ac0k4za6c6hzrqf"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-x64"; version = "8.0.452401"; sha256 = "13fqgkzqnciin2lizik68iki2yx53y8qry784y7yb20cnvmv50p7"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.osx-arm64"; version = "8.0.452401"; sha256 = "1vb254iy69jlnbdhh4ncnya2dcva51a7y2jmg174s8k7f3lann59"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.osx-x64"; version = "8.0.452401"; sha256 = "0kbypky3y773js6ndljgnfm7yd67x8i82a6gy9ybnbr5dsx7y32v"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-arm"; version = "8.0.452401"; sha256 = "1a7vsgf8bi1zc0i438d5791dbv4wdx64677px7gpfashs1zbn1fi"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-arm64"; version = "8.0.452401"; sha256 = "048hp1ic9qsbl1pmj798ind3pab5azlybgj5hwhlqqhghbl7dbg5"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-x64"; version = "8.0.452401"; sha256 = "0y8rjyg283zkd1g750jbmpiv1qsg56vcd22z9k8fj5fll1sydb6b"; }) - (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-x86"; version = "8.0.452401"; sha256 = "1zcpiy1nh7wm6w9dn1v3bkjscsziy2q4wyw771af8z6jibw85s8g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) - (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) - (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; hash = "sha256-7KrZfK3kUbmeT82eVadvHurZcaFq3FDj4qkIIeExJiM="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.3.0"; hash = "sha256-9/DyI5MV2+Biwg+xWNL7CBk2vIg0bHfmgf7ilAjZSdw="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.3.0"; hash = "sha256-pR/zH3AGkHNxZFzAUNmJwQg+KncAv9hgKq1CxHAeCb0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "2.3.0"; hash = "sha256-l+DaOdHrMHwXHbhwoHoCbcsyO9LpzAYCqV+WJp2FLYg="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "2.3.0"; hash = "sha256-OH4yRoHHn1xhbhci4pTZ6PAYuiQgkD+9Qfq1/PYMwYU="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.0"; hash = "sha256-EMIApW3Zj0V85leF7DLgFFvfqPdsIdvvJ3BD7zD+Pto="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim"; version = "8.0.532401"; hash = "sha256-rvTxIxaW6WYlbNqV0mVjX3JkjxOB2eoDtm7HD3qgKvg="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-arm"; version = "8.0.532401"; hash = "sha256-LYDAN85Qsnj3TIdH1VzzIbeQRQfo4A9kYp/da0nZMX4="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-arm64"; version = "8.0.532401"; hash = "sha256-/1eElmNjO8ug2i0hzsnX+ksaeTlSrJNxuHBZZ5Mxw7A="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-arm"; version = "8.0.532401"; hash = "sha256-3FsyQbXHgUErMg4islyZ68ZOi22Dtc7bHuzV4cHTetQ="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-arm64"; version = "8.0.532401"; hash = "sha256-UCGQZZ9ZQKgdvVpgJfKAUL1hDxopEOpkb71x11mZ5go="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-x64"; version = "8.0.532401"; hash = "sha256-zpKJdEGHfrk/ty0s2TuPiNi/yanEk6iAVZDOgBlv20s="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-x64"; version = "8.0.532401"; hash = "sha256-maN37KzN1GxFW37E2t8suG1XHNfTIdDLTHxiaiwGfdc="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.osx-arm64"; version = "8.0.532401"; hash = "sha256-4+hYe0f09F/seep1K1O9uF1S+g0ygyNJIcqA3b4Fhh4="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.osx-x64"; version = "8.0.532401"; hash = "sha256-K/0i5SGl3rG8ciXbhSu2dWURlzfB2uVorv2yc7KKP4I="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-arm"; version = "8.0.532401"; hash = "sha256-m/XEdwtXKGGIB1ORetiEaJ5qnQa+wz1Ou+aspxHAhe0="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-arm64"; version = "8.0.532401"; hash = "sha256-QPo/eFVr7HCAeOcLlsOrukL78BWfs+nZHVr5ClZzCiQ="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-x64"; version = "8.0.532401"; hash = "sha256-gxTB3KBr/ROgbBpLGQogtg2dz7a8F26UWyzsMJYMzv4="; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-x86"; version = "8.0.532401"; hash = "sha256-CP1WHi8a3Xr0ml2Dnhmhc14xSGqHPnrfnrfeuhZmm6o="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.3.1"; hash = "sha256-areGRq/dO08KhxiWuAK+cWAjOWYtuB1R9zGXLvIqwZw="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; hash = "sha256-JyqOf5/lsUNLMpIqK8XffcFTxB6vHWzGWHssmojokCQ="; }) + (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; hash = "sha256-Tfq7F61N0VfujVyI5A9MZvyWewQ5HepB1f1UMBMkUCs="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.4.2"; hash = "sha256-cYd2SWmnacNq14fTpyW9vGcnbZSD4DPRjpR+tgdZZyE="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; hash = "sha256-ezYVwe9atRkREc8O/HT/VfGDE2vuCpIckOfdY194/VE="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; hash = "sha256-8H2vRmsn29MNfMmCeIL5vHfbM19jWaLDKNLzDonCI+c="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.3.0"; hash = "sha256-tkMwiobmGQn/t8LDqpkM+Q7XJOebEl3bwVf11d2ZR4g="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; hash = "sha256-kd1JMqj6obhxzEPRJeYvcUyJqkOs/9A0UOQccC6oYrM="; }) + (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; hash = "sha256-dqk4CWuwocj5qsUAYlS+XAe6GGcY/N/HIPEGe5afrPM="; }) ] diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index 9f0a618312bce..76729d71e4019 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, perlPackages }: +{ lib, fetchFromGitHub, perl, perlPackages }: perlPackages.buildPerlPackage { pname = "ninka"; @@ -29,7 +29,7 @@ perlPackages.buildPerlPackage { mainProgram = "ninka"; homepage = "http://ninka.turingmachine.org/"; license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index e0b65b4ccc755..0249c098de5cf 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,12 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: -with python3.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "nrfutil"; version = "6.1.7"; @@ -17,7 +15,7 @@ buildPythonApplication rec { sha256 = "sha256-WiXqeQObhXszDcLxJN8ABd2ZkxsOUvtZQSVP8cYlT2M="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ click crcmod ecdsa @@ -32,9 +30,9 @@ buildPythonApplication rec { tqdm ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ behave - nose + pytestCheckHook ]; # Workaround: pythonRelaxDepsHook doesn't work for this. @@ -43,13 +41,15 @@ buildPythonApplication rec { substituteInPlace requirements.txt \ --replace "libusb1==1.9.3" "libusb1" \ --replace "protobuf >=3.17.3, < 4.0.0" "protobuf" + substituteInPlace nordicsemi/dfu/tests/test_signing.py \ + --replace "self.assertEqual(expected_vk_pem, vk_pem)" "" ''; - meta = with lib; { + meta = { description = "Device Firmware Update tool for nRF chips"; homepage = "https://github.com/NordicSemiconductor/pc-nrfutil"; - license = licenses.unfreeRedistributable; - platforms = platforms.unix; - maintainers = with maintainers; [ gebner ]; + license = lib.licenses.unfreeRedistributable; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ gebner ]; }; } diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 9eee3cca10517..c811925fbe633 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mainProgram = "objconv"; homepage = "https://www.agner.org/optimize/"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej vrthra ]; + maintainers = with maintainers; [ orivej ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index dec8b3fa8c3d9..8bde12db6257b 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.7"; + version = "1.13.9"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-vGzwXs4i9NiIz5M4JfoweJdpP5vbPKCdeUlE5xueYc4="; + hash = "sha256-EG0C1ebVlh01DLBnEFZxOzxTiCSByBy2OW9IP8wSlbE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 77a8842c1b579..cf1f713848e93 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "0.18.0-unstable-2024-01-15"; + version = "0.18.0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "7c2f768bf9601268a4e71c2ebe91e2011918a70f"; - sha256 = "sha256-PPXqKY2hJng4DBVE0I4xshv/vGLUskL7jl53roB8UdU="; + rev = "a0f54334df36770b335c051e540ba40afcbf8378"; + sha256 = "sha256-FSoxTcRZMGHNJh8dNtKOkcUtjhmhU6yQXcZZfUPLhQM="; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix index d3a31c8118a62..a962444a6fa59 100644 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "pest-ide-tools"; version = "0.3.11"; - cargoSha256 = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U="; + cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U="; src = fetchFromGitHub { owner = "pest-parser"; diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix index a9fecc09a2049..54c1954380f2a 100644 --- a/pkgs/development/tools/misc/polylith/default.nix +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.19"; + version = "0.2.21"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-tJV3kkB7dydnrJ0Es7DoOtCS+TwJG3SMONB2dsyHxx4="; + sha256 = "sha256-w1STu6+OzEhZ3MnfXer6QRQauEfW15iMIiiMN+nxAe0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index b9c616b1fa317..b855a648a5378 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, cargo , ctags , lib , makeWrapper diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/development/tools/misc/python-launcher/default.nix index a9531fbad6ded..854f1e39e1a2d 100644 --- a/pkgs/development/tools/misc/python-launcher/default.nix +++ b/pkgs/development/tools/misc/python-launcher/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "python-launcher"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "brettcannon"; repo = pname; rev = "v${version}"; - sha256 = "1r2pmli4jsdjag9zsgd9q1qlj3hxxjj2bni6yybjh1a10fcqxzzv"; + sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE="; }; - cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4="; + cargoHash = "sha256-+FtfL5jAGJrpnZaJDnDMvWC0D3Af0L466v9nqJkb+uA="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index eca2f5ccf0aa3..6d70f5232dd3f 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.18.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZmkT6LDdAxYKjwKWxz+hKtmCq2u7R5X9Nn+DNIN3CZg="; + hash = "sha256-Iu5jFSVg7I0i/GsSqAn90foaTG/6KmLMaqgna/0NOY0="; }; - vendorHash = "sha256-hYS6i9G4rzw1zRxaKo1D5vxKVu+bEkJsoNhm9RD0nYU="; + vendorHash = "sha256-djM2nMwLG16NSBTZyovOvi0ZgzIMANAWhB+tAaqJ02Q="; doCheck = false; diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/development/tools/misc/rtss/default.nix index 4172919d42f2f..5545d90281cdf 100644 --- a/pkgs/development/tools/misc/rtss/default.nix +++ b/pkgs/development/tools/misc/rtss/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM="; }; - cargoSha256 = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc="; + cargoHash = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc="; meta = with lib; { description = "Annotate output with relative durations between lines"; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 126167b475e67..9fee7cca7f7e7 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-wqAcHBHWtYavAakHLhHHCI+Yercgdtzo1EAOilsZOK0="; + hash = "sha256-wqAcHBHWtYavAakHLhHHCI+Yercgdtzo1EAOilsZOK0="; }; cargoHash = "sha256-XjVXhXoGEhxWc+LZa0EsPiw3Gq2pg03YjKONTptSQvA="; diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index 9d7978211ce0b..44b8cc62145d6 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-EFt/CnQcwtcm8Yr8e03+cSP5hgWwamtA2dILjD/QcMM="; + hash = "sha256-3hj/nY66z3AjdvmdvkKTAXD8E6A4qPtLOuY7U6sKw9U="; }; - vendorHash = "sha256-QR/Gcyx+QYK9cmCfotYOTcmcPOC+2ZA2+OQOUmNNmQE="; + vendorHash = "sha256-F6TEw9hk8Fu7uY8/KW4etyZMqOb/GL/g4NV87JjfAsY="; subPackages = [ "cmd/src" diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index ac780b8fc47fe..0fd75a8de8565 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.9"; + version = "6.10"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2hiemQqC48o6WkYxAS9+z9SJ2rRZhU2C2Mr2qGXBNWo="; + hash = "sha256-dl7HGqHeL+NzY8HkDHt2afwdQMRLtdOLqOjNgsTtzwc="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { # -kk ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils; - configureFlags = [ "--enable-mpers=check" ]; + configureFlags = [ "--enable-mpers=check" ] + ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function"; passthru.updateScript = gitUpdater { # No nicer place to find latest release. diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 6b6d1bc02db98..bae53ad42f9d3 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swig"; - version = "4.0.2"; + version = "4.2.1"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; - rev = "rel-${version}"; - sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8="; }; - PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; + PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config"; nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ pcre ]; + buildInputs = [ pcre2 ]; configureFlags = [ "--without-tcl" ]; @@ -26,12 +26,14 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with lib; { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + meta = { + changelog = "https://github.com/swig/swig/blob/${finalAttrs.src.rev}/CHANGES.current"; + description = "Interface compiler that connects C/C++ code to higher-level languages"; homepage = "https://swig.org/"; - # Different types of licenses available: http://www.swig.org/Release/LICENSE . - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; - platforms = with platforms; linux ++ darwin; + # Different types of licenses available: https://www.swig.org/Release/LICENSE . + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; + mainProgram = "swig"; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 5c1fe8c5b9b70..e638718474e54 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { mainProgram = "tcptrack"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor maintainers.vrthra ]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 24a0df088d678..500c2ff7ba1a5 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.33.1"; + version = "0.34.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-kVLB1ruWOWGmCyEgHj8wtA7GwbdKiCYo7n4anVyKM5Y="; + hash = "sha256-4k9ro5XfcZs68p4QmvO+SBxfgBFf2Z8yrXiWmkbOj1c="; }; - vendorHash = "sha256-Vwa3km9CAq3Zik7dXWeHOnkIbL0eAwuKJ+bkw2lDe5k="; + vendorHash = "sha256-znBfzX6oS19auL1ptcVXM0l2Thpnb7DrciYs5Z2XVJY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index f3361628288f6..35a503d8b0aad 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "terraform-lsp"; homepage = "https://github.com/juliosueiras/terraform-lsp"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/development/tools/misc/terramate/default.nix index 880183c8bdf60..90bf025f814f0 100644 --- a/pkgs/development/tools/misc/terramate/default.nix +++ b/pkgs/development/tools/misc/terramate/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.8.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-jcmOS81iPzy1ul0Cj/SiJk84AUIq7mLI+CmspuPit+o="; + hash = "sha256-SAMtEo84P5sxQ3JFU4evt2ycL1tg2yrLoWipWi4KObE="; }; - vendorHash = "sha256-Na2XDPSwgwWTQrweslAtSOh2+B/ZFaPIdy8ssAFWkGs="; + vendorHash = "sha256-TOntPPtynr333rX0wlb2pIeEwcNzyWP3wFqPoMz6LK0="; # required for version info nativeBuildInputs = [ git ]; @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-extldflags" "-static" ]; # Disable failing E2E tests preventing the package from building - excludedPackages = [ "./cmd/terramate/e2etests/cloud" "./cmd/terramate/e2etests/core" ]; + excludedPackages = [ "./e2etests/cloud" "./e2etests/core" ]; meta = with lib; { description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform"; diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix index efb4a364a68ea..a0f6527d05e94 100644 --- a/pkgs/development/tools/misc/terser/default.nix +++ b/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.31.1"; + version = "5.31.3"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-yKJPV6JGZTNCMjHh8v+MgnhaMuGF5cVHGEIJei896Hg="; + hash = "sha256-7B6dRulnSPD5s2w4nTXBPxJUCRvKD9++/Y1BMNm2ZwM="; }; - npmDepsHash = "sha256-E50RrEllhmluWe726KRmD2pcXbD2bSkWz8x6FeF+kOU="; + npmDepsHash = "sha256-FMd2bbMHzo38/zJuOlpzGtRPwuoxmZJF/XF2KgTP2ak="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix deleted file mode 100644 index c6036c069d0ab..0000000000000 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, texinfo, ncurses, xz, lib }: - -stdenv.mkDerivation rec { - pname = "texinfo"; - version = "4.13a"; - - src = fetchurl { - url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma"; - sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"; - }; - - buildInputs = [ ncurses ]; - nativeBuildInputs = [ xz ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - ]); - - # Disabled because we don't have zdiff in the stdenv bootstrap. - #doCheck = true; - - meta = texinfo.meta // { branch = version; }; -} diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix deleted file mode 100644 index d395494984d58..0000000000000 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "5.2"; - sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal"; -} diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix deleted file mode 100644 index 34596f306581b..0000000000000 --- a/pkgs/development/tools/misc/texinfo/6.5.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "6.5"; - sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; -} diff --git a/pkgs/development/tools/misc/texinfo/6.7.nix b/pkgs/development/tools/misc/texinfo/6.7.nix deleted file mode 100644 index 7915d6e3c6bee..0000000000000 --- a/pkgs/development/tools/misc/texinfo/6.7.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "6.7"; - sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q"; -} diff --git a/pkgs/development/tools/misc/texinfo/6.8.nix b/pkgs/development/tools/misc/texinfo/6.8.nix deleted file mode 100644 index 992f695bc92ca..0000000000000 --- a/pkgs/development/tools/misc/texinfo/6.8.nix +++ /dev/null @@ -1,8 +0,0 @@ -import ./common.nix { - version = "6.8"; - sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf"; - patches = [ - # glibc 2.34 compat - ./fix-glibc-2.34.patch - ]; -} diff --git a/pkgs/development/tools/misc/texinfo/7.0.nix b/pkgs/development/tools/misc/texinfo/7.0.nix deleted file mode 100644 index 01788f40d78d6..0000000000000 --- a/pkgs/development/tools/misc/texinfo/7.0.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "7.0.3"; - sha256 = "sha256-dLQg0J1/Uo6E+XqjMPDdaamKYFPnpOAXZ+7RFQOIB78="; -} diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index f3f2e93892960..9b5959d40e47b 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,10 +1,29 @@ -{ version, sha256, patches ? [] }: - -{ lib, stdenv, buildPackages, fetchurl, perl, libintl, bash -, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, freebsd, libiconv +{ + lib, + stdenv, + buildPackages, + fetchurl, + perl, + libintl, + bash, + updateAutotoolsGnuConfigScriptsHook, + gnulib, + gawk, + freebsd, + libiconv, + xz, + + # we are a dependency of gcc, this simplifies bootstraping + interactive ? false, + ncurses, + procps, + meta, +}: -# we are a dependency of gcc, this simplifies bootstraping -, interactive ? false, ncurses, procps +{ + version, + hash, + patches ? [ ], }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -13,7 +32,15 @@ # files. let - inherit (lib) getDev getLib optional optionals optionalString; + inherit (lib) + getBin + getDev + getLib + optional + optionals + optionalString + versionOlder + ; crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform; in @@ -23,20 +50,21 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz"; - inherit sha256; + inherit hash; }; patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch; - postPatch = '' - patchShebangs tp/maintain - '' - # This patch is needed for IEEE-standard long doubles on - # powerpc64; it does not apply cleanly to texinfo 5.x or - # earlier. It is merged upstream in texinfo 6.8. - + lib.optionalString (version == "6.7") '' - patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch} - ''; + postPatch = + '' + patchShebangs tp/maintain + '' + # This patch is needed for IEEE-standard long doubles on + # powerpc64; it does not apply cleanly to texinfo 5.x or + # earlier. It is merged upstream in texinfo 6.8. + + optionalString (version == "6.7") '' + patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch} + ''; # ncurses is required to build `makedoc' # this feature is introduced by the ./cross-tools-flags.patch @@ -47,31 +75,45 @@ stdenv.mkDerivation { enableParallelBuilding = true; # A native compiler is needed to build tools needed at build time - depsBuildBuild = [ buildPackages.stdenv.cc perl ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + perl + ]; nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; - buildInputs = [ bash libintl ] - ++ optionals stdenv.isSunOS [ libiconv gawk ] + buildInputs = + [ + bash + libintl + ] + ++ optionals stdenv.isSunOS [ + libiconv + gawk + ] ++ optional interactive ncurses; - configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] + configureFlags = + [ "PERL=${buildPackages.perl}/bin/perl" ] # Perl XS modules are difficult to cross-compile and texinfo has pure Perl # fallbacks. # Also prevent the buildPlatform's awk being used in the texindex script - ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${gawk}/bin/awk" ] - ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; + ++ optionals crossBuildTools [ + "--enable-perl-xs=no" + "TI_AWK=${getBin gawk}/bin/awk" + ] + ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; installFlags = [ "TEXMF=$(out)/texmf-dist" ]; - installTargets = [ "install" "install-tex" ]; + installTargets = [ + "install" + "install-tex" + ]; - nativeCheckInputs = [ procps ] - ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ]; + nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ]; - doCheck = interactive - && !stdenv.isDarwin - && !stdenv.isSunOS; # flaky + doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky - checkFlags = lib.optionals (!stdenv.hostPlatform.isMusl && lib.versionOlder version "7") [ + checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [ # Test is known to fail on various locales on texinfo-6.8: # https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh" @@ -84,31 +126,9 @@ stdenv.mkDerivation { done ''; - meta = with lib; { - description = "GNU documentation system"; - homepage = "https://www.gnu.org/software/texinfo/"; - changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra oxij ]; - # see comment above in patches section - broken = stdenv.hostPlatform.isPower64 && lib.strings.versionOlder version "6.0"; - - longDescription = '' - Texinfo is the official documentation format of the GNU project. - It was invented by Richard Stallman and Bob Chassell many years - ago, loosely based on Brian Reid's Scribe and other formatting - languages of the time. It is used by many non-GNU projects as - well. - - Texinfo uses a single source file to produce output in a number - of formats, both online and printed (dvi, html, info, pdf, xml, - etc.). This means that instead of writing different documents - for online information and another for a printed manual, you - need write only one document. And when the work is revised, you - need revise only that one document. The Texinfo system is - well-integrated with GNU Emacs. - ''; + meta = meta // { branch = version; + # see comment above in patches section + broken = stdenv.hostPlatform.isPower64 && versionOlder version "6.0"; }; } diff --git a/pkgs/development/tools/misc/texinfo/packages.nix b/pkgs/development/tools/misc/texinfo/packages.nix new file mode 100644 index 0000000000000..4131b6a53920f --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/packages.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + buildPackages, + callPackage, + fetchurl, + perl, + libintl, + bash, + updateAutotoolsGnuConfigScriptsHook, + gnulib, + gawk, + freebsd, + libiconv, + xz, + + # we are a dependency of gcc, this simplifies bootstraping + interactive ? false, + ncurses, + procps, +}: + +let + meta = { + description = "GNU documentation system"; + homepage = "https://www.gnu.org/software/texinfo/"; + changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ oxij ]; + + longDescription = '' + Texinfo is the official documentation format of the GNU project. + It was invented by Richard Stallman and Bob Chassell many years + ago, loosely based on Brian Reid's Scribe and other formatting + languages of the time. It is used by many non-GNU projects as + well. + + Texinfo uses a single source file to produce output in a number + of formats, both online and printed (dvi, html, info, pdf, xml, + etc.). This means that instead of writing different documents + for online information and another for a printed manual, you + need write only one document. And when the work is revised, you + need revise only that one document. The Texinfo system is + well-integrated with GNU Emacs. + ''; + mainProgram = "texi2any"; + }; + buildTexinfo = callPackage ./common.nix { + inherit + lib + stdenv + buildPackages + updateAutotoolsGnuConfigScriptsHook + fetchurl + perl + xz + libintl + libiconv + bash + gnulib + gawk + freebsd + ncurses + procps + meta + interactive + ; + }; +in +{ + texinfo413 = stdenv.mkDerivation (finalAttrs: { + pname = "texinfo"; + version = "4.13a"; + + src = fetchurl { + url = "mirror://gnu/texinfo/texinfo-${finalAttrs.version}.tar.lzma"; + hash = "sha256-bSiwzq6GbjU2FC/FUuejvJ+EyDAxGcJXMbJHju9kyeU="; + }; + + buildInputs = [ ncurses ]; + nativeBuildInputs = [ xz ]; + + # Disabled because we don't have zdiff in the stdenv bootstrap. + #doCheck = true; + + meta = meta // { + branch = finalAttrs.version; + }; + }); + texinfo5 = buildTexinfo { + version = "5.2"; + hash = "sha256-VHHvaDpkWIp8/vRu8r3T+8vKidhH4QgyYSKT8QXkTto="; + }; + texinfo6_5 = buildTexinfo { + version = "6.5"; + hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I="; + }; + texinfo6_7 = buildTexinfo { + version = "6.7"; + hash = "sha256-mIQDwVQtFa0ERgC5CZl7owebEOAyJMYRiBF/NnawLKo="; + }; + texinfo6 = buildTexinfo { + version = "6.8"; + hash = "sha256-jrdT7Si8oh+PVsGhgDYq7XiSKb1i//WL+DaOm+tZ/sQ="; + patches = [ ./fix-glibc-2.34.patch ]; + }; + texinfo7 = buildTexinfo { + version = "7.1"; + hash = "sha256-3u7J8Z8VngRv34rSIjGYGAbawzLMNy8cdjUErYKzCVM="; + }; +} diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 475b280c925a8..d691b94c38a3f 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.17.0"; + version = "5.19.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-4yMZxhq8Y3RFZHOlulG5hqj3bJSIYVycrtnmsbx+4bs="; + hash = "sha256-iH7KqZddP4uKwTBxLLMURUtWBsuEtLHGQppVgGFaWZQ="; }; - cargoHash = "sha256-/qT/mxKjVvyA6XAB0Oa6jpKss0YtIL6cvGwBHM8Bt4M="; + cargoHash = "sha256-QW+q869bVAMYv4SCj/2eKrADoDonrvQuaHuanZHIjMo="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 2db093cf018a7..5a50600d47c89 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Allow multiple web change files"; mainProgram = "tie"; platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; license = licenses.abstyles; }; } diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index d81760daa5fcc..90cf25e54772a 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/tock/tockloader"; changelog = "https://github.com/tock/tockloader/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 2008d134b5380..ff3ceafc7f5c5 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoSha256 = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; + cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix index 49fc2081d4fe0..6be5eedcca5fb 100644 --- a/pkgs/development/tools/misc/topiary/default.nix +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, stdenv , nix-update-script }: diff --git a/pkgs/development/tools/misc/travis/shell.nix b/pkgs/development/tools/misc/travis/shell.nix index ddcf493bb4682..0820e89b4ba3e 100644 --- a/pkgs/development/tools/misc/travis/shell.nix +++ b/pkgs/development/tools/misc/travis/shell.nix @@ -1,9 +1,10 @@ # Env to update Gemfile.lock / gemset.nix - -with import <nixpkgs> {}; -stdenv.mkDerivation { +{ + pkgs ? import ../../../../.. { }, +}: +pkgs.stdenv.mkDerivation { name = "env"; - buildInputs = [ + buildInputs = with pkgs; [ ruby.devEnv gnumake bundix diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index ebb034a92e72c..76c3b7346011f 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ orivej vrthra ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 56166b0c8599f..9c7875146690d 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; - cargoSha256 = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; + cargoHash = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; meta = with lib; { description = "Tool to identify potentially unused code"; diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/development/tools/misc/usbsdmux/default.nix index 86ed8b11acf97..7794cf06d77d2 100644 --- a/pkgs/development/tools/misc/usbsdmux/default.nix +++ b/pkgs/development/tools/misc/usbsdmux/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; + hash = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; }; # Remove the wrong GROUP=plugdev. diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index 4293a458977b3..030dcf400f738 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "whatstyle"; homepage = "https://github.com/mikr/whatstyle"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 6df8827181fd2..d8e5bd26b39da 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; src = fetchFromGitLab { - sha256 = "sha256-MeD/jjhwoiWTb/G8pHrnEEX22h+entPr9MhJ6WHO3DM="; + hash = "sha256-MeD/jjhwoiWTb/G8pHrnEEX22h+entPr9MhJ6WHO3DM="; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/development/tools/mongosh/default.nix b/pkgs/development/tools/mongosh/default.nix deleted file mode 100644 index 79834dafc2b8e..0000000000000 --- a/pkgs/development/tools/mongosh/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildNpmPackage -, fetchurl -, testers -, mongosh -}: - -let - source = lib.importJSON ./source.json; -in -buildNpmPackage { - pname = "mongosh"; - inherit (source) version; - - src = fetchurl { - url = "https://registry.npmjs.org/mongosh/-/${source.filename}"; - hash = source.integrity; - }; - - postPatch = '' - ln -s ${./package-lock.json} package-lock.json - ''; - - npmDepsHash = source.deps; - - makeCacheWritable = true; - dontNpmBuild = true; - npmFlags = [ "--omit=optional" ]; - - passthru = { - tests.version = testers.testVersion { - package = mongosh; - }; - updateScript = ./update.sh; - }; - - meta = with lib; { - homepage = "https://www.mongodb.com/try/download/shell"; - description = "MongoDB Shell"; - maintainers = with maintainers; [ aaronjheng ]; - license = licenses.asl20; - mainProgram = "mongosh"; - }; -} diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json deleted file mode 100644 index 3df3810340081..0000000000000 --- a/pkgs/development/tools/mongosh/package-lock.json +++ /dev/null @@ -1,5798 +0,0 @@ -{ - "name": "mongosh", - "version": "2.2.10", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "mongosh", - "version": "2.2.10", - "license": "Apache-2.0", - "dependencies": { - "@mongosh/cli-repl": "2.2.10" - }, - "bin": { - "mongosh": "bin/mongosh.js" - }, - "engines": { - "node": ">=16.15.0" - } - }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser": { - "version": "5.2.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", - "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", - "dependencies": { - "@aws-crypto/sha256-js": "^5.2.0", - "@aws-crypto/supports-web-crypto": "^5.2.0", - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/sha256-js": { - "version": "5.2.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", - "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", - "dependencies": { - "@aws-crypto/util": "^5.2.0", - "@aws-sdk/types": "^3.222.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-crypto/supports-web-crypto": { - "version": "5.2.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", - "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/util": { - "version": "5.2.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/util/-/util-5.2.0.tgz", - "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@smithy/util-utf8": "^2.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", - "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", - "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", - "dependencies": { - "@smithy/is-array-buffer": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", - "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", - "dependencies": { - "@smithy/util-buffer-from": "^2.2.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.606.0.tgz", - "integrity": "sha512-CJ3kovUg7HAn3trqo0WxVw3PJoaHxiGU1U+Ok8Vx/sL81+auyyiasT09M/NcchRqwAooKvUi44sVD0ih7Zi9Nw==", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.606.0", - "@aws-sdk/client-sts": "3.606.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz", - "integrity": "sha512-nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.606.0.tgz", - "integrity": "sha512-gL1FHPS6hwgMNS/A+Qh5bUyHOeRVOqdb7c6+i+9gR3wtGvt2lvoSm8w5DhS08Xiiacz2AqYRDEapp0xuyCrbBQ==", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.606.0" - } - }, - "node_modules/@aws-sdk/client-sts": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.606.0.tgz", - "integrity": "sha512-b11mAhjrkm3MMiAPoMGcmd6vsaz2120lg8rHG/NZCo9vB1K6Kc7WP+a1Q05TRMseer2egTtpWJfn44aVO97VqA==", - "dependencies": { - "@aws-crypto/sha256-browser": "5.2.0", - "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.606.0", - "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/middleware-host-header": "3.598.0", - "@aws-sdk/middleware-logger": "3.598.0", - "@aws-sdk/middleware-recursion-detection": "3.598.0", - "@aws-sdk/middleware-user-agent": "3.598.0", - "@aws-sdk/region-config-resolver": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@aws-sdk/util-user-agent-browser": "3.598.0", - "@aws-sdk/util-user-agent-node": "3.598.0", - "@smithy/config-resolver": "^3.0.2", - "@smithy/core": "^2.2.1", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/hash-node": "^3.0.1", - "@smithy/invalid-dependency": "^3.0.1", - "@smithy/middleware-content-length": "^3.0.1", - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.4", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-body-length-browser": "^3.0.0", - "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.4", - "@smithy/util-defaults-mode-node": "^3.0.4", - "@smithy/util-endpoints": "^2.0.2", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/core": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.598.0.tgz", - "integrity": "sha512-HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==", - "dependencies": { - "@smithy/core": "^2.2.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/signature-v4": "^3.1.0", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "fast-xml-parser": "4.2.5", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.606.0.tgz", - "integrity": "sha512-4wGvXilFLkozs4/dMnn9NvxZbL9oyyReoF9aR3kGUZ0QVO8cCBp/Zkr8IXZifhVBo9/esJdMFnR9lEXR7Yuleg==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.606.0", - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz", - "integrity": "sha512-vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz", - "integrity": "sha512-N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/fetch-http-handler": "^3.0.2", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.2", - "@smithy/types": "^3.1.0", - "@smithy/util-stream": "^3.0.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz", - "integrity": "sha512-/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.598.0", - "@aws-sdk/credential-provider-http": "3.598.0", - "@aws-sdk/credential-provider-process": "3.598.0", - "@aws-sdk/credential-provider-sso": "3.598.0", - "@aws-sdk/credential-provider-web-identity": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.598.0" - } - }, - "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.600.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.600.0.tgz", - "integrity": "sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.598.0", - "@aws-sdk/credential-provider-http": "3.598.0", - "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-process": "3.598.0", - "@aws-sdk/credential-provider-sso": "3.598.0", - "@aws-sdk/credential-provider-web-identity": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz", - "integrity": "sha512-rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz", - "integrity": "sha512-5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==", - "dependencies": { - "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/token-providers": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz", - "integrity": "sha512-GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sts": "^3.598.0" - } - }, - "node_modules/@aws-sdk/credential-providers": { - "version": "3.606.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.606.0.tgz", - "integrity": "sha512-34hswGNDWBFvp4Hi4Gv9DIJ4Ks0Nbg8w3emFsPVHLqqI6X2Wd0hJTf+mi1kMhy/AQXt5LisKLw6wjNIKD2+KGg==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.606.0", - "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/client-sts": "3.606.0", - "@aws-sdk/credential-provider-cognito-identity": "3.606.0", - "@aws-sdk/credential-provider-env": "3.598.0", - "@aws-sdk/credential-provider-http": "3.598.0", - "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-node": "3.600.0", - "@aws-sdk/credential-provider-process": "3.598.0", - "@aws-sdk/credential-provider-sso": "3.598.0", - "@aws-sdk/credential-provider-web-identity": "3.598.0", - "@aws-sdk/types": "3.598.0", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz", - "integrity": "sha512-WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/middleware-logger": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz", - "integrity": "sha512-bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz", - "integrity": "sha512-vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz", - "integrity": "sha512-4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@aws-sdk/util-endpoints": "3.598.0", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz", - "integrity": "sha512-oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/token-providers": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz", - "integrity": "sha512-TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.598.0" - } - }, - "node_modules/@aws-sdk/types": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.598.0.tgz", - "integrity": "sha512-742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==", - "dependencies": { - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/util-endpoints": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz", - "integrity": "sha512-Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/types": "^3.1.0", - "@smithy/util-endpoints": "^2.0.2", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/util-locate-window": { - "version": "3.568.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz", - "integrity": "sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz", - "integrity": "sha512-36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/types": "^3.1.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz", - "integrity": "sha512-oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==", - "dependencies": { - "@aws-sdk/types": "3.598.0", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "aws-crt": ">=1.0.0" - }, - "peerDependenciesMeta": { - "aws-crt": { - "optional": true - } - } - }, - "node_modules/@babel/code-frame": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.7.tgz", - "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", - "dependencies": { - "@babel/highlight": "^7.24.7", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/compat-data": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.7.tgz", - "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/core": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.7.tgz", - "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", - "dependencies": { - "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.7", - "@babel/helper-compilation-targets": "^7.24.7", - "@babel/helper-module-transforms": "^7.24.7", - "@babel/helpers": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/template": "^7.24.7", - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/generator": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.7.tgz", - "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", - "dependencies": { - "@babel/types": "^7.24.7", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", - "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", - "dependencies": { - "@babel/compat-data": "^7.24.7", - "@babel/helper-validator-option": "^7.24.7", - "browserslist": "^4.22.2", - "lru-cache": "^5.1.1", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@babel/helper-environment-visitor": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", - "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-function-name": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", - "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-hoist-variables": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", - "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-imports": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", - "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-module-transforms": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", - "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", - "dependencies": { - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-module-imports": "^7.24.7", - "@babel/helper-simple-access": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" - } - }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", - "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-simple-access": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", - "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", - "dependencies": { - "@babel/traverse": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", - "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", - "dependencies": { - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-string-parser": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", - "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", - "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helper-validator-option": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", - "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/helpers": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.7.tgz", - "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", - "dependencies": { - "@babel/template": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.7.tgz", - "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", - "dependencies": { - "@babel/helper-validator-identifier": "^7.24.7", - "chalk": "^2.4.2", - "js-tokens": "^4.0.0", - "picocolors": "^1.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/parser": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.7.tgz", - "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", - "bin": { - "parser": "bin/babel-parser.js" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz", - "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", - "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", - "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", - "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/template": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.7.tgz", - "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", - "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.7.tgz", - "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", - "dependencies": { - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.24.7", - "@babel/helper-environment-visitor": "^7.24.7", - "@babel/helper-function-name": "^7.24.7", - "@babel/helper-hoist-variables": "^7.24.7", - "@babel/helper-split-export-declaration": "^7.24.7", - "@babel/parser": "^7.24.7", - "@babel/types": "^7.24.7", - "debug": "^4.3.1", - "globals": "^11.1.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/types": { - "version": "7.24.7", - "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.7.tgz", - "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", - "dependencies": { - "@babel/helper-string-parser": "^7.24.7", - "@babel/helper-validator-identifier": "^7.24.7", - "to-fast-properties": "^2.0.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@hapi/hoek": { - "version": "9.3.0", - "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" - }, - "node_modules/@hapi/topo": { - "version": "5.1.0", - "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.1.0.tgz", - "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmmirror.com/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@lukeed/csprng": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/@lukeed/csprng/-/csprng-1.1.0.tgz", - "integrity": "sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@lukeed/uuid": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/@lukeed/uuid/-/uuid-2.0.1.tgz", - "integrity": "sha512-qC72D4+CDdjGqJvkFMMEAtancHUQ7/d/tAiHf64z8MopFDmcrtbcJuerDtFceuAfQJ2pDSfCKCtbqoGBNnwg0w==", - "dependencies": { - "@lukeed/csprng": "^1.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@mongodb-js/devtools-connect": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.0.1.tgz", - "integrity": "sha512-xbk/eGHPQTQz4VSpGb5oRqSSbzipcFDODrAc4YtYFrb0980buOAopO71NozCbQoVnoiO1pYVIqcnrZMHkdaJzg==", - "dependencies": { - "@mongodb-js/oidc-http-server-pages": "1.1.1", - "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.3", - "system-ca": "^1.0.2" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.0.0", - "os-dns-native": "^1.2.0", - "resolve-mongodb-srv": "^1.1.1" - }, - "peerDependencies": { - "@mongodb-js/oidc-plugin": "^1.0.0", - "mongodb": "^5.8.1 || ^6.0.0", - "mongodb-log-writer": "^1.4.2" - } - }, - "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.10.2", - "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.2.tgz", - "integrity": "sha512-ss0c6IxhSJZwDiY18We3vjFwrCL+1HJntMInFSthJ6oM61yiCCz5m8TfUjNGJQCXhPqok7sM9RSRcKrn43u0cg==", - "dependencies": { - "semver": "^7.5.4" - } - }, - "node_modules/@mongodb-js/oidc-http-server-pages": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-http-server-pages/-/oidc-http-server-pages-1.1.1.tgz", - "integrity": "sha512-zYkANxb4HVDN4zGuU2ud4fL+XpqRxaydCwVZyU9Mh5EhqbrCL5mGH7t3BaGnfdQUw+HVtwP3dmasc+5Hjewk+g==" - }, - "node_modules/@mongodb-js/oidc-plugin": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-1.0.2.tgz", - "integrity": "sha512-hwTbkmJ31RPB5ksA6pLepnaQOBz6iurE+uH89B1IIJdxVuiO0Qz+OqpTN8vk8LZzcVDb/WbNoxqxogCWwMqFKw==", - "dependencies": { - "express": "^4.18.2", - "open": "^9.1.0", - "openid-client": "^5.6.4" - }, - "engines": { - "node": ">= 16.20.1" - } - }, - "node_modules/@mongodb-js/saslprep": { - "version": "1.1.7", - "resolved": "https://registry.npmmirror.com/@mongodb-js/saslprep/-/saslprep-1.1.7.tgz", - "integrity": "sha512-dCHW/oEX0KJ4NjDULBo3JiOaK5+6axtpBbS+ao2ZInoAL9/YRQLhXzSNAFz7hP4nzLkIqsfYAK/PDE3+XHny0Q==", - "dependencies": { - "sparse-bitfield": "^3.0.3" - } - }, - "node_modules/@mongosh/arg-parser": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.10.tgz", - "integrity": "sha512-QvXziAmACrFty7id5I0s3ZOetIc1wWhjtpytGMtchEiusTQOO+NJy74UMrxK+NGxKPDRL0MroRIo05/LEfPkJg==", - "dependencies": { - "@mongosh/errors": "2.2.10", - "@mongosh/i18n": "2.2.10", - "mongodb-connection-string-url": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.10.tgz", - "integrity": "sha512-ssY+WxY/oOHPZAIjrYzUYhCr1K2towzshxQpYw3nk5JyjTdvN4gc0xnrWMNLJonEOD/ADTdlneFshQhuh/V1vQ==", - "dependencies": { - "@babel/core": "^7.22.8", - "@babel/plugin-transform-destructuring": "^7.22.5", - "@babel/plugin-transform-parameters": "^7.22.5", - "@babel/plugin-transform-shorthand-properties": "^7.22.5", - "@babel/types": "^7.22.5" - }, - "bin": { - "async-rewrite": "bin/async-rewrite.js" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/autocomplete": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.10.tgz", - "integrity": "sha512-iLrZ1vfA67jKwEWtSKGYAZ7QM5beYFo4AsmiV+KCXwtcZref3dX1OgcjBvRW8dRvSonz8/7RnN9r8QtsTyw2xw==", - "dependencies": { - "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.10", - "semver": "^7.5.4" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/cli-repl": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.10.tgz", - "integrity": "sha512-fjn+GZlsChPqn2A+hWiSgxNcGxO96hPBcv2TDfnXwtMSQySPBavJoayBDbEnazRHxgbAxqpmTV4UfWPOX+jYvA==", - "dependencies": { - "@mongosh/arg-parser": "2.2.10", - "@mongosh/autocomplete": "2.2.10", - "@mongosh/editor": "2.2.10", - "@mongosh/errors": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/i18n": "2.2.10", - "@mongosh/import-node-fetch": "2.2.10", - "@mongosh/js-multiline-to-singleline": "2.2.10", - "@mongosh/logging": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "@mongosh/service-provider-server": "2.2.10", - "@mongosh/shell-api": "2.2.10", - "@mongosh/shell-evaluator": "2.2.10", - "@mongosh/snippet-manager": "2.2.10", - "@mongosh/types": "2.2.10", - "@segment/analytics-node": "^1.3.0", - "ansi-escape-sequences": "^5.1.2", - "askcharacter": "^2.0.4", - "askpassword": "^2.0.2", - "escape-string-regexp": "^4.0.0", - "is-recoverable-error": "^1.0.3", - "js-yaml": "^4.1.0", - "mongodb-connection-string-url": "^3.0.1", - "mongodb-log-writer": "^1.4.2", - "numeral": "^2.0.6", - "pretty-repl": "^4.0.1", - "proxy-agent": "^6.4.0", - "semver": "^7.5.4", - "strip-ansi": "^6.0.0", - "text-table": "^0.2.0", - "yargs-parser": "^20.2.4" - }, - "bin": { - "mongosh": "bin/mongosh.js" - }, - "engines": { - "node": ">=16.15.0" - }, - "optionalDependencies": { - "get-console-process-list": "^1.0.5", - "glibc-version": "^1.0.0", - "macos-export-certificate-and-key": "^1.1.2", - "mongodb-crypt-library-version": "^1.0.5", - "win-export-certificate-and-key": "^1.1.2" - } - }, - "node_modules/@mongosh/editor": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.10.tgz", - "integrity": "sha512-iYNvhBbTNXwR0Dt9bj+hwJFAWVttS2F+zl6vzvF/wcA1THddFi4A8LboWMvDtpb7YF5woHCXIW3Oc3gHOUSW/g==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "@mongosh/shell-api": "2.2.10", - "@mongosh/shell-evaluator": "2.2.10", - "@mongosh/types": "2.2.10", - "js-beautify": "^1.15.1" - }, - "engines": { - "node": ">=16.15.0" - } - }, - "node_modules/@mongosh/errors": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.10.tgz", - "integrity": "sha512-jR8dv9MYYRwr+Yri/KI6HAuob0zdVBQOrMvjc+ygBbTIkL3wh1iOrjZKZuYUsjei1FDxLA8NywftAoHDchq2Tg==", - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/history": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.10.tgz", - "integrity": "sha512-EmMKvsytTXq/1tAwxZUvl+6+gCrarWdEDB9mO9vTCFneOgB0ao2jpo7KA9Jc63r8RYhDH78dtjFsSuFeox3AiA==", - "dependencies": { - "mongodb-connection-string-url": "^3.0.1", - "mongodb-redact": "^0.2.3" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/i18n": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.10.tgz", - "integrity": "sha512-TxyFOhdXqCN0AXGcWziPzZ+YBf8KthnZIbOVSyA+C1a0jynfMf+XBnLnNpwvKfGZUeQ1VyZkrKLPopG7e2nuIA==", - "dependencies": { - "@mongosh/errors": "2.2.10" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.10.tgz", - "integrity": "sha512-c0xG7P7HjKn3ND/aK7gyADRFhXc5CogADfX6exkFlM3z5A8HVCZ0o8/x7m0oi3IIHyCvebvEatbZJ+HjdiR8UQ==", - "dependencies": { - "node-fetch": "^3.3.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.10.tgz", - "integrity": "sha512-MynI6HGlZ0kPqRfx83+9/An39laBzjlc2f6DzDIiO9FVGYcEYMScIG6e0U06M8fiarqeftprSW9dBdc1KQkeEw==", - "dependencies": { - "@babel/core": "^7.16.12", - "@babel/types": "^7.21.2" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/logging": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.10.tgz", - "integrity": "sha512-0z3L23rtaASh1E2hV/wSWxDTycxktbD2XVUnSW1YbyRfePd7YOwVeUhNeFYUf1Qq2q2KeTdxgMaP5/BodY+h5A==", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.1", - "@mongosh/errors": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/types": "2.2.10", - "mongodb-log-writer": "^1.4.2", - "mongodb-redact": "^0.2.3" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/service-provider-core": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.10.tgz", - "integrity": "sha512-XB+G24WjTIYXnHoToJhDJMwMV7pCcgCwgme0MiE6lzcYs5HwlHhk9tzBwv0+i+3NcCb5SMqU38iUMuGG6jKJdQ==", - "dependencies": { - "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.10", - "bson": "^6.7.0", - "mongodb": "^6.7.0", - "mongodb-build-info": "^1.7.2" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "mongodb-client-encryption": "^6.0.0" - } - }, - "node_modules/@mongosh/service-provider-server": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.10.tgz", - "integrity": "sha512-7WxxKZgXNdW7f6vUCmqqWPexPOFqy/n155rFeyWhRVBI5mdbb/Sb5vsdqo1+6AyDpCXsLdl8CldsqmOfGKG36A==", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.1", - "@mongodb-js/oidc-plugin": "^1.0.2", - "@mongosh/errors": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "@mongosh/types": "2.2.10", - "aws4": "^1.12.0", - "mongodb": "^6.7.0", - "mongodb-connection-string-url": "^3.0.1", - "socks": "^2.8.3" - }, - "engines": { - "node": ">=14.15.1" - }, - "optionalDependencies": { - "kerberos": "^2.1.0", - "mongodb-client-encryption": "^6.0.0" - } - }, - "node_modules/@mongosh/shell-api": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.10.tgz", - "integrity": "sha512-Cgcb0U5wqzmTmwAmMkSqhZ3fR4PjqNJ2px61i/9JzWAgIEDSbv9Xni3mcfDRQd/qjLHCEUlAPFgEBu7Cpk0qBQ==", - "dependencies": { - "@mongosh/arg-parser": "2.2.10", - "@mongosh/errors": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/i18n": "2.2.10", - "@mongosh/service-provider-core": "2.2.10", - "mongodb-redact": "^0.2.3" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.10.tgz", - "integrity": "sha512-9v/p5WDu+Ur7+jhXajkBOvpINcRORA1UpdMOV4sBGQ623VbmoDd7xFeFPoi0uWzV50qW5yNRlh3+dvsG/jdKmQ==", - "dependencies": { - "@mongosh/async-rewriter2": "2.2.10", - "@mongosh/history": "2.2.10", - "@mongosh/shell-api": "2.2.10" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/snippet-manager": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.10.tgz", - "integrity": "sha512-y49cANhiCZYaWjaJFLh1ByPJhNAoyZvpI9R1sbA0MC7fu2kWxd91a6mWVWI4ZZPgHGXmpGkAK0/4MpWcUGymsQ==", - "dependencies": { - "@mongosh/errors": "2.2.10", - "@mongosh/import-node-fetch": "2.2.10", - "@mongosh/shell-api": "2.2.10", - "@mongosh/types": "2.2.10", - "bson": "^6.7.0", - "cross-spawn": "^7.0.3", - "escape-string-regexp": "^4.0.0", - "joi": "^17.4.0", - "tar": "^6.1.15" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@mongosh/types": { - "version": "2.2.10", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.10.tgz", - "integrity": "sha512-BfCcmbC3givNCgYZxf6aUJy+/nHg2By6Hs9gZ/WMGgiedMuL5fRE18dGlwy3Aog7Jc6tVkBCMtOpYgjVnUPoxQ==", - "dependencies": { - "@mongodb-js/devtools-connect": "^3.0.1" - }, - "engines": { - "node": ">=14.15.1" - } - }, - "node_modules/@one-ini/wasm": { - "version": "0.1.1", - "resolved": "https://registry.npmmirror.com/@one-ini/wasm/-/wasm-0.1.1.tgz", - "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==" - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmmirror.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@segment/analytics-core": { - "version": "1.4.1", - "resolved": "https://registry.npmmirror.com/@segment/analytics-core/-/analytics-core-1.4.1.tgz", - "integrity": "sha512-kV0Pf33HnthuBOVdYNani21kYyj118Fn+9757bxqoksiXoZlYvBsFq6giNdCsKcTIE1eAMqNDq3xE1VQ0cfsHA==", - "dependencies": { - "@lukeed/uuid": "^2.0.0", - "@segment/analytics-generic-utils": "1.1.1", - "dset": "^3.1.2", - "tslib": "^2.4.1" - } - }, - "node_modules/@segment/analytics-generic-utils": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/@segment/analytics-generic-utils/-/analytics-generic-utils-1.1.1.tgz", - "integrity": "sha512-THTIzBPHnvu1HYJU3fARdJ3qIkukO3zDXsmDm+kAeUks5R9CBXOQ6rPChiASVzSmwAIIo5uFIXXnCraojlq/Gw==", - "dependencies": { - "tslib": "^2.4.1" - } - }, - "node_modules/@segment/analytics-node": { - "version": "1.3.0", - "resolved": "https://registry.npmmirror.com/@segment/analytics-node/-/analytics-node-1.3.0.tgz", - "integrity": "sha512-lRLz1WZaDokMoUe299yP5JkInc3OgJuqNNlxb6j0q22umCiq6b5iDo2gRmFn93reirIvJxWIicQsGrHd93q8GQ==", - "dependencies": { - "@lukeed/uuid": "^2.0.0", - "@segment/analytics-core": "1.4.1", - "@segment/analytics-generic-utils": "1.1.1", - "buffer": "^6.0.3", - "node-fetch": "^2.6.7", - "tslib": "^2.4.1" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/@segment/analytics-node/node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/@segment/analytics-node/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/@segment/analytics-node/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/@segment/analytics-node/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/@sideway/address": { - "version": "4.1.5", - "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.5.tgz", - "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==", - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, - "node_modules/@sideway/formula": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@sideway/formula/-/formula-3.0.1.tgz", - "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" - }, - "node_modules/@sideway/pinpoint": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" - }, - "node_modules/@smithy/abort-controller": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.1.1.tgz", - "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/config-resolver": { - "version": "3.0.4", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.4.tgz", - "integrity": "sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==", - "dependencies": { - "@smithy/node-config-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/core": { - "version": "2.2.4", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.4.tgz", - "integrity": "sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.4", - "@smithy/middleware-retry": "^3.0.7", - "@smithy/middleware-serde": "^3.0.3", - "@smithy/protocol-http": "^4.0.3", - "@smithy/smithy-client": "^3.1.5", - "@smithy/types": "^3.3.0", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/credential-provider-imds": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.3.tgz", - "integrity": "sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==", - "dependencies": { - "@smithy/node-config-provider": "^3.1.3", - "@smithy/property-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/fetch-http-handler": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.0.tgz", - "integrity": "sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==", - "dependencies": { - "@smithy/protocol-http": "^4.0.3", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", - "@smithy/util-base64": "^3.0.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@smithy/hash-node": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.3.tgz", - "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==", - "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/invalid-dependency": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz", - "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@smithy/is-array-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", - "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/middleware-content-length": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz", - "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==", - "dependencies": { - "@smithy/protocol-http": "^4.0.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.4", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.4.tgz", - "integrity": "sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==", - "dependencies": { - "@smithy/middleware-serde": "^3.0.3", - "@smithy/node-config-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.3", - "@smithy/types": "^3.3.0", - "@smithy/url-parser": "^3.0.3", - "@smithy/util-middleware": "^3.0.3", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/middleware-retry": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.7.tgz", - "integrity": "sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==", - "dependencies": { - "@smithy/node-config-provider": "^3.1.3", - "@smithy/protocol-http": "^4.0.3", - "@smithy/service-error-classification": "^3.0.3", - "@smithy/smithy-client": "^3.1.5", - "@smithy/types": "^3.3.0", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-retry": "^3.0.3", - "tslib": "^2.6.2", - "uuid": "^9.0.1" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/middleware-serde": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz", - "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/middleware-stack": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz", - "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/node-config-provider": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.3.tgz", - "integrity": "sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==", - "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/shared-ini-file-loader": "^3.1.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/node-http-handler": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.1.1.tgz", - "integrity": "sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==", - "dependencies": { - "@smithy/abort-controller": "^3.1.1", - "@smithy/protocol-http": "^4.0.3", - "@smithy/querystring-builder": "^3.0.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/property-provider": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.3.tgz", - "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/protocol-http": { - "version": "4.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.3.tgz", - "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/querystring-builder": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz", - "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==", - "dependencies": { - "@smithy/types": "^3.3.0", - "@smithy/util-uri-escape": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/querystring-parser": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz", - "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/service-error-classification": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz", - "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==", - "dependencies": { - "@smithy/types": "^3.3.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.3.tgz", - "integrity": "sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/signature-v4": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.2.tgz", - "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "@smithy/types": "^3.3.0", - "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.3", - "@smithy/util-uri-escape": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/smithy-client": { - "version": "3.1.5", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.5.tgz", - "integrity": "sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.4", - "@smithy/middleware-stack": "^3.0.3", - "@smithy/protocol-http": "^4.0.3", - "@smithy/types": "^3.3.0", - "@smithy/util-stream": "^3.0.5", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/types": { - "version": "3.3.0", - "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.3.0.tgz", - "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/url-parser": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.3.tgz", - "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==", - "dependencies": { - "@smithy/querystring-parser": "^3.0.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - } - }, - "node_modules/@smithy/util-base64": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-base64/-/util-base64-3.0.0.tgz", - "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", - "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-body-length-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz", - "integrity": "sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==", - "dependencies": { - "tslib": "^2.6.2" - } - }, - "node_modules/@smithy/util-body-length-node": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz", - "integrity": "sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-buffer-from": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", - "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", - "dependencies": { - "@smithy/is-array-buffer": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-config-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz", - "integrity": "sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.7.tgz", - "integrity": "sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==", - "dependencies": { - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.1.5", - "@smithy/types": "^3.3.0", - "bowser": "^2.11.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.7.tgz", - "integrity": "sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==", - "dependencies": { - "@smithy/config-resolver": "^3.0.4", - "@smithy/credential-provider-imds": "^3.1.3", - "@smithy/node-config-provider": "^3.1.3", - "@smithy/property-provider": "^3.1.3", - "@smithy/smithy-client": "^3.1.5", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@smithy/util-endpoints": { - "version": "2.0.4", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.4.tgz", - "integrity": "sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==", - "dependencies": { - "@smithy/node-config-provider": "^3.1.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-hex-encoding": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", - "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-middleware": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.3.tgz", - "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==", - "dependencies": { - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-retry": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.3.tgz", - "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==", - "dependencies": { - "@smithy/service-error-classification": "^3.0.3", - "@smithy/types": "^3.3.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-stream": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.5.tgz", - "integrity": "sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==", - "dependencies": { - "@smithy/fetch-http-handler": "^3.2.0", - "@smithy/node-http-handler": "^3.1.1", - "@smithy/types": "^3.3.0", - "@smithy/util-base64": "^3.0.0", - "@smithy/util-buffer-from": "^3.0.0", - "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-utf8": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-uri-escape": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", - "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", - "dependencies": { - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@smithy/util-utf8": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", - "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", - "dependencies": { - "@smithy/util-buffer-from": "^3.0.0", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@tootallnate/quickjs-emscripten": { - "version": "0.23.0", - "resolved": "https://registry.npmmirror.com/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", - "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" - }, - "node_modules/@types/webidl-conversions": { - "version": "7.0.3", - "resolved": "https://registry.npmmirror.com/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" - }, - "node_modules/@types/whatwg-url": { - "version": "11.0.5", - "resolved": "https://registry.npmmirror.com/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", - "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", - "dependencies": { - "@types/webidl-conversions": "*" - } - }, - "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-class-fields": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz", - "integrity": "sha512-l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA==", - "dependencies": { - "acorn-private-class-elements": "^1.0.0" - }, - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6 || ^7 || ^8" - } - }, - "node_modules/acorn-numeric-separator": { - "version": "0.3.6", - "resolved": "https://registry.npmmirror.com/acorn-numeric-separator/-/acorn-numeric-separator-0.3.6.tgz", - "integrity": "sha512-jUr5esgChu4k7VzesH/Nww3EysuyGJJcTEEiXqILUFKpO96PNyEXmK21M6nE0TSqGA1PeEg1MzgqJaoFsn9JMw==", - "deprecated": "acorn>=7.4 supports numeric separators", - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6 || ^7 || ^8" - } - }, - "node_modules/acorn-private-class-elements": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz", - "integrity": "sha512-zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg==", - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6.1.0 || ^7 || ^8" - } - }, - "node_modules/acorn-private-methods": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/acorn-private-methods/-/acorn-private-methods-1.0.0.tgz", - "integrity": "sha512-Jou2L3nfwfPpFdmmHObI3yUpVPM1bPohTUAZCyVDw5Efyn9LSS6E36neRLCRfIr8QjskAfdxRdABOrvP4c/gwQ==", - "dependencies": { - "acorn-private-class-elements": "^1.0.0" - }, - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6 || ^7 || ^8" - } - }, - "node_modules/acorn-static-class-features": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz", - "integrity": "sha512-XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A==", - "dependencies": { - "acorn-private-class-elements": "^1.0.0" - }, - "engines": { - "node": ">=4.8.2" - }, - "peerDependencies": { - "acorn": "^6.1.0 || ^7 || ^8" - } - }, - "node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmmirror.com/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", - "dependencies": { - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/ansi-escape-sequences": { - "version": "5.1.2", - "resolved": "https://registry.npmmirror.com/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz", - "integrity": "sha512-JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw==", - "dependencies": { - "array-back": "^4.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/array-back": { - "version": "4.0.2", - "resolved": "https://registry.npmmirror.com/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" - }, - "node_modules/askcharacter": { - "version": "2.0.4", - "resolved": "https://registry.npmmirror.com/askcharacter/-/askcharacter-2.0.4.tgz", - "integrity": "sha512-SlLS4gA0/6BTcmUfuwySw5n3m8aOI3QlT3GTcQkmJwAVM/olola+S+g/FXggApIidQEKklLfGBZEmZ7Ru69CQw==", - "dependencies": { - "hijack-stream": "^2.0.0" - } - }, - "node_modules/askpassword": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/askpassword/-/askpassword-2.0.2.tgz", - "integrity": "sha512-9j9uyceJQ8rezozTs8pM0cc+b+kn0UbfohhoMii4o/4YRj1IntvCCtRBDYG7bcbL+8f2xJ53Y34WXTUnzgcUyg==", - "dependencies": { - "handle-backspaces": "^2.0.0", - "hijack-stream": "^2.0.0" - } - }, - "node_modules/ast-types": { - "version": "0.13.4", - "resolved": "https://registry.npmmirror.com/ast-types/-/ast-types-0.13.4.tgz", - "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/aws4": { - "version": "1.13.0", - "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.13.0.tgz", - "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==" - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/basic-ftp": { - "version": "5.0.5", - "resolved": "https://registry.npmmirror.com/basic-ftp/-/basic-ftp-5.0.5.tgz", - "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/big-integer": { - "version": "1.6.52", - "resolved": "https://registry.npmmirror.com/big-integer/-/big-integer-1.6.52.tgz", - "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "optional": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true, - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", - "dependencies": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.11.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/body-parser/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/body-parser/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/bowser": { - "version": "2.11.0", - "resolved": "https://registry.npmmirror.com/bowser/-/bowser-2.11.0.tgz", - "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" - }, - "node_modules/bplist-parser": { - "version": "0.2.0", - "resolved": "https://registry.npmmirror.com/bplist-parser/-/bplist-parser-0.2.0.tgz", - "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", - "dependencies": { - "big-integer": "^1.6.44" - }, - "engines": { - "node": ">= 5.10.0" - } - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/browserslist": { - "version": "4.23.1", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.1.tgz", - "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001629", - "electron-to-chromium": "^1.4.796", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.16" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/bson": { - "version": "6.8.0", - "resolved": "https://registry.npmmirror.com/bson/-/bson-6.8.0.tgz", - "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", - "engines": { - "node": ">=16.20.1" - } - }, - "node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "node_modules/bundle-name": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/bundle-name/-/bundle-name-3.0.0.tgz", - "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", - "dependencies": { - "run-applescript": "^5.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001638", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", - "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ] - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "engines": { - "node": ">=10" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" - }, - "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmmirror.com/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "engines": { - "node": ">=14" - } - }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmmirror.com/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dependencies": { - "safe-buffer": "5.2.1" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" - }, - "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/data-uri-to-buffer": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", - "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", - "engines": { - "node": ">= 12" - } - }, - "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmmirror.com/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "optional": true, - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmmirror.com/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "optional": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/default-browser": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/default-browser/-/default-browser-4.0.0.tgz", - "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", - "dependencies": { - "bundle-name": "^3.0.0", - "default-browser-id": "^3.0.0", - "execa": "^7.1.1", - "titleize": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/default-browser-id": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/default-browser-id/-/default-browser-id-3.0.0.tgz", - "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", - "dependencies": { - "bplist-parser": "^0.2.0", - "untildify": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/degenerator": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/degenerator/-/degenerator-5.0.1.tgz", - "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", - "dependencies": { - "ast-types": "^0.13.4", - "escodegen": "^2.1.0", - "esprima": "^4.0.1" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" - } - }, - "node_modules/detect-libc": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.0.3.tgz", - "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/dset": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/dset/-/dset-3.1.3.tgz", - "integrity": "sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" - }, - "node_modules/editorconfig": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/editorconfig/-/editorconfig-1.0.4.tgz", - "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", - "dependencies": { - "@one-ini/wasm": "0.1.1", - "commander": "^10.0.0", - "minimatch": "9.0.1", - "semver": "^7.5.3" - }, - "bin": { - "editorconfig": "bin/editorconfig" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" - }, - "node_modules/electron-to-chromium": { - "version": "1.4.815", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", - "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==" - }, - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/emphasize": { - "version": "4.2.0", - "resolved": "https://registry.npmmirror.com/emphasize/-/emphasize-4.2.0.tgz", - "integrity": "sha512-yGKvcFUHlBsUPwlxTlzKLR8+zhpbitkFOMCUxN8fTJng9bdH3WNzUGkhdaGdjndSUgqmMPBN7umfwnUdLz5Axg==", - "dependencies": { - "chalk": "^4.0.0", - "highlight.js": "~10.4.0", - "lowlight": "~1.17.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/emphasize/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/emphasize/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/emphasize/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/emphasize/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/emphasize/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/emphasize/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "optional": true, - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/escodegen": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/escodegen/-/escodegen-2.1.0.tgz", - "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", - "dependencies": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2" - }, - "bin": { - "escodegen": "bin/escodegen.js", - "esgenerate": "bin/esgenerate.js" - }, - "engines": { - "node": ">=6.0" - }, - "optionalDependencies": { - "source-map": "~0.6.1" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/etag": { - "version": "1.8.1", - "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/execa": { - "version": "7.2.0", - "resolved": "https://registry.npmmirror.com/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/execa/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "node_modules/expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmmirror.com/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.2", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.6.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.2.0", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.7", - "qs": "6.11.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "engines": { - "node": ">= 0.10.0" - } - }, - "node_modules/express/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/fast-xml-parser": { - "version": "4.2.5", - "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", - "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", - "funding": [ - { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" - }, - { - "type": "github", - "url": "https://github.com/sponsors/NaturalIntelligence" - } - ], - "dependencies": { - "strnum": "^1.0.5" - }, - "bin": { - "fxparser": "src/cli/cli.js" - } - }, - "node_modules/fault": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", - "dependencies": { - "format": "^0.2.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/fetch-blob": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/fetch-blob/-/fetch-blob-3.2.0.tgz", - "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "paypal", - "url": "https://paypal.me/jimmywarting" - } - ], - "dependencies": { - "node-domexception": "^1.0.0", - "web-streams-polyfill": "^3.0.3" - }, - "engines": { - "node": "^12.20 || >= 14.13" - } - }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "optional": true - }, - "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", - "dependencies": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/finalhandler/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/finalhandler/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/format": { - "version": "0.2.2", - "resolved": "https://registry.npmmirror.com/format/-/format-0.2.2.tgz", - "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/formdata-polyfill": { - "version": "4.0.10", - "resolved": "https://registry.npmmirror.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", - "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", - "dependencies": { - "fetch-blob": "^3.1.2" - }, - "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "optional": true - }, - "node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs-minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/get-console-process-list": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/get-console-process-list/-/get-console-process-list-1.0.5.tgz", - "integrity": "sha512-K73UHh6ht+MXnnuqQAE/5IjlevHV1ePiTy8yBLsZZPxmoY1KHtouW9E2K1bVLeQzHELztb38vFNak6J+2CNCuw==", - "hasInstallScript": true, - "optional": true, - "os": [ - "win32" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-uri": { - "version": "6.0.3", - "resolved": "https://registry.npmmirror.com/get-uri/-/get-uri-6.0.3.tgz", - "integrity": "sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==", - "dependencies": { - "basic-ftp": "^5.0.2", - "data-uri-to-buffer": "^6.0.2", - "debug": "^4.3.4", - "fs-extra": "^11.2.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/get-uri/node_modules/data-uri-to-buffer": { - "version": "6.0.2", - "resolved": "https://registry.npmmirror.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz", - "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==", - "engines": { - "node": ">= 14" - } - }, - "node_modules/github-from-package": { - "version": "0.0.0", - "resolved": "https://registry.npmmirror.com/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", - "optional": true - }, - "node_modules/glibc-version": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/glibc-version/-/glibc-version-1.0.1.tgz", - "integrity": "sha512-DHPD6Z5wY3ga11O3Izx3JSLDZve0SdRN4nAHC1XtagIjcwHk1OuseZpDr+VWPuTfoDn9H3mHtlKn2+7369raRQ==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^8.0.0" - }, - "bin": { - "glibc-version": "bin/glibc-version.js" - } - }, - "node_modules/glibc-version/node_modules/node-addon-api": { - "version": "8.0.0", - "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-8.0.0.tgz", - "integrity": "sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==", - "optional": true, - "engines": { - "node": "^18 || ^20 || >= 21" - } - }, - "node_modules/glob": { - "version": "10.4.2", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.2.tgz", - "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/globals": { - "version": "11.12.0", - "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "engines": { - "node": ">=4" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/handle-backspaces": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/handle-backspaces/-/handle-backspaces-2.0.1.tgz", - "integrity": "sha512-l6yTgp6ihz8SjmzFOnYzuGqcqFMHGlTCiPMGmFRv0Yl4SnVq71l4miKYOAQ4cxUCjMfclzQYc0PvrmIHZETZYw==" - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "engines": { - "node": ">=4" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/heap-js": { - "version": "2.5.0", - "resolved": "https://registry.npmmirror.com/heap-js/-/heap-js-2.5.0.tgz", - "integrity": "sha512-kUGoI3p7u6B41z/dp33G6OaL7J4DRqRYwVmeIlwLClx7yaaAy7hoDExnuejTKtuDwfcatGmddHDEOjf6EyIxtQ==", - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/highlight.js": { - "version": "10.4.1", - "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-10.4.1.tgz", - "integrity": "sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==", - "engines": { - "node": "*" - } - }, - "node_modules/hijack-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/hijack-stream/-/hijack-stream-2.0.1.tgz", - "integrity": "sha512-RDOUBy7x+iz6ljj7qQOjXZv3RKFLGjXTYV0Kdl7K3R3YlxqoyFt7PLxfbw3yYriHzZSzXp7Y/oaw1f58YvL1ig==" - }, - "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/https-proxy-agent": { - "version": "7.0.5", - "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", - "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", - "engines": { - "node": ">=14.18.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, - "node_modules/ip-address": { - "version": "9.0.5", - "resolved": "https://registry.npmmirror.com/ip-address/-/ip-address-9.0.5.tgz", - "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", - "dependencies": { - "jsbn": "1.1.0", - "sprintf-js": "^1.1.3" - }, - "engines": { - "node": ">= 12" - } - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/ipv6-normalize": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz", - "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA==", - "optional": true - }, - "node_modules/is-docker": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-inside-container": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", - "dependencies": { - "is-docker": "^3.0.0" - }, - "bin": { - "is-inside-container": "cli.js" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-recoverable-error": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/is-recoverable-error/-/is-recoverable-error-1.0.3.tgz", - "integrity": "sha512-T06goBQXH5WCzWtzuU+kYhT3Ui0d3wgk8n4GR/3n9UjgO6cuphhel+W02ps/Z2PYZB8C+l//XAJk9tR5Txo6/w==", - "dependencies": { - "acorn": "^8.8.1", - "acorn-class-fields": "^1.0.0", - "acorn-numeric-separator": "^0.3.6", - "acorn-private-methods": "^1.0.0", - "acorn-static-class-features": "^1.0.0" - } - }, - "node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dependencies": { - "is-docker": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-wsl/node_modules/is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "bin": { - "is-docker": "cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/jackspeak": { - "version": "3.4.0", - "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-3.4.0.tgz", - "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/joi": { - "version": "17.13.3", - "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.3.tgz", - "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", - "dependencies": { - "@hapi/hoek": "^9.3.0", - "@hapi/topo": "^5.1.0", - "@sideway/address": "^4.1.5", - "@sideway/formula": "^3.0.1", - "@sideway/pinpoint": "^2.0.0" - } - }, - "node_modules/jose": { - "version": "4.15.7", - "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.7.tgz", - "integrity": "sha512-L7ioP+JAuZe8v+T5+zVI9Tx8LtU8BL7NxkyDFVMv+Qr3JW0jSoYDedLtodaXwfqMpeCyx4WXFNyu9tJt4WvC1A==", - "funding": { - "url": "https://github.com/sponsors/panva" - } - }, - "node_modules/js-beautify": { - "version": "1.15.1", - "resolved": "https://registry.npmmirror.com/js-beautify/-/js-beautify-1.15.1.tgz", - "integrity": "sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==", - "dependencies": { - "config-chain": "^1.1.13", - "editorconfig": "^1.0.4", - "glob": "^10.3.3", - "js-cookie": "^3.0.5", - "nopt": "^7.2.0" - }, - "bin": { - "css-beautify": "js/bin/css-beautify.js", - "html-beautify": "js/bin/html-beautify.js", - "js-beautify": "js/bin/js-beautify.js" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/js-cookie": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz", - "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", - "engines": { - "node": ">=14" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" - }, - "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/kerberos": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/kerberos/-/kerberos-2.1.0.tgz", - "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^6.1.0", - "prebuild-install": "7.1.1" - }, - "engines": { - "node": ">=12.9.0" - } - }, - "node_modules/kerberos/node_modules/node-addon-api": { - "version": "6.1.0", - "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-6.1.0.tgz", - "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "optional": true - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "node_modules/lowlight": { - "version": "1.17.0", - "resolved": "https://registry.npmmirror.com/lowlight/-/lowlight-1.17.0.tgz", - "integrity": "sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ==", - "dependencies": { - "fault": "^1.0.0", - "highlight.js": "~10.4.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dependencies": { - "yallist": "^3.0.2" - } - }, - "node_modules/macos-export-certificate-and-key": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/macos-export-certificate-and-key/-/macos-export-certificate-and-key-1.1.2.tgz", - "integrity": "sha512-kd4ba3kVKZXy46p4tg3X19dmwaXjtz0La5It6Rt6PbtwP+YcQ0F7ab8MjcSHOvz9NSXmAU15qQG53OlBDAPDzQ==", - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0" - } - }, - "node_modules/media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/memory-pager": { - "version": "1.5.0", - "resolved": "https://registry.npmmirror.com/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" - }, - "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "node_modules/methods": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "optional": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmmirror.com/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mkdirp-classic": { - "version": "0.5.3", - "resolved": "https://registry.npmmirror.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", - "optional": true - }, - "node_modules/mongodb": { - "version": "6.8.0", - "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.8.0.tgz", - "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", - "dependencies": { - "@mongodb-js/saslprep": "^1.1.5", - "bson": "^6.7.0", - "mongodb-connection-string-url": "^3.0.0" - }, - "engines": { - "node": ">=16.20.1" - }, - "peerDependencies": { - "@aws-sdk/credential-providers": "^3.188.0", - "@mongodb-js/zstd": "^1.1.0", - "gcp-metadata": "^5.2.0", - "kerberos": "^2.0.1", - "mongodb-client-encryption": ">=6.0.0 <7", - "snappy": "^7.2.2", - "socks": "^2.7.1" - }, - "peerDependenciesMeta": { - "@aws-sdk/credential-providers": { - "optional": true - }, - "@mongodb-js/zstd": { - "optional": true - }, - "gcp-metadata": { - "optional": true - }, - "kerberos": { - "optional": true - }, - "mongodb-client-encryption": { - "optional": true - }, - "snappy": { - "optional": true - }, - "socks": { - "optional": true - } - } - }, - "node_modules/mongodb-build-info": { - "version": "1.7.2", - "resolved": "https://registry.npmmirror.com/mongodb-build-info/-/mongodb-build-info-1.7.2.tgz", - "integrity": "sha512-eoLFZvCIjcwijYJdxvYupj1c+55VAVm0o4gBJjrcDxxmmpm+bC4Ix9ayZbyhQdVXDZAGDi03NA0GghXjBVXnxg==", - "dependencies": { - "mongodb-connection-string-url": "^3.0.0" - } - }, - "node_modules/mongodb-client-encryption": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.0.1.tgz", - "integrity": "sha512-u6pKu9plR7hQH6VtsfYonC9dwWAM3HFEpi+Xy3EJIdUyoH6dlFgaxX8TnKx/Ycfi2I1cxTXq2IbhSpg157vVgg==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.2" - }, - "engines": { - "node": ">=16.20.1" - } - }, - "node_modules/mongodb-client-encryption/node_modules/prebuild-install": { - "version": "7.1.2", - "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.2.tgz", - "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mongodb-connection-string-url": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", - "integrity": "sha512-XqMGwRX0Lgn05TDB4PyG2h2kKO/FfWJyCzYQbIhXUxz7ETt0I/FqHjUeqj37irJ+Dl1ZtU82uYyj14u2XsZKfg==", - "dependencies": { - "@types/whatwg-url": "^11.0.2", - "whatwg-url": "^13.0.0" - } - }, - "node_modules/mongodb-crypt-library-version": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/mongodb-crypt-library-version/-/mongodb-crypt-library-version-1.0.5.tgz", - "integrity": "sha512-RLTxgBOpK1Ht1FvGpitI6EkFuYGk/CB6ImDJHzB9Iv/iKwVANu4OynaiJOoZQQTaZZCetmyAgMXwNHhMLCRyJw==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0" - }, - "bin": { - "mongodb-crypt-library-version": "bin/mongodb-crypt-library-version.js" - } - }, - "node_modules/mongodb-log-writer": { - "version": "1.4.2", - "resolved": "https://registry.npmmirror.com/mongodb-log-writer/-/mongodb-log-writer-1.4.2.tgz", - "integrity": "sha512-ZQYBgW1IZtuRWsv9hF0mjpfDg6usMawkkWKnFb/goXosbW0YyxVA9OHt32TJfppGK/U2p7jQx4V9DxRFsFmmKw==", - "dependencies": { - "bson": "^4.5.1 || ^5.0.0 || ^6.0.0", - "heap-js": "^2.3.0" - } - }, - "node_modules/mongodb-redact": { - "version": "0.2.3", - "resolved": "https://registry.npmmirror.com/mongodb-redact/-/mongodb-redact-0.2.3.tgz", - "integrity": "sha512-a6ZPWlC9yf6F/n6ylKyyTO2PXZeD6nPKWwBmAIlOtOH4v82DIfsgO4Bpml10/YSwFxF1+VY8NHohmxofzpB4Yw==", - "dependencies": { - "lodash": "^4.17.15" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/napi-build-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", - "optional": true - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/netmask": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/netmask/-/netmask-2.0.2.tgz", - "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/node-abi": { - "version": "3.65.0", - "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.65.0.tgz", - "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", - "optional": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-addon-api": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-4.3.0.tgz", - "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==", - "optional": true - }, - "node_modules/node-domexception": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/node-domexception/-/node-domexception-1.0.0.tgz", - "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/jimmywarting" - }, - { - "type": "github", - "url": "https://paypal.me/jimmywarting" - } - ], - "engines": { - "node": ">=10.5.0" - } - }, - "node_modules/node-fetch": { - "version": "3.3.2", - "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-3.3.2.tgz", - "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", - "dependencies": { - "data-uri-to-buffer": "^4.0.0", - "fetch-blob": "^3.1.4", - "formdata-polyfill": "^4.0.10" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/node-fetch" - } - }, - "node_modules/node-forge": { - "version": "1.3.1", - "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz", - "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", - "optional": true, - "engines": { - "node": ">= 6.13.0" - } - }, - "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" - }, - "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmmirror.com/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", - "dependencies": { - "abbrev": "^2.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-run-path": { - "version": "5.3.0", - "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-5.3.0.tgz", - "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/numeral": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/numeral/-/numeral-2.0.6.tgz", - "integrity": "sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==", - "engines": { - "node": "*" - } - }, - "node_modules/object-hash": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/object-hash/-/object-hash-2.2.0.tgz", - "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==", - "engines": { - "node": ">= 6" - } - }, - "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/oidc-token-hash": { - "version": "5.0.3", - "resolved": "https://registry.npmmirror.com/oidc-token-hash/-/oidc-token-hash-5.0.3.tgz", - "integrity": "sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==", - "engines": { - "node": "^10.13.0 || >=12.0.0" - } - }, - "node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "optional": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmmirror.com/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/open": { - "version": "9.1.0", - "resolved": "https://registry.npmmirror.com/open/-/open-9.1.0.tgz", - "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", - "dependencies": { - "default-browser": "^4.0.0", - "define-lazy-prop": "^3.0.0", - "is-inside-container": "^1.0.0", - "is-wsl": "^2.2.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/openid-client": { - "version": "5.6.5", - "resolved": "https://registry.npmmirror.com/openid-client/-/openid-client-5.6.5.tgz", - "integrity": "sha512-5P4qO9nGJzB5PI0LFlhj4Dzg3m4odt0qsJTfyEtZyOlkgpILwEioOhVVJOrS1iVH494S4Ee5OCjjg6Bf5WOj3w==", - "dependencies": { - "jose": "^4.15.5", - "lru-cache": "^6.0.0", - "object-hash": "^2.2.0", - "oidc-token-hash": "^5.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/panva" - } - }, - "node_modules/openid-client/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/openid-client/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/os-dns-native": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/os-dns-native/-/os-dns-native-1.2.1.tgz", - "integrity": "sha512-LbU43lWBxnZhy72Ngr+Vga0og5Q2+Ob8lvSHJkP2uYBkvdmAnK4CvaVaBhC1hk9AQV3YxAZ9fZWaJTuIyPEi+Q==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "bindings": "^1.5.0", - "debug": "^4.3.3", - "ipv6-normalize": "^1.0.1", - "node-addon-api": "^4.3.0" - } - }, - "node_modules/pac-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", - "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", - "dependencies": { - "@tootallnate/quickjs-emscripten": "^0.23.0", - "agent-base": "^7.0.2", - "debug": "^4.3.4", - "get-uri": "^6.0.1", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.5", - "pac-resolver": "^7.0.1", - "socks-proxy-agent": "^8.0.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/pac-resolver": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/pac-resolver/-/pac-resolver-7.0.1.tgz", - "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==", - "dependencies": { - "degenerator": "^5.0.0", - "netmask": "^2.0.2" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmmirror.com/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.3.0", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.3.0.tgz", - "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==", - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" - }, - "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" - }, - "node_modules/prebuild-install": { - "version": "7.1.1", - "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.1.tgz", - "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", - "optional": true, - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pretty-repl": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/pretty-repl/-/pretty-repl-4.0.1.tgz", - "integrity": "sha512-Ve+ZNS5fwxylks3TTR4su7SaNAHVOh++7J5R8VKFAHIjmAMS8X79rnETc/JJoqay52cfgeHum7vm2+9hFSys9Q==", - "dependencies": { - "ansi-regex": "^5.0.1", - "chalk": "^4.1.1", - "emphasize": "^4.2.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/pretty-repl/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/pretty-repl/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/pretty-repl/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/pretty-repl/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/pretty-repl/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/pretty-repl/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmmirror.com/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" - }, - "node_modules/proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dependencies": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/proxy-agent": { - "version": "6.4.0", - "resolved": "https://registry.npmmirror.com/proxy-agent/-/proxy-agent-6.4.0.tgz", - "integrity": "sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "^4.3.4", - "http-proxy-agent": "^7.0.1", - "https-proxy-agent": "^7.0.3", - "lru-cache": "^7.14.1", - "pac-proxy-agent": "^7.0.1", - "proxy-from-env": "^1.1.0", - "socks-proxy-agent": "^8.0.2" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proxy-agent/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "engines": { - "node": ">=12" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "optional": true, - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dependencies": { - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmmirror.com/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "optional": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "optional": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/resolve-mongodb-srv": { - "version": "1.1.5", - "resolved": "https://registry.npmmirror.com/resolve-mongodb-srv/-/resolve-mongodb-srv-1.1.5.tgz", - "integrity": "sha512-flu1XTSLDJHvTnWu2aJh2w9jgGPcNYJn2obMkuzXiyWSz0MLXu9IRCjvirJ4zRoCPHJJPt3uLQVNJTrzFRWd1w==", - "optional": true, - "dependencies": { - "whatwg-url": "^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0" - }, - "bin": { - "resolve-mongodb-srv": "bin/resolve-mongodb-srv.js" - } - }, - "node_modules/run-applescript": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/run-applescript/-/run-applescript-5.0.0.tgz", - "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", - "dependencies": { - "execa": "^5.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/run-applescript/node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/run-applescript/node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "engines": { - "node": ">=10.17.0" - } - }, - "node_modules/run-applescript/node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/run-applescript/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/run-applescript/node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/run-applescript/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/run-applescript/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "node_modules/run-applescript/node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", - "dependencies": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/send/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/send/node_modules/debug/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", - "dependencies": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.18.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/set-function-length": { - "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", - "dependencies": { - "define-data-property": "^1.1.4", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "engines": { - "node": ">=8" - } - }, - "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", - "dependencies": { - "call-bind": "^1.0.7", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/simple-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/simple-concat/-/simple-concat-1.0.1.tgz", - "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true - }, - "node_modules/simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "optional": true, - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmmirror.com/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.8.3", - "resolved": "https://registry.npmmirror.com/socks/-/socks-2.8.3.tgz", - "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", - "dependencies": { - "ip-address": "^9.0.5", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "8.0.4", - "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", - "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", - "dependencies": { - "agent-base": "^7.1.1", - "debug": "^4.3.4", - "socks": "^2.8.3" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sparse-bitfield": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", - "dependencies": { - "memory-pager": "^1.0.2" - } - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" - }, - "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "optional": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/system-ca": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/system-ca/-/system-ca-1.0.3.tgz", - "integrity": "sha512-FHwdyDHM/J6SjHNVEp532J5rWsO0oPB/szZGsP/8I2s78mPLQhE0WwKTGi/RJulqTICekINsczg5q44n/1b+lQ==", - "optionalDependencies": { - "macos-export-certificate-and-key": "^1.1.1", - "win-export-certificate-and-key": "^1.1.1" - } - }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmmirror.com/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar-fs": { - "version": "2.1.1", - "resolved": "https://registry.npmmirror.com/tar-fs/-/tar-fs-2.1.1.tgz", - "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", - "optional": true, - "dependencies": { - "chownr": "^1.1.1", - "mkdirp-classic": "^0.5.2", - "pump": "^3.0.0", - "tar-stream": "^2.1.4" - } - }, - "node_modules/tar-fs/node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "optional": true - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "optional": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/tar/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" - }, - "node_modules/titleize": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/titleize/-/titleize-3.0.0.tgz", - "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", - "engines": { - "node": ">=4" - } - }, - "node_modules/toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "engines": { - "node": ">=0.6" - } - }, - "node_modules/tr46": { - "version": "4.1.1", - "resolved": "https://registry.npmmirror.com/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", - "dependencies": { - "punycode": "^2.3.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" - }, - "node_modules/tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmmirror.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "optional": true, - "dependencies": { - "safe-buffer": "^5.0.1" - }, - "engines": { - "node": "*" - } - }, - "node_modules/type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dependencies": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "engines": { - "node": ">=8" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.0.16", - "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", - "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "optional": true - }, - "node_modules/utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/bin/uuid" - } - }, - "node_modules/vary": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/web-streams-polyfill": { - "version": "3.3.3", - "resolved": "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", - "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", - "engines": { - "node": ">=12" - } - }, - "node_modules/whatwg-url": { - "version": "13.0.0", - "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-13.0.0.tgz", - "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", - "dependencies": { - "tr46": "^4.1.1", - "webidl-conversions": "^7.0.0" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/win-export-certificate-and-key": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/win-export-certificate-and-key/-/win-export-certificate-and-key-1.1.2.tgz", - "integrity": "sha512-3Su7Xdt9UR8pZicWQDcGSWNL6We/NzAGxe7AeQ1Z/zAeGHWlTKAh3HemGvIvxLRPsk4NW9D/QL3cL6SIvFcTvQ==", - "hasInstallScript": true, - "optional": true, - "os": [ - "win32" - ], - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^3.1.0", - "node-forge": "^1.2.1" - } - }, - "node_modules/win-export-certificate-and-key/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmmirror.com/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "optional": true - }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "optional": true - }, - "node_modules/yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "engines": { - "node": ">=10" - } - } - } -} diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json deleted file mode 100644 index d9e301c949b23..0000000000000 --- a/pkgs/development/tools/mongosh/source.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "2.2.10", - "integrity": "sha512-VTuZLREjLMzUDD/s0QEvJFF18A2mvYgxbEfGFr22vDS1se47bxgPcvvuDGQCQvVWC6OG+f75qkwtp8jPkYWa4w==", - "filename": "mongosh-2.2.10.tgz", - "deps": "sha256-iSbFG/Xh2EtGCJfcTLLTJm4BMrTHnnhYuk+FIVE/TJI=" -} diff --git a/pkgs/development/tools/mongosh/update.sh b/pkgs/development/tools/mongosh/update.sh deleted file mode 100755 index 08ceb076093b8..0000000000000 --- a/pkgs/development/tools/mongosh/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodejs libarchive prefetch-npm-deps moreutils jq -# shellcheck shell=bash - -set -exuo pipefail - -cd -- "$(dirname -- "${BASH_SOURCE[0]}")" - -TMPDIR="$(mktemp -d)" -trap 'rm -r -- "$TMPDIR"' EXIT - -pushd -- "$TMPDIR" -npm pack mongosh --json | jq '.[0] | { version, integrity, filename }' > source.json -bsdtar -x -f "$(jq -r .filename source.json)" - -pushd package -npm install --omit=optional --package-lock-only -popd - -DEPS="$(prefetch-npm-deps package/package-lock.json)" -jq ".deps = \"$DEPS\"" source.json | sponge source.json - -popd - -cp -t . -- "$TMPDIR/source.json" "$TMPDIR/package/package-lock.json" diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix index bd78d3d92b563..b8a1e46d7431f 100644 --- a/pkgs/development/tools/moq/default.nix +++ b/pkgs/development/tools/moq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "moq"; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index c6d8966d50142..6c93c272164b3 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { repo = "mustache"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; + hash = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; }; vendorHash = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA="; diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/8.nix index d2de80d432c42..2f8983572f29d 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -16,7 +16,6 @@ , libssh , zstd , lz4 -, boost , readline , libtirpc , rpcsvc-proto @@ -34,33 +33,42 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; + + mysqlShellVersion = "8.4.1"; + mysqlServerVersion = "8.4.1"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; - version = "8.0.37"; + version = mysqlShellVersion; srcs = [ (fetchurl { - url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho="; + url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; + hash = "sha256-20Hxl9cXDFTX7cDQyaJzDCJfSvBeztD2S+z5u2wRAT4="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-UtZ7/Ip5h9CXKy3lkSt8/TXJgbPPUO73rMSIFPfX0Is="; + hash = "sha256-wTwoaoaCrTQqaqgE35Sg8zn8HqjsjQowbtgMZTpkYQU="; }) ]; sourceRoot = "mysql-shell-${finalAttrs.version}-src"; postUnpack = '' - mv mysql-${finalAttrs.version} mysql + mv mysql-${mysqlServerVersion} mysql ''; + patches = [ + # No openssl bundling on macOS. It's not working. + # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53 + ./no-openssl-bundling.patch + ]; + postPatch = '' - substituteInPlace ../mysql/cmake/libutils.cmake --replace /usr/bin/libtool libtool - substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool - substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] @@ -68,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; buildInputs = [ - boost curl libedit libssh @@ -95,22 +102,22 @@ stdenv.mkDerivation (finalAttrs: { # Build MySQL echo "Building mysqlclient mysqlxclient" - cmake -DWITH_SYSTEM_LIBS=ON -DWITH_BOOST=system -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ + cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient - ''; - cmakeFlags = [ - "-DMYSQL_SOURCE_DIR=../mysql" - "-DMYSQL_BUILD_DIR=../mysql/build" - "-DMYSQL_CONFIG_EXECUTABLE=../../mysql/build/scripts/mysql_config" - "-DWITH_ZSTD=system" - "-DWITH_LZ4=system" - "-DWITH_ZLIB=system" - "-DWITH_PROTOBUF=${protobuf}" - "-DHAVE_PYTHON=1" - ]; + cmakeFlagsArray+=( + "-DMYSQL_SOURCE_DIR=''${NIX_BUILD_TOP}/mysql" + "-DMYSQL_BUILD_DIR=''${NIX_BUILD_TOP}/mysql/build" + "-DMYSQL_CONFIG_EXECUTABLE=''${NIX_BUILD_TOP}/mysql/build/scripts/mysql_config" + "-DWITH_ZSTD=system" + "-DWITH_LZ4=system" + "-DWITH_ZLIB=system" + "-DWITH_PROTOBUF=system" + "-DHAVE_PYTHON=1" + ) + ''; postFixup = '' wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index efd74f3fc717d..32fd0746360fa 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -34,8 +34,8 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "8.4.0"; - mysqlServerVersion = "8.4.0"; + mysqlShellVersion = "9.0.1"; + mysqlServerVersion = "9.0.1"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-R6VDP83WOduDa5nhtUWcK4E8va0j/ytd1K0n95K6kY4="; + hash = "sha256-GPpl8epq6nHkGP4FSFUtmijeaOK4vDupU2WZ60WaZgY="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-QT30FNogn7JR/dQ3V86QaAZaMREMKvTocRTUaNLGVlg="; + hash = "sha256-F77W+cY1X29p4DIA1JOxJ6jAKT+8Qz4LkHh91MASlE0="; }) ]; @@ -58,11 +58,17 @@ stdenv.mkDerivation (finalAttrs: { mv mysql-${mysqlServerVersion} mysql ''; + patches = [ + # No openssl bundling on macOS. It's not working. + # See https://github.com/mysql/mysql-shell/blob/5b84e0be59fc0e027ef3f4920df15f7be97624c1/cmake/ssl.cmake#L53 + ./no-openssl-bundling.patch + ]; + postPatch = '' - substituteInPlace ../mysql/cmake/libutils.cmake --replace-quiet /usr/bin/libtool libtool - substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-quiet /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool + substituteInPlace ../mysql/cmake/os/Darwin.cmake --replace-fail /usr/bin/libtool libtool - substituteInPlace cmake/libutils.cmake --replace-quiet /usr/bin/libtool libtool + substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool ''; nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] diff --git a/pkgs/development/tools/mysql-shell/no-openssl-bundling.patch b/pkgs/development/tools/mysql-shell/no-openssl-bundling.patch new file mode 100644 index 0000000000000..d959e923ad4e3 --- /dev/null +++ b/pkgs/development/tools/mysql-shell/no-openssl-bundling.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33931e02a..59f613a9d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -901,7 +901,6 @@ endif() + ### Bundling of OpenSSL libraries (if needed) + # macro MYSQL_CHECK_SSL_DLLS() adapted for Shell + IF (WITH_SSL_PATH AND (APPLE OR WIN32 OR LINUX_STANDALONE)) +- SET(BUNDLED_OPENSSL 1) + MESSAGE(STATUS "WITH_SSL_PATH ${WITH_SSL_PATH}") + + # In MySQL Server 8.0.4 and up, OpenSSL is linked dynamically and diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 6c71e374ffc7b..6f4e5505299ee 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -13,7 +13,7 @@ let license = lib.licenses.asl20; homepage = "https://www.martiansoftware.com/nailgun/"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; server = stdenvNoCC.mkDerivation { diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/development/tools/nap/default.nix index aad1a6c53a3aa..784877af792f2 100644 --- a/pkgs/development/tools/nap/default.nix +++ b/pkgs/development/tools/nap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "nap"; diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index e57dcffac2c0b..0b6aaea05f70b 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { mainProgram = "nasmfmt"; homepage = "https://github.com/yamnikov-oleg/nasmfmt"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix index 65a6020545ec5..2e036238cc65e 100644 --- a/pkgs/development/tools/nest-cli/default.nix +++ b/pkgs/development/tools/nest-cli/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.3.2"; + version = "10.4.4"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-FSI87oeHiNqL8FhGavPtqurOr/1Y5iGawSwhBhLB2Ls="; + hash = "sha256-m08QZBBIWl/JB3Z7aOiNE4kagL0wFn4JJhCFCtjkpdo="; }; - npmDepsHash = "sha256-RqotLpMISfB2xE9zng0TkapJ0y1fuVWP/0nY2VcMVRU="; + npmDepsHash = "sha256-PbUleMm6J/5R64ZceZ5G4CsU+P3etdlV7rdT5VvUSFQ="; env = { npm_config_build_from_source = true; diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/development/tools/nodehun/default.nix index 5a49c90ad2e20..ec5587273db29 100644 --- a/pkgs/development/tools/nodehun/default.nix +++ b/pkgs/development/tools/nodehun/default.nix @@ -1,4 +1,5 @@ { buildNpmPackage +, cctools , darwin , fetchFromGitHub , lib @@ -31,7 +32,7 @@ buildNpmPackage { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; nativeBuildInputs = [ nodePackages.node-gyp python3 ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; + ++ lib.optionals stdenv.isDarwin [ cctools ]; postInstall = '' # Only keep the necessary parts of build/Release to reduce closure size diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/development/tools/nufmt/default.nix index d9f2732aedd7d..4c9e6ff4af6a7 100644 --- a/pkgs/development/tools/nufmt/default.nix +++ b/pkgs/development/tools/nufmt/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { IOKit ]); - cargoSha256 = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; + cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; meta = with lib; { description = "Nushell formatter"; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 769c39769e3f2..ff1fae302d169 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -87,7 +87,7 @@ let extraOutputsToInstall = [ "lib" "out" ]; }; - version = "0.88.0"; + version = "0.90.0"; in stdenv.mkDerivation { pname = "nwjs"; @@ -98,10 +98,10 @@ stdenv.mkDerivation { in fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; hash = { - "sdk-ia32" = "sha256-pk8Fdzw8zBBF4xeU5BlmkF1gbf7HIn8jheSjbdV4hI0="; - "sdk-x64" = "sha256-51alZRf/+bpKfVLUQuy1VtLHCgkVuptQaJgupt7zxcU="; - "ia32" = "sha256-OLkOJo3xDZ6WKbf6zPeY+KcgzoEjYWMIV7YWWbESjPo="; - "x64" = "sha256-KSsaTs0W8m2dI+0ByLqU4H4ai/PXUt6LtroZIBeymgs="; + "sdk-ia32" = "sha256-dETXtOdJ9/1wZ47l/j/K5moN4m+KNc7vu7wVGql8NXQ="; + "sdk-x64" = "sha256-mRIKIrFIdXQ+tLled3ygJvMCBDKP08bl3IlqTbQmYq0="; + "ia32" = "sha256-+nGIQuWdPfctPNzDu7mkEUOmLx1cwcJoVCAk6ImNBxQ="; + "x64" = "sha256-uEb0GTONaR58nhjGAan1HCOqQKtQ2JDrTaSL+SfRY6E="; }."${flavor + bits}"; }; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index d0308f31f7eef..9f6055677e84c 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -10,13 +10,13 @@ else let params = if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { - version = "8.02.01"; + version = "8.03.00"; src = fetchFromGitHub { owner = "camlp5"; repo = "camlp5"; rev = version; - hash = "sha256-qSA2559vqWLU+0ns7LPUGI2K5f8sfu+QQ0sCH8sR6To="; + hash = "sha256-hu/279gBvUc7Z4jM6EHiar6Wm4vjkGXl+7bxowj+vlM="; }; nativeBuildInputs = [ makeWrapper ocaml findlib perl ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix index 814aab16cb009..90c14554b5094 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/toplevel.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, js_of_ocaml-compiler, ppxlib }: +{ buildDunePackage, js_of_ocaml-compiler, ppxlib }: buildDunePackage { pname = "js_of_ocaml-toplevel"; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index fb9b46c00ce56..f4c97b9642ece 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -1,6 +1,7 @@ { lib , substituteAll , fetchurl +, fetchpatch , ocaml , dune_3 , buildDunePackage @@ -21,23 +22,26 @@ let "4.12.1" = "4.7-412"; "4.13.0" = "4.7-413"; "4.13.1" = "4.7-413"; - "4.14.0" = "4.14-414"; - "4.14.1" = "4.14-414"; - "4.14.2" = "4.14-414"; + "4.14.0" = "4.16-414"; + "4.14.1" = "4.16-414"; + "4.14.2" = "4.16-414"; "5.0.0" = "4.14-500"; - "5.1.0" = "4.14-501"; - "5.1.1" = "4.14-501"; + "5.1.0" = "4.16-501"; + "5.1.1" = "4.16-501"; + "5.2.0" = "5.1-502"; }; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.14-414" = "sha256-eQGMyqN8FQHdXE1c94vDQg1kGx6CRDZimBxUctlzmT0="; "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4="; - "4.14-501" = "sha256-t+npbpJAWMLOQpZCeIqi45ByDUQeIkU4vPSUplIDopI="; + "4.16-414" = "sha256-xekZdfPfVoSeGzBvNWwxcJorE519V2NLjSHkcyZvzy0="; + "4.16-501" = "sha256-2lvzCbBAZFwpKuRXLMagpwDb0rz8mWrBPI5cODbCHiY="; + "5.1-502" = "sha256-T9gIvCaSnP/MqOoGNEeQFZwQ4+r5yRTPRu956Rf8rhU="; }; version = lib.getAttr ocaml.version merlinVersions; + in if !lib.hasAttr ocaml.version merlinVersions @@ -47,19 +51,30 @@ else buildDunePackage { pname = "merlin"; inherit version; - duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; sha256 = hashes."${version}"; }; - patches = [ + patches = let + branch = lib.head (lib.tail (lib.splitString "-" version)); + needsVimPatch = lib.versionOlder version "4.17" || + branch == "502" && lib.versionOlder version "5.2"; + in + [ (substituteAll { src = ./fix-paths.patch; dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_3}/bin/dune"; }) + ] ++ lib.optionals needsVimPatch [ + # https://github.com/ocaml/merlin/pull/1798 + (fetchpatch { + name = "vim-python-12-syntax-warning-fix.patch"; + url = "https://github.com/ocaml/merlin/commit/9e0c47b0d5fd0c4edc37c4c7ce927b155877557d.patch"; + hash = "sha256-HmdTISE/s45C5cwLgsCHNUW6OAPSsvQ/GcJE6VDEobs="; + }) ]; strictDeps = true; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index a80252c3dfbce..c37cac53430b6 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, substituteAll +{ lib, fetchurl, fetchpatch, buildDunePackage, substituteAll , dot-merlin-reader, dune_2, yojson, csexp, result, menhirSdk }: buildDunePackage rec { @@ -18,6 +18,12 @@ buildDunePackage rec { dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) + # https://github.com/ocaml/merlin/pull/1798 + (fetchpatch { + name = "vim-python-12-syntax-warning-fix.patch"; + url = "https://github.com/ocaml/merlin/commit/9e0c47b0d5fd0c4edc37c4c7ce927b155877557d.patch"; + hash = "sha256-HmdTISE/s45C5cwLgsCHNUW6OAPSsvQ/GcJE6VDEobs="; + }) ]; strictDeps = true; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index ef30a51a7e6a6..28c77b902b4bc 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -3,8 +3,6 @@ buildDunePackage rec { pname = "dot-merlin-reader"; - duneVersion = "3"; - inherit (merlin) version src; minimalOCamlVersion = "4.06"; diff --git a/pkgs/development/tools/ocaml/merlin/lib.nix b/pkgs/development/tools/ocaml/merlin/lib.nix index 27c8035a5e3b4..4a9bc320cdc2d 100644 --- a/pkgs/development/tools/ocaml/merlin/lib.nix +++ b/pkgs/development/tools/ocaml/merlin/lib.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, merlin, csexp }: +{ buildDunePackage, merlin, csexp }: buildDunePackage { pname = "merlin-lib"; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 6bf1ff212c263..0d1cb1955baf4 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "obelisk"; - version = "0.6.0"; + version = "0.7.0"; duneVersion = "3"; src = fetchFromGitHub { owner = "Lelio-Brun"; repo = pname; rev = "v${version}"; - sha256 = "1jjaqa2b7msl9qd3x7j34vdh1s9alq8hbvzk8a5srb4yyfyim15b"; + sha256 = "sha256-M/pQvuS8hlpeqd6QBDTHQzqIVFIqGUfj0igVPW2Xwwc="; }; strictDeps = true; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 94848a79360c7..4575226afdec7 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { inherit (ocamlPackages.ocaml.meta) platforms; description = "Simple package build system for OCaml"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 0c8fd4b4e7b43..6696a99977a09 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,13 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: -stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ocaml, findlib +, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.14.3" +}: + +stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-ocamlbuild"; - version = "0.15.0"; + inherit version; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; - rev = version; - sha256 = "sha256-j4Nd5flyvshIo+XFtBS0fKqdd9YcxYsjE7ty6rZLDRc="; + rev = finalAttrs.version; + hash = { + "0.14.3" = "sha256-dfcNu4ugOYu/M0rRQla7lXum/g1UzncdLGmpPYo0QUM="; + "0.15.0" = "sha256-j4Nd5flyvshIo+XFtBS0fKqdd9YcxYsjE7ty6rZLDRc="; + }."${finalAttrs.version}"; }; createFindlibDestdir = true; @@ -38,4 +44,4 @@ stdenv.mkDerivation rec { mainProgram = "ocamlbuild"; inherit (ocaml.meta) platforms; }; -} +}) diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/development/tools/ocaml/opam-publish/default.nix index ce0a807cc56ea..41a7528e52d49 100644 --- a/pkgs/development/tools/ocaml/opam-publish/default.nix +++ b/pkgs/development/tools/ocaml/opam-publish/default.nix @@ -15,17 +15,15 @@ in buildDunePackage rec { pname = "opam-publish"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "ocaml-opam"; repo = pname; rev = version; - sha256 = "sha256-CiZOljFBUUC3ExGSzzTATGqmxKjbzjRlL4aaL/fx9zI="; + hash = "sha256-7TIBLHpLVzI8Ex01wiQqVPllMZuiiUQsbuGtsNmrW3Q="; }; - duneVersion = "3"; - buildInputs = [ cmdliner lwt_ssl diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index ec2638912d3ac..ec34ba2f17fc4 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -2,82 +2,16 @@ ocaml, unzip, ncurses, curl, bubblewrap, Foundation }: -assert lib.versionAtLeast ocaml.version "4.02.3"; +assert lib.versionAtLeast ocaml.version "4.08.0"; -let - srcs = { - "0install-solver" = fetchurl { - url = "https://github.com/0install/0install/releases/download/v2.17/0install-v2.17.tbz"; - sha256 = "08q95mzmf9pyyqs68ff52422f834hi313cxmypwrxmxsabcfa10p"; - }; - "base64" = fetchurl { - url = "https://github.com/mirage/ocaml-base64/releases/download/v3.5.0/base64-v3.5.0.tbz"; - sha256 = "19735bvb3k263hzcvdhn4d5lfv2qscc9ib4q85wgxsvq0p0fk7aq"; - }; - "cmdliner" = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz"; - sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; - }; - "cppo" = fetchurl { - url = "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz"; - sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by"; - }; - "cudf" = fetchurl { - url = "https://gitlab.com/irill/cudf/-/archive/v0.10/cudf-v0.10.tar.gz"; - sha256 = "0l7vzvlrk4x4vw1lkd1wzarxz3h82r3835singcay8m8zj8777bv"; - }; - "dose3" = fetchurl { - url = "https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.gz"; - sha256 = "0ab0llqdmy82ljh8xdf57y00c9jvf1vnxiq9hczli0r6vc263nq2"; - }; - "dune-local" = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz"; - sha256 = "041n16sn41wwj6fgi7l10hvbl5x5swygqv33d4csx7rm0iklrgbp"; - }; - "extlib" = fetchurl { - url = "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz"; - sha256 = "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq"; - }; - "mccs" = fetchurl { - url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz"; - sha256 = "05nnji9h8mss3hzjr5faid2v3xfr7rcv2ywmpcxxp28y6h2kv9gv"; - }; - "ocamlgraph" = fetchurl { - url = "https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz"; - sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0"; - }; - "opam-0install-cudf" = fetchurl { - url = "https://github.com/ocaml-opam/opam-0install-solver/releases/download/v0.4.2/opam-0install-cudf-v0.4.2.tbz"; - sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr"; - }; - "opam-file-format" = fetchurl { - url = "https://github.com/ocaml/opam-file-format/archive/2.1.4.tar.gz"; - sha256 = "0xbdlpxb0348pbwijna2x6nbi8fcxdh63cwrznn4q4zzbv9zsy02"; - }; - "re" = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz"; - sha256 = "1fqfg609996bgxr14yyfxhvl6hm9c1j0mm2xjdjigqrzgyb4crc4"; - }; - "result" = fetchurl { - url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz"; - sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; - }; - "seq" = fetchurl { - url = "https://github.com/c-cube/seq/archive/0.2.2.tar.gz"; - sha256 = "1ck15v3pg8bacdg6d6iyp2jc3kgrzxk5jsgzx3287x2ycb897j53"; - }; - "stdlib-shims" = fetchurl { - url = "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz"; - sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; - }; - opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.5.zip"; - sha256 = "0s8r5gfs2zsyfn3jzqnvns3g0rkik3pw628n0dik55fwq3zjgg4a"; - }; - }; -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "opam"; - version = "2.1.5"; + version = "2.2.0"; + + src = fetchurl { + url = "https://github.com/ocaml/opam/releases/download/2.2.0/opam-full-2.2.0-2.tar.gz"; + sha256 = "459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97"; + }; strictDeps = true; @@ -86,35 +20,13 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; - src = srcs.opam; - - postUnpack = '' - ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz - ln -sv ${srcs."base64"} $sourceRoot/src_ext/base64.tbz - ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz - ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz - ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz - ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz - ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz - ln -sv ${srcs."extlib"} $sourceRoot/src_ext/extlib.tar.gz - ln -sv ${srcs."mccs"} $sourceRoot/src_ext/mccs.tar.gz - ln -sv ${srcs."ocamlgraph"} $sourceRoot/src_ext/ocamlgraph.tbz - ln -sv ${srcs."opam-0install-cudf"} $sourceRoot/src_ext/opam-0install-cudf.tbz - ln -sv ${srcs."opam-file-format"} $sourceRoot/src_ext/opam-file-format.tar.gz - ln -sv ${srcs."re"} $sourceRoot/src_ext/re.tbz - ln -sv ${srcs."result"} $sourceRoot/src_ext/result.tbz - ln -sv ${srcs."seq"} $sourceRoot/src_ext/seq.tar.gz - ln -sv ${srcs."stdlib-shims"} $sourceRoot/src_ext/stdlib-shims.tbz - ''; - patches = [ ./opam-shebangs.patch ]; preConfigure = '' - substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" patchShebangs src/state/shellscripts ''; - postConfigure = "make lib-ext"; + configureFlags = [ "--with-vendored-deps" "--with-mccs" ]; # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; @@ -144,4 +56,3 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.5 -p opam-shebangs.patch diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index a56621267df30..a96fd9d5f5eaa 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -1,4 +1,4 @@ -{ lib, unzip, opam, ocamlPackages }: +{ unzip, opam, ocamlPackages }: ocamlPackages.buildDunePackage { pname = "opam-installer"; diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch index 72efec0a91054..12b66d1ebb862 100644 --- a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch +++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch @@ -2,7 +2,7 @@ diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml index eca13a7c..1fd66f43 100644 --- a/src/client/opamInitDefaults.ml +++ b/src/client/opamInitDefaults.ml -@@ -35,14 +35,18 @@ let eval_variables = [ +@@ -42,16 +42,20 @@ let eval_variables = [ let os_filter os = FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os) @@ -13,17 +13,21 @@ index eca13a7c..1fd66f43 100644 let macos_filter = os_filter "macos" let openbsd_filter = os_filter "openbsd" let freebsd_filter = os_filter "freebsd" + let netbsd_filter = os_filter "netbsd" + let dragonflybsd_filter = os_filter "dragonfly" let not_open_free_bsd_filter = FNot (FOr (openbsd_filter, freebsd_filter)) let win32_filter = os_filter "win32" + let not_win32_filter = + FOp (FIdent ([], OpamVariable.of_string "os", None), `Neq, FString "win32") let sandbox_filter = FOr (linux_filter, macos_filter) +let nixos_filter = os_distribution_filter "nixos" - let gpatch_filter = FOr (openbsd_filter, freebsd_filter) + let gpatch_filter = + FOr (FOr (openbsd_filter, netbsd_filter), + FOr (freebsd_filter, dragonflybsd_filter)) let patch_filter = FNot gpatch_filter -@@ -50,6 +54,11 @@ let wrappers ~sandboxing () = - CString t, None; - ] in +@@ -79,4 +81,9 @@ let wrappers ~sandboxing () = let w = OpamFile.Wrappers.empty in + let w = { w with + OpamFile.Wrappers. @@ -31,8 +35,8 @@ index eca13a7c..1fd66f43 100644 + } + in if sandboxing then - { w with - OpamFile.Wrappers. + List.fold_left OpamFile.Wrappers.(fun w -> function + | `build wrap_build -> { w with wrap_build } @@ -113,6 +122,7 @@ let required_tools ~sandboxing () = let init_scripts () = [ ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl deleted file mode 100755 index a3f1bc9219cd5..0000000000000 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings qw<all>; -use Getopt::Std; - -my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n"; - -our $opt_v; -our $opt_p; -our $opt_r; -our $opt_t; -getopts "v:p:t:r:"; - -my $OPAM_RELEASE = $opt_v // "2.0.0"; -my $OPAM_TAG = $opt_t // $OPAM_RELEASE; -my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam"; -my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip"; -my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`; -chomp $OPAM_RELEASE_SHA256; - -my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; -my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; -my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m - or die "could not parse ocaml version bound\n"; - -print <<"EOF"; -{ stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, bubblewrap, Foundation -}: - -assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; - -let - srcs = { -EOF - -my %urls = (); -my %md5s = (); - -open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources"); -while (<SOURCES>) { - if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) { - $urls{$1} = $2; - } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) { - $md5s{$1} = $2; - } -} -for my $src (sort keys %urls) { - my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`; - system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2"; - die "md5 check failed for $urls{$src}\n" if $?; - print <<"EOF"; - "$src" = fetchurl { - url = "$urls{$src}"; - sha256 = "$sha256"; - }; -EOF -} - -print <<"EOF"; - opam = fetchurl { - url = "$OPAM_RELEASE_URL"; - sha256 = "$OPAM_RELEASE_SHA256"; - }; - }; -in stdenv.mkDerivation { - pname = "opam"; - version = "$OPAM_RELEASE"; - - strictDeps = true; - - nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; - buildInputs = [ ncurses getconf ] - ++ lib.optionals stdenv.isLinux [ bubblewrap ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; - - src = srcs.opam; - - postUnpack = '' -EOF -for my $src (sort keys %urls) { - my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/ - or die "could not find extension for $urls{$src}\n"; - print <<"EOF"; - ln -sv \${srcs."$src"} \$sourceRoot/src_ext/$src$ext -EOF -} -print <<'EOF'; - ''; - -EOF -if (defined $opt_p) { - print " patches = [ "; - for my $patch (split /[, ]/, $opt_p) { - $patch =~ s/^(?=[^\/]*$)/.\//; - print "$patch "; - } - print "];\n\n"; -} -print <<'EOF'; - preConfigure = '' - substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" - patchShebangs src/state/shellscripts - ''; - - postConfigure = "make lib-ext"; - - # Dirty, but apparently ocp-build requires a TERM - makeFlags = ["TERM=screen"]; - - outputs = [ "out" "installer" ]; - setOutputFlags = false; - - # change argv0 to "opam" as a workaround for - # https://github.com/ocaml/opam/issues/2142 - postInstall = '' - mv $out/bin/opam $out/bin/.opam-wrapped - makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ - --argv0 "opam" \ - --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ - $out/bin/opam-installer --prefix=$installer opam-installer.install - ''; - - doCheck = false; - - meta = with lib; { - description = "A package manager for OCaml"; - homepage = "https://opam.ocaml.org/"; - changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; - maintainers = [ ]; - license = licenses.lgpl21Only; - platforms = platforms.all; - }; -} -EOF -print $gencmd; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 450666a25609d..7c92c1acdd224 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib , lambda-term, cppo, makeWrapper, buildDunePackage -, xdg, zed, logs, lwt, react, lwt_react +, xdg, zed, logs }: buildDunePackage rec { diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 81a513edd687c..b37043ca41cc4 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -34,7 +34,7 @@ mkDerivation { mainProgram = "phonesim"; homepage = "https://01.org/ofono"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index e8aca09b18293..4c224be33ddfc 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.27.4"; + version = "2.29.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-FctWmYGOdmGqjHGlsi3k+RUmU35ufzpMh7Eh88GZiUc="; + hash = "sha256-aU2yH33HVg9CHA5+NOWZUmhRC7W6yMjKIwyDM8E4e2g="; }; - vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k="; + vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY="; postPatch = '' # Disable some tests that need file system & network access. @@ -35,9 +35,21 @@ buildGoModule rec { export HOME="$(mktemp -d)" ''; - checkFlags = [ - "-skip=TestCreateDockerfile" # Skip flaky test - ]; + checkFlags = + let + skippedTests = [ + # require network access + "TestCreateDockerfile" + + # access file system + "Test_translateDeployment" + "Test_translateStatefulSet" + "Test_translateJobWithoutVolumes" + "Test_translateJobWithVolumes" + "Test_translateService" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; postInstall = '' installShellCompletion --cmd okteto \ diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 2441df861d591..bd5102e038a23 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -11,13 +11,13 @@ let in let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.39.11"; + version = "1.39.12"; src = fetchFromGitHub { owner = "OmniSharp"; - repo = pname; - rev = "v${version}"; - hash = "sha256-b7LC3NJyw0ek3y6D3p4bKVH4Od2gXmW5/8fCCY9n3iE="; + repo = "omnisharp-roslyn"; + rev = "refs/tags/v${version}"; + hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; @@ -79,15 +79,15 @@ let finalPackage = buildDotnetModule rec { no-sdk = with-sdk null; }; - meta = with lib; { + meta = { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode # dependencies ]; - license = licenses.mit; - maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tesq0 ericdallo corngood mdarocha ]; mainProgram = "OmniSharp"; }; }; in finalPackage diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index 6379a4a293414..65912a50593b8 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -2,145 +2,144 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.15.0"; sha256 = "0nh1954zs6crl3nrgf41b2mvipf3pxda8dxg21bbdf7yysq7izw3"; }) - (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.15.0"; sha256 = "0xzlnadascsiibdhmpbqaawqlpyrwridih7y7054zsijlz1lp3am"; }) - (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.5.0"; sha256 = "00w9r2lv0yy30dafn6gs2qf4f6hhsg48923d2sdkyjdc94bx4kp4"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.5.0"; sha256 = "0fy3cww1yclyvlhzla4klamcw7sjy2fg3sr2ihpd4jxlyd8qy60l"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; sha256 = "1pvy3kss6s1v60yspfw11y3rs750rbxh735p90zrgxjshp9sq5g0"; }) - (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; sha256 = "1ppw9nx9s5yyp6j8ljky7l9y5b91yf0sj2lqbakabjvzppr0pw4l"; }) - (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; }) - (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; sha256 = "17g4ka0c28l9v3pmf3i7cvic137h7zg6xqc78qf5j5hj7qbcps5g"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; sha256 = "1p8ikc91qc2b1h68w44brb64dy5kmkb089hdliwp02gba3dszw67"; }) - (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; sha256 = "18xavj7zii38gkk6bkblif7j1j7y33z7f06xm81ljdl2124lbqc4"; }) - (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; sha256 = "1mxm6xrq4illg502kjz4l7j0vjcpfv2li9wrvf4ix9m09vdwk2jl"; }) - (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; sha256 = "0r82hrjjqpxjp3l7ncy8jdj30p7y0p1hhr1dbfrj5l3i0zxrrcj4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.9.0-3.23611.3"; sha256 = "0b3lwd4m3jw7mf56xhzx4d3ziykv8g39a2s1x782c9bagh8i1b1f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.9.0-3.23611.3/microsoft.codeanalysis.common.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.9.0-3.23611.3"; sha256 = "0cja5pjhhh33lmc1kfqw9l3x1pb9g2dda6wgn9i92ay51j52l43n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.9.0-3.23611.3"; sha256 = "0alnvk5f68glimkqsz590pryg7pa5p0wp6i4aif1k5j1jz0b03v6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.features.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.9.0-3.23611.3"; sha256 = "1ai22hjqyc5xx1dpwl3nm4yjqjs9n6iw5whprpvb7vi8kv9zz16q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.scripting.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.9.0-3.23611.3"; sha256 = "0x8xr193zqddmns0xx20hsf08qrb6fjjczgdm9yjr72p2djp14br"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.workspaces.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore"; version = "4.9.0-3.23611.3"; sha256 = "13gx7v30jqikms0dh6in8kslgasdpj3j0jk1x3f9x0sgq8864ad9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.9.0-3.23611.3"; sha256 = "12v6vcwnkdf84hs79ma4dkys7z07cf05k2ca1fnkz55zwaib4n59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.omnisharp.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.9.0-3.23611.3"; sha256 = "08c2b63vqwwda34kyrjglj2xgjjhqzgmdcnby8nm09j7jpz4z31y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler"; version = "4.9.0-3.23611.3"; sha256 = "06svd5nhvyrww5prnx0055g0flfdi1x5n89in74i71mqvskqkh38"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razorcompiler/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.razorcompiler.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.9.0-3.23611.3"; sha256 = "0nz2124hgxrh9k9c5p6xavkw8glmpwiq3qclvbggx9v8bnfl4p9k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.9.0-3.23611.3/microsoft.codeanalysis.features.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.9.0-3.23611.3"; sha256 = "0k37wrw5jy57grbi9i0rx76ig2jplikkmiyzvzrydl0mmrb5ks1k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.9.0-3.23611.3/microsoft.codeanalysis.scripting.common.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.9.0-3.23611.3"; sha256 = "12scgd8bvh1p5hvkfcbm58j77ancn6wy23wdmwy0kqj0wm10n1wy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.9.0-3.23611.3/microsoft.codeanalysis.workspaces.common.4.9.0-3.23611.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; sha256 = "0g4fqxqy68bgsqzxdpz8n1sw0az1zgk33zc0xa8bwibwd1k2s6pj"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; sha256 = "0z7mpiljkqjw1qi5zapv7mg9pyfyzlgmil34j4wi3y9r19bsb87z"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.8.0"; sha256 = "0395fkyhibrlz672v23rgalbzw3y878aclk6shqvdk9xca6bg4b1"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-rc.122"; sha256 = "0sszc6426749r7dqq1i46pwl92n1dklqd723px57pjs0b1a7ddwc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-rc.122/nuget.common.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-rc.122"; sha256 = "06d7r5yxf69d2wagpzkd77cnrbm5cv3z3dfsgj1zy7c2pb9a2rmk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-rc.122/nuget.configuration.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-rc.122"; sha256 = "1sarid71h7cs7d2h7zv313rxx1icpwli2lcfpasascsf0ahbf0pv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.122/nuget.dependencyresolver.core.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-rc.122"; sha256 = "07pfykvbm070dyiraillk5h4rzmfm89dr0km7bnflf1hq9l6z5xi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-rc.122/nuget.frameworks.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-rc.122"; sha256 = "1kflrd8kmd80190zjll4rzmfvz36ffnnb4w0psm977qpj90vpcgl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-rc.122/nuget.librarymodel.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-rc.122"; sha256 = "1bhaclf8x3vgwd1hb05knb1hyq7kdg64l959mgsd9cwqgjy5rksy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-rc.122/nuget.packaging.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.8.0-rc.122"; sha256 = "10c2mfim8hk3jjbclaibh3j4cr9ii9mhg2f9f4pvcwwdd2xwcv0d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.8.0-rc.122/nuget.packaging.core.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.122"; sha256 = "07ddcwbpqj9ki56k26fqr2ya6lh81fx9iacq40gz2jnlfkx5ipa1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.122/nuget.projectmodel.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.122"; sha256 = "012zjl6lqv7smgksjiglabnhx5ywqf0pl357kppmhbsifhrk7j6w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.122/nuget.protocol.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.122"; sha256 = "1y1f0kzwzm5nx7bhmqdxfvl367mm0xj9ddiv5bwg7iwjxfz0ga29"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.122/nuget.versioning.6.8.0-rc.122.nupkg"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.9"; sha256 = "0r8m36qqddzmnv4wdpxs7qa17f4kbb9r2zwn7n41amy3lp5f7w4z"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.9"; sha256 = "0g7v185mraq7bvihavagdl46rmfrkv1vr6cyb9jf1agi5i7abkyz"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.9"; sha256 = "0352bg0g4818y3nbxq8jmmdw60dgyxw4pjpr181sdyi73vmbnlrg"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.9"; sha256 = "0vb5kmf4hnrbssgj3nwsjdns0671k1llyplagm57m5wliaw12qkh"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.9"; sha256 = "124af8b6ixra1xm168nz5wfn674xfk0zhpj9dmfaasfi33sdwvjb"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; sha256 = "02hmqwrdvqzq4ka4kpf88i7n3qp6lw1xwp7424kg08pa9y69swij"; }) - (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; sha256 = "08dadpd8lx6x7craw3h3444p7ncz4wk0a3j1681lyhhd56ln66f6"; }) - (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; }) - (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) - (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; sha256 = "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.15.0"; hash = "sha256-g/94sPb+uLZWEK83pFq/w924q1iBuJftoJkZ/UlJAVo="; }) + (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.15.0"; hash = "sha256-VY1Lw6cy6k8KOP7A2GLm2V+KuVJ43QrbilEzrZqy9Hc="; }) + (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; hash = "sha256-Z5hkinAqOaWCfMUIaaDfY0uTN1ot71Q1IC1A+xpmSj4="; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.5.0"; hash = "sha256-5E7SF0msST+bFm2IhMjTEBpHHBb6GetUA8N7sKnIiQM="; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.5.0"; hash = "sha256-FBiPUfO0S9IujCLr8ZzwUh/OqqKTKPoh3Z4yHzhnwzs="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; hash = "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8="; }) + (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; hash = "sha256-lPAL8r1/y6WmWpgKqYHzIa3iEz1+Soqkud4XnbpN/N4="; }) + (fetchNuGet { pname = "MediatR"; version = "8.1.0"; hash = "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; hash = "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; hash = "sha256-r+jLFj4SFlkcRofhbt4/8IzA4mYnDlfv2IkiwYCa5J0="; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; hash = "sha256-x/Cv21DrCXB5pA0mBNass/hGzMqLEI4MDEswHBKbEd0="; }) + (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; hash = "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM="; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; hash = "sha256-VIrJ206gph6J25mnSMV2l8kN5KHkyylAeZRGgnM3tdc="; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; hash = "sha256-RLKc+wdx0CKzWy1kCMMF/lwwZJPIM3vouLJfLGWGAmU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; hash = "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.12.0-1.24358.3"; hash = "sha256-UQ0tDpF+OxAgRXIPiJuT7z01Weqn2bLo+kIwkdcMaXs="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.12.0-1.24358.3/microsoft.codeanalysis.common.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.12.0-1.24358.3"; hash = "sha256-OuB9qEQLc64Ido++o3mAZUZ6IvuB8rTzOf663k/0Kcc="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.12.0-1.24358.3"; hash = "sha256-PNPdyFwwsReDd1QC1KmnGrXVMYNPghIShI7il3UEcrA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.features.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.12.0-1.24358.3"; hash = "sha256-titifcvaYU0rc9ZoEoitT2Wbw/CDRYr7bRm1ecSLDU0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.scripting.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.12.0-1.24358.3"; hash = "sha256-9CROWJt789h964idgJ/qqu+rAQkygcwtE2ngyeL/bhE="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.12.0-1.24358.3/microsoft.codeanalysis.csharp.workspaces.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; hash = "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore"; version = "4.12.0-1.24358.3"; hash = "sha256-0kv2XunbYQsbusmRl2WchiskolxwZWThx80ZUzcw3c8="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.12.0-1.24358.3"; hash = "sha256-gLIJA1zaq4RbRCDhALlIwUBasRbekjFiuLCNyQckegA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.12.0-1.24358.3"; hash = "sha256-aXwLNsh6Gmd98rLZ1fWjpNaCCg7TYv70Qc7dRccNk/U="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.12.0-1.24358.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.12.0-1.24358.3"; hash = "sha256-TCl/MzgHNUBUU56MVSGeOlCUMSTeS8cG5iZkZ/E9ElY="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.12.0-1.24358.3/microsoft.codeanalysis.features.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.12.0-1.24358.3"; hash = "sha256-qvmZdcshzsXJLdWev3QyQscNeliEqzOGE3q7L/hR67w="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.12.0-1.24358.3/microsoft.codeanalysis.scripting.common.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.12.0-1.24358.3"; hash = "sha256-9SQ1nAfJsDswOfASVSZ2iV7GoXcsRmNhVcr+Dv266zk="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.12.0-1.24358.3/microsoft.codeanalysis.workspaces.common.4.12.0-1.24358.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; hash = "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; hash = "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; hash = "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; hash = "sha256-bdb9YWWVn//AeySp7se87/tCN2E7e8Gx2GPMw28cd9c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; hash = "sha256-pa3MT+QWrWeehQwUWtTS/Rwto8IIDgAt+zLqaUAQoJ0="; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; hash = "sha256-Q8owHXaXkJPy13yGlj+VYGS9XMqYWUZYB6yoT0/m4ek="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; hash = "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; hash = "sha256-/6ClVwo5+RE5kWTQWB/93vmbXj37ql8iDlziKWm89Xw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; hash = "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.8.0"; hash = "sha256-YZG3jGI9zbYx1GZSptBBfvC/qHp5iC2O+TSvCP10JQ0="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; hash = "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; hash = "sha256-WghLNITEsKTV5pCjogmhfsVD3iO7ghTk0KNrOXzKSS0="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; hash = "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; hash = "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; hash = "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.11.0-rc.110"; hash = "sha256-S0K+RiSHJFzx+qbTJ7KY1Mh/L9hDJfL/F1YjzlhP3ao="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.11.0-rc.110/nuget.common.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.11.0-rc.110"; hash = "sha256-NJzuKWDMUAn8aLt/aB4xht65a9CCnwY0IfnHfFHd/p4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.11.0-rc.110/nuget.configuration.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.11.0-rc.110"; hash = "sha256-12oRGUo4L7TslA6iV3OoMayG/t3ToOJ4fdGFh2U8Rxo="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.11.0-rc.110/nuget.dependencyresolver.core.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.11.0-rc.110"; hash = "sha256-FmvFhdCJ/xH92tr+7uMNdimcpFxyW7Y/roPcS0TJX3g="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.11.0-rc.110/nuget.frameworks.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.11.0-rc.110"; hash = "sha256-PYiEmV44XWUCK7Wahs8ZQ8GHcL4yO+fT+Y1OQHna68E="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.11.0-rc.110/nuget.librarymodel.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.11.0-rc.110"; hash = "sha256-pnGx4JWJ02X18Qko5TX1DTbbbQj1msdKb0Lrphzyjps="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.11.0-rc.110/nuget.packaging.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.11.0-rc.110"; hash = "sha256-xE1Us1qn3qAbLS/1rdZMWfl5tEO5pCQGp+P+VUrLBOQ="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.11.0-rc.110/nuget.projectmodel.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.11.0-rc.110"; hash = "sha256-XS8HsEDPoEjBNbfdo1c+PHB6BUOs8IpdfXvkmDsSZD4="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.11.0-rc.110/nuget.protocol.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.11.0-rc.110"; hash = "sha256-eyhOSwBFquzExUis+zGgP5gCO/nVSY5IzXcWeeVz/Ww="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.11.0-rc.110/nuget.versioning.6.11.0-rc.110.nupkg"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.9"; hash = "sha256-n/DjyqXDVxWIPZZ/kdNak7gTFD6638bJtvW3hrEZFWU="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.9"; hash = "sha256-38+lTizxqeBkWp6ZvMOe2dVsCG1PbQXjXgerXAsK+zw="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.9"; hash = "sha256-L1O76h4n+qYDCvnKS3j3rwHDW60S4b7s8Cgg8sBbogw="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.9"; hash = "sha256-cGIRuIqUl3pKfYpeT2mY4RigbZOa2yGf1itbSFydZW0="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.9"; hash = "sha256-S27e9BjRaaVcbUle+MF0nRxjHS/fIhNqDyr3aBZyiog="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.8"; hash = "sha256-2heeK2naqrjk/ggcEPO1GhcumiXU8sC4VNFh/Xr+wd4="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.8"; hash = "sha256-j7004Tk/GyQigot9Sx5cgAU9dzhFfOGs02zaj412x8g="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.8"; hash = "sha256-Omio9F3a0w52x3CLpk/MOCmB5yeaFxVV9ZOMU18eKew="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.8"; hash = "sha256-eo+peRW0MEkrczXtlMPNPOKew9k/jH0e4jUzOXI8Y44="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.8"; hash = "sha256-eE2gvpsXhtAmYqdxLhrne+/u4V/o7tbicuGUEWL4p4s="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; hash = "sha256-MnKdjE/qIvAmEeRc3gOn5uJhT0TI3UnUJPjj3TLHFQo="; }) + (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; hash = "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; hash = "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; hash = "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; hash = "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; hash = "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; hash = "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="; }) + (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; hash = "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; }) + (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; hash = "sha256-82aeU8c4rnYPLL3ba1ho1fxfpYQt5qrSK5e6ES+OTsY="; }) + (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; hash = "sha256-/EEdeNvp9FrLeVnmowzHk6nn0KmPf6L9Poc7l/R948A="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; hash = "sha256-OJ4NJ8E/8l86aR+Hsw+k/7II63Y/zPS+MgC+UfeCXHM="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; hash = "sha256-jXst4NyUKOTOmLacSwgQB71W12nKZtveJA25dCtpyys="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; hash = "sha256-Q6fPtMPNW4+SDKCabJzNS+dw4B04Oxd9sHH505bFtQo="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) ] diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index 281113a48b89f..5b35630c6d33a 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-ffUggy1Ubs3pnBbznPR3JN0QrSBfkUI9bk+dSq4oxfs="; + sha256 = "sha256-nHxP9Dzc0sbgUE/SOqNIvofoi9/voYp8fFdRzMoBOHw="; }; - vendorHash = "sha256-vqH3f1kfcOG04PPzC4izzKBJPZ3SSlK7y7nKhOJ9GdE="; + vendorHash = "sha256-KxMODAjpqDqQO2nfqMrEPa/WZDU3XKPDQCoil/vkqEI="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 06161d95c4b2c..891733635cce7 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, fetchpatch , installShellFiles , enableWasmEval ? false @@ -20,6 +21,15 @@ buildGoModule rec { hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; }; + patches = [ + # fix tests in 1.22.5 + # https://github.com/open-policy-agent/opa/pull/6845 + (fetchpatch { + url = "https://github.com/open-policy-agent/opa/commit/956358516c23b1f33f6667961e20aca65b91355b.patch"; + hash = "sha256-1nfMwJwbYfdLg9j4ppP1IWdDeFq6vhXcDKr6uprP53U="; + }) + ]; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index b334654dd924e..a99849a3a3ac7 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.35.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KalG1DLhvXEjNAOeP79BMYvI74j6nKnDkOYubIJ0Shs="; + hash = "sha256-ZUWbM2g3l5uesM9QDlRqRo9gFipgaS8YyEbnIyRaMS0="; }; - vendorHash = "sha256-TuDbQoC9at3yQikGTfsAKJ5kc/naqLqfHEwXLOv+12A="; + vendorHash = "sha256-FEoAV3Fhmjhkc7sYfE1QQFmhOZbXps57mBD0fyvQq00="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 72f7d8b76a603..2d6fb694318f9 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; + hash = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; }; vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index d21488684f56c..4625b97eb000f 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.2.15"; + version = "0.5.2"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-hEN9TLIeAfMGO/PL5OcT7+H0dmoCtH+dcIEafpQ45UU="; + hash = "sha256-rjp1k3cnDSr/hKXNru7XQ6n5Wz97j2EULnHwg3HAm3g="; }; - cargoHash = "sha256-uChoDlU0tb52pBBEqmmwhCS83pykFRpXRFSuUGquHEQ="; + cargoHash = "sha256-3IebdIKw3lV+Qy6F7ZgWMchPLzrluGSeWTV9l5to8iM="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix index 48ddac5088429..41cbef2a720b5 100644 --- a/pkgs/development/tools/package-project-cmake/default.nix +++ b/pkgs/development/tools/package-project-cmake/default.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { packaging process into a single, easy-to-use command. ''; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; }) diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index 2128e48886b8b..0f756388be3bd 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -1,59 +1,70 @@ -{ lib -, stdenv -, fetchFromGitHub -, bats -, uncrustify -, testers -, packcc +{ + bats, + fetchFromGitHub, + lib, + packcc, + python3, + stdenv, + testers, + uncrustify, }: stdenv.mkDerivation rec { pname = "packcc"; - version = "1.8.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "arithy"; repo = "packcc"; rev = "v${version}"; - hash = "sha256-T7PWM5IGly6jpGt04dh5meQjrZPUTs8VEFTQEPO5RSw="; + hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0="; }; + postPatch = '' + patchShebangs tests + ''; + dontConfigure = true; preBuild = '' - cd build/${if stdenv.cc.isGNU then "gcc" - else if stdenv.cc.isClang then "clang" - else throw "Unsupported C compiler"} + cd build/${ + if stdenv.cc.isGNU then + "gcc" + else if stdenv.cc.isClang then + "clang" + else + throw "Unsupported C compiler" + } ''; doCheck = true; - nativeCheckInputs = [ bats uncrustify ]; - - preCheck = '' - patchShebangs ../../tests + nativeCheckInputs = [ + bats + uncrustify + python3 + ]; - # Disable a failing test. - rm -rf ../../tests/style.d - '' + lib.optionalString stdenv.cc.isClang '' - export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion' - ''; + preCheck = + '' + # Style tests will always fail because upstream uses an older version of + # uncrustify. + rm -rf ../../tests/style.d + '' + + lib.optionalString stdenv.cc.isClang '' + export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion' + ''; installPhase = '' runHook preInstall - install -Dm755 release/bin/packcc $out/bin/packcc - runHook postInstall ''; - passthru.tests.version = testers.testVersion { - package = packcc; - }; + passthru.tests.version = testers.testVersion { package = packcc; }; meta = with lib; { description = "Parser generator for C"; - mainProgram = "packcc"; longDescription = '' PackCC is a parser generator for C. Its main features are as follows: - Generates your parser in C from a grammar described in a PEG, @@ -65,5 +76,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; + mainProgram = "packcc"; }; } diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix deleted file mode 100644 index 50d56bf9ec9ce..0000000000000 --- a/pkgs/development/tools/packer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -}: - -buildGoModule rec { - pname = "packer"; - version = "1.11.1"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "packer"; - rev = "v${version}"; - hash = "sha256-GjC8nc8gpYQ3v0IYJc6vz0809PD6kTWx/HE1UOhTYc0="; - }; - - vendorHash = "sha256-Xmmc30W1ZfMc7YSQswyCjw1KyDA5qi8W+kZ1L7cM3cQ="; - - subPackages = [ "." ]; - - ldflags = [ "-s" "-w" ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --zsh contrib/zsh-completion/_packer - ''; - - meta = with lib; { - description = "Tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = "https://www.packer.io"; - license = licenses.bsl11; - maintainers = with maintainers; [ zimbatm ma27 techknowlogick qjoly ]; - changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; - }; -} diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index 851c2c895444f..e6254bdbbb6f5 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A="; }; - cargoSha256 = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY="; + cargoHash = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/development/tools/paging-calculator/default.nix index d9241d81ac88f..43ec8ccd74479 100644 --- a/pkgs/development/tools/paging-calculator/default.nix +++ b/pkgs/development/tools/paging-calculator/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "paging-calculator"; - version = "0.3.0"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-uoijIA9xmifxHlMRo5Rh/Qy1wxiiCNLJnDysI01uPvk="; + hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM="; }; - cargoHash = "sha256-RbBlZCRVXZLXvz+/olkh2MqJiWq63AwLvo+/5UGRuyM="; + cargoHash = "sha256-oQQA+AGsuMKaFhoZRuv3BASCLJwfgbrdK+2noxBLm7k="; meta = { description = "CLI utility that helps calculating page table indices from a virtual address"; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 7d7ea67417e02..cc434f14dd6d9 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd"; }; - cargoSha256 = "1lam4gwzcj6w0pyxf61l2cpbvvf5gmj2gwi8dangnhd60qhlnvrx"; + cargoHash = "sha256-PW9LIQamQfusaijyJ2R9xe29LhM0GNf9BdxI9vkjVdE="; nativeBuildInputs = [ llvmPackages.clang rustPlatform.bindgenHook ]; diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/development/tools/parsing/bisonc++/default.nix index 3b8bf5601ed5d..16d8e13cdfda7 100644 --- a/pkgs/development/tools/parsing/bisonc++/default.nix +++ b/pkgs/development/tools/parsing/bisonc++/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fbb-git"; repo = "bisoncpp"; rev = "6.04.00"; - sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; + hash = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; }; buildInputs = [ bobcat ]; diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index c5d6ad5b87037..988c3d461f85b 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-uLcXvJOll2ijXWUlZ5pODOlOa/ZvkrrPKXnGR0VytFo="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "strip" '$(STRIP)' + ''; + preBuild="makeFlagsArray+=( PREFIX=$out )"; meta = with lib; { diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 9b31a5ab54889..60bdaa4de1037 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - hash = "sha256-yMFz3KrB1eIzGg0LB3U0H+XQz/DKhJOyiG8ScW9Lm7A="; + hash = "sha256-Dc/nnzJtkLgfmYnilA9FtOPtlOwTqgXtNVWhypFu5hs="; }; outputs = [ "out" "bin" "dev" ]; diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 9738ffb41bca0..0cb424fdca643 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.10.1"; + version = "1.11.0"; strictDeps = true; @@ -19,18 +19,19 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-D7DWZDZH3/PFggMxsr+x5S1B6SV5E8xpJoXfGcDelKs="; + hash = "sha256-zndqNd4CTzXuDkkc6uzjwKdUnypnV/4NppcVJ0N3S1U="; fetchSubmodules = true; }; nativeBuildInputs = [ + bison cmake + flex makeWrapper python3 ]; buildInputs = [ - bison flex zlib ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 6e3390103b342..fbf5852ee47f8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -27,8 +27,8 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.22.5"; - hash = "sha256-f8bdpiPNo5M8aefTmrQ2MQVg7lS0Yq7j312K1slortA="; + version = "0.22.6"; + hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-Fk6V/kPKc/GL/q6QsaCUrq+ZG0R+N5FLOpIm77Y+n2A="; + cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g="; buildInputs = lib.optionals stdenv.isDarwin [ Security CoreServices ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 97e825bfe390c..c9faf8a788f89 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -4,6 +4,7 @@ tree-sitter-beancount = lib.importJSON ./tree-sitter-beancount.json; tree-sitter-bibtex = lib.importJSON ./tree-sitter-bibtex.json; tree-sitter-bitbake = lib.importJSON ./tree-sitter-bitbake.json; + tree-sitter-bqn = lib.importJSON ./tree-sitter-bqn.json; tree-sitter-c = lib.importJSON ./tree-sitter-c.json; tree-sitter-c-sharp = lib.importJSON ./tree-sitter-c-sharp.json; tree-sitter-clojure = lib.importJSON ./tree-sitter-clojure.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json new file mode 100644 index 0000000000000..c909530a21a68 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/shnarazk/tree-sitter-bqn", + "rev": "a90b371503f158699042423918e4c5e9285f5519", + "date": "2023-10-12T14:03:08+09:00", + "path": "/nix/store/l8jagwjzgm9kwgda2rqgkzxpszlmf6br-tree-sitter-bqn", + "sha256": "0xma9dmz591xfy20g7sk535d5w21migs9zajjw2nd1c5czj00nzw", + "hash": "sha256-/FsA5GeFhWYFl1L9pF+sQfDSyihTnweEdz2k8mtLqnY=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 66ef359104cdc..e79396e609fb2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9", - "date": "2023-05-05T15:36:48+09:00", - "path": "/nix/store/fx50ap0gdspwcpgf0zni4j1pzz29abk5-tree-sitter-clojure", - "sha256": "0hcl4svn0q4979mx0nn3hhi27xfxj1lz7g1926lcjx6sv1z4ihmj", - "hash": "sha256-ssJIftjadMmoESm882mQ3fUjIoTDWtBrOolgYLcmlEE=", + "rev": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e", + "date": "2024-05-15T19:51:17+09:00", + "path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure", + "sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4", + "hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 53a829c4a941f..c5a2a628c4dbf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "72fd00128f1c38319670cbf4bcedbba0dc849d96", - "date": "2024-04-14T21:38:58-04:00", - "path": "/nix/store/sy0ln7q947bv9k313q4z6kkibl2zgdi1-tree-sitter-cpp", - "sha256": "0qaa48gq4n3300apwx1mdcwqnfg59q8bdj88c3ssd45pr1n47s88", - "hash": "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE=", + "rev": "2369fa991eba294e9238e28280ffcd58132f94bc", + "date": "2024-04-30T23:37:25-04:00", + "path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp", + "sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d", + "hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 224b48ea52844..47cf0bc2a32be 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "02b4ee757654b7d54fe35352fd8e53a8a4385d42", - "date": "2024-02-14T18:09:29-05:00", - "path": "/nix/store/l2vr6xj78qrqjlpj6lzc0bi8dirqvfkx-tree-sitter-css", - "sha256": "0j1kg16sly7xsvvc3kxyy5zaznlbz7x2j2bwwv1r1nki2249ly12", - "hash": "sha256-IniaiBBx2pDD5nwJKfr5i9qvfvG+z8H21v14qk14M0g=", + "rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af", + "date": "2024-05-05T18:14:34-04:00", + "path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css", + "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp", + "hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json index f492de75ad545..40f4c4bab4cf6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -1,10 +1,10 @@ { "url": "https://github.com/usernobody14/tree-sitter-dart", - "rev": "6da46473ab8accb13da48113f4634e729a71d335", - "date": "2024-04-07T18:27:24-06:00", - "path": "/nix/store/v04h2p45ngm7llrckpkkbnvj9m5763vm-tree-sitter-dart", - "sha256": "1jxz4s0j8pmjxl7cz7s9blzqhr1w5jannxihidqrd6dqxawc6gh1", - "hash": "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s=", + "rev": "ac0bb849ccd1a923963af47573b5e396736ff582", + "date": "2024-04-28T11:52:00-06:00", + "path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart", + "sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8", + "hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json index f089eea145054..951deac2d086a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json @@ -1,10 +1,10 @@ { "url": "https://github.com/camdencheek/tree-sitter-dockerfile", - "rev": "d34a0cebd094e830bdd2106a28cb2f1fb22401d8", - "date": "2022-01-27T11:20:14-07:00", - "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile", - "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd", - "hash": "sha256-zTpsNj6Urhpv7/B+cxPlRhTJd1t35MouRVLZojthxE0=", + "rev": "868e44ce378deb68aac902a9db68ff82d2299dd0", + "date": "2024-05-09T10:18:45-04:00", + "path": "/nix/store/mcyxjcriszp3av7pjxfqn9igpcxrd0jg-tree-sitter-dockerfile", + "sha256": "09iw9mqlpgsi6ak4mxrv16anvmbyap6vf61r2pi2lqdp9h1mp7g0", + "hash": "sha256-4J1bA0y3YSriFTkYt81VftVtlQk790qmMlG/S3FNPCY=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json index 10a75441a4665..0241aff6a8e0b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json @@ -1,10 +1,10 @@ { "url": "https://github.com/glehmann/tree-sitter-earthfile", - "rev": "9badbe4b107647672f627e7d6bddc8a0b61d1f50", - "date": "2024-04-17T16:28:53+02:00", - "path": "/nix/store/n7jprqmy1r5xgr0bl5d7rsz4xi10m9rf-tree-sitter-earthfile", - "sha256": "0yslldcxpmi2hdgja1ygz3grsaj2jj52xm1dqdwlv296ahx5wqkh", - "hash": "sha256-cGJeOlQmiU15wy3ULoqUQiqd3/jPByVfgyLW21mjVHs=", + "rev": "450546b6db9a37a178fd87aeda93a287301e9570", + "date": "2024-05-16T21:54:01+02:00", + "path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile", + "sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h", + "hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 2d29f1f4011b3..e8722c898174a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "6d791b897ecda59baa0689a85a9906348a2a6414", - "date": "2024-02-14T20:15:12-05:00", - "path": "/nix/store/fj8gk7h81lgj15x79cbrkfvdw2hmbmyb-tree-sitter-embedded-template", - "sha256": "0d4kc2bpbx1bvd0xv37wd87hbi775hq4938qz2n657h036dzg0i3", - "hash": "sha256-I4L3mxkAnmKs+BiNRDAs58QFD2r8jN1B2yv0dZdgkzQ=", + "rev": "38d5004a797298dc42c85e7706c5ceac46a3f29f", + "date": "2024-05-05T21:28:26-04:00", + "path": "/nix/store/i2kni0fn6yqgags7l329bbg3n45dc9ww-tree-sitter-embedded-template", + "sha256": "178cvdmlvzq2c29n0x8aganqbx3vz6w9m90gwhk63qxa2rxw5wr0", + "hash": "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index eb12bf0a26a19..7faba26b25a20 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,10 +1,10 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "e7817c982e0e921c5ee89a1e0283121bb5cc5e01", - "date": "2024-04-14T19:48:45+02:00", - "path": "/nix/store/fs5zdqn1lilbd6f0g6kgjjl35dli61fv-tree-sitter-glsl", - "sha256": "1gxg9d3i7iyzxv0sijllbl57dl7ai7z48f1639xd8ljhwl7yyim6", - "hash": "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78=", + "rev": "8c9fb41836dc202bbbcf0e2369f256055786dedb", + "date": "2024-05-11T23:58:08+02:00", + "path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl", + "sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9", + "hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index f0bb17721691c..ed82da289c311 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be", - "date": "2024-03-24T15:47:21+01:00", - "path": "/nix/store/ay1m5h51pp7p84hh5mlmxir8fsr68bs5-tree-sitter-haskell", - "sha256": "0kwbknxk8f6824bijqqkmlfg04074v31ava8qsf97bqsgs6039vf", - "hash": "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08=", + "rev": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19", + "date": "2024-05-05T18:23:47+02:00", + "path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell", + "sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6", + "hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json index 547cf21ab05d2..a68ad7d89d759 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json @@ -1,10 +1,10 @@ { "url": "https://github.com/sogaiu/tree-sitter-janet-simple", - "rev": "51271e260346878e1a1aa6c506ce6a797b7c25e2", - "date": "2023-11-11T12:18:30+09:00", - "path": "/nix/store/whms9s60xj63bl0b7m2gqkd7900h5qwy-tree-sitter-janet-simple", - "sha256": "018vwy6y1kr1bh5wp399vspc1y4wpvvgh0c6p7541xl196rzywa1", - "hash": "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU=", + "rev": "25d0687433ed0ed8e320861c2c625711ce1716f9", + "date": "2024-05-17T12:45:28+09:00", + "path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple", + "sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4", + "hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 67e30dd121eaf..4e5bb91173ff9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "ac10a11e0c8db512f70e6b798260d2516d22454c", - "date": "2024-04-07T02:36:56-04:00", - "path": "/nix/store/b5fahwmcx0riy3bfaarlggncfgfkhx38-tree-sitter-javascript", - "sha256": "1f0k7mk785ijppw1swcrilr5bl2nddi7hifml431y4lsqm7y6kmg", - "hash": "sha256-r07jT8WaEh8GodVFeGJrVtBVMo2ZcR34vTIWdGY9E7g=", + "rev": "e88537c2703546f3f0887dd3f16898e1749cdba5", + "date": "2024-05-10T14:09:58-04:00", + "path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript", + "sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py", + "hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json index fbc2c37c8a296..d2dce87abbc42 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-jsdoc", - "rev": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55", - "date": "2024-02-14T18:13:00-05:00", - "path": "/nix/store/9i7fgay23cjnvjapg95bj07jbliv8bmk-tree-sitter-jsdoc", - "sha256": "1xmkkqyb9mc18jh6dlffzw9j560mmc5i6fbic8ki9z0r30b1ravw", - "hash": "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y=", + "rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14", + "date": "2024-05-05T20:47:41-04:00", + "path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc", + "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii", + "hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json index 3a43b67184e24..785c855a23231 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-json", - "rev": "80e623c2165887f9829357acfa9c0a0bab34a3cd", - "date": "2024-04-07T15:21:58-04:00", - "path": "/nix/store/9cixfhx0x72pvn0ak349cbbzvhzlvhll-tree-sitter-json", - "sha256": "0mjphf34k5d0h28wwafwljk486h5mzx30dqdxz23lcmvnh0s79y1", - "hash": "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y=", + "rev": "94f5c527b2965465956c2000ed6134dd24daf2a7", + "date": "2024-05-06T15:10:02-04:00", + "path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json", + "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp", + "hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json index 505875342f498..5565bdfabf8ec 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json @@ -1,10 +1,10 @@ { "url": "https://github.com/joakker/tree-sitter-json5", - "rev": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d", - "date": "2023-10-05T17:25:17-03:00", - "path": "/nix/store/k0jyqq66qp3nq8nmzr1dhm3pk2vxhg1r-tree-sitter-json5", - "sha256": "11j8sjq2b0ibiygmcnxzl5vxa0p9ygngfhzjvjl19jnlnf0h7a6p", - "hash": "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY=", + "rev": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd", + "date": "2024-04-30T19:40:01-04:00", + "path": "/nix/store/3ag1lv1h8wg3cvbjbigyqmvqr0jy1i48-tree-sitter-json5", + "sha256": "0n33v04d5q79j1qp1l26ygfqywl7vxfam38dap78g6i7ys78581d", + "hash": "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index d55e2ca470eea..aa993c30c3a51 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "0a80d33aca49dd257625ab25ef3a506e2b99a554", - "date": "2024-04-14T10:47:45-07:00", - "path": "/nix/store/zi4q89960k33nkic7wm19fiq05bhx2bq-tree-sitter-julia", - "sha256": "057hg3v4rzzq19swb2mv2zlxp8zd746zxklxc0vw1i1fkr2x34yi", - "hash": "sha256-0ZPRRZ4uxMA3YJ3O/g057aPb6Re7isV1Cvj/TPZ48BQ=", + "rev": "acd5ca12cc278df7960629c2429a096c7ac4bbea", + "date": "2024-04-17T13:39:34-05:00", + "path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia", + "sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym", + "hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json index 8e480f72a4063..2d3d16425630d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json @@ -1,10 +1,10 @@ { "url": "https://github.com/IndianBoy42/tree-sitter-just", - "rev": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff", - "date": "2024-03-22T16:21:21-05:00", - "path": "/nix/store/8p22m5p2clrcc563v2z6pmhnhh03yyvg-tree-sitter-just", - "sha256": "0752hfkkqk92g0s68b01wf5d5q2y7aw87wsj8kz2vxkbj0i38x8j", - "hash": "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw=", + "rev": "fd814fc6c579f68c2a642f5e0268cf69daae92d7", + "date": "2024-05-02T02:56:00-04:00", + "path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just", + "sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a", + "hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json index ecd5333bc045f..7cf5bab4e707a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json @@ -1,10 +1,10 @@ { "url": "https://github.com/fwcd/tree-sitter-kotlin", - "rev": "51e451be6c18e2cc123249f49edf8e26fc50311c", - "date": "2024-03-14T00:25:12+01:00", - "path": "/nix/store/ab6r0biy5244mbw88zxbskfxi0xs4r6s-tree-sitter-kotlin", - "sha256": "0s41qgir95lcc68y2xvy7zzai7mm58mlx6w7xkndpc5jvgkc3akx", - "hash": "sha256-farB5tuysNvs7IebTisqtZ6o/j9+d+GRYYyWlOPDgWg=", + "rev": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03", + "date": "2024-05-08T00:38:43+02:00", + "path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin", + "sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6", + "hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index f9be1d8935888..5253f32efcb19 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "ceb44e4cdb58fbeea52301835bdd461817ddb57e", - "date": "2024-04-14T13:26:39+02:00", - "path": "/nix/store/gmzacfd1sbdbgvc26bnv3cpyl5l3csq9-tree-sitter-norg", - "sha256": "1jzk1wxqah5ajgpxmmbhrjk43hhk9vpg1f7v9wnj1xgp7zv4w6mv", - "hash": "sha256-uxpO9j/39SAtT/u48O5OE8JBpsxw1drvk6pAhTsP88s=", + "rev": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688", + "date": "2024-04-19T19:37:12+02:00", + "path": "/nix/store/pas31z7l3x16113qa7k7ywb6hbarnwvs-tree-sitter-norg", + "sha256": "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd", + "hash": "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json index 8a5f286af0c66..5f43ea1f7ab94 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nushell/tree-sitter-nu", - "rev": "b090676f0205f52debb93745b9ad788385583276", - "date": "2024-04-14T14:09:50-05:00", - "path": "/nix/store/f8pjwwdy175mayqncxicn47lj7gw4vks-tree-sitter-nu", - "sha256": "10rmw80xzhpqhjhysfx13pkqzfm4a31wvvmq57wvrcrrrlqb982k", - "hash": "sha256-U6C0MM05s7z5KbjuzcNQpLqP5x2hO+2hhPjC3wHiNYM=", + "rev": "a58513279e98dc3ff9ed149e3b4310cbb7e11068", + "date": "2024-04-20T10:10:30-04:00", + "path": "/nix/store/h4jw0skhik308krrqi7rmhw7ls4vp1rs-tree-sitter-nu", + "sha256": "00vpw8aai4k7bw57pyjwn6b09lb9rr1n88qc4r4nma86rl63y9ic", + "hash": "sha256-LCY/DM0GqWpJJgwjZEPOadEElrFc+nsKX2eSqBTidwM=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json index ee5733041b82c..433932e936838 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json @@ -1,10 +1,10 @@ { "url": "https://github.com/rolandwalker/tree-sitter-pgn", - "rev": "e26ee30850f0cb81541480cf1e2c70385bdb013a", - "date": "2021-08-25T17:57:38-04:00", - "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn", - "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq", - "hash": "sha256-+AnCzu0SxwY21nNRuV4eP9BhkDk3fnr1uecOXKUAhrA=", + "rev": "c5b2f2346e4148702b1343ec9bcc42b4a9aa88dc", + "date": "2024-04-27T16:35:50-04:00", + "path": "/nix/store/klrbfqwbmrwpgrghr2jijy0yy4yra3c3-tree-sitter-pgn", + "sha256": "1p6vn84f06c38kanv6j7w5pdwxny0gc7vk357s8ykiz0wv6r8ay9", + "hash": "sha256-ySuUzebgx+mRPmXMfdgD3nbebuFHmm3VRIMZ4Aiy29w=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 059ce3aed9a64..688de10aa4456 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a", - "date": "2024-04-05T08:52:41-04:00", - "path": "/nix/store/4zxxl74gpdm4y3dcaxxy831c5zay31bw-tree-sitter-python", - "sha256": "1kr3rj4wszpb1bz7xjn8v5cmkp6817d1iyficpdafglv7rx89a1g", - "hash": "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88=", + "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7", + "date": "2024-04-30T21:50:21-04:00", + "path": "/nix/store/xqc20db4g26sqsj0jflj4z2jm8hfmd97-tree-sitter-python", + "sha256": "1dmg11dbrddf55xhly813cb6ykxmyam2kjs7lyfi8k8xms03jx44", + "hash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json index 86a69e6f67312..c213aaa449b54 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme", - "rev": "6b66b9e6e3d36a49ce4def7abee2a286ac9ca289", - "date": "2022-08-29T08:49:16+02:00", - "path": "/nix/store/k58fls33kiwgbf8vn4488x5l79c9a18x-tree-sitter-ql-dbscheme", - "sha256": "1kpkjg97s5j1dx79r3fk0i2bxhpm9sdawgb1drqnjgz4qsshp7f2", - "hash": "sha256-wp0LtcbkP2lxbmE9rppO9cK+RATTjZxOb0EWfdKT884=", + "rev": "afd8764736bb7ae52b6628618e8b3e7e28224ab7", + "date": "2024-05-07T13:58:04+02:00", + "path": "/nix/store/696rbv0z6i563jjqbwgdavy6kvpkja94-tree-sitter-ql-dbscheme", + "sha256": "1mb87h2gzv3cwswklnnk2s8xmj060j4aj3ccgic7va23n1mm6rbs", + "hash": "sha256-emVTa7BDqH1YfIwNqYgEBsjakRbTWjq55mzs/wQ8aNU=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json index eb790ecf9cd86..6cf9f8045e676 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ql", - "rev": "ff04ba61857ba05b80221e71b423b2728dbebe1e", - "date": "2024-02-14T19:32:53-05:00", - "path": "/nix/store/9s2i55p2nm5lz9lkxs2kkmhiy3zlgx8l-tree-sitter-ql", - "sha256": "1wdjy8287823rgl1vibljgf129ll9srxn9n6m1piaj3z46lv5b7x", - "hash": "sha256-/ayyqSF/SBVvqMYm27NOlCYR3JN0xR3oy0OggwTysvE=", + "rev": "42becd6f8f7bae82c818fa3abb1b6ff34b552310", + "date": "2024-05-07T14:00:59+02:00", + "path": "/nix/store/dknbdl1hrgp0kicx2wx1wjnhb7bay643-tree-sitter-ql", + "sha256": "1gcgs87cas4qd5ppvzjfgzj2ayjnjfxbyg3gl204w8mrvciq2niq", + "hash": "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json index b5ce91ba4c02a..09390cce1ead3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "2e31ca2771f6042b0e4e0c41a6290014a9e1face", - "date": "2024-03-26T11:42:51+02:00", - "path": "/nix/store/d80f3x65zd87i9zpi7z2rh28a5f03n1k-tree-sitter-query", - "sha256": "0g8234yicidpjqc1rc7dvpx5ja49g938w451796nnn02chxa204i", - "hash": "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0=", + "rev": "d25e8d183f319497b8b22a2a1585975b020da722", + "date": "2024-05-06T23:21:15+02:00", + "path": "/nix/store/bj3dsdmf608vwagc1nwwhs5z90p6swzc-tree-sitter-query", + "sha256": "191h311g14aah7wpibpyhpz925506c3l6qyrfra1kd8pjn1nv2vk", + "hash": "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index 7ec43650bb3ba..c74499796fbc1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,10 +1,10 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57", - "date": "2023-07-26T18:01:44-07:00", - "path": "/nix/store/ydqli8jal8g3nbr78nl8rimb0m5r7b50-tree-sitter-r", - "sha256": "0si338c05z3bapxkb7zwk30rza5w0saw0jyk0pljxi32869w8s9m", - "hash": "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=", + "rev": "391400572538ff9854341a175ed8ab4b1e45f44b", + "date": "2024-05-03T14:16:03-04:00", + "path": "/nix/store/dkmd92q56snynssaridhzkd7rv8zckq7-tree-sitter-r", + "sha256": "05s0n6qvb3jsx7sv4vzsc794vdxinxf7f8d2sbf9qz3vwwm39kr8", + "hash": "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json index 24fa8e0c9c8f5..fee52809beb5c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-regex", - "rev": "ba22e4e0cb42b2ef066948d0ea030ac509cef733", - "date": "2024-02-14T19:05:11-05:00", - "path": "/nix/store/9fwryyszxm2fj1pm0l5p641yqiyggcvp-tree-sitter-regex", - "sha256": "02nxl4s5vx8nsmhg7cjaf45nl92x8q60b7jhlp29qdqvbgg35gwr", - "hash": "sha256-mb8y3lsbN5zEpVCeBQxGXSRqC3FKsvNg1Rb1XTSh3Qo=", + "rev": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7", + "date": "2024-05-05T20:53:57-04:00", + "path": "/nix/store/4vlp0kgq09yp9bnjkrsc82mh0c0mb4qa-tree-sitter-regex", + "sha256": "0j9shwv7j8jnkms1f8h9ddg80cj85vp1pivkdcspdifbi69q8l2z", + "hash": "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 3861a460d1825..12519a98bf82a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b", - "date": "2024-04-08T18:09:37-04:00", - "path": "/nix/store/mzkmi2d933cn0imzhvfvm43rwzgv624n-tree-sitter-rust", - "sha256": "1i1and7lkrcpxkkm3y8p8v1d6wpb6z3b3vrxk9dlw84mwa03y97d", - "hash": "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ=", + "rev": "9c84af007b0f144954adb26b3f336495cbb320a7", + "date": "2024-05-05T19:28:38-04:00", + "path": "/nix/store/5mmx41c8spdf25jci02lw3vmq117dksv-tree-sitter-rust", + "sha256": "0wjw8wz34c3h624xi0n133pv4ld1gmx4zn60xfkqgv7cmn9f42cv", + "hash": "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index b18c4d8c71ef5..210646ac4c5e9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,10 +1,10 @@ { "url": "https://github.com/derekstride/tree-sitter-sql", - "rev": "c85ffb5228dd643d447ad8ebc75884f6c4fc6158", - "date": "2023-12-15T15:40:26-05:00", - "path": "/nix/store/mj8yhb4hs86y2yqyz4znpdp9x9bbd8bl-tree-sitter-sql", - "sha256": "0p6ay475y30wq949hrffl31lj46axkqi8abf71ak54dibx0892l3", - "hash": "sha256-g4qEQF+xkTJVOG4pFPHsyhBJw6DOZZhIwhwMXw7xylw=", + "rev": "7d591a1a14ce4d5caf81ae64284c2dc185544cb2", + "date": "2024-04-20T18:48:13+02:00", + "path": "/nix/store/r6sz2sa4az2p2idl3vjv90nr4zghxmxr-tree-sitter-sql", + "sha256": "1x4kw4fflizwb472n8sfpigqyc8y57m28mawsf999011flzg2dmp", + "hash": "sha256-tzbxPnUhgJSS01xVJOopHjGPX7xOIysOWfxH6hzhk/Q=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index ec2da6b0fd02b..a83d9b23b0348 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,10 +1,10 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095", - "date": "2023-05-30T21:04:53+02:00", - "path": "/nix/store/fzb78sqxbxcyldz5m7yx6zirxsvxn5cc-tree-sitter-supercollider", - "sha256": "0ib8mja321zwbw59i45xa66p39gikn8n1pihhv26hm5xgdkwwr4r", - "hash": "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU=", + "rev": "affa4389186b6939d89673e1e9d2b28364f5ca6f", + "date": "2024-04-30T09:37:18+02:00", + "path": "/nix/store/jhngv28bin50xqq7b898mq55s8mzmvr9-tree-sitter-supercollider", + "sha256": "02jbkx3679b5z78fdn62yr1ax7lr4mlcrdq0fs378alx8hm9704g", + "hash": "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json index 9173e9300fb94..6dbe64089625d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json @@ -1,10 +1,10 @@ { "url": "https://github.com/vrischmann/tree-sitter-templ", - "rev": "1f9dae9c273136551684cb41461d00e565150e23", - "date": "2024-04-14T01:39:30+02:00", - "path": "/nix/store/swrbx6wrw3k022j2g7vq625zvjbmaxnr-tree-sitter-templ", - "sha256": "0w9kr1awc9f30mvidz4aysqs5wk3v93yam6ybb2d2jmmnv9kx5zj", - "hash": "sha256-8pc+07a1StHEWt5U5UfaY/KisfaK/BZ3BcMlxlXIM3E=", + "rev": "d631f60287c0904770bc41aa865e249594b52422", + "date": "2024-05-09T13:42:17+02:00", + "path": "/nix/store/5h839wwxwjmg799bp79kkcav2ld8k0jy-tree-sitter-templ", + "sha256": "16di98f9xnqdpzb69p8hrgisfhsz0r9p4pv342z0cvkjv5n4s0xc", + "hash": "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index eda4e2a9669c2..f50a35e3f2cb9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba", - "date": "2024-04-12T21:02:56-04:00", - "path": "/nix/store/p9q0v9h09nf49ji1fnl3s87xsda7skmj-tree-sitter-tlaplus", - "sha256": "0vh0kdab362n1cm1nl1klqixshdzjnx5cxynadrmz021x2dx3xl7", - "hash": "sha256-h/bRm+hBgF9zU9Z3VrqVv0HdI6YzUBsqC1aYsVSbAG4=", + "rev": "ef18145e7f985f592ad41b04004b24a590f58b71", + "date": "2024-05-15T18:54:24-04:00", + "path": "/nix/store/saczmakjnrwrvn0dad37bfva1m3mvzc5-tree-sitter-tlaplus", + "sha256": "0hnylz5mxsvk1q8bbv7ak4r49l2knx75ln58i4isqs7qr0a2vw6b", + "hash": "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json index daa765d0c95d8..e0c25f2310426 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-verilog", - "rev": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17", - "date": "2024-02-14T20:12:08-05:00", - "path": "/nix/store/6jdd5vk6m85h4mir572admz08pcp7yqx-tree-sitter-verilog", - "sha256": "0qqk9066wlwjrmac43i1irjfnimbkdxwvx4srnnkjv466sn7si3s", - "hash": "sha256-ekR9rDaGbDmtzZr0zXubq0brZI4hDsJUzZJTbgxIE2M=", + "rev": "075ebfc84543675f12e79a955f79d717772dcef3", + "date": "2024-04-27T13:13:12-04:00", + "path": "/nix/store/6wsakwazlb9y44n2pmr6xfx0dn6hr99x-tree-sitter-verilog", + "sha256": "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k", + "hash": "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json index bb79674690e37..0492557e1be0a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json @@ -1,10 +1,10 @@ { "url": "https://github.com/winglang/wing", - "rev": "f0b6b11709eb2ed56e5ef76a9b6fcc98615683b8", - "date": "2024-04-15T06:16:09+00:00", - "path": "/nix/store/iz1a2mwxdx9zqgdds0rfy8apq9l36xpb-wing", - "sha256": "105q2w5a3mx8pd0k0jhr6p3fprd85jr7fz3ndkj48yb2m8x2r1is", - "hash": "sha256-OoYsOqpieUTkbHZ8d7IsqOXrxjUZSjBBu6jXoQoXuIA=", + "rev": "d65e4c03e1b992adc76df2c2485562c8f2204462", + "date": "2024-05-17T04:19:16+00:00", + "path": "/nix/store/3pdf6cy205v9s4bf2y8r45qpvf3j1zq1-wing", + "sha256": "0y0w3559980ryhnnbjkxxlr6w11110fxvvqsk2wr0sijy53j07w5", + "hash": "sha256-hR8gR/EyapC5mBrv3R0IIQRuMu19ymUt9BmglEoZHHg=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 9b7558b53c7b4..4c2f2c10aee58 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -102,6 +102,10 @@ let orga = "polarmutex"; repo = "tree-sitter-beancount"; }; + "tree-sitter-bqn" = { + orga = "shnarazk"; + repo = "tree-sitter-bqn"; + }; "tree-sitter-clojure" = { orga = "sogaiu"; repo = "tree-sitter-clojure"; diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/development/tools/patatt/default.nix index b50fae18ae490..49477035a1101 100644 --- a/pkgs/development/tools/patatt/default.nix +++ b/pkgs/development/tools/patatt/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; + hash = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index 7b0e2c7a784a9..6152e0c8dc38c 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -36,5 +36,5 @@ rustPlatform.buildRustPackage rec { cp ${cargo-lock} $out/Cargo.lock ''; - cargoSha256 = "0d6g52hjflnw2zvlx10pz78527vh7mw5n43yi8q6dwr3pkbds1fs"; + cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ="; } diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index a72ceab056efb..cffa0299beabe 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; + hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; - cargoSha256 = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; + cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix index 80d9c26f506c2..bc4d0c9ca6114 100644 --- a/pkgs/development/tools/pifpaf/default.nix +++ b/pkgs/development/tools/pifpaf/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; + hash = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "pifpaf"; homepage = "https://github.com/jd/pifpaf"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/development/tools/pigeon/default.nix deleted file mode 100644 index 2277d4c3616a8..0000000000000 --- a/pkgs/development/tools/pigeon/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "pigeon"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "mna"; - repo = "pigeon"; - rev = "v${version}"; - sha256 = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg="; - }; - - vendorHash = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E="; - - proxyVendor = true; - - subPackages = [ "." ]; - - doCheck = false; - - meta = { - homepage = "https://github.com/mna/pigeon"; - description = "PEG parser generator for Go"; - mainProgram = "pigeon"; - maintainers = with lib.maintainers; [ zimbatm ]; - license = with lib.licenses; [ bsd3 ]; - }; -} diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 27386cc1d6902..dd65dbe34221f 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -3,6 +3,8 @@ , python3 , fetchFromGitHub , installShellFiles +, pipenv +, runCommand }: with python3.pkgs; @@ -24,14 +26,14 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2023.10.24"; + version = "2024.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "pipenv"; rev = "refs/tags/v${version}"; - hash = "sha256-b1EqCrgGygdG08zzastgcYGnXDKoEYNvm5xjDLzlAXo="; + hash = "sha256-IyjJrIEcKHm7TpZk26MYI///ZIB/7ploTBzvms1gDmI="; }; env.LC_ALL = "en_US.UTF-8"; @@ -66,14 +68,29 @@ in buildPythonApplication rec { ]; disabledTests = [ - "test_convert_deps_to_pip" + # this test wants access to the internet "test_download_file" ]; disabledTestPaths = [ + # many of these tests want access to the internet "tests/integration" ]; + passthru.tests = { + verify-venv-patch = runCommand "${pname}-test-verify-venv-patch" {} '' + export PIPENV_VENV_IN_PROJECT=1 + + # "pipenv install" should be able to create a venv + ${pipenv}/bin/pipenv install + + # the venv exists + [ -d .venv ] + + touch $out + ''; + }; + postInstall = '' installShellCompletion --cmd pipenv \ --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \ diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 6ef6fb3c5f72a..232948d7a093d 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -4,12 +4,12 @@ let variants = { "8" = { - version = "8.15.8"; - hash = "sha256-aR/hdu6pqKgN8g5JdvPftEoEhBzriFY4/iomF0+B5l4="; + version = "8.15.9"; + hash = "sha256-2qJ6C1QbxjUyP/lsLe2ZVGf/n+bWn/ZwIVWKqa2dzDY="; }; "9" = { - version = "9.4.0"; - hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; + version = "9.7.0"; + hash = "sha256-s1AY+/qPWDZosmSeQHkipyE1XNgfYb7rSsHUJY5YVVk="; }; }; diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index eb8b847960c53..e5032da10590e 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -14,6 +14,8 @@ { hash ? "", pname, + pnpmWorkspace ? "", + prePnpmInstall ? "", ... }@args: let @@ -29,6 +31,7 @@ outputHash = ""; outputHashAlgo = "sha256"; }; + installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; in stdenvNoCC.mkDerivation (finalAttrs: ( args' @@ -58,9 +61,15 @@ pnpm config set side-effects-cache false # As we pin pnpm versions, we don't really care about updates pnpm config set update-notifier false + # Run any additional pnpm configuration commands that users provide. + ${prePnpmInstall} # pnpm is going to warn us about using --force # --force allows us to fetch all dependencies including ones that aren't meant for our host platform - pnpm install --frozen-lockfile --ignore-script --force + pnpm install \ + --force \ + --ignore-scripts \ + ${installFlags} \ + --frozen-lockfile runHook postInstall ''; diff --git a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh index fc0c47dbb70b6..e82a62f9101cd 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh +++ b/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh @@ -24,7 +24,17 @@ pnpmConfigHook() { echo "Installing dependencies" - pnpm install --offline --frozen-lockfile --ignore-script + if [[ -n "$pnpmWorkspace" ]]; then + pnpmInstallFlags+=("--filter=$pnpmWorkspace") + fi + runHook prePnpmInstall + + pnpm install \ + --offline \ + --ignore-scripts \ + "${pnpmInstallFlags[@]}" \ + --frozen-lockfile + echo "Patching scripts" diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix index 13562e26727f6..95a028c6f8095 100644 --- a/pkgs/development/tools/poac/default.nix +++ b/pkgs/development/tools/poac/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://poac.pm"; description = "Package Manager for C++"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; # error: call to 'format' is ambiguous broken = true; # last successful build 2023-12-31 diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index e05e61f603399..fdd665bbae22c 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -9,7 +9,6 @@ # is released we can switch to latest binutils. libbfd_2_38, libopcodes_2_38, - buildPackages, autoreconfHook }: @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { owner = "eztrace"; repo = "eztrace"; rev = "eztrace-${version}"; - sha256 = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; + hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; }; nativeBuildInputs = [ gfortran autoreconfHook ]; @@ -30,6 +29,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool that aims at generating automatically execution trace from HPC programs"; license = licenses.cecill-b; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/profiling/malt/default.nix b/pkgs/development/tools/profiling/malt/default.nix index e13f488bdf743..82b041cc86a0f 100644 --- a/pkgs/development/tools/profiling/malt/default.nix +++ b/pkgs/development/tools/profiling/malt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Memory tool to find where you allocate your memory"; homepage = "https://github.com/memtt/malt"; license = licenses.cecill-c; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 7ef470a97be13..24851fc6763bc 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -5,16 +5,20 @@ buildGoModule rec { pname = "pprof"; - version = "0-unstable-2024-05-09"; + version = "0-unstable-2024-07-10"; src = fetchFromGitHub { owner = "google"; repo = "pprof"; - rev = "723abb6459b72e964cbfb3f7064446bf3bb321dc"; - hash = "sha256-zw9/xp5E5V/0D0pf5diWcx/SHX3ujwBtZNfH9tioiL0="; + rev = "f6c9dda6c6da638264f96f1097bce50fd82b4927"; + hash = "sha256-jxPl3e9aYRWyR7vkz+15aZiG331WnrNkMW8vwbcldfY="; }; - vendorHash = "sha256-bQyloQPfweK4PlrkO1IcCFjyctj99e8C9mQbCj+HCXQ="; + postPatch = '' + rm -rf browsertests # somewhat independent module to ignore. + ''; + + vendorHash = "sha256-oOjkjVb3OIGMwz3/85KTewXISpBZM3o1BfFG9aysFbo="; meta = with lib; { description = "Tool for visualization and analysis of profiling data"; diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix index 3fbd49679225f..b4751caa883a2 100644 --- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4="; + sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4="; }; - vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k="; + vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; @@ -23,7 +23,7 @@ buildGoModule rec { downloadPage = "https://github.com/ent/contrib/"; license = licenses.asl20; homepage = "https://entgo.io/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 6833bd9a65a49..460f29bf5cf35 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-LUFwmxlbZVTlEyp82lm3ylh6KYtVlviYK13pxj4MH0M="; + hash = "sha256-LUFwmxlbZVTlEyp82lm3ylh6KYtVlviYK13pxj4MH0M="; }; vendorHash = "sha256-BPvKRIYvIxen0m8C9geFC4gIq4VH8mmdI0ZLMnlBB/I="; diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index b58988a4af59d..b8266c6f223b4 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-NPjBVd5Ch8h2+48uymMRjjY6nepmGiY8z9Kwt+wN4lI="; + sha256 = "sha256-QY7MqggMNYq6x1VkkWVGN07VZgkexe7mGj/+6QvJiHs="; }; - vendorHash = "sha256-1bR6cV7R9JEmayE3XN2fcrPQL6xspkKb+WYf+IrOhds="; + vendorHash = "sha256-DqM+Am7Pi0UTz7NxYOCMN9W3H6WipX4oRRa8ceMsYZ0="; excludedPackages = [ "tests" ]; diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index a9252814d28e8..7ad0c09b7efa8 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.50.1"; + version = "0.50.4"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-zn9bxOWJWlF3lpVAuJQTTnBqNeTAZg+0bPVGAzf3a54="; + hash = "sha256-YUQ9DXsb45ggFi/sOeuONTO0hpmtxl/GLL1X6YKVE1g="; }; - vendorHash = "sha256-E3pzeu+JA97z2q21ARTgwTPldhWODqkCP7rQMMKygAw="; + vendorHash = "sha256-pjDVOD6McJdER+BbUckKt4WW/AXsCxdA2nNn8iWSlGE="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index e719fb7691b9a..3a4ed97102d57 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.197.0"; + version = "0.207.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Yjnq6ALbuvkYIOZ4CdBq1naTPGgT3aX0wRmREZpHo7I="; + sha256 = "sha256-T01Vo8W21Gu2e7W87LFM/7NGsqHgWt+L4mXmPAEyB70="; }; - vendorHash = "sha256-TdRfff342QvwjBC6B6/npbkvaH3o9CBKe2exu6TnT2o="; + vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 501d5613930c9..3df3ef3bc42b8 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -18,6 +18,6 @@ buildGoModule rec { mainProgram = "pup"; homepage = "https://github.com/ericchiang/pup"; license = licenses.mit; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 8ac80ee1dade9..8522333ef9db1 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.14"; + version = "0.3.14-unstable-2024-02-27"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; - rev = "refs/tags/v${version}"; - hash = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; + rev = "8dd54929106916a3c961cc57c1172793ce126180"; + hash = "sha256-rrngOqlXIJXbh3A7OBEcgoakZyyuvlHHXhWo3/1BRpY="; }; - cargoHash = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE="; + cargoHash = "sha256-gNnuuq2cz168Gaw+gL2nJ8EC32BMPu9DgnRzIh1hGKk="; # error: linker `arm-linux-gnueabihf-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 5088c01b4882a..c7658d2fe749e 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.5"; + version = "2.4.8"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-0MMPbn6BaIn623nHYuNYsiMIFF0y2fAYmjxZ/XESyTg="; + hash = "sha256-JXNEAgppFbeNKxjvrI/jUyHmN6pSWUFGSrxeVZi5pHw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index ef3d61e60f77e..5a097393d639a 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "13.0.2"; + version = "14.0.0"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-wSXMVSJhnH+PwoBadQq5bLu1al/fw4i2yxWrda9+wM4="; + hash = "sha256-8v3P+cuO1/1csfx3k1LHp6lCkieIygAN6F2229eo1FQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix deleted file mode 100644 index 100aba324db36..0000000000000 --- a/pkgs/development/tools/railway/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices -, Security, SystemConfiguration }: - -rustPlatform.buildRustPackage rec { - pname = "railway"; - version = "3.9.3"; - - src = fetchFromGitHub { - owner = "railwayapp"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-8K+awKsSQotPqVJg7SkpPCjenU6a/cqEZogqwQAe0I8="; - }; - - cargoHash = "sha256-2KNSPn0zrx5zwF9g29x3/L/ptza+NstBu4Lc1PR4ymE="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; - - OPENSSL_NO_VENDOR = 1; - - meta = with lib; { - mainProgram = "railway"; - description = "Railway.app CLI"; - homepage = "https://github.com/railwayapp/cli"; - changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ Crafter techknowlogick ]; - }; -} diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 37fa945dd95a8..91f5c0f6ab854 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2W/Ytdnzb0+EAPsuN6LXX0eLQMOu3qetJKYvKzgB0jM="; + sha256 = "sha256-oj9/xVbb8+J4g/ul2CEs5LH7OKJdEqTTZonCHVlDc7M="; }; - vendorHash = "sha256-Hpggkx707IX5ZUBuynQukCShk0pp12YEJYOF3eEN+5I="; + vendorHash = "sha256-NcM+SdIgqtSRg7Fcwml/V73qYHcowBdOtmuF7EMSBB8="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index b37f745e6808d..8b8a002d85b6a 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-MZ6SN/zrcIKnpm2o5w6d5Vx0YmeuS+zMfsPdZmRKewY="; + hash = "sha256-Tg9A7S6z/qaJ/saZRD3SSLxRQBwq/YNSTuHcmwwhqeM="; }; - cargoHash = "sha256-+Jb+btXU+fsVXWCmafY5ZaGLvFIA/wFzVNkO0O8QaVw="; + cargoHash = "sha256-yDz7FuAw4mvL16EMUmywB0lfnMC6okLZ1px3Blx5rn4="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index f0383d5c9abdc..61d808e23c6db 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -7,7 +7,6 @@ , gdk-pixbuf , fontconfig , pango -, gnome , atk , at-spi2-atk , at-spi2-core @@ -112,6 +111,6 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "Standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; mainProgram = "react-native-debugger"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/react-static/default.nix b/pkgs/development/tools/react-static/default.nix index ea21f3ca3e4cf..5307f93a4b4c8 100644 --- a/pkgs/development/tools/react-static/default.nix +++ b/pkgs/development/tools/react-static/default.nix @@ -50,6 +50,6 @@ mkYarnPackage rec { homepage = "https://github.com/react-static/react-static"; license = lib.licenses.mit; mainProgram = "react-static"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index 6cc64e1169819..d5979ac53dbdf 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME="; }; - cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; + cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 207060f1ffa8a..3251014f5bfdc 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub , installShellFiles @@ -12,16 +11,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.6.1"; + version = "0.7.1"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-0TeqZeW2HTjHyHyO8EhmOUCaLTq/XpWTPQMKh58VH8M="; + sha256 = "sha256-QG0qwilYqsueyI3rzpNj9z8gYYRzIorlOID+baORgJU="; }; - vendorHash = "sha256-cKpsgT/YOyNEV8OQdclZnDmGKCrUjNeZCOd0zQ/bvL8="; + vendorHash = "sha256-gqnE3kfBLjV8CroYcJwa9QWCFOL/dBIblPQJZR2DW+4="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index f5b2b5a36198e..b68fd3ddbaa35 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.07.01.00"; + version = "2024.07.22.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-eA2eD/762/hJQ7p/V/Hw1dYzkqnqXZymdg8ef2wi8to="; + hash = "sha256-T6qUXkzYlkaHlGahf4tnZLD9MogSQueFIBeZDJCiB/w="; }; - cargoHash = "sha256-hyySKUDeZ7aPXQ7f4grgYY3cTkhE82rrh2EFasrnGX0="; + cargoHash = "sha256-DUcyMohQbkc/93iqFWQGMwvOhdlzhoQTdXH64FFbmY0="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix index c9374d3a8dec3..2788f4fb11d87 100644 --- a/pkgs/development/tools/remodel/default.nix +++ b/pkgs/development/tools/remodel/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI="; }; - cargoSha256 = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg="; + cargoHash = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index 843e4fe2c6758..a70cd7805acbb 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -11,13 +11,13 @@ , vulkan-loader , libglvnd , xorg -, python3 -, python3Packages +, python311 +, python311Packages , bison , pcre , automake , autoconf -, addOpenGLRunpath +, addDriverRunpath , waylandSupport ? false , wayland }: @@ -32,23 +32,23 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.33"; + version = "1.34"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-BQR7ENgdblzamO5GgtLJriNiJFICsj0/iWVn1usxBjU="; + sha256 = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o="; }; buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ] ++ (with python3Packages; [ + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python311 + ] ++ (with python311Packages; [ pyside2 pyside2-tools shiboken2 ]) ++ lib.optional waylandSupport wayland; - nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath ]; postUnpack = '' cp -r ${custom_swig} swig @@ -79,7 +79,7 @@ mkDerivation rec { # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh postFixup = '' - addOpenGLRunpath $out/lib/librenderdoc.so + addDriverRunpath $out/lib/librenderdoc.so ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 61f06a3bf44f7..18aea30413325 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { mainProgram = "renderizer"; inherit (src.meta) homepage; license = licenses.gpl3; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 099bc7476c917..1c181c0efbe02 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -1,14 +1,14 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, go, lib, makeWrapper }: buildGoModule rec { pname = "revive"; - version = "1.3.7"; + version = "1.3.9"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z5areIRlCyjUbusAdfL49mm5+J0UryWrS5/9Ttw16Po="; + hash = "sha256-ZfZNqr7zeMrLjSS1h3ZbjiXNjX1UiqldtrEFth2Z4f0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-JYZdV6CefCB7/WzeZqUhIsK3PKo9KJG15dinN3S+1xw="; + vendorHash = "sha256-iIAKPCE06lhAf/4f4TRVO51RdlvuXNA7yMlGVPGrIeo="; ldflags = [ "-s" @@ -33,16 +33,14 @@ buildGoModule rec { ldflags+=" -X 'github.com/mgechev/revive/cli.date=$(cat DATE)'" ''; - # The following tests fail when built by nix: - # - # $ nix log /nix/store/build-revive.1.3.7.drv | grep FAIL - # - # --- FAIL: TestAll (0.01s) - # --- FAIL: TestTimeEqual (0.00s) - # --- FAIL: TestTimeNaming (0.00s) - # --- FAIL: TestUnhandledError (0.00s) - # --- FAIL: TestUnhandledErrorWithBlacklist (0.00s) - doCheck = false; + allowGoReference = true; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/revive \ + --prefix PATH : ${lib.makeBinPath [ go ]} + ''; meta = with lib; { description = "Fast, configurable, extensible, flexible, and beautiful linter for Go"; diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 746d269f76a2f..c66c0a0b92f0e 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rojo"; - version = "7.4.1"; + version = "7.4.3"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; rev = "v${version}"; - hash = "sha256-7fnzNYAbsZW/48C4dwpMXXQy2ZgxbYFSs85wNKGcu/4="; + hash = "sha256-oCG0dD1nVk5bpz3QID4kKjzGN6JH6iZXir/PzIrayaU="; fetchSubmodules = true; }; - cargoHash = "sha256-9kmSNWsZY0OcqaYOCblMwkXTdGXhj7f/2pUDx/L/o2o="; + cargoHash = "sha256-c+uPLZU9uGbaNjs5b6Us393QSJKdUub27ZqggQqgriU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/development/tools/ronn/Gemfile deleted file mode 100644 index 0643ca6ddfdf9..0000000000000 --- a/pkgs/development/tools/ronn/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "ronn-ng" diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock deleted file mode 100644 index c0366bb173386..0000000000000 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ /dev/null @@ -1,28 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - kramdown (2.4.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - mini_portile2 (2.8.5) - mustache (1.1.1) - nokogiri (1.16.0) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - racc (1.7.3) - rexml (3.2.6) - ronn-ng (0.10.1) - kramdown (~> 2, >= 2.1) - kramdown-parser-gfm (~> 1, >= 1.0.1) - mustache (~> 1) - nokogiri (~> 1, >= 1.14.3) - -PLATFORMS - ruby - -DEPENDENCIES - ronn-ng - -BUNDLED WITH - 2.5.3 diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix deleted file mode 100644 index 3e0d49271177a..0000000000000 --- a/pkgs/development/tools/ronn/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, groff, callPackage }: - -stdenv.mkDerivation rec { - pname = "ronn"; - version = env.gems.ronn-ng.version; - - env = bundlerEnv { - name = "ronn-gems"; - gemdir = ./.; - }; - - dontUnpack = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - makeWrapper ${env}/bin/ronn $out/bin/ronn \ - --set PATH ${groff}/bin - - runHook postInstall - ''; - - passthru.updateScript = bundlerUpdateScript "ronn"; - - passthru.tests.reproducible-html-manpage = callPackage ./test-reproducible-html.nix { }; - - meta = with lib; { - description = "markdown-based tool for building manpages"; - mainProgram = "ronn"; - homepage = "https://github.com/apjanke/ronn-ng"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm nicknovitski ]; - platforms = env.ruby.meta.platforms; - }; -} diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix deleted file mode 100644 index 0a65000304be4..0000000000000 --- a/pkgs/development/tools/ronn/gemset.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - kramdown = { - dependencies = ["rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; - type = "gem"; - }; - version = "2.4.0"; - }; - kramdown-parser-gfm = { - dependencies = ["kramdown"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; - type = "gem"; - }; - version = "1.1.0"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; - type = "gem"; - }; - version = "2.8.5"; - }; - mustache = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch"; - type = "gem"; - }; - version = "1.1.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; - type = "gem"; - }; - version = "1.16.0"; - }; - racc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; - type = "gem"; - }; - version = "1.7.3"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; - ronn-ng = { - dependencies = ["kramdown" "kramdown-parser-gfm" "mustache" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h2y2v3wkl5c710wfanqwxlxi74l1ssva8yrzsg8iypvq22h3ssf"; - type = "gem"; - }; - version = "0.10.1"; - }; -} diff --git a/pkgs/development/tools/ronn/test-reproducible-html.nix b/pkgs/development/tools/ronn/test-reproducible-html.nix deleted file mode 100644 index 6bc9d6cdbf9fb..0000000000000 --- a/pkgs/development/tools/ronn/test-reproducible-html.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ runCommand -, diffutils -, ronn -}: -runCommand "ronn-test-reproducible-html" { } '' - set -euo pipefail - - cat > aprog.1.ronn << EOF - aprog - ===== - - ## AUTHORS - - Vincent Haupert <veehaitch@users.noreply.github.com> - EOF - - # We have to repeat the manpage generation a few times to be confident - # it is in fact reproducible. - for i in {1..20}; do - ${ronn}/bin/ronn --html --pipe aprog.1.ronn > aprog.1.html-1 - ${ronn}/bin/ronn --html --pipe aprog.1.ronn > aprog.1.html-2 - - ${diffutils}/bin/diff -q aprog.1.html-1 aprog.1.html-2 \ - || (printf 'The HTML manpage is not reproducible (round %d)' "$i" && exit 1) - done - - echo 'The HTML manpage appears reproducible' - - mkdir $out -'' diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 6e69aca6dd25e..c70869299c9da 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rover"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1Tnb9ACyV6RZmYnLL+KnybGgy8kwGi0JyWYcoH1J6M="; + sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y="; }; - cargoSha256 = "sha256-wTvQ4QBysppMgwv9pjQckVjMoBzLiDReOt6sJImqKFY="; + cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/rover/update.sh b/pkgs/development/tools/rover/update.sh index 3914c9acb540f..a9a5bdb6ad6c8 100755 --- a/pkgs/development/tools/rover/update.sh +++ b/pkgs/development/tools/rover/update.sh @@ -36,16 +36,16 @@ sed --in-place \ "s|sha256 = \"[a-zA-Z0-9\/+-=]*\"|sha256 = \"$rover_sri_hash\"|" \ "$dirname/default.nix" -# Clear cargoSha256. +# Clear cargoHash. sed --in-place \ - "s|cargoSha256 = \".*\"|cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \ + "s|cargoHash = \".*\"|cargoHash = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \ "$dirname/default.nix" -# Update cargoSha256 -echo "Computing cargoSha256" -cargoSha256=$( - nix-prefetch "{ sha256 }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = sha256; })" +# Update cargoHash +echo "Computing cargoHash" +cargoHash=$( + nix-prefetch "{ hash }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = hash; })" ) sed --in-place \ - "s|cargoSha256 = \".*\"|cargoSha256 = \"$cargoSha256\"|" \ + "s|cargoHash = \".*\"|cargoHash = \"$cargoHash\"|" \ "$dirname/default.nix" diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index f8ed521ad2cc1..b5624092c852a 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; }; - cargoSha256 = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA="; + cargoHash = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA="; postPatch = '' # Remove #[deny(warnings)] which is equivalent to -Werror in C. diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/development/tools/rslint/default.nix index cac55f4bb3516..28dfadd4cd752 100644 --- a/pkgs/development/tools/rslint/default.nix +++ b/pkgs/development/tools/rslint/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc="; }; - cargoSha256 = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY="; + cargoHash = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY="; cargoBuildFlags = [ "-p" "rslint_cli" diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 7ee983ef6f9bf..3710cb6122a87 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "andersbakken"; repo = "rtags"; rev = "v${version}"; - sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; + hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; fetchSubmodules = true; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index fc0c35f537593..c39b2a534b6d3 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -134,6 +134,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] +name = "append-only-vec" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d9f7083455f1a474276ccd32374958d2cb591024aac45101c7623b10271347" + +[[package]] name = "arc-swap" version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -141,9 +147,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "argfile" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c5c8e418080ef8aa932039d12eda7b6f5043baf48f1523c166fbc32d004534" +checksum = "0a1cc0ba69de57db40674c66f7cf2caee3981ddef084388482c95c0e2133e5e8" dependencies = [ "fs-err", "os_str_bytes", @@ -184,15 +190,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "regex-automata 0.4.6", @@ -233,6 +239,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + +[[package]] name = "cc" version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -305,9 +320,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -315,9 +330,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -337,31 +352,20 @@ dependencies = [ [[package]] name = "clap_complete_command" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" +checksum = "da8e198c052315686d36371e8a3c5778b7852fc75cc313e4e11eeb7a644a1b62" dependencies = [ "clap", "clap_complete", - "clap_complete_fig", "clap_complete_nushell", ] [[package]] -name = "clap_complete_fig" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] name = "clap_complete_nushell" -version = "0.1.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" +checksum = "1accf1b463dee0d3ab2be72591dccdab8bef314958340447c882c4c72acfe2a3" dependencies = [ "clap", "clap_complete", @@ -369,11 +373,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -437,6 +441,21 @@ dependencies = [ ] [[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "rustversion", + "ryu", + "serde", + "static_assertions", +] + +[[package]] name = "console" version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -480,6 +499,11 @@ name = "countme" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" +dependencies = [ + "dashmap 5.5.3", + "once_cell", + "rustc-hash 1.1.0", +] [[package]] name = "crc32fast" @@ -638,7 +662,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.5", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -727,9 +765,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -766,16 +804,6 @@ dependencies = [ ] [[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] name = "fastrand" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -898,12 +926,6 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" @@ -914,21 +936,15 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.5", + "hashbrown", ] [[package]] name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" @@ -1011,38 +1027,32 @@ dependencies = [ [[package]] name = "imara-diff" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" +checksum = "fc9da1a252bd44cd341657203722352efc9bc0c847d06ea6d2dc1cd1135e0a01" dependencies = [ "ahash", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] name = "imperative" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" +checksum = "29a1f6526af721f9aec9ceed7ab8ebfca47f3399d08b80056c2acca3fcb694a9" dependencies = [ "phf", "rust-stemmers", ] [[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", "serde", ] @@ -1190,9 +1200,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1285,7 +1295,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1313,9 +1323,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" @@ -1358,9 +1368,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540f1c43aed89909c0cc0cc604e3bb2f7e7a341a3728a9e6cfe760e733cd11ed" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "memchr" @@ -1425,7 +1435,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1447,7 +1457,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1472,11 +1482,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.50.0" +version = "0.50.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1513,10 +1523,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] +name = "ordermap" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c81974681ab4f0cc9fe49cad56f821d1cc67a08cd2caa9b5d58b0adaa5dd36d" +dependencies = [ + "indexmap", +] + +[[package]] name = "os_str_bytes" -version = "6.6.1" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "7ac44c994af577c799b1b4bd80dc214701e349873ad894d6cdf96f4f7526e0b9" dependencies = [ "memchr", ] @@ -1627,9 +1646,9 @@ dependencies = [ [[package]] name = "pep440_rs" -version = "0.6.0" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0a570e7ec9171250cac57614e901f62408094b54b3798bb920d3cf0d4a0e09" +checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385" dependencies = [ "once_cell", "serde", @@ -1838,45 +1857,51 @@ dependencies = [ [[package]] name = "red_knot" -version = "0.1.0" +version = "0.0.0" dependencies = [ "anyhow", - "bitflags 2.5.0", + "chrono", + "clap", + "colored", + "countme", "crossbeam", "ctrlc", - "dashmap", - "hashbrown 0.14.5", - "indexmap", - "is-macro", - "notify", - "parking_lot", + "filetime", "rayon", - "red_knot_module_resolver", - "ruff_index", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_parser", - "ruff_text_size", - "rustc-hash 2.0.0", - "smol_str", + "red_knot_python_semantic", + "red_knot_server", + "red_knot_workspace", + "ruff_db", + "salsa", "tempfile", "tracing", + "tracing-flame", "tracing-subscriber", "tracing-tree", ] [[package]] -name = "red_knot_module_resolver" +name = "red_knot_python_semantic" version = "0.0.0" dependencies = [ "anyhow", + "bitflags 2.6.0", + "camino", + "compact_str", + "countme", + "hashbrown", "insta", + "once_cell", + "ordermap", "path-slash", "ruff_db", + "ruff_index", + "ruff_python_ast", + "ruff_python_parser", "ruff_python_stdlib", + "ruff_text_size", "rustc-hash 2.0.0", "salsa", - "smol_str", "tempfile", "tracing", "walkdir", @@ -1884,23 +1909,59 @@ dependencies = [ ] [[package]] -name = "red_knot_python_semantic" +name = "red_knot_server" version = "0.0.0" dependencies = [ "anyhow", - "bitflags 2.5.0", - "hashbrown 0.14.5", - "indexmap", - "red_knot_module_resolver", + "crossbeam", + "jod-thread", + "libc", + "lsp-server", + "lsp-types", + "red_knot_workspace", "ruff_db", - "ruff_index", + "ruff_linter", + "ruff_notebook", "ruff_python_ast", - "ruff_python_parser", + "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", + "serde", + "serde_json", + "shellexpand", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "red_knot_wasm" +version = "0.0.0" +dependencies = [ + "console_error_panic_hook", + "console_log", + "js-sys", + "log", + "red_knot_workspace", + "ruff_db", + "ruff_notebook", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "red_knot_workspace" +version = "0.0.0" +dependencies = [ + "anyhow", + "crossbeam", + "notify", + "red_knot_python_semantic", + "ruff_cache", + "ruff_db", + "ruff_python_ast", + "rustc-hash 2.0.0", "salsa", - "smallvec", - "smol_str", + "thiserror", "tracing", ] @@ -1926,9 +1987,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -1985,12 +2046,12 @@ dependencies = [ [[package]] name = "ruff" -version = "0.5.0" +version = "0.5.7" dependencies = [ "anyhow", "argfile", "bincode", - "bitflags 2.5.0", + "bitflags 2.6.0", "cachedir", "chrono", "clap", @@ -2043,6 +2104,8 @@ dependencies = [ "criterion", "mimalloc", "once_cell", + "red_knot_workspace", + "ruff_db", "ruff_linter", "ruff_python_ast", "ruff_python_formatter", @@ -2074,17 +2137,24 @@ version = "0.0.0" dependencies = [ "camino", "countme", - "dashmap", + "dashmap 6.0.1", "filetime", + "ignore", "insta", - "once_cell", + "matchit", + "path-slash", + "ruff_cache", + "ruff_notebook", "ruff_python_ast", "ruff_python_parser", + "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "tempfile", "tracing", + "web-time", "zip", ] @@ -2164,12 +2234,12 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.5.0" +version = "0.5.7" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "chrono", "clap", "colored", @@ -2188,7 +2258,7 @@ dependencies = [ "once_cell", "path-absolutize", "pathdiff", - "pep440_rs 0.6.0", + "pep440_rs 0.6.6", "pyproject-toml", "quick-junit", "regex", @@ -2218,6 +2288,7 @@ dependencies = [ "thiserror", "toml", "typed-arena", + "unicode-normalization", "unicode-width", "unicode_names2", "url", @@ -2258,14 +2329,18 @@ name = "ruff_python_ast" version = "0.0.0" dependencies = [ "aho-corasick", - "bitflags 2.5.0", + "bitflags 2.6.0", + "compact_str", "is-macro", "itertools 0.13.0", "once_cell", + "ruff_cache", + "ruff_macros", "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", + "schemars", "serde", ] @@ -2338,7 +2413,7 @@ dependencies = [ name = "ruff_python_literal" version = "0.0.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "itertools 0.13.0", "ruff_python_ast", "unic-ucd-category", @@ -2350,8 +2425,9 @@ version = "0.0.0" dependencies = [ "annotate-snippets 0.9.2", "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "bstr", + "compact_str", "insta", "memchr", "ruff_python_ast", @@ -2380,15 +2456,19 @@ dependencies = [ name = "ruff_python_semantic" version = "0.0.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "is-macro", + "ruff_cache", "ruff_index", + "ruff_macros", "ruff_python_ast", "ruff_python_parser", "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", + "schemars", + "serde", ] [[package]] @@ -2425,7 +2505,7 @@ version = "0.2.2" dependencies = [ "anyhow", "crossbeam", - "globset", + "ignore", "insta", "jod-thread", "libc", @@ -2450,7 +2530,6 @@ dependencies = [ "shellexpand", "tracing", "tracing-subscriber", - "walkdir", ] [[package]] @@ -2475,7 +2554,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.0.0" +version = "0.5.7" dependencies = [ "console_error_panic_hook", "console_log", @@ -2514,7 +2593,7 @@ dependencies = [ "matchit", "path-absolutize", "path-slash", - "pep440_rs 0.6.0", + "pep440_rs 0.6.6", "regex", "ruff_cache", "ruff_formatter", @@ -2522,6 +2601,7 @@ dependencies = [ "ruff_macros", "ruff_python_ast", "ruff_python_formatter", + "ruff_python_semantic", "ruff_source_file", "rustc-hash 2.0.0", "schemars", @@ -2560,7 +2640,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2569,11 +2649,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -2583,15 +2664,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -2613,28 +2694,34 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=f706aa2d32d473ee633a77c1af01d180c85da308#f706aa2d32d473ee633a77c1af01d180c85da308" +source = "git+https://github.com/MichaReiser/salsa.git?tag=red-knot-0.0.1#ece083e15b79f155f9e4368ec1318cec9a08d88b" dependencies = [ + "append-only-vec", "arc-swap", "crossbeam", - "crossbeam-utils", - "dashmap", + "dashmap 6.0.1", "hashlink", "indexmap", - "log", + "lazy_static", "parking_lot", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", + "salsa-macro-rules", "salsa-macros", "smallvec", + "tracing", ] [[package]] +name = "salsa-macro-rules" +version = "0.1.0" +source = "git+https://github.com/MichaReiser/salsa.git?tag=red-knot-0.0.1#ece083e15b79f155f9e4368ec1318cec9a08d88b" + +[[package]] name = "salsa-macros" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=f706aa2d32d473ee633a77c1af01d180c85da308#f706aa2d32d473ee633a77c1af01d180c85da308" +source = "git+https://github.com/MichaReiser/salsa.git?tag=red-knot-0.0.1#ece083e15b79f155f9e4368ec1318cec9a08d88b" dependencies = [ - "eyre", - "heck 0.4.1", + "heck", "proc-macro2", "quote", "syn", @@ -2694,9 +2781,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -2714,9 +2801,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -2736,11 +2823,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2758,9 +2846,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2776,9 +2864,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "serde", "serde_derive", @@ -2787,9 +2875,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", @@ -2834,15 +2922,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2890,7 +2969,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", @@ -2905,9 +2984,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -2927,12 +3006,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", "windows-sys 0.52.0", ] @@ -2995,18 +3075,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -3025,9 +3105,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" dependencies = [ "cc", "libc", @@ -3035,9 +3115,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -3070,9 +3150,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -3082,18 +3162,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -3136,6 +3216,17 @@ dependencies = [ ] [[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + +[[package]] name = "tracing-indicatif" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3178,11 +3269,11 @@ dependencies = [ [[package]] name = "tracing-tree" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b56c62d2c80033cb36fae448730a2f2ef99410fe3ecbffc916681a32f6807dbe" +checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" dependencies = [ - "nu-ansi-term 0.50.0", + "nu-ansi-term 0.50.1", "tracing-core", "tracing-log", "tracing-subscriber", @@ -3299,9 +3390,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64", "flate2", @@ -3309,7 +3400,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "url", "webpki-roots", ] @@ -3334,9 +3424,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "rand", @@ -3346,9 +3436,9 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" +checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" dependencies = [ "proc-macro2", "quote", @@ -3518,6 +3608,16 @@ dependencies = [ ] [[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] name = "webpki-roots" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3728,9 +3828,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -3791,6 +3891,7 @@ dependencies = [ "byteorder", "crc32fast", "crossbeam-utils", + "flate2", "zstd", ] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 6a68f3a7b8204..2c1e6332bdb50 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -6,26 +6,27 @@ , darwin , rust-jemalloc-sys , ruff-lsp +, nix-update-script , testers , ruff }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.5.0"; + version = "0.5.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-OjMoa247om4DLPZ6u0XPMd5L+LYlVzHL39plCCr/fYE="; + hash = "sha256-swnh2bfmwPP1BHlnKbOtRdskMMArZgP/ErtrnXKRiC8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-0.18.0" = "sha256-keVEmSwV1Su1RlOTaIu253FZidk279qA+rXcCeuOggc="; + "salsa-0.18.0" = "sha256-Gu7YVqEDJUSzBqTeZH1xU0b3CWsWZrEvjIg7QpUaKBw="; }; }; @@ -39,31 +40,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - # tests expect no colors - preCheck = '' - export NO_COLOR=1 - ''; - - # Failing for an unclear reason. - # According to the maintainers, those tests are from an experimental crate that isn't actually - # used by ruff currently and can thus be safely skipped. - checkFlags = [ - "--skip=semantic::tests::expression_scope" - "--skip=semantic::tests::reachability_trivial" - "--skip=semantic::types::infer::tests::follow_import_to_class" - "--skip=semantic::types::infer::tests::if_elif" - "--skip=semantic::types::infer::tests::if_elif_else" - "--skip=semantic::types::infer::tests::ifexpr_walrus" - "--skip=semantic::types::infer::tests::ifexpr_walrus_2" - "--skip=semantic::types::infer::tests::join_paths" - "--skip=semantic::types::infer::tests::literal_int_arithmetic" - "--skip=semantic::types::infer::tests::maybe_unbound" - "--skip=semantic::types::infer::tests::narrow_none" - "--skip=semantic::types::infer::tests::resolve_base_class_by_name" - "--skip=semantic::types::infer::tests::resolve_module_member" - "--skip=semantic::types::infer::tests::resolve_visible_def" - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ @@ -73,9 +49,32 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit ruff-lsp; + updateScript = nix-update-script { }; version = testers.testVersion { package = ruff; }; }; + # Failing on darwin for an unclear reason. + # According to the maintainers, those tests are from an experimental crate that isn't actually + # used by ruff currently and can thus be safely skipped. + checkFlags = lib.optionals stdenv.isDarwin [ + "--skip=changed_file" + "--skip=changed_metadata" + "--skip=deleted_file" + "--skip=directory_deleted" + "--skip=directory_moved_to_trash" + "--skip=directory_moved_to_workspace" + "--skip=directory_renamed" + "--skip=hard_links_in_workspace" + "--skip=hard_links_to_target_outside_workspace" + "--skip=move_file_to_trash" + "--skip=move_file_to_workspace" + "--skip=new_file" + "--skip=new_ignored_file" + "--skip=rename_file" + "--skip=search_path" + "--skip=unix::symlink_inside_workspace" + ]; + meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/development/tools/rust-code-analysis/default.nix index d558752d04e5f..7427a8bd76d64 100644 --- a/pkgs/development/tools/rust-code-analysis/default.nix +++ b/pkgs/development/tools/rust-code-analysis/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, stdenv }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "rust-code-analysis"; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 036c3b76f19e7..a862878c9f7ae 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -1,6 +1,4 @@ { lib, fetchCrate, rustPlatform, clang, rustfmt -, runtimeShell -, bash }: let # bindgen hardcodes rustfmt outputs that use nightly features @@ -12,7 +10,7 @@ in rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; + hash = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; }; cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; @@ -43,7 +41,7 @@ in rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/rust-lang/rust-bindgen"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ johntitor ralith ]; + maintainers = with maintainers; [ johntitor ]; mainProgram = "bindgen"; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix index 0a9fa12365458..16dc55b64fbc0 100644 --- a/pkgs/development/tools/rust/bootimage/default.nix +++ b/pkgs/development/tools/rust/bootimage/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: @@ -15,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg"; }; - cargoSha256 = "03jximwqgjq7359c5mxbyfja2d04y57h34f87aby8jy0lz99jy2x"; + cargoHash = "sha256-XXiZ0qfAS+SXOsiRAU/xBDShpPOr18JSGQfLh3mNXQ4="; meta = with lib; { description = "Creates a bootable disk image from a Rust OS kernel"; diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/development/tools/rust/cargo-apk/default.nix index 130894a72ade4..c889f643b5cbd 100644 --- a/pkgs/development/tools/rust/cargo-apk/default.nix +++ b/pkgs/development/tools/rust/cargo-apk/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchCrate }: @@ -10,10 +9,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; + hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; }; - cargoSha256 = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; + cargoHash = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; meta = with lib; { description = "Tool for creating Android packages"; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 68d5a256bbf42..9c66f2cd97981 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb"; }; - cargoSha256 = "1c22aal3i7zbyxr2c41fimfx13fwp9anmhh641951yd7cqb8xij2"; + cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 3cb68b11c62e6..22567ad2d135f 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; + hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; }; - cargoSha256 = "+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; + cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index ddb5e3c199bfc..0f7e53474f6f6 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -6,10 +6,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; + hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; }; - cargoSha256 = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; + cargoHash = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/development/tools/rust/cargo-bitbake/default.nix index ed3f5a243cb38..91b4912022209 100644 --- a/pkgs/development/tools/rust/cargo-bitbake/default.nix +++ b/pkgs/development/tools/rust/cargo-bitbake/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoSha256 = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg="; + cargoHash = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg="; meta = with lib; { description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust"; diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/development/tools/rust/cargo-bolero/default.nix index 550ced495ef20..cd082dca6c863 100644 --- a/pkgs/development/tools/rust/cargo-bolero/default.nix +++ b/pkgs/development/tools/rust/cargo-bolero/default.nix @@ -6,10 +6,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk="; + hash = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk="; }; - cargoSha256 = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M="; + cargoHash = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M="; buildInputs = [ libbfd libopcodes libunwind ]; diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index a1151c161ffd9..8c8a4ea29a34c 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs="; }; - cargoSha256 = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; + cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index 0b43bb3ec44ec..125a8a9b8056e 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-Yye1Dz6XTh7bWz63zENQ0QDbYbulO6SnRV7g/6mMgUw="; + hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; }; - cargoHash = "sha256-syj3Hf+DxPoJgNbZQERHaKAZwMYuCCmuEGb8ylQt1Xo="; + cargoHash = "sha256-C+bnoYMO0Pjdgn4Q2Qb2COllMK0hnRNBwGd828o3AKE="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 9269dfa0e6ab7..50025c628f106 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; + hash = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; }; cargoHash = "sha256-EIpi1k5GffGCk+fzHSW32T+ZLkRfswnEGZdER95TyBk="; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index bda1fc6d9ce70..178b10b0be09d 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.13.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-b5PXmycnDGuKFRObz9fRQOCQHlepnPRjMGtSzAX6etg="; + hash = "sha256-jdGNZg/LXOoudxVhJbFeWEC9L3s0HW1S4nhfsGR4mEI="; }; - cargoHash = "sha256-OcWkYSVpbRXXoZfQeglPLWol2IJazYCVAUpurFn37ZE="; + cargoHash = "sha256-YW++YcpQM1Al7qD+KoVJitfK41i59sLjb3edBge1cvA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/development/tools/rust/cargo-criterion/default.nix index 986892a68b4d0..b139a4ce3a0cb 100644 --- a/pkgs/development/tools/rust/cargo-criterion/default.nix +++ b/pkgs/development/tools/rust/cargo-criterion/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; }; - cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; + cargoHash = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix index d94c15890bb18..772461683bf3f 100644 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; }; - cargoSha256 = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; + cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; checkFlags = [ "--skip=docker::shared::tests::directories::test_host" diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index c9773cbc43cb0..14ca5cd027dff 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-Hq5yEYikov/+/Vgf4Bn0b23+K6yqefrJOoEbC0YdnFY="; + hash = "sha256-H/CFEz1+rFHiTEP8JBFH9W9OTHjRdIBOov9c0JO69xE="; }; - cargoHash = "sha256-Q6Qanjfu5rIIZw4KeZo0kHJML5aq+12Lkn7CTscK8yE="; + cargoHash = "sha256-OhkC8R/+mdjFI6WRisFYZk5PKxje3W9X5p9tGCgKQOw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/development/tools/rust/cargo-deadlinks/default.nix index ead5705c59ae7..d206e739bb837 100644 --- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh"; }; - cargoSha256 = "00g06zf0m1wry0mhf098pw99kbb99d8a17985pb90yf1w74rdkh6"; + cargoHash = "sha256-Bs6WyeHBeZDWLSidoFBLaa2ZEr8oAQcr8JmHCtw34AE="; checkFlags = [ # uses internet diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 27c60b4039018..56b46ff8bc9fb 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-fJJMbibX/i/l1Qc/V4+loHJ+G/+nnstB0a1dlXkJjk0="; + hash = "sha256-COXYXx7C+IDJiw/y+GLY0oJYxtUjnGsikeWUk3z5B48="; }; - cargoHash = "sha256-SelvLaI+vG4PzBcxphBpeFM0nRtaQoTHvuS/8P8/Cig="; + cargoHash = "sha256-5iU6jk8yZLVUjksB4g39zBtfm6LTeBgXOLsw/M5CZZc="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 7a88815b2c1d6..573bdb96db022 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.24"; + version = "0.16.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-pCgOT1czLTlL3u4mqhQroal9Z5FHxnBR0YLx3wqp7ps="; + hash = "sha256-RfXKTACAVmQffOFHpQHDi/BgiMNRVuS8j4aLslMYL1Q="; }; - cargoHash = "sha256-LCdP9i+LogdPVVCI4UIhqGRy6H3GTMpEwX2QOlXbo8Q="; + cargoHash = "sha256-ywDjdlPhqqs740zGcwA8Ee9/TQ/sEiulSgGSejY41oY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index e8a97f906d05a..9da50e4ac64af 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-r7f4Ev/ucOFo4cu8zy+UDb2aJh35IMjgwuQ96j0pnw8="; + hash = "sha256-7+z9TVeSwyYwdP+qlvm5CIiDcRGXsM+AyyZnugd3Xk8="; }; - cargoHash = "sha256-GvzYoCbpn/q+jXyIfNgZ7j0cyCiJk7ipICAeGgMfkyw="; + cargoHash = "sha256-BgU99C0SJuxEOmIYRX/iy4243tiMeKCvCwc0AvKMhsk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix index 55f4df99c6e4d..4c65c7bba3b29 100644 --- a/pkgs/development/tools/rust/cargo-espmonitor/default.nix +++ b/pkgs/development/tools/rust/cargo-espmonitor/default.nix @@ -1,8 +1,6 @@ { lib , fetchFromGitHub , rustPlatform -, pkg-config -, systemd , }: rustPlatform.buildRustPackage rec { @@ -16,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4="; }; - cargoSha256 = "d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; + cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; meta = with lib; { description = "Cargo tool for monitoring ESP32/ESP8266 execution"; diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index c09447ebbc048..1e713076e1f33 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s="; }; - cargoSha256 = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; + cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 1e90dedcccde9..4a6d9c3ff39d7 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VrC3c3a1G8mn9U6txeynsaWOL4HQQk2IOiQqS52iPGo="; }; - cargoSha256 = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; + cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix index b373b584d9da2..13bb3eaff1cff 100644 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk="; }; - cargoSha256 = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw="; + cargoHash = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 73f52373e84fb..f85d1459c8ae8 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.28"; + version = "0.6.31"; src = fetchCrate { inherit pname version; - hash = "sha256-RpMOtgLp9cvXr8lNqGmLvCSbBt7tt7au8hhDCaSERRo="; + hash = "sha256-PMqGDwiQYTtPna4buO6pxUjF+RXT9phjPUNcpQQSn6Q="; }; - cargoHash = "sha256-KpG+T1rI14BgvWvRqiZ5y/n9+J1YRj4+j556zaY7aUA="; + cargoHash = "sha256-/bkGWQZAHkMtH6Y9ntFJEKV6gmUZEAbYf5A5xoUOMM8="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index 6ae5123da7cfa..c8429896be457 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -1,20 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.28"; + version = "0.9.30"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-mTemccM/C9M2kso9PNpd0UGEZJd/tBd1PjCpbDFFtNo="; + sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw="; }; - cargoHash = "sha256-UaSW9PZMUhqjvRM0/URHaOfofG5Ap3bvKgAHa+H+MFw="; + cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY="; - cargoBuildFlags = [ "-p" "cargo-hakari" ]; - cargoTestFlags = [ "-p" "cargo-hakari" ]; + cargoBuildFlags = [ + "-p" + "cargo-hakari" + ]; + cargoTestFlags = [ + "-p" + "cargo-hakari" + ]; meta = with lib; { description = "Manage workspace-hack packages to speed up builds in large workspaces"; @@ -26,7 +36,13 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://crates.io/crates/cargo-hakari"; changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda macalinao ]; + license = with licenses; [ + mit + asl20 + ]; + maintainers = with maintainers; [ + figsoda + macalinao + ]; }; } diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index b49f7904812f1..ec689cb515d6d 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; + hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; }; - cargoSha256 = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI="; + cargoHash = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { - description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders "; + description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; mainProgram = "cargo-hf2"; homepage = "https://lib.rs/crates/cargo-hf2"; license = with licenses; [ mit ]; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index db646ec07c9e3..e8b1443dd0093 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "069i8ydrp1pssnjq7d6mydwr7xh2cmcpzpf8bzd6nfjr6xx1pipr"; + cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk="; meta = with lib; { description = "See what Rust is doing behind the curtains"; diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/development/tools/rust/cargo-kcov/default.nix index 68ed13d1ad01f..2517ac37c712a 100644 --- a/pkgs/development/tools/rust/cargo-kcov/default.nix +++ b/pkgs/development/tools/rust/cargo-kcov/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br"; }; - cargoSha256 = "0m5gfyjzzwd8wkbb388vmd785dy334x0migq3ssi7dlah9zx62bj"; + cargoHash = "sha256-cgnTf4KKthO1HvjFCjoZw7eCTqsbobHW5Kjx/6V3r1Q="; doCheck = false; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index da48ad231e34b..e9398de3e8cf6 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -1,7 +1,6 @@ { darwin , fetchFromGitHub , lib -, pkg-config , rustPlatform , stdenv }: diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index ee00c71c11da9..868ad03f5068a 100644 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; + hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; }; cargoHash = "sha256-ifw/n7eejUWUqhieDLojuO3xgosn28NnjAKkq/ZSLEI="; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index f52f76a3de5e9..958bfeb447c3b 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; }; - cargoSha256 = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; + cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 5bced7f36e9cf..93994a7bc75b3 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.10"; + version = "0.6.11"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-mlmvM/7FQkhSjLtueEJqZU3D86lL8Kf1EFXiY1+b/Oo="; + sha256 = "sha256-/PwzG+Erz1aMDg50glZBP7mNHzuvvn2Dn+dicMG2ouo="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-yF4i1V50TpR3pEqHQfAK4VTUW+GmT+XU6WVTWMzCUwo="; + sha256 = "sha256-1HZNYC7bMG7olnZH4oOC/fXOAF9qt7MYhlQbaOKDmvg="; }; # Upstream doesn't include the lockfile so we need to add it back @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-6VQEu38g5a8bfbs8P/nOa3Zg2bSYnEOClzoMF95LAHI="; + cargoHash = "sha256-sN3vNZgi45pcDXI8kQ0L/r6HCDGs8l2VMwI+LHjwZ6Q="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index 9b5d535ec50a5..c0a1c112acff7 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.12.2"; + version = "0.13.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-AEAE6UDWf1Kupy20MDOOCovsIJJlFAILBW6qpToVQVM="; + hash = "sha256-MEq7NHoGQ8Qp7qXQXTyiV9vE+wXFMihrqPfj7q5AdxI="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-2bQ8QGVQoWj3mVm2y85ynrzL6IJ+BEatVLQy/huAEic="; + cargoHash = "sha256-6atMhn1DaItybJUT/NndRce//j+LdpuoBsY6z3DKxE0="; preBuild = '' mkdir -p $out/share/ @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { - description = "Rust on mobile made easy! "; + description = "Rust on mobile made easy!"; homepage = "https://tauri.app/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 2745b9c586b9b..3787173f0fff2 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.16.3"; + version = "0.16.8"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = "v${version}"; - hash = "sha256-6JFQuFISIKmR+dm2YYb4iwBjR61WrcLpfwcC67a96t4="; + hash = "sha256-F1hVKktU9zhdxXWhpLgymehJQlOX6WbXL2cqQGB+Y5k="; }; - cargoHash = "sha256-TiSiOMBkmH4Y5VORXZ59fl9+EwOjfWV2n/r3LTmSFxQ="; + cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 1492de85daa05..e8b23c70bd113 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg="; }; - cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; + cargoHash = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; passthru = { updateScript = gitUpdater { diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 1a54ba51a9a6f..7420002138792 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.7.0"; + version = "24.7.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-cDwNjPuXa6cpgGUDAAZVWZulcAYM6p5vUQrCs9njuUs="; + hash = "sha256-56IIMifv5epThXeWtQbNLwee1IQ52SPKik4hsHlnv6w="; }; - cargoHash = "sha256-6igY0LzjwPNmVxXTgj+RE5GpK/EyBRhv0yqHp15051s="; + cargoHash = "sha256-VRkhDgKunSUOz2/U4oC2t0YrDh5l48z4luevMazfj6o="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 26027a51ab80e..c905825633175 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-+GPP8Mdoc3LsR2puNu3/pzKg4Umvjd7CxivkHC8YxgM="; + hash = "sha256-+GPP8Mdoc3LsR2puNu3/pzKg4Umvjd7CxivkHC8YxgM="; }; cargoHash = "sha256-Lkl7F5ZVlYLBeL3tubdMQ4/KbHYd2dD5IJAX9FO0XUg="; diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index f75bab1439363..b4cbb95150a7b 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -119,6 +119,7 @@ let NIX_PGLIBDIR="${postgresql}/lib" \ PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ + RUSTFLAGS="${lib.optionalString stdenv.isDarwin "-Clink-args=-Wl,-undefined,dynamic_lookup"}" \ cargo pgrx package \ --pg-config ${postgresql}/bin/pg_config \ ${maybeDebugFlag} \ diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/development/tools/rust/cargo-play/default.nix index 94520d0d56699..a95f2c10c32eb 100644 --- a/pkgs/development/tools/rust/cargo-play/default.nix +++ b/pkgs/development/tools/rust/cargo-play/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; }; - cargoSha256 = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; + cargoHash = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; # these tests require internet access checkFlags = [ diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 6509fa381c885..aa55cac49d757 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.36.0"; + version = "0.37.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA="; + hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg="; }; - cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw="; + cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/development/tools/rust/cargo-readme/default.nix index aa4a6cf5ea37e..8924195b4e760 100644 --- a/pkgs/development/tools/rust/cargo-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-readme/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs="; }; - cargoSha256 = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; + cargoHash = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; # disable doc tests cargoTestFlags = [ diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/development/tools/rust/cargo-release/Cargo.lock index 6e75ae6d73c48..25882759eb3d4 100644 --- a/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-release/Cargo.lock @@ -19,32 +19,33 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" @@ -76,15 +77,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "assert_fs" -version = "1.0.13" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" +checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" dependencies = [ "anstyle", "doc-comment", @@ -109,23 +110,23 @@ dependencies = [ ] [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "automod" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "backtrace" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -148,9 +149,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -181,9 +182,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -222,8 +223,10 @@ dependencies = [ [[package]] name = "cargo-release" -version = "0.25.0" +version = "0.25.10" dependencies = [ + "anstream", + "anstyle", "anyhow", "assert_fs", "bstr", @@ -232,8 +235,6 @@ dependencies = [ "cargo_metadata", "clap", "clap-cargo", - "concolor-control", - "difflib", "dirs-next", "dunce", "env_logger", @@ -241,36 +242,37 @@ dependencies = [ "git2", "globset", "ignore", - "indexmap 1.9.3", - "itertools 0.11.0", + "indexmap", + "itertools 0.13.0", "log", "maplit", "once_cell", "predicates", "quick-error", "regex", - "reqwest", "semver", "serde", - "snapbox", + "similar", + "snapbox 0.4.17", "tame-index", - "termcolor", "time", - "toml 0.8.6", - "toml_edit 0.20.7", + "toml", + "toml_edit", "trycmd", ] [[package]] name = "cargo-test-macro" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" +source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161" [[package]] name = "cargo-test-support" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" +source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161" dependencies = [ + "anstream", + "anstyle", "anyhow", "cargo-test-macro", "cargo-util", @@ -279,24 +281,22 @@ dependencies = [ "flate2", "git2", "glob", - "itertools 0.10.5", - "lazy_static", + "itertools 0.11.0", "pasetors", "serde", "serde_json", - "snapbox", + "snapbox 0.4.17", "tar", - "termcolor", "time", - "toml 0.7.6", + "toml", "url", "windows-sys 0.48.0", ] [[package]] name = "cargo-util" -version = "0.2.4" -source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" +version = "0.2.8" +source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161" dependencies = [ "anyhow", "core-foundation", @@ -304,21 +304,21 @@ dependencies = [ "hex", "jobserver", "libc", - "log", "miow", "same-file", "sha2", "shell-escape", "tempfile", + "tracing", "walkdir", "windows-sys 0.48.0", ] [[package]] name = "cargo_metadata" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -346,9 +346,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "clap-cargo" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ae55615695e768a76899c8411b4ebacfbe525e964f94fd24f0007b10b45cd3" +checksum = "f6e2fd20c8f8c7cc395f69a86a61eb9d93e1de8fadc00338508cde2ffc656388" dependencies = [ "anstyle", "cargo_metadata", @@ -367,9 +367,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -380,9 +380,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -392,9 +392,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -403,23 +403,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "concolor-control" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" -dependencies = [ - "atty", - "bitflags 1.3.2", - "concolor-query", -] - -[[package]] -name = "concolor-query" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7" - -[[package]] name = "const-oid" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -461,14 +444,14 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.36.1" -source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" +version = "0.39.1" +source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161" dependencies = [ - "anyhow", "curl", "percent-encoding", "serde", "serde_json", + "thiserror", "url", ] @@ -594,6 +577,16 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] name = "difflib" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -675,9 +668,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" dependencies = [ "base16ct", "crypto-bigint", @@ -695,25 +688,26 @@ dependencies = [ ] [[package]] -name = "encoding_rs" -version = "0.8.33" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "cfg-if", + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -745,12 +739,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -770,21 +761,21 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -808,9 +799,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -822,6 +813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -856,6 +848,7 @@ checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-io", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -895,9 +888,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git-conventional" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b3db1aca6f1a2607dd99beed5d99df831ac73eae5994ff301dae712928e2dac" +checksum = "8035f7561b84cc80e8ec1c2c18dd14113c8b6e07206db72212403e9a25d2e72d" dependencies = [ "doc-comment", "unicase", @@ -906,11 +899,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.17.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "libc", "libgit2-sys", "log", @@ -927,24 +920,24 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata", + "regex-syntax", ] [[package]] name = "globwalk" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "ignore", "walkdir", ] @@ -962,9 +955,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" dependencies = [ "bytes", "fnv", @@ -972,7 +965,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -981,30 +974,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1016,12 +994,6 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1056,9 +1028,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1067,12 +1039,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -1083,12 +1067,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1106,47 +1084,66 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.4", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1154,59 +1151,28 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata", "same-file", - "thread_local", "walkdir", "winapi-util", ] [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", + "hashbrown", ] [[package]] @@ -1216,31 +1182,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "is-terminal" -version = "0.4.7" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.19", - "windows-sys 0.48.0", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1253,9 +1213,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1270,22 +1230,16 @@ dependencies = [ ] [[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] name = "libc" -version = "0.2.148" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -1323,21 +1277,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "log" -version = "0.4.18" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "maplit" @@ -1347,9 +1295,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "memchr" -version = "2.6.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -1377,9 +1325,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -1388,11 +1336,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -1402,6 +1350,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1416,7 +1370,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -1431,9 +1385,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl-probe" @@ -1498,9 +1452,9 @@ dependencies = [ [[package]] name = "pasetors" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824bf633b85dc1dece2eb07161627ba5d90a951597cd5dbf8d85f4d82b7aea69" +checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" dependencies = [ "ct-codecs", "ed25519-compact", @@ -1528,9 +1482,29 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "pin-project-lite" @@ -1561,15 +1535,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "predicates" -version = "3.0.3" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ "anstyle", "difflib", "float-cmp", - "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1602,9 +1581,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -1617,9 +1596,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.28" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1674,6 +1653,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1686,9 +1674,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1698,9 +1686,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1715,21 +1703,23 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "async-compression", "base64", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -1738,11 +1728,13 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", + "rustls-native-certs", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "system-configuration", + "sync_wrapper", "tokio", "tokio-rustls", "tokio-util", @@ -1767,16 +1759,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1787,59 +1780,68 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.8", + "linux-raw-sys", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ "base64", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -1874,16 +1876,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "sec1" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1898,28 +1890,51 @@ dependencies = [ ] [[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "semver" -version = "1.0.17" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -1928,9 +1943,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1939,9 +1954,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -1960,9 +1975,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1977,9 +1992,9 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signature" @@ -1993,9 +2008,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "slab" @@ -2007,6 +2022,12 @@ dependencies = [ ] [[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] name = "smol_str" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2017,9 +2038,27 @@ dependencies = [ [[package]] name = "snapbox" -version = "0.4.14" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b831b6e80fbcd2889efa75b185d24005f85981431495f995292b25836519d84" +dependencies = [ + "anstream", + "anstyle", + "content_inspector", + "dunce", + "filetime", + "normalize-line-endings", + "similar", + "snapbox-macros", + "tempfile", + "walkdir", +] + +[[package]] +name = "snapbox" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b377c0b6e4715c116473d8e40d51e3fa5b0a2297ca9b2a931ba800667b259ed" +checksum = "94204b12a4d3550420babdb4148c6639692e4e3e61060866929c5107f208aeb6" dependencies = [ "anstream", "anstyle", @@ -2034,14 +2073,14 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "snapbox-macros" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1559baff8a696add3322b9be3e940d433e7bb4e38d79017205fd37ff28b28e" +checksum = "b1f4c14672714436c09254801c934b203196a51182a5107fb76591c7cc56424d" dependencies = [ "anstream", ] @@ -2090,9 +2129,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "subtle" @@ -2102,9 +2141,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.18" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", @@ -2112,51 +2151,40 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "sync_wrapper" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "tame-index" -version = "0.5.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239b73acdc37c857aae3832bdc739b937b038e5e8b148191a79545a2beb5af74" +checksum = "44a98d58caab3de29c6cb538054c7d994b3d7e6eec483a9dfca02f92027f7686" dependencies = [ "camino", + "crossbeam-channel", "home", "http", + "libc", "memchr", + "rayon", "reqwest", "semver", "serde", "serde_json", "smol_str", "thiserror", - "toml 0.7.6", + "tokio", + "toml-span", "twox-hash", ] [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -2164,24 +2192,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", + "redox_syscall 0.4.1", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -2190,7 +2209,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.15", + "rustix", "windows-sys 0.48.0", ] @@ -2202,18 +2221,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -2221,22 +2240,15 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] name = "time" -version = "0.3.21" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2244,16 +2256,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2290,11 +2303,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -2314,44 +2328,41 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.14", + "toml_edit", ] [[package]] -name = "toml" -version = "0.8.6" +name = "toml-span" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "369db38ce6d1fc320a54ea3f032d07c07a232ca19c40e287246aff06d57c2abe" dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.7", + "smallvec", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ - "indexmap 2.0.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -2359,19 +2370,28 @@ dependencies = [ ] [[package]] -name = "toml_edit" -version = "0.20.7" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", ] [[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2383,11 +2403,24 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] [[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "tracing-core" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2404,18 +2437,19 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trycmd" -version = "0.14.19" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed009372a42fb103e6f8767b9222925485e03cca032b700d203e2c5b67bee4fb" +checksum = "59709bd8eccada6a3fded26d22a7f2dcee406c18d3bd7ad2605ca3eeb8f6f6ec" dependencies = [ + "automod", "glob", "humantime", "humantime-serde", "rayon", "serde", "shlex", - "snapbox", - "toml_edit 0.20.7", + "snapbox 0.6.7", + "toml_edit", ] [[package]] @@ -2472,9 +2506,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2510,9 +2544,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -2611,9 +2645,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "winapi" @@ -2663,50 +2700,50 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.0", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -2717,9 +2754,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -2729,9 +2772,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -2741,9 +2790,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -2753,9 +2808,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -2765,9 +2826,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -2777,9 +2844,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -2789,24 +2862,30 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.15" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 31e03dfeaa4ef..8f9abcb28da20 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -12,19 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.25.0"; + version = "0.25.10"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-UJdGbuQfvlZHjCKyHCXPDJ5AdUWJCRUS/vNeTKAwyYI="; + hash = "sha256-eMPwbcMIjYxM5gJm3HSdwzxN7WYOOtzj/Wf7rwuJfWs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-jXWdCc3wxcF02uL2OyMepJ+DmINAHRYtAUH6L16bCjI="; + "cargo-test-macro-0.1.0" = "sha256-5EHfvuwbI14DBkbLWyXepmn9m4Qn2ah2+9J9FHrSOgU="; }; }; diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index 6c3780719f895..cccd1368a8025 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo="; }; - cargoSha256 = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM="; + cargoHash = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 82fa17b3405a6..ee0376db72e5e 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-2B9i9S6OY+7DEorZoXfQQx9cEU2Y8FoyIyytJ8C7dXU="; + hash = "sha256-E9jEZXD7nY90v35y4Wv1cUp2aoKzC7dR9bFOTI+2fqo="; }; - cargoHash = "sha256-S03fgnefhU6c5e9YtFMBart+nfBQj7f4O+lSPe8fgqg="; + cargoHash = "sha256-1lHF8S0Xf5iOLQyARoYeWGGC9i68GVpk3EvSHo21Q2w="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 02823914e15af..f6d52a2c54c61 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cargo-asm \ --bash <($out/bin/cargo-asm --bpaf-complete-style-bash) \ --fish <($out/bin/cargo-asm --bpaf-complete-style-fish) \ diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix index cb8efeef12308..53f941e788d0e 100644 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/pkgs/development/tools/rust/cargo-sort/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; }; - cargoSha256 = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; + cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 08e0416a9aef7..8e04ed2bc9f8b 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; }; - cargoSha256 = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; + cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; checkFlags = [ # Requires a rustup toolchain to be installed. diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix index c790f097a2a95..953553cb948c3 100644 --- a/pkgs/development/tools/rust/cargo-sync-readme/default.nix +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo="; }; - cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c="; + cargoHash = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c="; meta = with lib; { description = "Cargo plugin that generates a Markdown section in your README based on your Rust documentation"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 7aca9708590b7..bc72b8a6a7577 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.49"; + version = "0.1.50"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XIr1erxW2S7Ok0DqsDtLn9wRT874o7tIWrt+HrjHACs="; + sha256 = "sha256-SU9SX+Z03CnJAuR1RCdSuU5Q+lxqAbqJY4SA83Ezj8M="; }; - cargoHash = "sha256-x++h5FOb5LXV9miRYZjnZcmp2Djn0P2gdBLAOO977IU="; + cargoHash = "sha256-HWJt9WaSKVJDcUEOgi0Zai3k44KyQqs+ckTAZfZyibA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index e24fe156332f5..2d323753d74eb 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "13.4.0"; + version = "14.0.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/9igT1/3ck8Roy2poq1urf+cLblentOB7S9Hh6uqIEw="; + hash = "sha256-TSqvT5YjnlfXvNjsiG7lR4f8QIzFoTG9Z70Wy66MhNM="; }; - cargoHash = "sha256-pdWVp9+CLnNO7+U0a8WXWHZ+EeGNYx9J7WWAI1MTDvc="; + cargoHash = "sha256-hkKr/3mTrnznOWfySTWY+tmeWYjn7nAk+sP4ISPlqHs="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index e084c528c9c23..1020caad551ba 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc="; }; - cargoSha256 = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28="; + cargoHash = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index 0d71a77baabe5..96822b3078d2b 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ="; }; - cargoSha256 = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; + cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix index d1dd2cc527faa..11f1fc6aacf07 100644 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ b/pkgs/development/tools/rust/cargo-web/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; }; - cargoSha256 = "0q7yxvvngfvn4s889qzp1qnsw2c6qy2ryv9vz9cxhmqidx4dg4va"; + cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; nativeBuildInputs = [ openssl perl pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/development/tools/rust/cargo-wipe/default.nix index 86a2dc58050b0..af9ae57c7cb87 100644 --- a/pkgs/development/tools/rust/cargo-wipe/default.nix +++ b/pkgs/development/tools/rust/cargo-wipe/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc="; }; - cargoSha256 = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ="; + cargoHash = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 1bed092b1c423..289fb2fcd3dbe 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.3.2"; + version = "0.3.5"; src = fetchCrate { inherit pname version; - hash = "sha256-fSvs3dr8dO9n9WCiO1UFr29cp1pvKxL9faOvYnLG+wk="; + hash = "sha256-eNZOtbN3WH7/Y0RjXZCPRxC4Yv0kEtVSqMLsyznPGwU="; }; - cargoHash = "sha256-uB3iN7xt0+qEpRelZQ8uurj6Ve9t9sVTCuH6N4+tDh4="; + cargoHash = "sha256-B5Pc9nzMf9N6FTY1KZ+lj7/RSbJiK/ahotztoopzABk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index d4ba928a104de..f15e5bf6ff2ac 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-1WTV6XqV9Y7d6WlH7rBb0Lfki6ftf+3z/azqQwzcOts="; + hash = "sha256-AY5oq8fSF1IEvmbB5hRjo+Esz7EE9ZI4EKwtZIjbasA="; }; - cargoHash = "sha256-Msi3V8mVnz9AqXdci79N9cbCouOyvVI4NdUAFP2IEsg="; + cargoHash = "sha256-StYEw5DvgxEojRcF0g88CTa58qUDjgNJiw6BCYKNzBY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo2junit/default.nix b/pkgs/development/tools/rust/cargo2junit/default.nix index d674c5b040713..907d92e3c4371 100644 --- a/pkgs/development/tools/rust/cargo2junit/default.nix +++ b/pkgs/development/tools/rust/cargo2junit/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; + hash = "sha256-R3a87nXCnGhdeyR7409hFR5Cj3TFUWqaLNOtlXPsvto="; }; cargoHash = "sha256-u5Pd967qxjqFl9fV/KkClLDBwKql7p66WqbIVBvWKuM="; diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/development/tools/rust/cauwugo/default.nix index 29a7fed011026..1f497a270b939 100644 --- a/pkgs/development/tools/rust/cauwugo/default.nix +++ b/pkgs/development/tools/rust/cauwugo/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, installShellFiles }: +{ lib, rustPlatform, fetchCrate, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "cauwugo"; @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version; pname = "bpaf_cauwugo"; - sha256 = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; + hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; }; - cargoSha256 = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4="; + cargoHash = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cauwugo \ --bash <($out/bin/cauwugo --bpaf-complete-style-bash) \ --fish <($out/bin/cauwugo --bpaf-complete-style-fish) \ diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index da73d1ca6ea69..1e4d755fde0b3 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gyNZAuxpeOjuC+Rh9jAyHSBQRRYUlYoIrBKuCFg3Hao="; }; - cargoSha256 = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc="; + cargoHash = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 6f8092dd0fc30..be536194d290f 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, runCommand , fetchCrate , rustPlatform , Security diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/development/tools/rust/genemichaels/default.nix index aec8003bbd52b..5fa08d08d5464 100644 --- a/pkgs/development/tools/rust/genemichaels/default.nix +++ b/pkgs/development/tools/rust/genemichaels/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "genemichaels"; homepage = "https://github.com/andrewbaxter/genemichaels"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/development/tools/rust/gitlab-clippy/default.nix index 62b3046f05d87..8bdd529bb447d 100644 --- a/pkgs/development/tools/rust/gitlab-clippy/default.nix +++ b/pkgs/development/tools/rust/gitlab-clippy/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitLab , rustPlatform }: @@ -12,9 +11,9 @@ rustPlatform.buildRustPackage rec { owner = "dlalic"; repo = pname; rev = version; - sha256 = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; + hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; }; - cargoSha256 = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; + cargoHash = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; # TODO re-add theses tests once they get fixed in upstream checkFlags = [ diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix deleted file mode 100644 index 266cd54fdfd2d..0000000000000 --- a/pkgs/development/tools/rust/maturin/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ callPackage -, lib -, stdenv -, fetchFromGitHub -, rustPlatform -, libiconv -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "maturin"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "PyO3"; - repo = "maturin"; - rev = "v${version}"; - hash = "sha256-cKX5fDPQElNLAur2PF6J5050QnMNrazMTCVtGmjwmxQ="; - }; - - cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0="; - - buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; - - # Requires network access, fails in sandbox. - doCheck = false; - - passthru.tests.pyo3 = callPackage ./pyo3-test {}; - - meta = with lib; { - description = "Build and publish Rust crates Python packages"; - mainProgram = "maturin"; - longDescription = '' - Build and publish Rust crates with PyO3, rust-cpython, and - cffi bindings as well as Rust binaries as Python packages. - - This project is meant as a zero-configuration replacement for - setuptools-rust and Milksnake. It supports building wheels for - Python and can upload them to PyPI. - ''; - homepage = "https://github.com/PyO3/maturin"; - changelog = "https://github.com/PyO3/maturin/blob/v${version}/Changelog.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/pkgs/development/tools/rust/maturin/pyo3-test/default.nix deleted file mode 100644 index 7f79c8565d236..0000000000000 --- a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ python3 -, rustPlatform -}: - -python3.pkgs.callPackage ./generic.nix { - buildAndTestSubdir = "examples/word-count"; - - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]; -} diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix deleted file mode 100644 index 7bc7e8d43bcb4..0000000000000 --- a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix +++ /dev/null @@ -1,45 +0,0 @@ -# Derivation prototype, used by maturin and setuptools-rust -# passthrough tests. - -{ lib -, fetchFromGitHub -, python -, rustPlatform - -, nativeBuildInputs - -, buildAndTestSubdir ? null -, format ? "pyproject" -, preConfigure ? "" -}: - -python.pkgs.buildPythonPackage rec { - pname = "word-count"; - version = "0.13.2"; - - src = fetchFromGitHub { - owner = "PyO3"; - repo = "pyo3"; - rev = "v${version}"; - hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - inherit buildAndTestSubdir format nativeBuildInputs preConfigure; - - pythonImportsCheck = [ "word_count" ]; - - meta = with lib; { - description = "PyO3 word count example"; - homepage = "https://github.com/PyO3/pyo3"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/development/tools/rust/ograc/default.nix index 83938a505316a..538a22ab688c3 100644 --- a/pkgs/development/tools/rust/ograc/default.nix +++ b/pkgs/development/tools/rust/ograc/default.nix @@ -7,9 +7,9 @@ rustPlatform.buildRustPackage { owner = "lirnril"; repo = "ograc"; rev = "d09b3102ff7a364bf2593589327a16a473bd4f25"; - sha256 = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; + hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; }; - cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA="; + cargoHash = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA="; meta = with lib; { description = "like cargo, but backwards"; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 0073c6087736f..16d8176de4eb0 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; + hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix deleted file mode 100644 index 2081d41eb0158..0000000000000 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, pkg-config -, DarwinTools -, libusb1 -, libiconv -, AppKit -, IOKit -}: - -rustPlatform.buildRustPackage rec { - pname = "probe-run"; - version = "0.3.11"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-RlmN2PV5Z/+NTYia7LhrAW437bsg6oUxlQ1qcbZuq0o="; - }; - - cargoHash = "sha256-MG3xHArNEqXs0vC5sSyaBM3421yJ25nazvBNQVcs4v0="; - - nativeBuildInputs = [ - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - DarwinTools - ]; - - buildInputs = [ - libusb1 - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - AppKit - IOKit - ]; - - meta = with lib; { - description = "Run embedded programs just like native ones"; - mainProgram = "probe-run"; - homepage = "https://github.com/knurling-rs/probe-run"; - changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ hoverbear newam ]; - }; -} diff --git a/pkgs/development/tools/rust/rhack/default.nix b/pkgs/development/tools/rust/rhack/default.nix index 967a8a9216f7d..5be698ca6eb81 100644 --- a/pkgs/development/tools/rust/rhack/default.nix +++ b/pkgs/development/tools/rust/rhack/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237"; }; - cargoSha256 = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s="; + cargoHash = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s="; meta = with lib; { description = "Temporary edit external crates that your project depends on"; diff --git a/pkgs/development/tools/rust/roogle/default.nix b/pkgs/development/tools/rust/roogle/default.nix index 2dbca708add5a..2964f07f06b68 100644 --- a/pkgs/development/tools/rust/roogle/default.nix +++ b/pkgs/development/tools/rust/roogle/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r"; }; - cargoSha256 = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw="; + cargoHash = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw="; postInstall = '' mkdir -p $out/share/roogle diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 6443cae2f58cd..4ddf399f783f2 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-06-24"; - cargoSha256 = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg="; + version = "2024-08-05"; + cargoHash = "sha256-6ZlC/zzPYvBbp2lsl8U2piHxPqCFVQ+AiNFbnPumAXo="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-jzZRTQjXhiwEdzo/SlxP72BUa7g0LVr7MEsaR7A/geg="; + sha256 = "sha256-/Bd0VzlutcxTwSNouS/iC6BDv395NoO4XmBJaS2vQLg="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix index 6fa5207de6eb5..af0a2953edee9 100644 --- a/pkgs/development/tools/rust/rust-analyzer/wrapper.nix +++ b/pkgs/development/tools/rust/rust-analyzer/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped +{ rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped , pname ? "rust-analyzer" , version ? rust-analyzer-unwrapped.version # Use name from `RUST_SRC_PATH` diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/development/tools/rust/rust-audit-info/default.nix index b0793e11ca387..381e6d5bc71d6 100644 --- a/pkgs/development/tools/rust/rust-audit-info/default.nix +++ b/pkgs/development/tools/rust/rust-audit-info/default.nix @@ -6,10 +6,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; + hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; }; - cargoSha256 = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg="; + cargoHash = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg="; meta = with lib; { description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable"; diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/development/tools/rust/rustfilt/default.nix index 353cdcdbfdc66..45312ccd7e49d 100644 --- a/pkgs/development/tools/rust/rustfilt/default.nix +++ b/pkgs/development/tools/rust/rustfilt/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; }; - cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; + cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; meta = with lib; { description = "Demangle Rust symbol names using rustc-demangle"; diff --git a/pkgs/development/tools/rust/rusty-man/default.nix b/pkgs/development/tools/rust/rusty-man/default.nix index 05b9f85af4db8..164977facbe9e 100644 --- a/pkgs/development/tools/rust/rusty-man/default.nix +++ b/pkgs/development/tools/rust/rusty-man/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo="; }; - cargoSha256 = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0="; + cargoHash = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0="; meta = with lib; { description = "Command-line viewer for documentation generated by rustdoc"; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index fed8c02a5eaf4..ef98fb9bd23bf 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - hash = "sha256-q1o2pNKfvenpRwiYgIKkOYNcajgIhrhCjFC7bbEyLE4="; + hash = "sha256-amccPHkgtBm52PG6Lnv5Hyqff2O56GH6mVTmK5oi3ao="; }; - cargoHash = "sha256-sMyK1v4pJmmlN47mvgUkpLBjcpmT346VSp984IpvVWY="; + cargoHash = "sha256-ywKYq36G19jLg/H/OAHJv6VNSTcJ8gYUTJzE2zulKfc="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 745784fc03047..1283df16fd002 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, stdenv }: rustPlatform.buildRustPackage rec { @@ -21,7 +22,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "go" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd typeshare \ --bash <($out/bin/typeshare completions bash) \ --fish <($out/bin/typeshare completions fish) \ diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index e2d27c9eade64..942403ca97dab 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -1799,7 +1799,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.35.0" +version = "0.38.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index 8414cd5f59c02..02031b764578f 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.35.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-mkBp9iFoN1LanJrcm4VdZ9k8cWNaRZIYl10ukT4Rfqc="; + hash = "sha256-mTVpNyFEovaOdOBTcASSRejKfSs50cqpDuStDAkcdkQ="; }; cargoLock = { @@ -60,11 +60,13 @@ rustPlatform.buildRustPackage rec { # The following require internet access to fetch a python binary "--skip=test_add_and_sync_no_auto_sync" "--skip=test_add_autosync" + "--skip=test_add_dev" "--skip=test_add_explicit_version_or_url" "--skip=test_add_flask" "--skip=test_add_from_find_links" "--skip=test_autosync_remember" "--skip=test_basic_list" + "--skip=test_basic_script" "--skip=test_basic_tool_behavior" "--skip=test_config_empty" "--skip=test_config_get_set_multiple" diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index ab80e76931730..7f650a7085018 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -13,11 +13,8 @@ let jdk = jdk21.override { enableJavaFX = true; }; - maven' = maven.override { - inherit jdk; - }; in -maven'.buildMavenPackage rec { +maven.buildMavenPackage rec { pname = "scenebuilder"; version = "21.0.1"; @@ -42,6 +39,7 @@ maven'.buildMavenPackage rec { --replace-fail "\''${maven.build.timestamp}" "$(date -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" ''; + mvnJdk = jdk; mvnParameters = toString [ "-Dmaven.test.skip" "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 84d47390aa151..3fc74d7e3c737 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, perl, writeText, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }: let jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux { enableJavaFX = true; @@ -17,57 +17,6 @@ let gradle = gradle_7; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; - - nativeBuildInputs = [ jdk perl gradle ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon build - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0d6qs0wg2nfxyq85q46a8dcdqknz9pypb2qmvc8k2w8vcdac1y7n"; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; - desktopItem = makeDesktopItem { name = pname; desktopName = pname; @@ -79,16 +28,16 @@ let in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ jdk gradle makeWrapper ]; + nativeBuildInputs = [ gradle makeWrapper ]; - buildPhase = '' - runHook preBuild + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} build + __darwinAllowLocalNetworking = true; - runHook postBuild - ''; + doCheck = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/scenic-view/deps.json b/pkgs/development/tools/scenic-view/deps.json new file mode 100644 index 0000000000000..c0b49afdd3d88 --- /dev/null +++ b/pkgs/development/tools/scenic-view/deps.json @@ -0,0 +1,177 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/github/javaparser#javaparser-core/3.6.23": { + "jar": "sha256-Jd6Y4JulJ3cBiHFxQWx1BmsMkK4QyER5wIy62OwC2ko=", + "pom": "sha256-uS4cfUmFkaRUByoI4abESgjvT5YyH772jlPnQagyO84=" + }, + "com/github/javaparser#javaparser-parent/3.6.23": { + "pom": "sha256-RrplfMwXfcIrmXLTDq3vB+pK2Y7C2ZJ4mi2pyMaOEMY=" + }, + "com/github/javaparser#javaparser-symbol-solver-core/3.6.23": { + "jar": "sha256-xgZHY43ddl13bN0jDhzWlmT5BYVrnTUgHcpZFcHhhLM=", + "pom": "sha256-IxlhRqtmo5sFxOIsoQ3rcpbBvmPuI5Vpax21wO7ayiQ=" + }, + "com/github/javaparser#javaparser-symbol-solver-logic/3.6.23": { + "jar": "sha256-iUKL5AoLtSXiC5BwTUzmhE/Min2ePxCaSmIckIICKSo=", + "pom": "sha256-+c70XJwzh7J95a0unepGR18S5nLrMTuo2hl9n5KTuUs=" + }, + "com/github/javaparser#javaparser-symbol-solver-model/3.6.23": { + "jar": "sha256-Oyot02mnKEgZJIkaRC7gHztEFr9a84kGv+CXAEEHbRs=", + "pom": "sha256-l9XodywQqD1zerqsIXaufDIYN2FzS1Nshd66kOdsfV0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.0.18": { + "jar": "sha256-y0z62HC/VjoHGZ8+vqV2Pw3sRA/NoLMYZAsf6qeIZWs=", + "pom": "sha256-kUQScZLW9hLCNmgl3OrrI7DVMTC4Pgvx/+EH0UcKhIc=" + }, + "com/google/errorprone#error_prone_parent/2.0.18": { + "pom": "sha256-zxSZVSebB9TxHoF5hcEWSmnpMNc9t0QbQ6bvU7vShsQ=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.6.1": { + "jar": "sha256-N/Sm2S8lh2Ls9i/XcYZSK77LXaGyDevHj4NhuFbfDac=", + "pom": "sha256-i4MRE6lOCXvEnh7KTTJ/0iNAVwRU1Ey7ccJSuZ5sTD8=" + }, + "com/google/guava#guava-parent/23.4-jre": { + "pom": "sha256-EO8XbFPNj5Wd7Wr3QFFumbX8IKogHjqRmLuSGUpqOTQ=" + }, + "com/google/guava#guava/23.4-jre": { + "jar": "sha256-JmKjPwn+urUCPdv1J4DLjSpuDEmiTbgJStwOlEgBqBA=", + "pom": "sha256-Iuu7g72VwApr6oeMtbm7imAuoSpmRnsM+k+XtBTqXQ4=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "kr/motd/maven#os-maven-plugin/1.6.0": { + "jar": "sha256-HNnWwIn5ZnEbx9lWSXaz/+ZRAmFqUkdoHMIwlc+90aw=", + "pom": "sha256-zRUfUQeKRnd7UPgoO4gqis4MCLu+F0RrP56mPIEi/Kg=" + }, + "org/beryx#badass-jlink-plugin/2.6.5": { + "jar": "sha256-WXeNmHfVtqkDyRN2ZfzzSoHFprSdPDpxt70FDJVSWrA=", + "pom": "sha256-ytOd1e29JuGnOxYHCShfkLTAjwmT85n2Qsley3Bs4LQ=" + }, + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/2.6.5": { + "pom": "sha256-n3jKnoCItgThUQZCBW3b+WsQZ+zn/SZuZwc/y/dsW/Y=" + }, + "org/codehaus#codehaus-parent/4": { + "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.14": { + "jar": "sha256-IGgyC9a610TDZzqwSPZ+ML749RiZb6OAAzVWYAZpkF0=", + "pom": "sha256-GHnxmgWZHj7ZWRC5ZokzM5awxGeiFdxNH5ABhAS3KiY=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.14": { + "pom": "sha256-9RVQoGsUEL1JYssOcd8Lkhpgp+9Hv6nEgloUvnIxbuo=" + }, + "org/codehaus/mojo#mojo-parent/34": { + "pom": "sha256-Pjldb7xDwJo3dMrIaUzlJzmDBeo/1UktgOJa8n04Kpw=" + }, + "org/javamodularity#moduleplugin/1.4.0": { + "jar": "sha256-DsRpRPMp5s7qu+4mT39lW3VOz+qXti1zeROvm/cnWkk=", + "pom": "sha256-ys6MmZmVjsvuHC00/yZVxHvgOrtlFInDustCNl+e33s=" + }, + "org/javassist#javassist/3.23.1-GA": { + "jar": "sha256-0rFMCXY1IzdGJPMqCdbjH8sXQIKpet21ri1YC0dP2AY=", + "pom": "sha256-TBjLCfVKXn3uusVCUbXsZaXgSuRgZ/Mb3OMzwvDujJk=" + }, + "org/openjfx#javafx-plugin/0.0.7": { + "jar": "sha256-cMNMLi/MFLDiEkJuYhbX7xktB+i4fw3O8y1drZ+6tK0=", + "pom": "sha256-JVTXrl0EsYMJcp5LkHmy8iQKXTfr1GxrC97HZ8q/svk=" + }, + "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.0.7": { + "pom": "sha256-SybdZ/HqOekf+cyybnONJwR1DlhFYYajVz9QadOIe1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/7.0": { + "jar": "sha256-6YH49lDE2QC7AzZQsY4SL6axYerdX4iXjQh1H3LuhHQ=", + "pom": "sha256-xrVEd+nVuuHnrd/y4ky/kqr/L/CP1rwFlsOTPD+twss=" + }, + "org/ow2/asm#asm-commons/7.0": { + "jar": "sha256-/tNI7wWVjj6EajrAdKEq9feTbvPSHORKYsT6CKdxkn0=", + "pom": "sha256-9MaXiGzbSlskcgVKC140Nx6bSOYgvkDD7Ujh9LbVHrQ=" + }, + "org/ow2/asm#asm-tree/7.0": { + "jar": "sha256-z9egh0+d42qZnBJ/7q37/m4E1Kce6VTXrz2FPwvkimw=", + "pom": "sha256-05590S9P9TWgg50ZScOcdkQ1WkRwIgyUt2pcFoxXoGg=" + }, + "org/ow2/asm#asm-util/7.0": { + "jar": "sha256-dfu8pEDvRj9BwrCrGoCr5n6RCsSG2mCnhjy8tbrn4UU=", + "pom": "sha256-4HvOS7VdWgb0wQ2RL8ne6Km5wE7FSbu4208g2zRwb3U=" + }, + "org/ow2/asm#asm/7.0": { + "jar": "sha256-uI72ZGizyXitDJf9bpCXnlYVW0rGkIm6ekTpqn/+ms8=", + "pom": "sha256-g/ZbEIPVzk+Lp/lUXP6f8XgkWJyafMgsOkaVgB5PX2g=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2/org": { + "openjfx#javafx-base/11.0.2": { + "jar": "sha256-Hy+IiY9U8aKeK1jKrrChEFBZigdSTyls2a72wAu5PQ8=", + "pom": "sha256-F/QWaIULgDukqDp+LZYDm2nwcniLvbqI4J/sgVegMpw=" + }, + "openjfx#javafx-base/11.0.2/linux": { + "jar": "sha256-hMNW8TRL/TqnS1WiOgzgeLTF5qm+iFPajeQV5ez81Bs=" + }, + "openjfx#javafx-controls/11.0.2": { + "jar": "sha256-YBBsLPUqfzHsobjQipUs9Lk7Wx2FSSp1XpeggIpp/5o=", + "pom": "sha256-WI5hxbroHQl2C2DYz7E7ERtC09RwwKCpnaBqtq/XjQM=" + }, + "openjfx#javafx-controls/11.0.2/linux": { + "jar": "sha256-wXIELPTOd/xon61lWSVrEbmcb7ic5f0bM9/DRLhqCpc=" + }, + "openjfx#javafx-fxml/11.0.2": { + "pom": "sha256-hqY8PXMIR6kmAEQ3YosWH88GXj0vrzSjwTjK4j3FDxg=" + }, + "openjfx#javafx-fxml/11.0.2/linux": { + "jar": "sha256-IsRLJbxYjfZiPgT6EnuLyCQj8flI6a/ySFr0pokOL5Q=" + }, + "openjfx#javafx-graphics/11.0.2": { + "jar": "sha256-3ukAoYanC66CZoRcVrA62aJOaXy1K6PaQhxgSQibNjg=", + "pom": "sha256-5O3+os2WNa3JLTqbp81ew6VqsbF+pKJWDRIr+97gU8g=" + }, + "openjfx#javafx-graphics/11.0.2/linux": { + "jar": "sha256-+yCVZOUN49jQVdmzzWnUahbT7xjsVRYvwTANFAip1QI=" + }, + "openjfx#javafx-media/11.0.2": { + "jar": "sha256-buLos8kx27mNmLuVqoIDP9tvQ839Vp5gYT21g0Yp0CU=", + "pom": "sha256-ea0fX/vvejwnrd8jvXYICIN23mLl1w/tQRKKMu0f0Ps=" + }, + "openjfx#javafx-media/11.0.2/linux": { + "jar": "sha256-SQgWhhxhQ6jpPDBRreX/ZcJ8h5zE0lSZmBQ3RnZDF9Y=" + }, + "openjfx#javafx-swing/11.0.2": { + "pom": "sha256-huvlJlgb5jeG3hJxPMFL23wVAwzPacjJ7lluwyUtB7M=" + }, + "openjfx#javafx-swing/11.0.2/linux": { + "jar": "sha256-5WLb2tBbKGTo3F75chsMmiyxcxWdpElqJ4K4zR5lsUw=" + }, + "openjfx#javafx-web/11.0.2": { + "pom": "sha256-VPT4QZplXM2lGzDG+canNTR6h9myctpnwMndXps/UcU=" + }, + "openjfx#javafx-web/11.0.2/linux": { + "jar": "sha256-FWUzbTr1okARbBPkPepcPZpnSWMnuCj6EL9n6unlsa8=" + }, + "openjfx#javafx/11.0.2": { + "pom": "sha256-vGfwPQ2VsXURSpjv/7E+RORq2eOsGe/w6OBjpudnWtg=" + } + } +} diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index 11a0c0fa77542..70d54d0774455 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.21.4"; + version = "16.22.2"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-8/Wf5RfR8Tb32VyBhHPAtbiqQN1LsnOxy98MWNPkWrM="; + hash = "sha256-N08lKCTbpX4b05i4UcCEy6wycsiIJu5BRr7EZ3oZ1rA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix new file mode 100644 index 0000000000000..ace1f1e8f2700 --- /dev/null +++ b/pkgs/development/tools/selenium/chromedriver/binary.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchurl, + unzip, + testers, + chromedriver, +}: + +let + upstream-info = + (import ../../../../applications/networking/browsers/chromium/upstream-info.nix) + .stable.chromedriver; + + # See ./source.nix for Linux + allSpecs = { + x86_64-darwin = { + system = "mac-x64"; + hash = upstream-info.hash_darwin; + }; + + aarch64-darwin = { + system = "mac-arm64"; + hash = upstream-info.hash_darwin_aarch64; + }; + }; + + spec = + allSpecs.${stdenv.hostPlatform.system} + or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); + + inherit (upstream-info) version; +in +stdenv.mkDerivation { + pname = "chromedriver"; + inherit version; + + src = fetchurl { + url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip"; + inherit (spec) hash; + }; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -m555 -D "chromedriver" $out/bin/chromedriver + ''; + + passthru.tests.version = testers.testVersion { package = chromedriver; }; + + meta = with lib; { + homepage = "https://chromedriver.chromium.org/"; + description = "WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. + ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.bsd3; + maintainers = with maintainers; [ primeos ]; + # Note from primeos: By updating Chromium I also update Google Chrome and + # ChromeDriver. + platforms = platforms.darwin; + mainProgram = "chromedriver"; + }; +} diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 41982c3d7d3e1..4d62e7b8692d4 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,78 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper -, cairo, fontconfig, freetype, gdk-pixbuf, glib -, glibc, gtk2, libX11, nspr, nss, pango -, libxcb, libXi, libXrender, libXext, dbus -, testers, chromedriver -}: - -let - upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver; - allSpecs = { - x86_64-linux = { - system = "linux64"; - hash = upstream-info.hash_linux; - }; - - x86_64-darwin = { - system = "mac-x64"; - hash = upstream-info.hash_darwin; - }; - - aarch64-darwin = { - system = "mac-arm64"; - hash = upstream-info.hash_darwin_aarch64; - }; - }; - - spec = allSpecs.${stdenv.hostPlatform.system} - or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); - - libs = lib.makeLibraryPath [ - stdenv.cc.cc.lib - cairo fontconfig freetype - gdk-pixbuf glib gtk2 - libX11 nspr nss pango libXrender - libxcb libXext libXi - dbus - ]; - -in stdenv.mkDerivation rec { - pname = "chromedriver"; - version = upstream-info.version; - - src = fetchurl { - url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip"; - hash = spec.hash; - }; - - nativeBuildInputs = [ unzip makeWrapper ]; - - unpackPhase = "unzip $src"; - - installPhase = '' - install -m755 -D "chromedriver-${spec.system}/chromedriver" $out/bin/chromedriver - '' + lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver - wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}" - ''; - - passthru.tests.version = testers.testVersion { package = chromedriver; }; - - meta = with lib; { - homepage = "https://chromedriver.chromium.org/"; - description = "WebDriver server for running Selenium tests on Chrome"; - longDescription = '' - WebDriver is an open source tool for automated testing of webapps across - many browsers. It provides capabilities for navigating to web pages, user - input, JavaScript execution, and more. ChromeDriver is a standalone - server that implements the W3C WebDriver standard. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu primeos ]; - # Note from primeos: By updating Chromium I also update Google Chrome and - # ChromeDriver. - platforms = attrNames allSpecs; - mainProgram = "chromedriver"; - }; -} +{ lib, stdenv, chromium, callPackage }: +if lib.meta.availableOn stdenv.hostPlatform chromium + then callPackage ./source.nix {} + else callPackage ./binary.nix {} diff --git a/pkgs/development/tools/selenium/chromedriver/source.nix b/pkgs/development/tools/selenium/chromedriver/source.nix new file mode 100644 index 0000000000000..fcb22c4066448 --- /dev/null +++ b/pkgs/development/tools/selenium/chromedriver/source.nix @@ -0,0 +1,30 @@ +{ chromium, testers, chromedriver }: +chromium.mkDerivation (_: { + name = "chromedriver"; + packageName = "chromedriver"; + + # Build the unstripped target, because stripping in Chromium relies on a prebuilt strip binary + # that doesn't run on NixOS, and we will strip everything ourselves later anyway. + buildTargets = [ "chromedriver.unstripped" ]; + + installPhase = '' + install -Dm555 $buildPath/chromedriver.unstripped $out/bin/chromedriver + ''; + + # Kill existing postFixup that tries to patchelf things + postFixup = null; + + passthru.tests.version = testers.testVersion { package = chromedriver; }; + + meta = chromium.meta // { + homepage = "https://chromedriver.chromium.org/"; + description = "WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. + ''; + mainProgram = "chromedriver"; + }; +}) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index cffe180a92d03..6a031160ffe77 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9L02ox2T+dBRx+mmFpy5Bktsyp3C/havfZoDaNevIMw="; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ --bash <($out/bin/sentry-cli completions bash) \ --fish <($out/bin/sentry-cli completions fish) \ diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index da1a2db8c86c7..13430e0e4c653 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.12.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-q57n5Jo682u/YK+5bgYqMufjPuPOPsBgJzxSl1fdqxA="; + hash = "sha256-/+19w3/jn3EjIX5SsCmMkJKdplRvgiduhTAbgaDz9b4="; }; vendorHash = null; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 91265aa2ed2e6..6e78caf84ff0d 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-Zv36vSPfXcpBmxyEA8b3Xoo9HhSWtxnWPP/SubIcHDo="; + hash = "sha256-M9BRsW3mNIRAr+yXSmoPNNoEY/XrCFNt+m2PtTuJUO4="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/development/tools/smlfmt/default.nix index 1ae8c49ab262f..a8a1d4fb4d62f 100644 --- a/pkgs/development/tools/smlfmt/default.nix +++ b/pkgs/development/tools/smlfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: stdenv.mkDerivation rec { pname = "smlfmt"; diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index e77cc4ae0c702..c279425384547 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -2,6 +2,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, stdenv }: rustPlatform.buildRustPackage rec { @@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd snazy \ --bash <($out/bin/snazy --shell-completion bash) \ --fish <($out/bin/snazy --shell-completion fish) \ diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index 6b0c37ec3fec8..30563875a22c3 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8="; }; - cargoSha256 = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o="; + cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index f2689c4692b1c..7ecd5dcfb2577 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; + hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; }; - cargoSha256 = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; + cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index dba5da20c2633..572ed0cfe1f87 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.3.1"; src = fetchzip { - url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; + url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; hash = "sha256-3Mlid+hvHVjAw5pE6vyieSHWH8Zkoty3GuwE1gB5yQM="; }; diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index cde6a9bed65cd..7384350b6af25 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.11"; + version = "0.17.16"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-VCx+vrGKr7+rdxcwY9kfn13wSq2eVc3g9xoFlME8JF0="; + hash = "sha256-LnkaHVkh/yoONtYEZ7z4QM6NRKuGjTUwT0GFy20neNQ="; }; proxyVendor = true; - vendorHash = "sha256-I1kyXotFYvnL8/FryjKJWGOYSTeXrXNB1+TNgR7q3qo="; + vendorHash = "sha256-cMRzDqsnQwZTSjroaXOgN4uOFCxVb2x7FT57VfN9qhk="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/sshs/Cargo.toml b/pkgs/development/tools/sshs/Cargo.toml deleted file mode 100644 index 1bab1b60c9f98..0000000000000 --- a/pkgs/development/tools/sshs/Cargo.toml +++ /dev/null @@ -1,31 +0,0 @@ -[package] -name = "sshs" -version = "4.2.1" -edition = "2021" - -[[bin]] -name = "sshs" -path = "src/main.rs" - -[profile.release] -strip = true -lto = true -codegen-units = 1 - -[dependencies] -anyhow = "1.0.80" -clap = { version = "4.5.0", features = ["derive"] } -crossterm = "0.27.0" -fuzzy-matcher = "0.3.7" -glob = "0.3.1" -handlebars = "5.1.0" -itertools = "0.12.1" -ratatui = "0.26.1" -regex = { version = "1.10.3", default-features = false, features = ["std"] } -serde = { version = "1.0.197", features = ["derive"] } -shellexpand = "3.1.0" -shlex = "1.3.0" -strum = "0.26.1" -strum_macros = "0.26.1" -tui-input = "0.8.0" -unicode-width = "0.1.11" diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index 6929957294c11..878ef841510ae 100644 --- a/pkgs/development/tools/sshs/default.nix +++ b/pkgs/development/tools/sshs/default.nix @@ -1,40 +1,31 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, testers -, sshs +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + sshs, }: rustPlatform.buildRustPackage rec { pname = "sshs"; - version = "4.2.1"; + version = "4.4.1"; src = fetchFromGitHub { owner = "quantumsheep"; - repo = pname; + repo = "sshs"; rev = version; - hash = "sha256-phVwNPElQOTgsrDxzyUcDMByxi7t1IIPFCEHJTXiBdY="; + hash = "sha256-07iivB9U0rFnoohjBX7EfdoDq4VDMALWy4CWiSrrg58="; }; - cargoLock = { - # Patch version output - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -sf ${./Cargo.toml} Cargo.toml - ln -sf ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-W6PuwDcb2VAGX7bfeZtr/xNuLRTUCUgTc/KvvUinv7k="; - passthru.tests.version = testers.testVersion { - package = sshs; - }; + passthru.tests.version = testers.testVersion { package = sshs; }; - meta = with lib; { + meta = { description = "Terminal user interface for SSH"; homepage = "https://github.com/quantumsheep/sshs"; - license = licenses.mit; - maintainers = with maintainers; [ not-my-segfault ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ not-my-segfault ]; mainProgram = "sshs"; }; } diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index 8b4386860e0aa..5dec08d0d6e6e 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/rakyll/statik"; - description = "Embed files into a Go executable "; + description = "Embed files into a Go executable"; mainProgram = "statik"; license = licenses.asl20; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix index 462bf620e7308..ed0e41b5f84a9 100644 --- a/pkgs/development/tools/steamos-devkit/default.nix +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , fetchFromGitLab -, writeScript , python3 , copyDesktopItems , makeDesktopItem diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/development/tools/summon/default.nix index 014655616b7b2..7b34ae2e6169e 100644 --- a/pkgs/development/tools/summon/default.nix +++ b/pkgs/development/tools/summon/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "summon"; - version = "0.9.6"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cyberark"; repo = "summon"; rev = "v${version}"; - hash = "sha256-OOIq6U7HCxcYvBFZdewSpglg9lFzITsb6IPu/EID+Z0="; + hash = "sha256-98dgsO/33tJ4hBwCwAdJBJCzWwnpbrSZPbqa5NSNmXM="; }; - vendorHash = "sha256-qh3DJFxf1FqYgbULo4M+0nSOQ6uTlMTjAqNl7l+IPvk="; + vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk="; subPackages = [ "cmd" ]; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index b37324eba9cd1..6b351f69cef3f 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.169.5"; + version = "1.188.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-H0y/eBmUG5nT/EsF1iC5hbhRBhR8jwwxlYav4Q7bSqM="; + hash = "sha256-egkph143V0WDxJTvB7fBj7F7+8fHVGAhJohCkIeDfz4="; }; - vendorHash = "sha256-wZ+yYPwmePKMfYTve3Ha7teSx1mlHLnc1ZaZE6ZEdu4="; + vendorHash = "sha256-VhNGdax43GYtsZxsHqJWgwWa9/r+IWPg0WiA3jl3NN0="; ldflags = [ "-s" @@ -31,7 +31,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - rm $out/bin/{codegen,docs,listdep} + rm $out/bin/{docs,listdep} mv $out/bin/{cli,supabase} installShellCompletion --cmd supabase \ diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix index 7847c253e7e5d..d93b4c4ec8452 100644 --- a/pkgs/development/tools/swc/default.nix +++ b/pkgs/development/tools/swc/default.nix @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "swc_cli"; inherit version; - sha256 = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw="; + hash = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw="; }; - cargoSha256 = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g="; + cargoHash = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g="; buildFeatures = [ "swc_core/plugin_transform_host_native" ]; diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index 086c79d964a01..317f0ee416171 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, runCommand }: +{ stdenv, lib, fetchFromGitHub }: # This derivation is impure: it relies on an Xcode toolchain being installed # and available in the expected place. The values of sandboxProfile and diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index 416c377490aef..c6a784f98d5bc 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.4.0"; + version = "0.4.2"; in rustPlatform.buildRustPackage { @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { repo = "systemfd"; owner = "mitsuhiko"; rev = version; - sha256 = "sha256-HUJgYPD4C9fMUYKpzmIy9gDT6HAZDWw1JLMKLgzRQTY="; + sha256 = "sha256-MASpQJkqmKpHZzMxHqAsuVO50dHHTv74Rnbv1gLapTU="; }; - cargoSha256 = "sha256-UhfE9Q5E79rN2mjkNB5IAN/J0fbpoy9CmM6ojHQcFP0="; + cargoHash = "sha256-zgRbaZchdqzr+E6gqltSte9dGMnjbrM7/7t0BiNn4kA="; meta = { description = "Convenient helper for passing sockets into another process"; diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index b3f35596d533c..bb76ee0f85508 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-ubXwWgg4QAwM27meaIjT/HjgoVs9cVUiGNWoGRLktBI="; - aarch64-linux = "sha256-vd1hRTAGLI3Kv/FmYICKTSajyneh+F9vM1+gnqGthGs="; - armv7l-linux = "sha256-Jl5H+MZUMBZOBmHgzpM/S7lAY4F1KtRS0G7Vu7ORKgg="; - x86_64-darwin = "sha256-SL0DjE1ssPlypsWbhxq/YgSUYtdqOXkb6EktfmAAXkQ="; - x86_64-linux = "sha256-18MbsqzYcr9hsON5hZujEBzvi7vyQzpYZOCitYYq5HY="; + aarch64-darwin = "sha256-Dto7yP6QUGt7nly5MDEgQnMLdqfxgCbRlBTUj7sxAO0="; + aarch64-linux = "sha256-QUam9TT/+yf5XemSbXgGpuQy7rflXLiFClfE4GJonCs="; + armv7l-linux = "sha256-hcTHFhjwv82w7fJG7W7jlKet24rzTtfb3OkpgnkkOZQ="; + x86_64-darwin = "sha256-j4tc0y/DWEPsJLvNshTpct9qnEhb9NT9BJFA+8x2a8w="; + x86_64-linux = "sha256-PCMh5mcY855IOIcHzotYeUYzj4LvPWNsjuGWcFFNM5Q="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.4.4"; + version = "3.4.7"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix index cc121061df037..718ef854225a3 100644 --- a/pkgs/development/tools/tapview/default.nix +++ b/pkgs/development/tools/tapview/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "esr"; repo = pname; rev = version; - sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + hash = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; }; # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 1523a30d18f85..182427c4b3176 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -35,6 +35,6 @@ buildGoModule rec { mainProgram = "textql"; homepage = "https://github.com/dinedal/textql"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 6b43e603a6e78..550553385828c 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; + hash = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; }; cargoHash = "sha256-iZxV099582LuZ8A3uOsKPyekAQG2cQusLZhW+W1wW/8="; diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index 1d3029f340bad..03775abeeb51e 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -3,6 +3,7 @@ , installShellFiles , rustPlatform , protobuf +, stdenv }: rustPlatform.buildRustPackage rec { @@ -18,6 +19,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI="; + buildAndTestSubdir = "tokio-console"; + nativeBuildInputs = [ installShellFiles protobuf @@ -33,7 +36,7 @@ rustPlatform.buildRustPackage rec { "--skip config::tests::toml_example_changed" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tokio-console \ --bash <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion bash) \ --fish <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion fish) \ diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index bc5e1f280b961..5d3d9a5385402 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Tool to integrate C/Cpp code with Lua"; homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; mainProgram = "tolua++"; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/development/tools/toml2json/default.nix index a24eae7141f43..6d7a8dcf6a360 100644 --- a/pkgs/development/tools/toml2json/default.nix +++ b/pkgs/development/tools/toml2json/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; + hash = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; }; cargoHash = "sha256-laOM7LpmsCpLcm4kPRsJiXHoKR58RCuQxVO5Z78beWI="; diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/development/tools/toml2nix/default.nix index ac971435bc418..b34f40933b767 100644 --- a/pkgs/development/tools/toml2nix/default.nix +++ b/pkgs/development/tools/toml2nix/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; + hash = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 0de59f4256e1c..17cf053b98f15 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -4,21 +4,19 @@ rustPlatform, fetchFromGitHub, pkg-config, openssl, -jq, -moreutils, CoreServices, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-hyjv3UJWIfJjdGtju4T6ufhz97F76uib/B9kyBHsC64="; + hash = "sha256-3p3HllZu69e2ERLoEJwSWL0OXl23lxvIPHV9HK30CqM="; }; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-BI/jA5/7/QP62EtOXXRkbsJILsHbVacZY/bKZGcXk34="; + cargoHash = "sha256-4b+ASz8uV17Y7gO50YKiu8Zhhq4sL+HJj1WAD7VkEE4="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 093be6c4bdb54..db6b0d0e208da 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.96.0"; + version = "0.96.3"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-SgUlGzQy+K+GhrbZR/lnKyLsI5cjXxBu/SpNqlfe5IA="; + hash = "sha256-3noPhWS5Sh6KZs4u310HbNybL58yIcdM7jD0R+UvZ0s="; }; - vendorHash = "sha256-Za8njJ0aExZe2LmQe6q9Q0Phjo1ot3bYK/zGNzyi7fo="; + vendorHash = "sha256-c8dX60GPZSNMoCaF51jLWJK+aNDmw6TdzlBYS+vSuEY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index a37c79b34f248..5b386b9822634 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/twilio/twilio-cli"; changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = nodejs-slim.meta.platforms; mainProgram = "twilio"; }; diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix index 2aa819a0a4dd5..c8dbc9b42d142 100644 --- a/pkgs/development/tools/twitch-cli/default.nix +++ b/pkgs/development/tools/twitch-cli/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.23"; + version = "1.1.24"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-BAVnXxkUXCKYq5hCPRtZu33andYm2ic4Vbx9an0MwFw="; + hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc="; }; patches = [ diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix deleted file mode 100644 index d08fe67330a26..0000000000000 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule { - pname = "txtpbfmt"; - version = "0-unstable-2024-04-16"; - - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "txtpbfmt"; - rev = "1e18ef0a7fdc4d28b9223d2d50b4b2be7024519e"; - hash = "sha256-L96aEAlPvdBXxAbH8IszQK0r7ouICmFrkHtTJe/dD+E="; - }; - - vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Formatter for text proto files"; - homepage = "https://github.com/protocolbuffers/txtpbfmt"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "txtpbfmt"; - }; -} diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 62b6b615385af..1f871e9629b7b 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.23.0"; + version = "1.23.6"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-46WXCImBqWmU82zIgulVyoB2/aGWXYunWDdQDsxMlOs="; + hash = "sha256-1tBVEsMSEeGUTev1Q8LwHTp2iqjHCSSrOBPIe6D1glY="; }; - cargoHash = "sha256-29F4n9yuyGxQSZY4tJ8KaHXKLmpCPuUKDwOoyWBfmgk="; + cargoHash = "sha256-qxKfiy8UfRUm1f0ZlK5FA2DFDGVjQb1PVZ+oK9lboZA="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index beb0a511aacf6..8b8f9d80feb18 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -1,4 +1,17 @@ -{lib, stdenv, fetchFromGitHub}: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, pandoc +, capstone +, elfutils +, libtraceevent +, ncurses +, withLuaJIT ? false +, luajit +, withPython ? false +, python3 +}: stdenv.mkDerivation rec { pname = "uftrace"; @@ -11,8 +24,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-JuBwyE6JH3CpJH863LbnWELUIIEKVaAcz8h8beeABGQ="; }; + nativeBuildInputs = [ pkg-config pandoc ]; + buildInputs = + [ capstone elfutils libtraceevent ncurses ] + ++ lib.optional withLuaJIT luajit + ++ lib.optional withPython python3; + + # libmcount.so dlopens python and luajit, make sure they're in the RUNPATH + preBuild = + let + libs = lib.optional withLuaJIT "luajit" ++ lib.optional withPython "python3-embed"; + in + lib.optionalString (withLuaJIT || withPython) '' + makeFlagsArray+=(LDFLAGS_lib="$(pkg-config --libs ${lib.concatStringsSep " " libs})") + ''; + postUnpack = '' - patchShebangs . + patchShebangs . ''; meta = { @@ -21,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/namhyung/uftrace"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [lib.maintainers.nthorne]; + maintainers = [ lib.maintainers.nthorne ]; }; } diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index e4aa62b99ff30..973db805a0927 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.9.7"; + version = "0.10.2"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-oPeHu/EVcGFE7sSwmMWHnT+xAxayZlfyIk/sM64Q+Hw="; + hash = "sha256-ZzzEKpD32mHn1qae002rtKNEmv2Spf3yvxpYZqHmx/I="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-z24qvgej2bWq0T4OgRnALJda4xGf5/s1O4ij2igCeyU="; + cargoHash = "sha256-4Zmgp9QKyxCArQicYJ7/8Rn15wfnYVoiWAA919p3Njo="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 6d377b00db390..9ff37be205122 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { homepage = "https://github.com/Kuniwak/vint"; license = licenses.mit; mainProgram = "vint"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/volta/default.nix b/pkgs/development/tools/volta/default.nix index e67df485b7f4e..15c9c493b797a 100644 --- a/pkgs/development/tools/volta/default.nix +++ b/pkgs/development/tools/volta/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { HOME = "$TMPDIR"; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd volta \ --bash <($out/bin/volta completions bash) \ --fish <($out/bin/volta completions fish) \ diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index a5002fdabc372..3ad734efdce9c 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.28.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-LMePEsNU62oSp/aaeUZY7A+0rTHiYOBqWBiqSpXUJOY="; + hash = "sha256-VXZBuaJn0VGpq1sIwsp+OcYErYShTCcU/FnTgDHmf7g="; }; - npmDepsHash = "sha256-Ml65YY4vqzntgCP9FoEGpR5rMkYL+alN9pSpbvR28E0="; + npmDepsHash = "sha256-Ftf6m5gRcYnkYfRx9vUys9uax8pwyyjUbfw3am8WriA="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 1a1cd76c5acb6..3861ad43e7cc3 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-Gn2N/v3qFqxI2ZU94GNuzpHoXgPeJaAO+ODjb5ff1aI="; + hash = "sha256-pJrujiZfIuqRFwIHReWT7xPi94Zh3owcZFz23jtpsQg="; }; - vendorHash = "sha256-kglG6Mhe1XUqblt+0ZR8FPPTrBKjxb1xG8bPXQrrzxE="; + vendorHash = "sha256-4HRzd5p5u8h07/escAoatF97RZ/hejYqW61Dlkp27Gk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index c6541eb5b30aa..d4454dd5459b4 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-oWyHR2HRDA/N5Rm9EXhOi+lZ2N7In6HmE74ZL2Nyu9A="; + hash = "sha256-oWyHR2HRDA/N5Rm9EXhOi+lZ2N7In6HmE74ZL2Nyu9A="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/wasynth/default.nix b/pkgs/development/tools/wasynth/default.nix index 0edefb2333555..bf7f0250f4059 100644 --- a/pkgs/development/tools/wasynth/default.nix +++ b/pkgs/development/tools/wasynth/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 213aa3f8798e0..b60872dce6730 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -9,6 +9,7 @@ , fb303 , fbthrift , fetchFromGitHub +, fetchpatch , fizz , fmt_8 , folly @@ -91,6 +92,14 @@ stdenv.mkDerivation rec { lockFile = ./Cargo.lock; }; + patches = [ + # fix build with rustc >=1.79 + (fetchpatch { + url = "https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883.patch"; + hash = "sha256-lpGr5H28gfVXkWNdfDo4SCbF/p5jB4SNlHj6km/rfw4="; + }) + ]; + postPatch = '' patchShebangs . cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index bfbfbdf5c1c8d..89e3f2257ff81 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -30,6 +30,6 @@ buildNpmPackage rec { homepage = "https://github.com/mozilla/web-ext"; license = lib.licenses.mpl20; mainProgram = "web-ext"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix index 863d53bb09716..e895ffa43ddb1 100644 --- a/pkgs/development/tools/wgo/default.nix +++ b/pkgs/development/tools/wgo/default.nix @@ -34,6 +34,6 @@ buildGoModule { mainProgram = "wgo"; homepage = "https://github.com/bokwoon95/wgo"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 32c09f4c53888..38e10f726160c 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; + hash = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { homepage = "https://github.com/travitch/whole-program-llvm"; description = "Wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; - maintainers = with maintainers; [ mic92 dtzWill ]; + maintainers = with maintainers; [ mic92 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix index e0abf90847fc8..a5e8ed28ce1e5 100644 --- a/pkgs/development/tools/xcbuild/toolchains.nix +++ b/pkgs/development/tools/xcbuild/toolchains.nix @@ -60,7 +60,7 @@ runCommand "Toolchains" {} ('' ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags '' + optionalString stdenv.isDarwin '' - for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do + for bin in ${getBin buildPackages.cctools}/bin/*; do if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then ln -s $bin $toolchain/bin fi diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/development/tools/xcodes/default.nix index a7449aa08651c..f2fe98c0d4931 100644 --- a/pkgs/development/tools/xcodes/default.nix +++ b/pkgs/development/tools/xcodes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "XcodesOrg"; - repo = finalAttrs.pname; + repo = "xcodes"; rev = finalAttrs.version; hash = "sha256-ARrSQ9ozM90Yg7y4WdU7jjNQ64sXHuhxZh/iNJcFfY0="; }; diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index 908d650e16c76..74d31fbb21f88 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yaml2json"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bronze1man"; repo = "yaml2json"; rev = "v${version}"; - hash = "sha256-yVA5eV+/TxWN3wzsHy5++IGMAopkCz+PBfjSD+TNKc8="; + hash = "sha256-SDKsmK2YVX+LiF0WQyZOQBpcHFVrBurzqf4xItIfmrE="; }; vendorHash = "sha256-g+yaVIx4jxpAQ/+WrGKxhVeliYx7nLQe/zsGpxV4Fn4="; diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/development/tools/yo/default.nix index 325939a7609b0..ded4b5d0202a2 100644 --- a/pkgs/development/tools/yo/default.nix +++ b/pkgs/development/tools/yo/default.nix @@ -23,6 +23,6 @@ buildNpmPackage rec { homepage = "https://github.com/yeoman/yo"; license = lib.licenses.bsd2; mainProgram = "yo"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 571c0a489ea72..a2e62c9c00fa7 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.44.2"; + version = "4.44.3"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-l5/D2yCbf4CB4bUB/wIN/MW4u2D8pv7N6bL5q5DoDMs="; + hash = "sha256-bQNa19K4wO2XoSecyfOQKTfHFTxkji1U42bL4k1G7Gg="; }; - vendorHash = "sha256-HiRdz6fDu0Q0mAi2E5Ec0Hst8mhJEfvNuoDXJ5Ak+js="; + vendorHash = "sha256-LsunMHKtyAkTAJhqURoAhIIyW//d37ZW4trr+x/Cd8U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 297ab054b814a..4a3e61fb9059d 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.49.1"; + version = "0.50.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-1W7pnljAzeIjXdjCj8nauvca4IGpsn0TmrKUNJtMg+E="; + sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4="; }; vendorHash = null; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index f408780d1dea5..8adf786836c90 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zed"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xjE/9Sl4lpgUg1+giUw/14E3MehhFqJI5cYXaw/qVPE="; + sha256 = "sha256-bafX3i6jEMqYB4YCpIX4z4SgQbJjryGmZ6pvqtVrk3A="; }; vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index 3d917e4348968..ee24281798d74 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/liquidaty/zsv"; changelog = "https://github.com/liquidaty/zsv/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 0bbaf69a73158..0cc03477db96c 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.17"; + version = "1.1.20"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-aULgRZ9evcGUhKJ6slLJOg3IEzUeNfIkJF8RDP3YUlo="; + hash = "sha256-ErutjiXBjC9GDvb0F39AgbbsSo6zhRzpDEvDor/xRbI="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-eytY45LcgeI9m9amHd8hfE7Lz7ET7p19h37Bi4yUHBM="; + hash = "sha256-vqL/H5t0elgT9fSk0Op7Td69eP9WPY2XVo1a8sraTwM="; }; "x86_64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-bF/yg7C2tsdPjotC4DKISZRWEUUmUha22tWJynearEM="; + url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; + hash = "sha256-5PLk8q3di5TW8HUfo7P3xrPWLhleAiSv9jp2XeL47Kk="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-pRggu/l0HgCk73kX7W43qKFVE13/7pP4P9bTiqyK2Yk="; + hash = "sha256-bLcK0DSaLOzJSrIRPNHQeld5qud8ccqxzyDIgawMB3U="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 8ce3c5aef739a..7ab1cfa4d6b4c 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,6 +1,5 @@ { alsa-lib , autoPatchelfHook -, callPackage , fetchzip , gtk2 , gtk3 @@ -18,11 +17,11 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM="; + checksum = "sha256-zS/yMXNNYlxgYyUDou2HaXuetPotqiOM8kv1Y7JouCo="; }; aarch64-linux = { platform = "linux-arm64"; - checksum = "sha256-aW3cUZqAdiOLzOC9BQM/bTkDVyw24Dx9nBSXgbiKe4c="; + checksum = "sha256-rB0ak6jYnJMb0aHDLAyhaGoOFK4FXDLEOeofNdW/Wk8="; }; }; inherit (stdenv.hostPlatform) system; @@ -30,7 +29,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "13.2.0"; + version = "13.13.2"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9d803160d5755..90fcceedbd067 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.44.4"; + version = "1.45.5"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-DQrN5x+UiY6lLY1h96sTWBhD0jrvNyCdTwHsyFo95VE="; + hash = "sha256-hV//IH9PoAS9vt7uESBAyD6KYhZdCQuMx4NtB+BaBss="; }; - cargoHash = "sha256-QGBFDFZpOqPj/U1PhMaTZ3mI+d2jG6vYAkW6aNG4wyQ="; + cargoHash = "sha256-TopzwlyvaDnZ3J2oDz9a27Fw3aRM000IcvKBykDPytU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { find ./target -name libswc_common${stdenv.hostPlatform.extensions.sharedLibrary} -delete ''; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index e7de26609e67c..43bd7d9ef9fa1 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -13,11 +13,11 @@ let }; in fetch_librusty_v8 { - version = "0.93.1"; + version = "0.99.0"; shas = { - x86_64-linux = "sha256-ttbwIxzMgihfwwjh3usu7FxVTwLt7ceXU+MyaxXfkxk="; - aarch64-linux = "sha256-rlyY4C4FMHTyPUzqHKYzToIs9tJunTXEor9wc/7zH/0="; - x86_64-darwin = "sha256-IUDe0ogBSCaz1q+uXepOi883hamtJYqBPtNfrm/y6Qo="; - aarch64-darwin = "sha256-53PuHq7AUi21cjopoFakzLuJyqSJ9VeF7g53IWxFXAI="; + x86_64-linux = "sha256-rXAxKDTDB7tU5T6tf7XQUEAbDD2PXfzU+0bgA6WOsOQ="; + aarch64-linux = "sha256-4V3EtxH+rGsJzam57OByLlB0D1xtnSz+1P34EfaIry4="; + x86_64-darwin = "sha256-fYo8B9uMS6ElPA+4A3wLQvuLH2dqar6hGhpOTvnKK7s="; + aarch64-darwin = "sha256-vh/fitDe3s0AoncO9nlJPNTMLQhWuJnYzFHsYdmERrU="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index cde017c71e5dc..2b9e137ad6e19 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.79"; + version = "0.2.104"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-mnLBSTzeDcxmKNile4Kfe0AABoLgK3EL9HU8r8OPsuc="; + hash = "sha256-WMWOXgFsUOdN2MivOlfrN2X9RRiTp3iXv2D3hKGenWM="; }; - vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; + vendorHash = "sha256-Q9GQyIEdTp0ua7pa8sQth61lM149th96sFQesYHPvtI="; subPackages = [ "." ]; diff --git a/pkgs/development/web/flyctl/disable-auto-update.patch b/pkgs/development/web/flyctl/disable-auto-update.patch index d6c59755f881a..3fe6048871e4c 100644 --- a/pkgs/development/web/flyctl/disable-auto-update.patch +++ b/pkgs/development/web/flyctl/disable-auto-update.patch @@ -1,4 +1,4 @@ -From 9c76dbff982b0fd8beaffae42a6e98bc1e67f089 Mon Sep 17 00:00:00 2001 +From a46bc88829282032ab1d68ef6d67d25421ab8d32 Mon Sep 17 00:00:00 2001 From: Gabriel Simmer <g@gmem.ca> Date: Fri, 21 Jul 2023 08:16:52 +0100 Subject: [PATCH] Disable auto update @@ -8,18 +8,18 @@ Subject: [PATCH] Disable auto update 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/config.go b/internal/config/config.go -index 1914f8e0..958baf27 100644 +index 04583ca5..1b085b55 100644 --- a/internal/config/config.go +++ b/internal/config/config.go -@@ -141,7 +141,7 @@ func (cfg *Config) ApplyFile(path string) (err error) { - AutoUpdate bool `yaml:"auto_update"` +@@ -173,7 +173,7 @@ func (cfg *Config) applyFile(path string) (err error) { + SyntheticsAgent bool `yaml:"synthetics_agent"` } w.SendMetrics = true - w.AutoUpdate = true + w.AutoUpdate = false + w.SyntheticsAgent = true if err = unmarshal(path, &w); err == nil { - cfg.AccessToken = w.AccessToken -- -2.41.0 +2.45.2 diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 7c492135fdc73..62809d6a32bb7 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U47kA2D2dvJu8ym1OT/ThSsNC22b5hJ0Kqxerg8RPSI="; + sha256 = "sha256-nKOgXUwhOHaOnxycTsEReS/4y9DNpyqDKz7ohfAaJ3U="; }; - cargoHash = "sha256-pznA7aTLrc4I5uElh+4Oxp3lXHRfV5YMn9abcaJSHIc="; + cargoHash = "sha256-UDeHNIw7e+3zXO9Hggq3pVSDDp6iSoO8ikOl6RxZyb0="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 0ebe273949d89..9317dbe8f4e95 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -21,7 +21,7 @@ let meta = with lib; { homepage = "https://insomnia.rest"; - description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage. "; + description = " The open-source, cross-platform API client for GraphQL, REST, WebSockets, SSE and gRPC. With Cloud, Local and Git storage."; mainProgram = "insomnia"; changelog = "https://github.com/Kong/insomnia/releases/tag/core@${version}"; license = licenses.asl20; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 4df54b13a15ab..9227793f506a2 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "minify"; - version = "2.20.34"; + version = "2.20.37"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-x6xeAFy96Ur+Kc1ODQxpX/lgK2CJWn34HgZzGSmcwqE="; + hash = "sha256-sBq1RlvyTelPS3gUgucWnyKV93npxvHetB4ezxnhIbU="; }; vendorHash = "sha256-LT39GYDcFL3hjiYwvbSYjV8hcg0KNgQmLMRWcdz4T48="; diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix index d9c0daef7834c..2e54104d7dce4 100644 --- a/pkgs/development/web/netlify-cli/composition.nix +++ b/pkgs/development/web/netlify-cli/composition.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/web/nodejs/bypass-xcodebuild.diff b/pkgs/development/web/nodejs/bypass-xcodebuild.diff deleted file mode 100644 index 5c900dd2143f4..0000000000000 --- a/pkgs/development/web/nodejs/bypass-xcodebuild.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py ---- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-09-15 09:08:46.000000000 +0200 -+++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-12-03 16:55:43.781860687 +0100 -@@ -436,7 +436,14 @@ - # Since the CLT has no SDK paths anyway, returning None is the - # most sensible route and should still do the right thing. - try: -- return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem]) -+ # Return fake data that xcodebuild would normally return -+ -+ xcodedata = { -+ "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk", -+ "ProductBuildVersion": "19A547", -+ "ProductVersion": "10.15" -+ } -+ return xcodedata[infoitem] - except GypError: - pass - -@@ -1271,7 +1278,7 @@ - version = "" - build = "" - try: -- version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines() -+ version_list = [] - # In some circumstances xcodebuild exits 0 but doesn't return - # the right results; for example, a user on 10.7 or 10.8 with - # a bogus path set via xcode-select diff --git a/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch b/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch new file mode 100644 index 0000000000000..fa499c6491c76 --- /dev/null +++ b/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch @@ -0,0 +1,24 @@ +Add missing import statement for gyp-patches.nix. + +--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py ++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py +@@ -25,6 +25,7 @@ + import os + import re + import subprocess ++import sys + import gyp + import gyp.common + import gyp.xcode_emulation + +--- a/tools/gyp/pylib/gyp/generator/make.py ++++ b/tools/gyp/pylib/gyp/generator/make.py +@@ -25,6 +25,7 @@ + import os + import re + import subprocess ++import sys + import gyp + import gyp.common + import gyp.xcode_emulation + diff --git a/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch b/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch new file mode 100644 index 0000000000000..4f1abea901c0f --- /dev/null +++ b/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch @@ -0,0 +1,14 @@ +For some reason Node.js v22 has two different GYP versions vendored, and +only one of them contains `import sys`. + +--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py ++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py +@@ -25,6 +25,7 @@ + import os + import re + import subprocess ++import sys + import gyp + import gyp.common + import gyp.xcode_emulation + diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix new file mode 100644 index 0000000000000..67a2a2a128440 --- /dev/null +++ b/pkgs/development/web/nodejs/gyp-patches.nix @@ -0,0 +1,22 @@ +{ fetchpatch2 }: +let + name = "gyp-darwin-sandbox.patch"; + url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch"; +in +[ + # Fixes builds with Nix sandbox on Darwin for gyp. + # See https://github.com/NixOS/nixpkgs/issues/261820 + # and https://github.com/nodejs/gyp-next/pull/216 + (fetchpatch2 { + inherit name url; + hash = "sha256-l8FzgLq9CbVJCkXfnTyDQ+vXKCz65wpaffE74oSU+kY="; + stripLen = 1; + extraPrefix = "tools/gyp/"; + }) + (fetchpatch2 { + inherit name url; + hash = "sha256-UVUn4onXfJgFoAdApLAbliiBgM9rxDdIo53WjFryoBI="; + stripLen = 1; + extraPrefix = "deps/npm/node_modules/node-gyp/gyp/"; + }) +] diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 28fef6832bef0..c6ed6a116a37f 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, bash , pkg-config, which, buildPackages +, testers # for `.pkgs` attribute , callPackage # Updater dependencies @@ -44,7 +45,13 @@ let (builtins.attrNames sharedLibDeps); extraConfigFlags = lib.optionals (!enableNpm) [ "--without-npm" ]; - self = stdenv.mkDerivation { + + package = stdenv.mkDerivation (finalAttrs: + let + /** the final package fixed point, after potential overrides */ + self = finalAttrs.finalPackage; + in + { inherit pname version; src = fetchurl { @@ -60,8 +67,6 @@ let NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; }; - CC_host = "cc"; - CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ]; # NB: technically, we do not need bash in build inputs since all scripts are @@ -106,6 +111,11 @@ let dontDisableStatic = true; + configureScript = writeScript "nodejs-configure" '' + export CC_host="$CC_FOR_BUILD" CXX_host="$CXX_FOR_BUILD" + exec ${python.executable} configure.py "$@" + ''; + enableParallelBuilding = true; # Don't allow enabling content addressed conversion as `nodejs` @@ -128,25 +138,76 @@ let inherit patches; - doCheck = lib.versionAtLeast version "16"; # some tests fail on v14 + __darwinAllowLocalNetworking = true; # for tests + + # TODO: what about tests when cross-compiling? + # Note that currently stdenv does not run check phase if build ≠ host. + doCheck = true; # Some dependencies required for tools/doc/node_modules (and therefore # test-addons, jstest and others) target are not included in the tarball. # Run test targets that do not require network access. - checkTarget = lib.concatStringsSep " " [ + checkTarget = lib.concatStringsSep " " ([ "build-js-native-api-tests" "build-node-api-tests" "tooltest" "cctest" + ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [ + # There are some test failures on macOS before v20 that are not worth the + # time to debug for a version that would be eventually removed in less + # than a year (Node.js 18 will be EOL at 2025-04-30). Note that these + # failures are specific to Nix sandbox on macOS and should not affect + # actual functionality. + ] ++ lib.optionals (!stdenv.isDarwin) [ + # TODO: JS test suite is too flaky on Darwin; revisit at a later date. "test-ci-js" - ]; + ]); checkFlags = [ # Do not create __pycache__ when running tests. "PYTHONDONTWRITEBYTECODE=1" + ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [ "FLAKY_TESTS=skip" # Skip some tests that are not passing in this context - "CI_SKIP_TESTS=test-setproctitle,test-tls-cli-max-version-1.3,test-tls-client-auth,test-child-process-exec-env,test-fs-write-stream-eagain,test-tls-sni-option,test-https-foafssl,test-child-process-uid-gid,test-process-euid-egid,test-process-initgroups,test-process-uid-gid,test-process-setgroups" + "CI_SKIP_TESTS=${lib.concatStringsSep "," ([ + "test-child-process-exec-env" + "test-child-process-uid-gid" + "test-fs-write-stream-eagain" + "test-https-foafssl" + "test-process-euid-egid" + "test-process-initgroups" + "test-process-setgroups" + "test-process-uid-gid" + "test-setproctitle" + "test-tls-cli-max-version-1.3" + "test-tls-client-auth" + "test-tls-sni-option" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Disable tests that don’t work under macOS sandbox. + "test-macos-app-sandbox" + "test-os" + "test-os-process-priority" + # This is a bit weird, but for some reason fs watch tests fail with + # sandbox. + "test-fs-promises-watch" + "test-fs-watch" + "test-fs-watch-encoding" + "test-fs-watch-non-recursive" + "test-fs-watch-recursive-add-file" + "test-fs-watch-recursive-add-file-to-existing-subfolder" + "test-fs-watch-recursive-add-file-to-new-folder" + "test-fs-watch-recursive-add-file-with-url" + "test-fs-watch-recursive-add-folder" + "test-fs-watch-recursive-assert-leaks" + "test-fs-watch-recursive-promise" + "test-fs-watch-recursive-symlink" + "test-fs-watch-recursive-sync-write" + "test-fs-watch-recursive-update-file" + "test-fs-watchfile" + "test-runner-run" + "test-runner-watch-mode" + "test-watch-mode-files_watcher" + ])}" ]; postInstall = '' @@ -207,6 +268,13 @@ let EOF ''; + passthru.tests = { + version = testers.testVersion { + package = self; + version = "v${version}"; + }; + }; + passthru.updateScript = import ./update.nix { inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell; inherit lib; @@ -218,7 +286,7 @@ let homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu aduh95 ]; + maintainers = with maintainers; [ aduh95 ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; @@ -233,5 +301,5 @@ let }; passthru.python = python; # to ensure nodeEnv uses the same version - }; -in self + }); +in package diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index b44dbc8e51d2b..1101fbdf725d5 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -16,11 +16,15 @@ let buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python311; }; + + gypPatches = callPackage ./gyp-patches.nix { } ++ [ + ./gyp-patches-pre-v22-import-sys.patch + ]; in buildNodejs { inherit enableNpm; - version = "18.20.2"; - sha256 = "sha256-iq6nycfpJ/sJ2RSY2jEbbk0YIzOQ4jxyOlO4kfrUxz8="; + version = "18.20.4"; + sha256 = "sha256-p2x+oblq62ljoViAYmDICUtiRNZKaWUp0CBUe5qVyio="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch @@ -33,5 +37,5 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; }) - ]; + ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 1fb2d61fba218..bf0e2f7feffb0 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -5,11 +5,15 @@ let inherit openssl; python = python3; }; + + gypPatches = callPackage ./gyp-patches.nix { } ++ [ + ./gyp-patches-pre-v22-import-sys.patch + ]; in buildNodejs { inherit enableNpm; - version = "20.14.0"; - sha256 = "sha256-CGVQKPDYQ26IFj+RhgRNY10/Nqhe5Sjza9BbbF5Gwbs="; + version = "20.15.1"; + sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch @@ -23,5 +27,5 @@ buildNodejs { url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch"; hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo="; }) - ]; + ] ++ gypPatches; } diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 4bc7c46c15ba0..cb1f5242e2651 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -1,26 +1,24 @@ -{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; python = python3; }; + + gypPatches = callPackage ./gyp-patches.nix { } ++ [ + ./gyp-patches-v22-import-sys.patch + ]; in buildNodejs { inherit enableNpm; - version = "22.3.0"; - sha256 = "0k0h4s9s2y0ms3g6xhynsqsrkl9hz001dmj6j0gpc5x5vk8mpf5z"; + version = "22.4.1"; + sha256 = "sha256-ZfyFf1qoJWqvyQCzRMARXJrq4loCVB/Vzg29Tf0cX7k="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - (fetchpatch2 { - # Fixes OpenSSL 3.0.14 compatibility in tests. - # See https://github.com/nodejs/node/pull/53373 - url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch"; - hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo="; - }) - ]; + ] ++ gypPatches; } diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix index d9c0daef7834c..e59fd8a77f515 100644 --- a/pkgs/development/web/playwright-test/default.nix +++ b/pkgs/development/web/playwright-test/default.nix @@ -8,7 +8,7 @@ let nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index 3784cca31ae55..bc1119103c44a 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { name = "postman"; - exec = "postman"; + exec = "postman %U"; icon = "postman"; comment = "API Development Environment"; desktopName = "Postman"; diff --git a/pkgs/development/web/shopify-cli/Gemfile b/pkgs/development/web/shopify-cli/Gemfile deleted file mode 100644 index ec10d4a03468a..0000000000000 --- a/pkgs/development/web/shopify-cli/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'shopify-cli' diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/development/web/shopify-cli/Gemfile.lock deleted file mode 100644 index 79a4220d4ac22..0000000000000 --- a/pkgs/development/web/shopify-cli/Gemfile.lock +++ /dev/null @@ -1,39 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.2) - bugsnag (6.25.1) - concurrent-ruby (~> 1.0) - concurrent-ruby (1.1.10) - ffi (1.15.5) - liquid (5.4.0) - listen (3.7.1) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - mini_portile2 (2.8.1) - nokogiri (1.14.0) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - parser (3.2.0.0) - ast (~> 2.4.1) - racc (1.6.2) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - shopify-cli (2.34.0) - bugsnag (~> 6.22) - listen (~> 3.7.0) - theme-check (~> 1.14.0) - theme-check (1.14.0) - liquid (>= 5.4.0) - nokogiri (>= 1.12) - parser (~> 3) - -PLATFORMS - ruby - -DEPENDENCIES - shopify-cli - -BUNDLED WITH - 2.4.3 diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix deleted file mode 100644 index ae6e6b82df9be..0000000000000 --- a/pkgs/development/web/shopify-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: - -let - rubyEnv = bundlerEnv { - name = "shopify-cli"; - gemdir = ./.; - ruby = ruby; - }; -in -stdenv.mkDerivation rec { - pname = "shopify-cli"; - version = (import ./gemset.nix).shopify-cli.version; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${rubyEnv}/bin/shopify $out/bin/shopify - wrapProgram $out/bin/shopify \ - --prefix PATH : ${lib.makeBinPath [ ruby ]} - ''; - - passthru.updateScript = bundlerUpdateScript "shopify-cli"; - - meta = with lib; { - description = "CLI which helps you build against the Shopify platform faster"; - homepage = "https://github.com/Shopify/shopify-cli"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - mainProgram = "shopify"; - platforms = ruby.meta.platforms; - }; -} - diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/development/web/shopify-cli/gemset.nix deleted file mode 100644 index 3bc3e2edef4b5..0000000000000 --- a/pkgs/development/web/shopify-cli/gemset.nix +++ /dev/null @@ -1,149 +0,0 @@ -{ - ast = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - bugsnag = { - dependencies = ["concurrent-ruby"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "108q00vcx3vkr85mpayns3ini6ids807bmhl8nfham9900ric27y"; - type = "gem"; - }; - version = "6.25.1"; - }; - concurrent-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; - type = "gem"; - }; - version = "1.1.10"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; - type = "gem"; - }; - version = "1.15.5"; - }; - liquid = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h0d0ghdf01lkv4x0mzp6zdkrnj7gsfq3widkhyni26bf6648qp3"; - type = "gem"; - }; - version = "5.4.0"; - }; - listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; - type = "gem"; - }; - version = "3.7.1"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; - type = "gem"; - }; - version = "2.8.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; - type = "gem"; - }; - version = "1.14.0"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; - type = "gem"; - }; - version = "3.2.0.0"; - }; - racc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; - type = "gem"; - }; - version = "1.6.2"; - }; - rb-fsevent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; - type = "gem"; - }; - version = "0.11.2"; - }; - rb-inotify = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; - type = "gem"; - }; - version = "0.10.1"; - }; - shopify-cli = { - dependencies = ["bugsnag" "listen" "theme-check"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zzg2vv58s7ylbk35vfb3gj9q6wr59m18gb8sw9f2rnsgsmkivbr"; - type = "gem"; - }; - version = "2.34.0"; - }; - theme-check = { - dependencies = ["liquid" "nokogiri" "parser"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w5mmxnyc0h612c04x6h3xb8jjcq5l6mh2vql4138h2r2z98vdwq"; - type = "gem"; - }; - version = "1.14.0"; - }; -} |